Enable the Go Back button by default on FullScreenLoadingIndicator

src/components/FullscreenLoadingIndicator.tsx

@@ -21,7 +21,7 @@ type FullScreenLoadingIndicatorProps = {
     style?: StyleProp<ViewStyle>;
     iconSize?: FullScreenLoadingIndicatorIconSize;
 
-    /** Whether the "Go Back" button appears after a timeout. */
+    /** Whether the "Go Back" button appears after a timeout. Defaults to true, pass false where going back is dead or harmful (e.g. global overlays, or a transition that is mid sign-out). */
     shouldUseGoBackButton?: boolean;
 
     onGoBack?: () => void;
@@ -35,7 +35,7 @@ type FullScreenLoadingIndicatorProps = {
 function FullScreenLoadingIndicator({
     style,
     iconSize = CONST.ACTIVITY_INDICATOR_SIZE.LARGE,
-    shouldUseGoBackButton = false,
+    shouldUseGoBackButton = true,
     onGoBack = Navigation.goBack,
     testID = '',
     extraLoadingContext,

src/libs/Navigation/AppNavigator/DelegatorConnectGate.tsx

@@ -58,7 +58,8 @@ function DelegatorConnectGuard({children}: {children: React.ReactNode}) {
     }
 
     return (
-        <Suspense fallback={<FullScreenLoadingIndicator />}>
+        // No "Go Back" button: this fallback replaces the whole AuthScreens navigator while connect() clears Onyx, so there is no screen to go back to.
+        <Suspense fallback={<FullScreenLoadingIndicator shouldUseGoBackButton={false} />}>
             <DelegatorConnectGate delegatorEmail={delegatorEmail}>{children}</DelegatorConnectGate>
         </Suspense>
     );

src/pages/AvatarCropPage.tsx

@@ -42,7 +42,7 @@ function AvatarCropPage() {
     );
 
     if (isLoadingDraft || !draft?.uri) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     const onSave = (image: File | CustomRNImageManipulatorResult) => {

src/pages/LogInWithShortLivedAuthTokenPage.tsx

@@ -93,7 +93,8 @@ function LogInWithShortLivedAuthTokenPage({route}: LogInWithShortLivedAuthTokenP
     }, [route, isLoadingSignInData]);
 
     if (account?.isLoading || isLoadingSignInData) {
-        return <FullScreenLoadingIndicator />;
+        // No "Go Back" button: this is a deep-link entry point, so there is usually no history to pop back to.
+        return <FullScreenLoadingIndicator shouldUseGoBackButton={false} />;
     }
 
     return <SessionExpiredPage />;

src/pages/LogOutPreviousUserPage.tsx

@@ -212,7 +212,8 @@ function LogOutPreviousUserPage({route}: LogOutPreviousUserPageProps) {
         return <NotFoundPage />;
     }
 
-    return <FullScreenLoadingIndicator />;
+    // No "Go Back" button: going back would pop /transition into the outgoing user's session mid sign-out.
+    return <FullScreenLoadingIndicator shouldUseGoBackButton={false} />;
 }
 
 export default LogOutPreviousUserPage;

src/pages/PreMountBufferPage.tsx

@@ -7,7 +7,6 @@ import Navigation from '@libs/Navigation/Navigation';
 function PreMountBufferPage() {
     return (
         <FullscreenLoadingIndicator
-            shouldUseGoBackButton
             onGoBack={Navigation.recoverFromPreMountBuffer}
             extraLoadingContext={{context: 'PreMountBufferPage'}}
         />

src/pages/ReimbursementAccount/EnterSignerInfo/index.tsx

@@ -111,7 +111,7 @@ function EnterSignerInfo({route}: EnterSignerInfoProps) {
     }, [isEditing, moveTo, pageIndex, prevPage]);
 
     if (isRedirecting) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     return (

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

@@ -638,7 +638,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen
     }
 
     if (isLoadingPolicy) {
-        return <FullScreenLoadingIndicator />;
+        return <FullScreenLoadingIndicator onGoBack={() => Navigation.goBack(backTo)} />;
     }
 
     // Show loading indicator when page is first time being opened and props.reimbursementAccount yet to be loaded from the server

src/pages/Search/SearchChangeApproverPage.tsx

@@ -331,7 +331,7 @@ function SearchChangeApproverPage() {
         );
 
     if (!isOffline && isLoadingBulkChangeApproverPage) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     return (

src/pages/Search/SearchColumnsPage.tsx

@@ -117,7 +117,7 @@ function SearchColumnsPage() {
     };
 
     if (isSeedPending) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     return (

src/pages/TransactionDuplicate/DynamicConfirmationPage.tsx

@@ -171,7 +171,7 @@ function DynamicConfirmationPage() {
         (reviewDuplicatesResult.status === 'loaded' && (!newTransaction?.transactionID || !doesTransactionBelongToReport));
 
     if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult) || !newTransaction?.transactionID) {
-        return <FullScreenLoadingIndicator />;
+        return <FullScreenLoadingIndicator onGoBack={() => Navigation.goBack(backPath, {compareParams: false})} />;
     }
 
     return (

src/pages/UnlinkLoginPage.tsx

@@ -62,7 +62,8 @@ function UnlinkLoginPage({route}: UnlinkLoginPageProps) {
         };
     }, [prevIsLoading, account?.isLoading]);
 
-    return <FullScreenLoadingIndicator />;
+    // No "Go Back" button: this is a deep-link entry point, so there is usually no history to pop back to.
+    return <FullScreenLoadingIndicator shouldUseGoBackButton={false} />;
 }
 
 export default UnlinkLoginPage;

src/pages/ValidateLoginPage/index.tsx

@@ -49,7 +49,8 @@ function ValidateLoginPage({
         });
     }, [session?.autoAuthState]);
 
-    return <FullScreenLoadingIndicator />;
+    // No "Go Back" button: this is a deep-link entry point, so there is usually no history to pop back to.
+    return <FullScreenLoadingIndicator shouldUseGoBackButton={false} />;
 }
 
 export default ValidateLoginPage;

src/pages/ValidateLoginPage/index.web.tsx

@@ -177,7 +177,11 @@ function ValidateLoginPage({
                 />
             )}
             {((!effectiveAutoAuthState ? shouldStartSignInWithValidateCode : autoAuthStateWithDefault === CONST.AUTO_AUTH_STATE.SIGNING_IN) || isCompletingDirectSignIn) && (
-                <FullScreenLoadingIndicator testID="validate-login-loading" />
+                <FullScreenLoadingIndicator
+                    // No "Go Back" button: this is a deep-link entry point, so there is usually no history to pop back to.
+                    shouldUseGoBackButton={false}
+                    testID="validate-login-loading"
+                />
             )}
         </>
     );

src/pages/domain/DomainAccessRestrictedPage.tsx

@@ -55,7 +55,7 @@ function DomainAccessRestrictedPage({route}: DomainAccessRestrictedPageProps) {
     }, [domainAccountID]);
 
     if (isRedirecting) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     return (

src/pages/domain/DomainAlreadyExistsPage.tsx

@@ -71,7 +71,7 @@ function DomainAlreadyExistsPage({route}: DomainAlreadyExistsPageProps) {
     }, [domainAccountID]);
 
     if (isRedirecting) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     return (

src/pages/domain/DomainNameOrNotFoundWrapper.tsx

@@ -26,7 +26,7 @@ function DomainNameOrNotFoundWrapper({domainAccountID, onLinkPress, children}: D
     const [domainName, domainNameResult] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainNameSelector});
 
     if (isLoadingOnyxValue(domainNameResult)) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     if (!domainName) {

src/pages/domain/DomainNotFoundPageWrapper.tsx

@@ -3,6 +3,7 @@ import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
 import Navigation from '@navigation/Navigation';
 
@@ -33,6 +34,7 @@ function DomainNotFoundPageWrapper({domainAccountID, shouldBeBlocked, fullPageNo
     });
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const isAdmin = adminAccountIDs?.includes(currentUserAccountID);
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const shouldShowFullScreenLoadingIndicator = isLoadingOnyxValue(domainMetadata);
     const shouldShowNotFoundPage = !domain || !isAdmin || shouldBeBlocked;
@@ -46,7 +48,7 @@ function DomainNotFoundPageWrapper({domainAccountID, shouldBeBlocked, fullPageNo
     }, [domain, isAdmin, shouldShowFullScreenLoadingIndicator]);
 
     if (shouldShowFullScreenLoadingIndicator) {
-        return <FullscreenLoadingIndicator />;
+        return <FullscreenLoadingIndicator shouldUseGoBackButton={shouldUseNarrowLayout} />;
     }
 
     if (shouldShowNotFoundPage) {

src/pages/domain/DomainSamlPage.tsx

@@ -76,7 +76,7 @@ function DomainSamlPage({route}: DomainSamlPageProps) {
     );
 
     if (isLoadingOnyxValue(domainResults, domainSettingsResults)) {
-        return <FullScreenLoadingIndicator />;
+        return <FullScreenLoadingIndicator shouldUseGoBackButton={shouldUseNarrowLayout} />;
     }
 
     return (

src/pages/inbox/report/withReportOrNotFound.tsx

@@ -117,7 +117,7 @@ export default function (shouldRequireReportID = true): <TProps extends WithRepo
             }
 
             if (decision === 'loading') {
-                return <FullscreenLoadingIndicator shouldUseGoBackButton />;
+                return <FullscreenLoadingIndicator />;
             }
 
             if (decision === 'notFound') {

src/pages/iou/DynamicSplitExpensePage.tsx

@@ -620,7 +620,12 @@ function DynamicSplitExpensePage({route}: DynamicSplitExpensePageProps) {
     };
 
     if (isLoadingDraftTransaction) {
-        return <FullScreenLoadingIndicator style={[styles.opacity1]} />;
+        return (
+            <FullScreenLoadingIndicator
+                style={[styles.opacity1]}
+                onGoBack={() => Navigation.goBack(backPath)}
+            />
+        );
     }
 
     const collapsibleHeaderOffset = isInitialSplit ? TAB_NAVIGATOR_HEIGHT_LANDSCAPE : 0;

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

@@ -1009,7 +1009,7 @@ function IOURequestStepConfirmationContent({
                 <ActivityIndicator size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE} />
             </View>
         ) : (
-            <FullScreenLoadingIndicator shouldUseGoBackButton />
+            <FullScreenLoadingIndicator onGoBack={navigateBack} />
         );
     }
 

src/pages/iou/request/step/withFullTransactionOrNotFound.tsx

@@ -118,7 +118,7 @@ function WithFullTransactionOrNotFoundImpl<TProps extends WithFullTransactionOrN
                 <ActivityIndicator size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE} />
             </View>
         ) : (
-            <FullScreenLoadingIndicator shouldUseGoBackButton />
+            <FullScreenLoadingIndicator />
         );
     }
     return (

src/pages/settings/Agents/AddAgentPage.tsx

@@ -284,7 +284,7 @@ function AddAgentPage({route}: AddAgentPageProps) {
     const [template, templateMetadata] = useOnyx(ONYXKEYS.NEW_AGENT_TEMPLATE);
 
     if (isLoadingOnyxValue(templateMetadata)) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     return (

src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx

@@ -224,7 +224,7 @@ function DynamicContactMethodDetailsPage({route}: DynamicContactMethodDetailsPag
     }, [isValidateCodeFormVisible, translate, turnOnDeleteModal, isDefaultContactMethod, icons.Trashcan]);
 
     if (isLoadingOnyxValues || (isLoadingReportData && isEmptyObject(loginList))) {
-        return <FullscreenLoadingIndicator />;
+        return <FullscreenLoadingIndicator onGoBack={() => Navigation.goBack(listPath)} />;
     }
 
     if (!contactMethod || !loginData) {

src/pages/settings/Profile/CustomStatus/SetDatePage.tsx

@@ -54,7 +54,7 @@ function SetDatePage() {
     const isLoadingStatusDraft = isLoadingOnyxValue(statusDraftCustomClearAfterDateMetaData);
 
     if (isLoadingStatusDraft) {
-        return <FullScreenLoadingIndicator />;
+        return <FullScreenLoadingIndicator onGoBack={() => Navigation.goBack(ROUTES.SETTINGS_STATUS_CLEAR_AFTER)} />;
     }
 
     return (

src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx

@@ -97,7 +97,7 @@ function VacationDelegateMissingWorkspacesPage() {
     });
 
     if (!submittedInput && isLoadingOnyxValue(vacationDelegateMetadata)) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator onGoBack={() => Navigation.goBack(ROUTES.SETTINGS_VACATION_DELEGATE)} />;
     }
 
     if (!policyDiff) {

src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsPage.tsx

@@ -226,7 +226,7 @@ function PrivatePersonalDetailsPage() {
     };
 
     if (isLoadingApp) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     return (

src/pages/settings/Subscription/SubscriptionSettingsPage.tsx

@@ -50,7 +50,12 @@ function SubscriptionSettingsPage({route}: SubscriptionSettingsPageProps) {
     }, [isAppLoading, shouldShowPage, isFocused]);
 
     if (!shouldShowPage && isAppLoading) {
-        return <FullScreenLoadingIndicator />;
+        return (
+            <FullScreenLoadingIndicator
+                shouldUseGoBackButton={shouldUseNarrowLayout}
+                onGoBack={() => Navigation.goBack(backTo)}
+            />
+        );
     }
 
     if (!shouldShowPage) {

src/pages/settings/Wallet/AddCardToDigitalWalletPage.tsx

@@ -116,7 +116,7 @@ function AddCardToDigitalWalletPage({
     const isWaitingForPendingApproval = !isOffline && isCheckingPendingApproval !== false && !hasPendingApproval && !submittedRequest;
 
     if (isWaitingForPendingApproval || (!card && isLoadingOnyxValue(cardMetadata))) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator onGoBack={goBackToEntryPoint} />;
     }
 
     if (!card || (!hasPendingApproval && !submittedRequest)) {

src/pages/settings/Wallet/ChooseTransferAccountPage.tsx

@@ -117,7 +117,7 @@ function ChooseTransferAccountPage() {
     };
 
     if (isLoadingOnyxValue(walletTransferResult)) {
-        return <FullscreenLoadingIndicator />;
+        return <FullscreenLoadingIndicator onGoBack={() => Navigation.goBack(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE)} />;
     }
 
     return (

src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx

@@ -172,7 +172,7 @@ function InternationalDepositAccountContent({
             shouldShowOfflineIndicatorInWideScreen={pageIndex === CONST.CORPAY_FIELDS.INDEXES.MAPPING.CONFIRMATION}
         >
             {isRedirecting || isAccountLoading ? (
-                <FullScreenLoadingIndicator />
+                <FullScreenLoadingIndicator onGoBack={handleBackButtonPress} />
             ) : (
                 <>
                     <HeaderWithBackButton

src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx

@@ -47,7 +47,7 @@ function AddPersonalNewCardPage() {
     }, []);
 
     if (isAddCardFeedLoading) {
-        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullScreenLoadingIndicator />;
     }
 
     let CurrentStep: React.JSX.Element;

src/pages/tasks/DynamicNewTaskDescriptionPage.tsx

@@ -57,7 +57,7 @@ function DynamicNewTaskDescriptionPage() {
     };
 
     if (isLoadingOnyxValue(taskMetadata)) {
-        return <FullScreenLoadingIndicator />;
+        return <FullScreenLoadingIndicator onGoBack={goBack} />;
     }
 
     return (

src/pages/tasks/DynamicNewTaskTitlePage.tsx

@@ -63,7 +63,7 @@ function DynamicNewTaskTitlePage() {
     };
 
     if (isLoadingOnyxValue(taskMetadata)) {
-        return <FullScreenLoadingIndicator />;
+        return <FullScreenLoadingIndicator onGoBack={goBack} />;
     }
 
     return (

src/pages/workspace/AccessOrNotFoundWrapper.tsx

@@ -180,6 +180,7 @@ function AccessOrNotFoundWrapper({
     const pendingField = featureName ? policy?.pendingFields?.[featureName] : undefined;
     const isFocused = useIsFocused();
     const isWorkspacesTabFocused = useIsWorkspacesTabFocused();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     useEffect(() => {
         if (!isPolicyIDInRoute || !isEmptyObject(policy)) {
@@ -250,12 +251,12 @@ function AccessOrNotFoundWrapper({
     }, [isLoadingReportData, isPolicyNotAccessible]);
 
     if (shouldShowFullScreenLoadingIndicator) {
-        return <FullscreenLoadingIndicator />;
+        return <FullscreenLoadingIndicator shouldUseGoBackButton={shouldUseNarrowLayout} />;
     }
     // The feature linked to this page is disabled, so the redirect effect above will navigate to the More Features page.
     // Render a loader instead of the page's children so the disabled page is never shown for a frame (avoids a visible flash).
     if (shouldRedirectToMoreFeatures) {
-        return <FullscreenLoadingIndicator shouldUseGoBackButton />;
+        return <FullscreenLoadingIndicator shouldUseGoBackButton={shouldUseNarrowLayout} />;
     }
     if (shouldShowNotFoundPage) {
         return (

src/pages/workspace/DynamicWorkspaceInvitePage.tsx

@@ -298,8 +298,9 @@ function DynamicWorkspaceInvitePageContent({route, policy, invitedEmailsToAccoun
 function DynamicWorkspaceInvitePage(props: WorkspaceInvitePageProps) {
     const [policy, policyMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${props.route.params.policyID}`);
     const [invitedEmailsToAccountIDsDraft, invitedEmailsToAccountIDsDraftMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${props.route.params.policyID}`);
+    const dynamicBackPath = useDynamicBackPath(DYNAMIC_ROUTES.WORKSPACE_INVITE.path);
     if (isLoadingOnyxValue(policyMetadata, invitedEmailsToAccountIDsDraftMetadata)) {
-        return <FullscreenLoadingIndicator />;
+        return <FullscreenLoadingIndicator onGoBack={() => Navigation.goBack(dynamicBackPath)} />;
     }
     return (
         <DynamicWorkspaceInvitePageContent