Merge pull request #49339 from allgandalf/issue-48974

[Internal QA]: Refactor ChooseTransferAccountPage to use Selection List
Expensify · Sep 18, 2024 · b7c0055 · b7c0055
2 parents cd3f9d2 + 1260999
commit b7c0055
Showing 1 changed file with 72 additions and 38 deletions.
diff --git a/src/pages/settings/Wallet/ChooseTransferAccountPage.tsx b/src/pages/settings/Wallet/ChooseTransferAccountPage.tsx
@@ -1,31 +1,32 @@
-import React from 'react';
-import type {GestureResponderEvent} from 'react-native';
+import React, {useMemo} from 'react';
 import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import getBankIcon from '@components/Icon/BankIcons';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MenuItem from '@components/MenuItem';
 import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {getLastFourDigits} from '@libs/BankAccountUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {AccountData, WalletTransfer} from '@src/types/onyx';
-import PaymentMethodList from './PaymentMethodList';
+import type {AccountData} from '@src/types/onyx';
+import type {BankName} from '@src/types/onyx/Bank';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-type ChooseTransferAccountPageOnyxProps = {
-    /** Wallet transfer propTypes */
-    walletTransfer: OnyxEntry<WalletTransfer>;
-};
+function ChooseTransferAccountPage() {
+    const [walletTransfer, walletTransferResult] = useOnyx(ONYXKEYS.WALLET_TRANSFER);
 
-type ChooseTransferAccountPageProps = ChooseTransferAccountPageOnyxProps;
-
-function ChooseTransferAccountPage({walletTransfer = {}}: ChooseTransferAccountPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     /**
@@ -34,7 +35,7 @@ function ChooseTransferAccountPage({walletTransfer = {}}: ChooseTransferAccountP
      * @param accountType of the selected account type
      * @param account of the selected account data
      */
-    const selectAccountAndNavigateBack = (event?: GestureResponderEvent | KeyboardEvent, accountType?: string, account?: AccountData) => {
+    const selectAccountAndNavigateBack = (accountType?: string, account?: AccountData) => {
         PaymentMethods.saveWalletTransferAccountTypeAndID(
             accountType ?? '',
             (accountType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT ? account?.bankAccountID?.toString() : account?.fundID?.toString()) ?? '',
@@ -50,40 +51,73 @@ function ChooseTransferAccountPage({walletTransfer = {}}: ChooseTransferAccountP
         BankAccounts.openPersonalBankAccountSetupView();
     };
 
+    const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const selectedAccountID = walletTransfer?.selectedAccountID;
+    const data = useMemo(() => {
+        const options = Object.values(bankAccountsList ?? {}).map((bankAccount) => {
+            const bankName = (bankAccount.accountData?.additionalData?.bankName ?? '') as BankName;
+            const bankAccountNumber = bankAccount.accountData?.accountNumber ?? '';
+            const bankAccountID = bankAccount.accountData?.bankAccountID ?? bankAccount.methodID;
+            const {icon, iconSize, iconStyles} = getBankIcon({bankName, styles});
+            return {
+                value: bankAccountID,
+                text: bankAccount.title,
+                leftElement: icon ? (
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.mr3]}>
+                        <Icon
+                            src={icon}
+                            width={iconSize}
+                            height={iconSize}
+                            additionalStyles={iconStyles}
+                        />
+                    </View>
+                ) : null,
+                alternateText: `${translate('workspace.expensifyCard.accountEndingIn')} ${getLastFourDigits(bankAccountNumber)}`,
+                keyForList: bankAccountID?.toString(),
+                isSelected: bankAccountID?.toString() === selectedAccountID,
+                bankAccount,
+            };
+        });
+        return options;
+    }, [bankAccountsList, selectedAccountID, styles, translate]);
+
+    if (isLoadingOnyxValue(walletTransferResult)) {
+        return <FullscreenLoadingIndicator />;
+    }
+
     return (
         <ScreenWrapper testID={ChooseTransferAccountPage.displayName}>
             <HeaderWithBackButton
                 title={translate('chooseTransferAccountPage.chooseAccount')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE)}
             />
-            <View style={[styles.mt3, styles.flexShrink1, styles.flexBasisAuto]}>
-                <PaymentMethodList
-                    onPress={selectAccountAndNavigateBack}
-                    shouldShowSelectedState
-                    filterType={walletTransfer?.filterPaymentMethodType}
-                    selectedMethodID={walletTransfer?.selectedAccountID}
-                    shouldShowAddPaymentMethodButton={false}
-                    shouldShowAddBankAccount={false}
-                    shouldShowRightIcon={false}
+            <ScrollView>
+                <SelectionList
+                    sections={[{data}]}
+                    ListItem={RadioListItem}
+                    onSelectRow={(value) => {
+                        const accountType = value?.bankAccount?.accountType;
+                        const accountData = value?.bankAccount?.accountData;
+                        selectAccountAndNavigateBack(accountType, accountData);
+                    }}
+                    shouldSingleExecuteRowSelect
+                    shouldUpdateFocusedIndex
+                    initiallyFocusedOptionKey={walletTransfer?.selectedAccountID?.toString()}
                 />
-            </View>
-            <MenuItem
-                onPress={navigateToAddPaymentMethodPage}
-                title={
-                    walletTransfer?.filterPaymentMethodType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT
-                        ? translate('paymentMethodList.addNewBankAccount')
-                        : translate('paymentMethodList.addNewDebitCard')
-                }
-                icon={Expensicons.Plus}
-            />
+                <MenuItem
+                    onPress={navigateToAddPaymentMethodPage}
+                    title={
+                        walletTransfer?.filterPaymentMethodType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT
+                            ? translate('paymentMethodList.addNewBankAccount')
+                            : translate('paymentMethodList.addNewDebitCard')
+                    }
+                    icon={Expensicons.Plus}
+                />
+            </ScrollView>
         </ScreenWrapper>
     );
 }
 
 ChooseTransferAccountPage.displayName = 'ChooseTransferAccountPage';
 
-export default withOnyx<ChooseTransferAccountPageProps, ChooseTransferAccountPageOnyxProps>({
-    walletTransfer: {
-        key: ONYXKEYS.WALLET_TRANSFER,
-    },
-})(ChooseTransferAccountPage);
+export default ChooseTransferAccountPage;