Use policy achAccount instead of reimbursementAccount in WorkspaceWorkflow #38395
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,6 @@ import useNetwork from '@hooks/useNetwork'; | |
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import useWindowDimensions from '@hooks/useWindowDimensions'; | ||
| import * as ErrorUtils from '@libs/ErrorUtils'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import Permissions from '@libs/Permissions'; | ||
| import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils'; | ||
|
|
@@ -30,7 +29,7 @@ import CONST from '@src/CONST'; | |
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import type SCREENS from '@src/SCREENS'; | ||
| import type {Beta, Session} from '@src/types/onyx'; | ||
| import ToggleSettingOptionRow from './ToggleSettingsOptionRow'; | ||
| import type {ToggleSettingOptionRowProps} from './ToggleSettingsOptionRow'; | ||
| import {getAutoReportingFrequencyDisplayNames} from './WorkspaceAutoReportingFrequencyPage'; | ||
|
|
@@ -39,14 +38,12 @@ import type {AutoReportingFrequencyKey} from './WorkspaceAutoReportingFrequencyP | |
| type WorkspaceWorkflowsPageOnyxProps = { | ||
| /** Beta features list */ | ||
| betas: OnyxEntry<Beta[]>; | ||
| /** Policy details */ | ||
| session: OnyxEntry<Session>; | ||
| }; | ||
| type WorkspaceWorkflowsPageProps = WithPolicyProps & WorkspaceWorkflowsPageOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS>; | ||
|
|
||
| function WorkspaceWorkflowsPage({policy, betas, route, session}: WorkspaceWorkflowsPageProps) { | ||
| const {translate, preferredLocale} = useLocalize(); | ||
| const styles = useThemeStyles(); | ||
| const {isSmallScreenWidth} = useWindowDimensions(); | ||
|
|
@@ -78,17 +75,21 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses | |
| navigateToBankAccountRoute(route.params.policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID)); | ||
| }, [policy, route.params.policyID]); | ||
|
|
||
| const {isOffline} = useNetwork({onReconnect: fetchData}); | ||
| const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy); | ||
|
|
||
| useEffect(() => { | ||
| fetchData(); | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, []); | ||
|
|
||
| const optionItems: ToggleSettingOptionRowProps[] = useMemo(() => { | ||
| const {accountNumber, addressName, bankName} = policy?.achAccount ?? {}; | ||
| const hasVBA = !!policy?.achAccount; | ||
|
There was a problem hiding this comment. This change also caused issue #39947 where we don't yet have a bank account added and because the achAccount: {reimburser: reimburserEmail} is set everytime we toggle "Make or track payments", the UI ends up looking like we have a bank account added because of this check, when we don't actually have a bank account added yet. |
||
| let bankDisplayName = bankName ?? addressName; | ||
| if (accountNumber && bankDisplayName !== accountNumber) { | ||
| bankDisplayName += ` ${accountNumber.slice(-5)}`; | ||
| } | ||
| const hasReimburserEmailError = !!policy?.errorFields?.reimburserEmail; | ||
| const hasApprovalError = !!policy?.errorFields?.approvalMode; | ||
| const hasDelayedSubmissionError = !!policy?.errorFields?.autoReporting; | ||
|
|
@@ -187,15 +188,16 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses | |
| ? translate('common.bankAccount') | ||
| : translate('workflowsPage.connectBankAccount') | ||
| } | ||
| description={bankDisplayName} | ||
| disabled={isOffline || !isPolicyAdmin} | ||
| onPress={() => { | ||
| if (!Policy.isCurrencySupportedForDirectReimbursement(policy?.outputCurrency ?? '')) { | ||
| setIsCurrencyModalOpen(true); | ||
| return; | ||
| } | ||
| navigateToBankAccountRoute(route.params.policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID)); | ||
| }} | ||
| shouldShowRightIcon={!isOffline && isPolicyAdmin} | ||
| wrapperStyle={containerStyle} | ||
| hoverAndPressStyle={[styles.mr0, styles.br2]} | ||
| /> | ||
|
|
@@ -238,9 +240,10 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses | |
| onPressAutoReportingFrequency, | ||
| preferredLocale, | ||
| canUseDelayedSubmission, | ||
| displayNameForAuthorizedPayer, | ||
| session?.accountID, | ||
| isOffline, | ||
| isPolicyAdmin, | ||
| ]); | ||
|
|
||
| const renderOptionItem = (item: ToggleSettingOptionRowProps, index: number) => ( | ||
|
|
@@ -263,8 +266,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses | |
| ); | ||
|
|
||
| const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy); | ||
| const isLoading = Boolean(policy?.isLoading && policy?.reimbursementChoice === undefined); | ||
|
|
||
| return ( | ||
| <FeatureEnabledAccessOrNotFoundWrapper | ||
|
|
@@ -317,10 +319,6 @@ export default withPolicy( | |
| betas: { | ||
| key: ONYXKEYS.BETAS, | ||
| }, | ||
| session: { | ||
| key: ONYXKEYS.SESSION, | ||
| }, | ||
|
|
||
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
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.
Hey, this PR caused a bug: Disconnected bank account is still displayed on bank account preview on Workflows page.
It has been handled but just FYI,
Whether the bank name shows up in the bank account preview on the workspace workflows page depends on the policy's
achAccount. But when we disconnect the bank account, we forget to setachAccounttonullin optimistic data. So, even after disconnecting, the bank account preview still appears until we get response from backend.More details here - #39439 (comment)