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

Fix: OpenWorkspaceView API call is made on pages that do not need it #42979

Merged
merged 7 commits into from
Jun 10, 2024
Merged

Fix: OpenWorkspaceView API call is made on pages that do not need it #42979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd48cd5
Fix: OpenWorkspaceView API call is made on pages that do not need it
truph01 Jun 3, 2024
d1c1499
fix merge main
truph01 Jun 5, 2024
0011a1c
Fix: only call VBBA one time
truph01 Jun 7, 2024
7951fcf
fix rename ref
truph01 Jun 7, 2024
14bfe67
fix merge main
truph01 Jun 7, 2024
6b8c4b2
Fix: Remove isCalledVBBARef
truph01 Jun 8, 2024
3c81519
Fix: Merge main to fix lint
truph01 Jun 10, 2024
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
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspacePageWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function WorkspacePageWithSections({
reimbursementAccount = CONST.REIMBURSEMENT_ACCOUNT.DEFAULT_DATA,
route,
shouldUseScrollView = false,
shouldSkipVBBACall = false,
shouldSkipVBBACall = true,
shouldShowBackButton = false,
user,
shouldShowLoading = true,
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/WorkspaceProfilePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
shouldShowOfflineIndicatorInWideScreen
shouldShowNonAdmin
icon={Illustrations.House}
shouldSkipVBBACall={false}
>
{(hasVBA?: boolean) => (
<View style={[styles.flex1, styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/bills/WorkspaceBillsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function WorkspaceBillsPage({route}: WorkspaceBillsPageProps) {
shouldUseScrollView
headerText={translate('workspace.common.bills')}
route={route}
shouldSkipVBBACall={false}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BILLS}
shouldShowOfflineIndicatorInWideScreen
>
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/card/WorkspaceCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function WorkspaceCardPage({route}: WorkspaceCardPageProps) {
shouldUseScrollView
headerText={translate('workspace.common.card')}
route={route}
shouldSkipVBBACall={false}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_CARD}
shouldShowOfflineIndicatorInWideScreen
>
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function WorkspaceInvoicesPage({route}: WorkspaceInvoicesPageProps) {
headerText={translate('workspace.common.invoices')}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INVOICES}
shouldShowOfflineIndicatorInWideScreen
shouldSkipVBBACall={false}
route={route}
>
{(hasVBA?: boolean, policyID?: string) => (
Expand Down
1 change: 0 additions & 1 deletion src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
headerText={translate('workspace.reimburse.trackDistance')}
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
shouldSkipVBBACall
backButtonRoute=""
shouldShowLoading={false}
shouldShowBackButton
Expand Down
1 change: 0 additions & 1 deletion src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ function WorkspaceRatePage(props: WorkspaceRatePageProps) {
headerText={translate('workspace.reimburse.trackDistanceRate')}
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
shouldSkipVBBACall
backButtonRoute={ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '')}
shouldShowLoading={false}
shouldShowBackButton
Expand Down
1 change: 0 additions & 1 deletion src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
headerText={translate('workspace.reimburse.trackDistanceUnit')}
route={props.route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
shouldSkipVBBACall
backButtonRoute={ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '')}
shouldShowLoading={false}
shouldShowBackButton
Expand Down
1 change: 0 additions & 1 deletion src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ function WorkspaceReimbursePage({route, policy}: WorkspaceReimbursePageProps) {
headerText={translate('workspace.common.reimburse')}
route={route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
shouldSkipVBBACall
shouldShowLoading={false}
shouldShowOfflineIndicatorInWideScreen
>
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/travel/WorkspaceTravelPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ function WorkspaceTravelPage({route}: WorkspaceTravelPageProps) {
route={route}
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_TRAVEL}
shouldShowOfflineIndicatorInWideScreen
shouldSkipVBBACall={false}
>
{(hasVBA, policyID) => (
<View style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
Expand Down
1 change: 0 additions & 1 deletion src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ function WorkspaceWorkflowsPage({policy, betas, route}: WorkspaceWorkflowsPagePr
guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_WORKFLOWS}
shouldShowOfflineIndicatorInWideScreen
shouldShowNotFoundPage={!isPaidGroupPolicy || !isPolicyAdmin}
shouldSkipVBBACall
isLoading={isLoading}
shouldShowLoading={isLoading}
shouldUseScrollView
Expand Down
Loading