Handle error in workspace's bank account page #15394
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ import withPolicy from '../workspace/withPolicy'; | |
| import * as ReimbursementAccountProps from './reimbursementAccountPropTypes'; | ||
| import WorkspaceResetBankAccountModal from '../workspace/WorkspaceResetBankAccountModal'; | ||
| import * as BankAccounts from '../../libs/actions/BankAccounts'; | ||
| import OfflineWithFeedback from '../../components/OfflineWithFeedback'; | ||
|
|
||
| const propTypes = { | ||
| /** Bank account currently in setup */ | ||
|
|
@@ -29,9 +30,6 @@ const propTypes = { | |
| /** Callback to continue to the next step of the setup */ | ||
| continue: PropTypes.func.isRequired, | ||
|
|
||
| /** Policy values needed in the component */ | ||
| policy: PropTypes.shape({ | ||
| name: PropTypes.string, | ||
|
|
@@ -40,55 +38,67 @@ const propTypes = { | |
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const ContinueBankAccountSetup = (props) => { | ||
| const errors = lodashGet(props.reimbursementAccount, 'errors', {}); | ||
| const pendingAction = lodashGet(props.reimbursementAccount, 'pendingAction', null); | ||
| return ( | ||
| <ScreenWrapper includeSafeAreaPaddingBottom={false}> | ||
| <FullPageNotFoundView shouldShow={_.isEmpty(props.policy)}> | ||
| <HeaderWithCloseButton | ||
| title={props.translate('workspace.common.bankAccount')} | ||
| subtitle={lodashGet(props.policy, 'name')} | ||
| onCloseButtonPress={Navigation.dismissModal} | ||
| onBackButtonPress={Navigation.goBack} | ||
| shouldShowGetAssistanceButton | ||
| guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BANK_ACCOUNT} | ||
| shouldShowBackButton | ||
| /> | ||
| <ScrollView style={styles.flex1}> | ||
| <Section | ||
| title={props.translate('workspace.bankAccount.almostDone')} | ||
| icon={Illustrations.BankArrow} | ||
| > | ||
| <OfflineWithFeedback | ||
|
There was a problem hiding this comment. Hi all! Just dropping a note that this PR caused issue - #18517 Wrapping with 
There was a problem hiding this comment. Nice catch, but with removing the pending action we may lose some other intended strikethough styles? https://github.com/Expensify/App/pull/15394/files#r1119420530 |
||
| pendingAction={pendingAction} | ||
| errors={errors} | ||
| shouldShowErrorMessage | ||
| onClose={BankAccounts.resetReimbursementAccount} | ||
|
Comment on lines
+66
to
+70
There was a problem hiding this comment. Wrapped in
|
||
| > | ||
| <Text> | ||
| {props.translate('workspace.bankAccount.youreAlmostDone')} | ||
| </Text> | ||
| <Button | ||
| text={props.translate('workspace.bankAccount.continueWithSetup')} | ||
| onPress={props.continue} | ||
| icon={Expensicons.Bank} | ||
| style={[styles.mv4]} | ||
| iconStyles={[styles.buttonCTAIcon]} | ||
| shouldShowRightIcon | ||
| large | ||
| success | ||
| isDisabled={Boolean(pendingAction)} | ||
| /> | ||
| <MenuItem | ||
| title={props.translate('workspace.bankAccount.startOver')} | ||
| icon={Expensicons.RotateLeft} | ||
| onPress={() => BankAccounts.requestResetFreePlanBankAccount()} | ||
| shouldShowRightIcon | ||
| wrapperStyle={[styles.cardMenuItem]} | ||
| disabled={Boolean(pendingAction)} | ||
| /> | ||
| </OfflineWithFeedback> | ||
| </Section> | ||
| </ScrollView> | ||
| </FullPageNotFoundView> | ||
|
|
||
| {props.reimbursementAccount.shouldShowResetModal && ( | ||
| <WorkspaceResetBankAccountModal | ||
| reimbursementAccount={props.reimbursementAccount} | ||
| /> | ||
| )} | ||
| </ScreenWrapper> | ||
| ); | ||
| }; | ||
|
|
||
| ContinueBankAccountSetup.propTypes = propTypes; | ||
| ContinueBankAccountSetup.displayName = 'ContinueBankAccountSetup'; | ||
|
|
||
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
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.
We re-load the
reimbursementAccountdata each time we enter the "Connect bank account" page of a workspace. If there is an error,errors: null,was clearing the errors, not allowing the user to clear it with the X and not giving time to read it.