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

Show full page spinner while VBA state is loading #9202

Merged
merged 3 commits into from
Jun 2, 2022
Merged

Show full page spinner while VBA state is loading #9202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71df296
Show spinner on workspace pages while VBA state loads
amyevans May 27, 2022
13d0321
Clean up now unneeded isLoadingVBA
amyevans May 27, 2022
6b47923
Only show Save button once loading completes
amyevans Jun 1, 2022
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
30 changes: 19 additions & 11 deletions src/pages/workspace/WorkspacePageWithSections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import {View, ScrollView} from 'react-native';
import {ActivityIndicator, View, ScrollView} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import lodashGet from 'lodash/get';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import Navigation from '../../libs/Navigation/Navigation';
import compose from '../../libs/compose';
import ROUTES from '../../ROUTES';
Expand Down Expand Up @@ -88,7 +89,6 @@ class WorkspacePageWithSections extends React.Component {

render() {
const achState = lodashGet(this.props.reimbursementAccount, 'achData.state', '');
const isLoadingVBA = this.props.reimbursementAccount.loading;
const hasVBA = achState === BankAccount.STATE.OPEN;
const isUsingECard = lodashGet(this.props.user, 'isUsingExpensifyCard', false);
const policyID = lodashGet(this.props.route, 'params.policyID');
Expand All @@ -106,16 +106,24 @@ class WorkspacePageWithSections extends React.Component {
onBackButtonPress={() => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID))}
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<ScrollView
style={[styles.settingsPageBackground, styles.flex1, styles.w100]}
>
<View style={[styles.w100, styles.flex1]}>

{this.props.children(isLoadingVBA, hasVBA, policyID, isUsingECard)}

{this.props.reimbursementAccount.loading ? (
<View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter]}>
<ActivityIndicator color={themeColors.spinner} size="large" />
</View>
</ScrollView>
{this.props.footer}
) : (
<>
<ScrollView
style={[styles.settingsPageBackground, styles.flex1, styles.w100]}
>
<View style={[styles.w100, styles.flex1]}>

{this.props.children(hasVBA, policyID, isUsingECard)}

</View>
</ScrollView>
{this.props.footer}
</>
)}
</KeyboardAvoidingView>
</ScreenWrapper>
);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/WorkspaceSettingsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class WorkspaceSettingsPage extends React.Component {
</FixedFooter>
)}
>
{(isLoadingVBA, hasVBA) => (
{hasVBA => (
<View style={[styles.pageWrapper, styles.flex1, styles.alignItemsStretch]}>
<AvatarWithImagePicker
isUploading={this.props.policy.isAvatarUploading}
Expand Down Expand Up @@ -176,7 +176,7 @@ class WorkspaceSettingsPage extends React.Component {
onInputChange={currency => this.setState({currency})}
items={this.getCurrencyItems()}
value={this.state.currency}
isDisabled={isLoadingVBA || hasVBA}
isDisabled={hasVBA}
/>
</View>
<Text style={[styles.textLabel, styles.colorMuted, styles.mt2]}>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/bills/WorkspaceBillsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ const WorkspaceBillsPage = props => (
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BILLS}
>
{(isLoadingVBA, hasVBA, policyID) => (
{(hasVBA, policyID) => (
<>
{!isLoadingVBA && !hasVBA && (
{!hasVBA && (
<WorkspaceBillsNoVBAView policyID={policyID} />
)}
{!isLoadingVBA && hasVBA && (
{hasVBA && (
<WorkspaceBillsVBAView policyID={policyID} />
)}
</>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/workspace/card/WorkspaceCardPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ const WorkspaceCardPage = props => (
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_CARD}
>
{(isLoadingVBA, hasVBA, policyID, isUsingECard) => (
{(hasVBA, policyID, isUsingECard) => (
<>
{!isLoadingVBA && !hasVBA && (
{!hasVBA && (
<WorkspaceCardNoVBAView policyID={policyID} />
)}

{!isLoadingVBA && hasVBA && !isUsingECard && (
{hasVBA && !isUsingECard && (
<WorkspaceCardVBANoECardView />
)}

{!isLoadingVBA && hasVBA && isUsingECard && (
{hasVBA && isUsingECard && (
<WorkspaceCardVBAWithECardView />
)}
</>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/invoices/WorkspaceInvoicesPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ const WorkspaceInvoicesPage = props => (
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INVOICES}
>
{(isLoadingVBA, hasVBA, policyID) => (
{(hasVBA, policyID) => (
<>
{!isLoadingVBA && !hasVBA && (
{!hasVBA && (
<WorkspaceInvoicesNoVBAView policyID={policyID} />
)}
{!isLoadingVBA && hasVBA && (
{hasVBA && (
<WorkspaceInvoicesVBAView policyID={policyID} />
)}
</>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/reimburse/WorkspaceReimbursePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ const WorkspaceReimbursePage = props => (
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
>
{(isLoadingVBA, hasVBA, policyID) => (
<WorkspaceReimburseView policyID={policyID} isLoadingVBA={isLoadingVBA} hasVBA={hasVBA} />
{(hasVBA, policyID) => (
<WorkspaceReimburseView policyID={policyID} hasVBA={hasVBA} />
)}
</WorkspacePageWithSections>
);
Expand Down
7 changes: 2 additions & 5 deletions src/pages/workspace/reimburse/WorkspaceReimburseView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ const propTypes = {
/** The policy ID currently being configured */
policyID: PropTypes.string.isRequired,

/** Whether VBA data is loading */
isLoadingVBA: PropTypes.bool.isRequired,

/** Does the user have a VBA in their account? */
hasVBA: PropTypes.bool.isRequired,

Expand Down Expand Up @@ -194,7 +191,7 @@ class WorkspaceReimburseView extends React.Component {
</View>
</Section>

{!this.props.isLoadingVBA && !this.props.hasVBA && (
{!this.props.hasVBA && (
<Section
title={this.props.translate('workspace.reimburse.unlockNextDayReimbursements')}
icon={Illustrations.JewelBoxGreen}
Expand All @@ -214,7 +211,7 @@ class WorkspaceReimburseView extends React.Component {
/>
</Section>
)}
{!this.props.isLoadingVBA && this.props.hasVBA && (
{this.props.hasVBA && (
<Section
title={this.props.translate('workspace.reimburse.fastReimbursementsHappyMembers')}
icon={Illustrations.BankUserGreen}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/travel/WorkspaceTravelPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ const WorkspaceTravelPage = props => (
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_TRAVEL}
>
{(isLoadingVBA, hasVBA, policyID) => (
{(hasVBA, policyID) => (
<>
{!isLoadingVBA && !hasVBA && (
{!hasVBA && (
<WorkspaceTravelNoVBAView policyID={policyID} />
)}
{!isLoadingVBA && hasVBA && (
{hasVBA && (
<WorkspaceTravelVBAView />
)}
</>
Expand Down