Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix blank screen when showing the WorkspaceResetBankAccount modal #14726

Merged
merged 18 commits into from
Feb 13, 2023
Merged

Fix blank screen when showing the WorkspaceResetBankAccount modal #14726

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b21b39a
Display continue setup even when the reset modal is shown
MariaHCD Feb 1, 2023
ba9bd35
Add onConfirm callback when resetting workspace bank account
MariaHCD Feb 1, 2023
63be74c
Make onConfirm an optional callback
MariaHCD Feb 1, 2023
68132de
Show workspace bank account reset modal in the Enable and Validation …
MariaHCD Feb 1, 2023
eca45cf
Fix missing import
MariaHCD Feb 1, 2023
4c9dd1f
Fix lint errors
MariaHCD Feb 1, 2023
68ce2bf
Remove unnecessary condition
MariaHCD Feb 2, 2023
46dec4a
Merge remote-tracking branch 'origin/main' into maria-workspace-bank-…
MariaHCD Feb 2, 2023
593668a
Include WorkspaceResetBankAccountModal in ContinueBankAccountSetp
MariaHCD Feb 3, 2023
7ae96ea
Remove unnecessary props
MariaHCD Feb 3, 2023
eaf6f6c
Update default for func prop
MariaHCD Feb 3, 2023
982b971
Remove unnecessary if statement
MariaHCD Feb 3, 2023
875d452
Add isLoading to resetFreePlanBankAccount
MariaHCD Feb 3, 2023
17c81b6
Fix lint error and address review comment
MariaHCD Feb 3, 2023
e936a7c
Remove View to fix issue with blank screen on iOS
MariaHCD Feb 9, 2023
ce95ec9
Merge remote-tracking branch 'origin/main' into maria-workspace-bank-…
MariaHCD Feb 9, 2023
bfc75e8
Use ScreenWrapper component to avoid header being cut off on iOS
MariaHCD Feb 9, 2023
c3c505f
Fix lint error
MariaHCD Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function resetFreePlanBankAccount(bankAccountID) {
{
optimisticData: [
{
onyxMethod: 'set',
onyxMethod: CONST.ONYX.METHOD.SET,
key: ONYXKEYS.ONFIDO_TOKEN,
value: '',
},
Expand All @@ -44,12 +44,31 @@ function resetFreePlanBankAccount(bankAccountID) {
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
value: ReimbursementAccountProps.reimbursementAccountDefaultProps,
},
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
value: {isLoading: true},
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a note for myself and reviewers, adding isLoading here caused this side effect: #15114

#15114 (comment)

},
{
onyxMethod: CONST.ONYX.METHOD.SET,
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT,
value: {},
},
],
successData: [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
value: {isLoading: false},
},
],
failureData: [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
value: {isLoading: false},
},
]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing comma

});
}

Expand Down
19 changes: 17 additions & 2 deletions src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,18 @@ import ScreenWrapper from '../../components/ScreenWrapper';
import Section from '../../components/Section';
import Text from '../../components/Text';
import withPolicy from '../workspace/withPolicy';
import * as ReimbursementAccountProps from './reimbursementAccountPropTypes';
import WorkspaceResetBankAccountModal from '../workspace/WorkspaceResetBankAccountModal';
import * as BankAccounts from '../../libs/actions/BankAccounts';

const propTypes = {
/** Bank account currently in setup */
reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes.isRequired,

/** Callback to continue to the next step of the setup */
continue: PropTypes.func.isRequired,

/** Callback to start over the setup */
/** Callback to reset the bank account */
startOver: PropTypes.func.isRequired,

/** Policy values needed in the component */
Expand Down Expand Up @@ -67,13 +73,22 @@ const ContinueBankAccountSetup = props => (
<MenuItem
title={props.translate('workspace.bankAccount.startOver')}
icon={Expensicons.RotateLeft}
onPress={props.startOver}
onPress={() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be on same line

BankAccounts.requestResetFreePlanBankAccount();
}}
shouldShowRightIcon
wrapperStyle={[styles.cardMenuItem]}
/>
</Section>
</ScrollView>
</FullPageNotFoundView>

{props.reimbursementAccount.shouldShowResetModal && (
<WorkspaceResetBankAccountModal
reimbursementAccount={props.reimbursementAccount}
onConfirm={props.startOver}
/>
)}
</ScreenWrapper>
);

Expand Down
12 changes: 2 additions & 10 deletions src/pages/ReimbursementAccount/ReimbursementAccountPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import EnableStep from './EnableStep';
import ROUTES from '../../ROUTES';
import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
import * as ReimbursementAccountProps from './reimbursementAccountPropTypes';
import WorkspaceResetBankAccountModal from '../workspace/WorkspaceResetBankAccountModal';
import reimbursementAccountDraftPropTypes from './ReimbursementAccountDraftPropTypes';
import * as ReimbursementAccountUtils from '../../libs/ReimbursementAccountUtils';

Expand Down Expand Up @@ -276,17 +275,10 @@ class ReimbursementAccountPage extends React.Component {
return (
<View>
<ContinueBankAccountSetup
reimbursementAccount={this.props.reimbursementAccount}
continue={this.continue}
startOver={() => {
BankAccounts.requestResetFreePlanBankAccount();
}}
startOver={() => this.setState({shouldHideContinueSetupButton: true})}
/>
{this.props.reimbursementAccount.shouldShowResetModal && (
<WorkspaceResetBankAccountModal
reimbursementAccount={this.props.reimbursementAccount}
onConfirm={() => this.setState({shouldHideContinueSetupButton: true})}
/>
)}
</View>
);
}
Expand Down
6 changes: 2 additions & 4 deletions src/pages/workspace/WorkspaceResetBankAccountModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const propTypes = {
};

const defaultProps = {
onConfirm: null,
onConfirm: () => {},
};

const WorkspaceResetBankAccountModal = (props) => {
Expand All @@ -47,9 +47,7 @@ const WorkspaceResetBankAccountModal = (props) => {
onCancel={BankAccounts.cancelResetFreePlanBankAccount}
onConfirm={() => {
BankAccounts.resetFreePlanBankAccount(bankAccountID);
if (props.onConfirm) {
props.onConfirm();
}
props.onConfirm();
}}
shouldShowCancelButton
isVisible
Expand Down