Refactor remaining instances of WorkspacePageWithSections

Expensify · May 25, 2022 · 30e79ff · 30e79ff
1 parent 4a0bbeb
commit 30e79ff
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js
@@ -139,7 +139,7 @@ class WorkspaceSettingsPage extends React.Component {
                     </FixedFooter>
                 )}
             >
-                {hasVBA => (
+                {(isLoadingVBA, hasVBA) => (
                     <View style={[styles.pageWrapper, styles.flex1, styles.alignItemsStretch]}>
                         <AvatarWithImagePicker
                             isUploading={this.props.policy.isAvatarUploading}

diff --git a/src/pages/workspace/bills/WorkspaceBillsPage.js b/src/pages/workspace/bills/WorkspaceBillsPage.js
@@ -25,11 +25,12 @@ const WorkspaceBillsPage = props => (
         route={props.route}
         guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BILLS}
     >
-        {(hasVBA, policyID) => (
+        {(isLoadingVBA, hasVBA, policyID) => (
             <>
-                {!hasVBA ? (
+                {!isLoadingVBA && !hasVBA && (
                     <WorkspaceBillsNoVBAView policyID={policyID} />
-                ) : (
+                )}
+                {!isLoadingVBA && hasVBA && (
                     <WorkspaceBillsVBAView policyID={policyID} />
                 )}
             </>

diff --git a/src/pages/workspace/card/WorkspaceCardPage.js b/src/pages/workspace/card/WorkspaceCardPage.js
@@ -26,17 +26,17 @@ const WorkspaceCardPage = props => (
         route={props.route}
         guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_CARD}
     >
-        {(hasVBA, policyID, isUsingECard) => (
+        {(isLoadingVBA, hasVBA, policyID, isUsingECard) => (
             <>
-                {!hasVBA && (
+                {!isLoadingVBA && !hasVBA && (
                     <WorkspaceCardNoVBAView policyID={policyID} />
                 )}
 
-                {hasVBA && !isUsingECard && (
+                {!isLoadingVBA && hasVBA && !isUsingECard && (
                     <WorkspaceCardVBANoECardView />
                 )}
 
-                {hasVBA && isUsingECard && (
+                {!isLoadingVBA && hasVBA && isUsingECard && (
                     <WorkspaceCardVBAWithECardView />
                 )}
             </>

diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesPage.js b/src/pages/workspace/invoices/WorkspaceInvoicesPage.js
@@ -25,11 +25,12 @@ const WorkspaceInvoicesPage = props => (
         route={props.route}
         guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INVOICES}
     >
-        {(hasVBA, policyID) => (
+        {(isLoadingVBA, hasVBA, policyID) => (
             <>
-                {!hasVBA ? (
+                {!isLoadingVBA && !hasVBA && (
                     <WorkspaceInvoicesNoVBAView policyID={policyID} />
-                ) : (
+                )}
+                {!isLoadingVBA && hasVBA && (
                     <WorkspaceInvoicesVBAView policyID={policyID} />
                 )}
             </>

diff --git a/src/pages/workspace/travel/WorkspaceTravelPage.js b/src/pages/workspace/travel/WorkspaceTravelPage.js
@@ -25,11 +25,12 @@ const WorkspaceTravelPage = props => (
         route={props.route}
         guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_TRAVEL}
     >
-        {(hasVBA, policyID) => (
+        {(isLoadingVBA, hasVBA, policyID) => (
             <>
-                {!hasVBA ? (
+                {!isLoadingVBA && !hasVBA && (
                     <WorkspaceTravelNoVBAView policyID={policyID} />
-                ) : (
+                )}
+                {!isLoadingVBA && hasVBA && (
                     <WorkspaceTravelVBAView />
                 )}
             </>