From 544539a87bbe27e89db4c9a3fee1c14952d2da02 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Thu, 20 Mar 2025 00:05:06 +0700
Subject: [PATCH 1/2] Wallet bank account popover has extra space

---
 src/pages/settings/Wallet/WalletPage/WalletPage.tsx         | 4 ++--
 src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
index 2180b8f50a219..0f99ba6460208 100644
--- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
+++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -611,7 +611,7 @@ function WalletPage({shouldListenForResize = false}: WalletPageProps) {
                     anchorRef={paymentMethodButtonRef as RefObject<View>}
                 >
                     {!showConfirmDeleteModal && (
-                        <View style={[styles.mv5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
+                        <View style={[!isPopoverBottomMount ? styles.pv4 : styles.pt5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
                             {isPopoverBottomMount && (
                                 <MenuItem
                                     title={paymentMethod.formattedSelectedPaymentMethod.title}
@@ -668,7 +668,7 @@ function WalletPage({shouldListenForResize = false}: WalletPageProps) {
                     }}
                     anchorRef={paymentMethodButtonRef as RefObject<View>}
                 >
-                    <View style={[styles.mv5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
+                    <View style={[!isPopoverBottomMount ? styles.pv4 : styles.pt5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
                         {isPopoverBottomMount && (
                             <MenuItem
                                 title={paymentMethod.formattedSelectedPaymentMethod.title}
diff --git a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
index 0bd05289e480a..45c9c45385a09 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
@@ -205,7 +205,7 @@ function WorkspaceInvoiceVBASection({policyID}: WorkspaceInvoiceVBASectionProps)
                 anchorRef={paymentMethodButtonRef as RefObject<View>}
             >
                 {!showConfirmDeleteModal && (
-                    <View style={[styles.mv5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
+                    <View style={[!isPopoverBottomMount ? styles.pv4 : styles.pt5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
                         {isPopoverBottomMount && (
                             <MenuItem
                                 title={paymentMethod.formattedSelectedPaymentMethod.title}

From 376685ca27cffd36277ad2d541019b87879eece9 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Thu, 20 Mar 2025 00:40:05 +0700
Subject: [PATCH 2/2] clean code

---
 .../settings/Wallet/WalletPage/WalletPage.tsx | 22 +++++++++++++++++--
 .../invoices/WorkspaceInvoiceVBASection.tsx   | 11 +++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
index 0f99ba6460208..ceb16efec8724 100644
--- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
+++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -611,7 +611,16 @@ function WalletPage({shouldListenForResize = false}: WalletPageProps) {
                     anchorRef={paymentMethodButtonRef as RefObject<View>}
                 >
                     {!showConfirmDeleteModal && (
-                        <View style={[!isPopoverBottomMount ? styles.pv4 : styles.pt5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
+                        <View
+                            style={[
+                                !shouldUseNarrowLayout
+                                    ? {
+                                          ...styles.sidebarPopover,
+                                          ...styles.pv4,
+                                      }
+                                    : styles.pt5,
+                            ]}
+                        >
                             {isPopoverBottomMount && (
                                 <MenuItem
                                     title={paymentMethod.formattedSelectedPaymentMethod.title}
@@ -668,7 +677,16 @@ function WalletPage({shouldListenForResize = false}: WalletPageProps) {
                     }}
                     anchorRef={paymentMethodButtonRef as RefObject<View>}
                 >
-                    <View style={[!isPopoverBottomMount ? styles.pv4 : styles.pt5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
+                    <View
+                        style={[
+                            !shouldUseNarrowLayout
+                                ? {
+                                      ...styles.sidebarPopover,
+                                      ...styles.pv4,
+                                  }
+                                : styles.pt5,
+                        ]}
+                    >
                         {isPopoverBottomMount && (
                             <MenuItem
                                 title={paymentMethod.formattedSelectedPaymentMethod.title}
diff --git a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
index 45c9c45385a09..0154afe7f170b 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
@@ -205,7 +205,16 @@ function WorkspaceInvoiceVBASection({policyID}: WorkspaceInvoiceVBASectionProps)
                 anchorRef={paymentMethodButtonRef as RefObject<View>}
             >
                 {!showConfirmDeleteModal && (
-                    <View style={[!isPopoverBottomMount ? styles.pv4 : styles.pt5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
+                    <View
+                        style={[
+                            !shouldUseNarrowLayout
+                                ? {
+                                      ...styles.sidebarPopover,
+                                      ...styles.pv4,
+                                  }
+                                : styles.pt5,
+                        ]}
+                    >
                         {isPopoverBottomMount && (
                             <MenuItem
                                 title={paymentMethod.formattedSelectedPaymentMethod.title}