From 6c1c4963837840e2f22ec7a936012363093364d6 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 17 Mar 2026 09:06:09 +0000
Subject: [PATCH] Replace FullScreenLoadingIndicator with ActivityIndicator in
 NewReportWorkspaceSelectionPage

Use a View-wrapped ActivityIndicator instead of FullScreenLoadingIndicator to
avoid a duplicate back control when shouldUseGoBackButton becomes the default.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 src/pages/NewReportWorkspaceSelectionPage.tsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/NewReportWorkspaceSelectionPage.tsx b/src/pages/NewReportWorkspaceSelectionPage.tsx
index 7f1d7d5d83ed2..8c2bc923d79d5 100644
--- a/src/pages/NewReportWorkspaceSelectionPage.tsx
+++ b/src/pages/NewReportWorkspaceSelectionPage.tsx
@@ -1,7 +1,8 @@
 import {accountIDSelector, emailSelector} from '@selectors/Session';
 import React, {useEffect, useState} from 'react';
+import {View} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
-import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import ActivityIndicator from '@components/ActivityIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {useSearchActionsContext, useSearchStateContext} from '@components/Search/SearchContext';
@@ -268,10 +269,12 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag
                     />
                     {CreateReportConfirmationModal}
                     {shouldShowLoadingIndicator ? (
-                        <FullScreenLoadingIndicator
-                            style={[styles.flex1, styles.pRelative]}
-                            reasonAttributes={{context: 'NewReportWorkspaceSelectionPage', isLoadingApp: !!isLoadingApp}}
-                        />
+                        <View style={[styles.flex1, styles.fullScreenLoading]}>
+                            <ActivityIndicator
+                                size="large"
+                                reasonAttributes={{context: 'NewReportWorkspaceSelectionPage', isLoadingApp: !!isLoadingApp}}
+                            />
+                        </View>
                     ) : (
                         <>
                             <Text style={[styles.ph5, styles.mb3]}>{translate('report.newReport.chooseWorkspace')}</Text>