[No QA] Card settings page #45415
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,8 @@ import CONST from '@src/CONST'; | |
| import type {TranslationPaths} from '@src/languages/types'; | ||
| import type {OnyxValues} from '@src/ONYXKEYS'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type {BankAccountList, Card, CardList} from '@src/types/onyx'; | ||
| import {isEmptyObject} from '@src/types/utils/EmptyObject'; | ||
| import * as Localize from './Localize'; | ||
|
|
||
| let allCards: OnyxValues[typeof ONYXKEYS.CARD_LIST] = {}; | ||
|
|
@@ -158,6 +159,14 @@ function getTranslationKeyForLimitType(limitType: ValueOf<typeof CONST.EXPENSIFY | |
| } | ||
| } | ||
|
|
||
| function getEligibleBankAccountsForCard(bankAccountsList: OnyxEntry<BankAccountList>) { | ||
| if (!bankAccountsList || isEmptyObject(bankAccountsList)) { | ||
| return []; | ||
| } | ||
| /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ | ||
| return Object.values(bankAccountsList).filter((bankAccount) => bankAccount?.accountData?.allowDebit || bankAccount?.accountData?.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS); | ||
|
There was a problem hiding this comment. Why not There was a problem hiding this comment. if allowDebit would be false it would return false and wouldn't check for the type. We could have false for allowDebit but type would be fine, but we would get false incorrectly There was a problem hiding this comment. Could we get around this? I believe that any eslnt rule disable means that react-compiler does not process this file, we should try to avoid adding any eslint-disable to new code |
||
| } | ||
|
|
||
| export { | ||
| isExpensifyCard, | ||
| isCorporateCard, | ||
|
|
@@ -171,4 +180,5 @@ export { | |
| hasDetectedFraud, | ||
| getMCardNumberString, | ||
| getTranslationKeyForLimitType, | ||
| getEligibleBankAccountsForCard, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -409,6 +409,9 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP | |
| [SCREENS.WORKSPACE.TAX_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/ValuePage').default, | ||
| [SCREENS.WORKSPACE.TAX_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceCreateTaxPage').default, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/card/issueNew/IssueNewCardPage').default, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceCardSettingsPage').default, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceSettlementAccountPage').default, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage').default, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts').default, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage').default, | ||
| [SCREENS.SETTINGS.SAVE_THE_WORLD]: () => require<ReactComponentModule>('../../../../pages/TeachersUnite/SaveTheWorldPage').default, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -161,7 +161,14 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = { | |
| SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE, | ||
| SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE, | ||
| ], | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD]: [ | ||
| SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW, | ||
| SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT, | ||
| SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS, | ||
| SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT, | ||
| SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY, | ||
| SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS, | ||
| ], | ||
| }; | ||
|
|
||
| export default FULL_SCREEN_TO_RHP_MAPPING; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -468,6 +468,15 @@ const config: LinkingOptions<RootStackParamList>['config'] = { | |
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: { | ||
| path: ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.route, | ||
| }, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: { | ||
| path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS.route, | ||
| }, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: { | ||
| path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_FREQUENCY.route, | ||
| }, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: { | ||
| path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT.route, | ||
| }, | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: { | ||
| path: ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.route, | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -656,6 +656,15 @@ type SettingsNavigatorParamList = { | |
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: { | ||
| policyID: string; | ||
| }; | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: { | ||
| policyID: string; | ||
| }; | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: { | ||
| policyID: string; | ||
| }; | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: { | ||
| policyID: string; | ||
| }; | ||
| [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: { | ||
| policyID: string; | ||
| cardID: string; | ||
|
|
@@ -1066,9 +1075,6 @@ type FullScreenNavigatorParamList = { | |
| [SCREENS.WORKSPACE.WORKFLOWS]: { | ||
| policyID: string; | ||
| }; | ||
| [SCREENS.WORKSPACE.WORKFLOWS_APPROVER]: { | ||
| policyID: string; | ||
| }; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| import Onyx from 'react-native-onyx'; | ||
| import type {OnyxUpdate} from 'react-native-onyx'; | ||
| import type {ValueOf} from 'type-fest'; | ||
| import * as API from '@libs/API'; | ||
| import type {ActivatePhysicalExpensifyCardParams, ReportVirtualExpensifyCardFraudParams, RequestReplacementExpensifyCardParams, RevealExpensifyCardDetailsParams} from '@libs/API/parameters'; | ||
| import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; | ||
|
|
@@ -196,6 +197,102 @@ function revealVirtualCardDetails(cardID: number): Promise<ExpensifyCardDetails> | |
| }); | ||
| } | ||
|
|
||
| function updateSettlementFrequency(policyID: string, frequency: ValueOf<typeof CONST.EXPENSIFY_CARD.FREQUENCY_SETTING>) { | ||
| // TODO: remove this code when the API is ready | ||
| if (frequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY) { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, { | ||
| monthlySettlementDate: null, | ||
| }); | ||
| } else { | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, { | ||
| monthlySettlementDate: new Date(), | ||
| }); | ||
| } | ||
|
|
||
| // TODO: uncomment this code when the API is ready | ||
| // const optimisticData: OnyxUpdate[] = [ | ||
| // { | ||
| // onyxMethod: Onyx.METHOD.MERGE, | ||
| // key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, | ||
| // value: { | ||
| // monthlySettlementDate: '', | ||
| // }, | ||
| // }, | ||
| // ]; | ||
| // | ||
| // const successData: OnyxUpdate[] = [ | ||
| // { | ||
| // onyxMethod: Onyx.METHOD.MERGE, | ||
| // key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, | ||
| // value: { | ||
| // monthlySettlementDate: '', | ||
| // }, | ||
| // }, | ||
| // ]; | ||
| // | ||
| // const failureData: OnyxUpdate[] = [ | ||
| // { | ||
| // onyxMethod: Onyx.METHOD.MERGE, | ||
| // key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, | ||
| // value: { | ||
| // monthlySettlementDate: null, | ||
| // }, | ||
| // }, | ||
| // ]; | ||
| // | ||
| // const parameters = { | ||
| // workspaceAccountID: policyID, | ||
| // settlementFrequency: frequency, | ||
| // }; | ||
| // | ||
| // API.write(WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_FREQUENCY, parameters, {optimisticData, successData, failureData}); | ||
| } | ||
|
|
||
| function updateSettlementAccount(policyID: string, accountID: number) { | ||
| // TODO: remove this code when the API is ready | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, { | ||
| paymentBankAccountID: accountID, | ||
| }); | ||
|
|
||
| // TODO: uncomment this code when the API is ready | ||
| // const optimisticData: OnyxUpdate[] = [ | ||
| // { | ||
| // onyxMethod: Onyx.METHOD.MERGE, | ||
| // key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, | ||
| // value: { | ||
| // paymentBankAccountID: accountID, | ||
| // }, | ||
| // }, | ||
| // ]; | ||
| // | ||
| // const successData: OnyxUpdate[] = [ | ||
| // { | ||
| // onyxMethod: Onyx.METHOD.MERGE, | ||
| // key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, | ||
| // value: { | ||
| // paymentBankAccountID: accountID, | ||
| // }, | ||
| // }, | ||
| // ]; | ||
| // | ||
| // const failureData: OnyxUpdate[] = [ | ||
| // { | ||
| // onyxMethod: Onyx.METHOD.MERGE, | ||
| // key: `${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`, | ||
| // value: { | ||
| // paymentBankAccountID: null, | ||
| // }, | ||
| // }, | ||
| // ]; | ||
| // | ||
| // const parameters = { | ||
| // workspaceAccountID: policyID, | ||
| // settlementBankAccountID: accountID, | ||
| // }; | ||
| // | ||
| // API.write(WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_ACCOUNT, parameters, {optimisticData, successData, failureData}); | ||
| } | ||
|
|
||
| function setIssueNewCardStepAndData({data, isEditing, step}: IssueNewCardFlowData) { | ||
| Onyx.merge(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD, {data, isEditing, currentStep: step}); | ||
| } | ||
|
|
@@ -213,6 +310,8 @@ export { | |
| clearCardListErrors, | ||
| reportVirtualExpensifyCardFraud, | ||
| revealVirtualCardDetails, | ||
| updateSettlementFrequency, | ||
| updateSettlementAccount, | ||
| setIssueNewCardStepAndData, | ||
| clearIssueNewCardFlow, | ||
| }; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,9 +23,10 @@ function ReconciliationAccountSettingsPage({route}: ReconciliationAccountSetting | |
| const {translate} = useLocalize(); | ||
|
|
||
| const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST); | ||
| const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_EXPENSIFY_CARD_SETTINGS}${policyID}`); | ||
| const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? ''; | ||
|
|
||
| const selectedBankAccount = useMemo(() => bankAccountList?.[paymentBankAccountID], [paymentBankAccountID, bankAccountList]); | ||
|
|
||
| const sections = useMemo(() => { | ||
| const data = Object.values(bankAccountList ?? {}).map((bankAccount) => ({ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@MariaHCD @mountiny - just to make sure, sharedNVP_expensifyCard_continuousReconciliationConnection_ should store connection name, not the bank account data?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, sharedNVP_expensifyCard_continuousReconciliationConnection_ will just store the name of the connection like
quickbooksOnline,xero,netsuiteorintacctThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, thanks! So it's now fixed in this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not related but just for info, is that an
array? can we have multiple connections at once?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will just be a string. I believe it's only one connection at a time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cool, thanks