From d8e45cb939fb5f270e5c0a8b8afee1bdf72e94c6 Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Tue, 13 May 2025 00:52:18 +0200 Subject: [PATCH 1/3] update card settlement to use data from cardSettings --- .../WorkspaceCardSettingsPage.tsx | 3 +- .../WorkspaceSettlementAccountPage.tsx | 28 +++++++++++++++++-- src/types/onyx/ExpensifyCardSettings.ts | 6 ++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx index 6c6b2c4879c7..d32b2ddaff2a 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx @@ -32,10 +32,11 @@ function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) { const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`, {canBeMissing: false}); const paymentBankAccountID = cardSettings?.paymentBankAccountID; + const paymentBankAccountNumber = cardSettings?.paymentBankAccountNumber; const isMonthlySettlementAllowed = cardSettings?.isMonthlySettlementAllowed ?? false; const settlementFrequency = cardSettings?.monthlySettlementDate ? CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY : CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY; const isSettlementFrequencyBlocked = !isMonthlySettlementAllowed && settlementFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY; - const bankAccountNumber = paymentBankAccountID ? bankAccountList?.[paymentBankAccountID.toString()]?.accountData?.accountNumber ?? '' : ''; + const bankAccountNumber = bankAccountList?.[paymentBankAccountID?.toString() ?? '']?.accountData?.accountNumber ?? paymentBankAccountNumber ?? ''; return ( + + + ), + alternateText: `${translate('workspace.expensifyCard.accountEndingIn')} ${getLastFourDigits(bankAccountNumber)}`, + keyForList: paymentBankAccountID?.toString(), + isSelected: true, + }); + } return options; - }, [eligibleBankAccounts, paymentBankAccountID, styles, translate]); + }, [eligibleBankAccounts, paymentBankAccountAddressName, paymentBankAccountID, paymentBankAccountNumberFromCardSettings, styles, translate]); const updateSettlementAccount = (value: number) => { updateSettlementAccountCard(domainName, defaultFundID, policyID, value, paymentBankAccountID); diff --git a/src/types/onyx/ExpensifyCardSettings.ts b/src/types/onyx/ExpensifyCardSettings.ts index 95eedb462f75..df70b4adc599 100644 --- a/src/types/onyx/ExpensifyCardSettings.ts +++ b/src/types/onyx/ExpensifyCardSettings.ts @@ -37,6 +37,12 @@ type ExpensifyCardSettings = OnyxCommon.OnyxValueWithOfflineFeedback<{ /** Name of the domain card was issued for */ domainName?: string; + + /** Name of the bank account used for the card settlement */ + paymentBankAccountAddressName?: string; + + /** Number of the bank account used for the card settlement */ + paymentBankAccountNumber?: string; }>; export default ExpensifyCardSettings; From 65e077c9104b7ed233987b1a7f149a4230ac993b Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Wed, 14 May 2025 11:12:53 +0200 Subject: [PATCH 2/3] fix linter --- .../expensifyCard/WorkspaceSettlementAccountPage.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx index 4e9d8613f0e8..ffdc8c271433 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx @@ -36,10 +36,10 @@ function WorkspaceSettlementAccountPage({route}: WorkspaceSettlementAccountPageP const policyID = route.params?.policyID; const defaultFundID = useDefaultFundID(policyID); - const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); - const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`); - const [isUsedContinuousReconciliation] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${defaultFundID}`); - const [reconciliationConnection] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${defaultFundID}`); + const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {canBeMissing: true}); + const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`, {canBeMissing: true}); + const [isUsedContinuousReconciliation] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${defaultFundID}`, {canBeMissing: true}); + const [reconciliationConnection] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${defaultFundID}`, {canBeMissing: true}); const connectionName = reconciliationConnection ?? ''; const connectionParam = getRouteParamForConnection(connectionName as ConnectionName); From 8d4b0d2ec67905c05ca5fe67112a7050434936bb Mon Sep 17 00:00:00 2001 From: Artem Makushov Date: Wed, 14 May 2025 19:02:34 +0200 Subject: [PATCH 3/3] feedback --- .../expensifyCard/WorkspaceSettlementAccountPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx index ffdc8c271433..b239a935e293 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx @@ -38,7 +38,7 @@ function WorkspaceSettlementAccountPage({route}: WorkspaceSettlementAccountPageP const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {canBeMissing: true}); const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`, {canBeMissing: true}); - const [isUsedContinuousReconciliation] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${defaultFundID}`, {canBeMissing: true}); + const [isUsingContinuousReconciliation] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${defaultFundID}`, {canBeMissing: true}); const [reconciliationConnection] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${defaultFundID}`, {canBeMissing: true}); const connectionName = reconciliationConnection ?? ''; @@ -140,7 +140,7 @@ function WorkspaceSettlementAccountPage({route}: WorkspaceSettlementAccountPageP listHeaderContent={ <> {translate('workspace.expensifyCard.settlementAccountDescription')} - {!!isUsedContinuousReconciliation && ( + {!!isUsingContinuousReconciliation && ( {translate('workspace.expensifyCard.settlementAccountInfoPt1')}{' '} Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS.getRoute(policyID, connectionParam))}>