Merge pull request #39944 from dragnoir/38643-fix

Fix: style of page Transfer balance
Expensify · Apr 23, 2024 · 5e54d5a · 5e54d5a
2 parents 6e699cf + 28614bf
commit 5e54d5a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/pages/settings/Wallet/ChooseTransferAccountPage.tsx b/src/pages/settings/Wallet/ChooseTransferAccountPage.tsx
@@ -63,6 +63,8 @@ function ChooseTransferAccountPage({walletTransfer = {}}: ChooseTransferAccountP
                     filterType={walletTransfer?.filterPaymentMethodType}
                     selectedMethodID={walletTransfer?.selectedAccountID}
                     shouldShowAddPaymentMethodButton={false}
+                    shouldShowAddBankAccount={false}
+                    shouldShowRightIcon={false}
                 />
             </View>
             <MenuItem

diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -97,6 +97,9 @@ type PaymentMethodListProps = PaymentMethodListOnyxProps & {
     /** Whether the empty list message should be shown when the list is empty */
     shouldShowEmptyListMessage?: boolean;
 
+    /** Whether the right icon should be shown in PaymentMethodItem */
+    shouldShowRightIcon?: boolean;
+
     /** What to do when a menu item is pressed */
     onPress: (
         event?: GestureResponderEvent | KeyboardEvent,
@@ -186,6 +189,7 @@ function PaymentMethodList({
     shouldEnableScroll = true,
     style = {},
     listItemStyle = {},
+    shouldShowRightIcon = true,
 }: PaymentMethodListProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -265,12 +269,26 @@ function PaymentMethodList({
                 disabled: paymentMethod.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 isMethodActive,
                 iconRight: Expensicons.ThreeDots,
-                shouldShowRightIcon: true,
+                shouldShowRightIcon,
             };
         });
 
         return combinedPaymentMethods;
-    }, [shouldShowAssignedCards, fundList, bankAccountList, styles, filterType, isOffline, cardList, translate, actionPaymentMethodType, activePaymentMethodID, StyleUtils, onPress]);
+    }, [
+        shouldShowAssignedCards,
+        fundList,
+        bankAccountList,
+        styles,
+        filterType,
+        isOffline,
+        cardList,
+        translate,
+        actionPaymentMethodType,
+        activePaymentMethodID,
+        StyleUtils,
+        shouldShowRightIcon,
+        onPress,
+    ]);
 
     /**
      * Render placeholder when there are no payments methods

diff --git a/src/pages/settings/Wallet/TransferBalancePage.tsx b/src/pages/settings/Wallet/TransferBalancePage.tsx
@@ -188,7 +188,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
                             />
                         ))}
                     </View>
-                    <Text style={[styles.p5, styles.textLabelSupporting, styles.justifyContentStart]}>{translate('transferAmountPage.whichAccount')}</Text>
+                    <Text style={[styles.pt8, styles.ph5, styles.pb1, styles.textLabelSupporting, styles.justifyContentStart]}>{translate('transferAmountPage.whichAccount')}</Text>
                     {Boolean(selectedAccount) && (
                         <MenuItem
                             title={selectedAccount?.title}