Skip to content

Fix: VBA - Background page is reloading when proceeding through VBA flow #37188

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

Merged
cristipaval merged 2 commits into from
Feb 28, 2024
Merged

Fix: VBA - Background page is reloading when proceeding through VBA flow #37188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ed6de8
Fix: VBA - Background page is reloading when proceeding through VBA flow
rayane-d Feb 25, 2024
ea2eb7d
Merge branch 'Expensify:main' into Fix-VBA-Background-page-is-reloadi…
rayane-d Feb 25, 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
4 changes: 3 additions & 1 deletion src/pages/workspace/WorkspacePageWithSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {useIsFocused} from '@react-navigation/native';
import type {ReactNode} from 'react';
import React, {useEffect, useMemo, useRef} from 'react';
import {View} from 'react-native';
Expand Down Expand Up @@ -121,6 +122,7 @@ function WorkspacePageWithSections({
const content = typeof children === 'function' ? children(hasVBA, policyID, isUsingECard) : children;
const {isSmallScreenWidth} = useWindowDimensions();
const firstRender = useRef(true);
const isFocused = useIsFocused();

useEffect(() => {
// Because isLoading is false before merging in Onyx, we need firstRender ref to display loading page as well before isLoading is change to true
Expand Down Expand Up @@ -163,7 +165,7 @@ function WorkspacePageWithSections({
onBackButtonPress={() => Navigation.goBack(backButtonRoute ?? ROUTES.WORKSPACE_INITIAL.getRoute(policyID))}
icon={icon ?? undefined}
/>
{(isLoading || firstRender.current) && shouldShowLoading ? (
{(isLoading || firstRender.current) && shouldShowLoading && isFocused ? (
<FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
) : (
<>
Expand Down