From fdc8a3d12ea951c35d1deb65711ae8639ac2df5c Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 17 Mar 2026 09:03:30 +0000
Subject: [PATCH 1/2] Replace FullScreenLoadingIndicator with ActivityIndicator
 in WorkspacesListPage

As part of the loading indicator standardization (Expensify/App#69850), replace
FullScreenLoadingIndicator with a plain ActivityIndicator wrapped in a View
with fullScreenLoading styles in WorkspacesListPage.tsx. This prevents the
upcoming shouldUseGoBackButton default from showing duplicate back controls
when TopBar and NavigationTabBar are already visible.

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

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 9d28305b31e3c..12b5a0626be85 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -8,7 +8,7 @@ import ConfirmModal from '@components/ConfirmModal';
 import type {DomainItem} from '@components/Domain/DomainMenuItem';
 import DomainMenuItem from '@components/Domain/DomainMenuItem';
 import DomainsEmptyStateComponent from '@components/DomainsEmptyStateComponent';
-import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import ActivityIndicator from '@components/ActivityIndicator';
 import type {MenuItemProps} from '@components/MenuItem';
 import NavigationTabBar from '@components/Navigation/NavigationTabBar';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
@@ -738,9 +738,9 @@ function WorkspacesListPage() {
                 </TopBarWithLoadingBar>
                 {shouldUseNarrowLayout && <View style={[styles.ph5, styles.pt2]}>{headerButton}</View>}
                 {shouldShowLoadingIndicator ? (
-                    <View style={[styles.flex1]}>
-                        <FullScreenLoadingIndicator
-                            style={[styles.flex1, styles.pRelative]}
+                    <View style={[styles.flex1, styles.fullScreenLoading]}>
+                        <ActivityIndicator
+                            size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
                             reasonAttributes={
                                 {
                                     context: 'WorkspacesListPage',

From 90a8440351ceb7e2201e18c90176817cacb72a21 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Tue, 17 Mar 2026 09:11:28 +0000
Subject: [PATCH 2/2] Fix: sort ActivityIndicator import alphabetically for
 Prettier

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 src/pages/workspace/WorkspacesListPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 12b5a0626be85..c197ae7882b5d 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -4,11 +4,11 @@ import React, {useEffect, useRef, useState} from 'react';
 import {FlatList, InteractionManager, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
+import ActivityIndicator from '@components/ActivityIndicator';
 import ConfirmModal from '@components/ConfirmModal';
 import type {DomainItem} from '@components/Domain/DomainMenuItem';
 import DomainMenuItem from '@components/Domain/DomainMenuItem';
 import DomainsEmptyStateComponent from '@components/DomainsEmptyStateComponent';
-import ActivityIndicator from '@components/ActivityIndicator';
 import type {MenuItemProps} from '@components/MenuItem';
 import NavigationTabBar from '@components/Navigation/NavigationTabBar';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';