From b013749185b967891e4870d83762d7092b63b70f Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 14 May 2026 14:32:20 +0000
Subject: [PATCH 1/2] Replace FullscreenLoadingIndicator with ActivityIndicator
 in SearchFiltersWorkspacePage

Replace FullscreenLoadingIndicator with a View-wrapped ActivityIndicator
to avoid duplicate back button when shouldUseGoBackButton is enabled.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 .../SearchFiltersWorkspacePage.tsx               | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
index 3cd8051a5622..2170ec92066e 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
@@ -1,6 +1,7 @@
 import {emailSelector} from '@selectors/Session';
 import React, {useCallback, useMemo, useState} from 'react';
-import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import {StyleSheet, View} from 'react-native';
+import ActivityIndicator from '@components/ActivityIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SearchFilterPageFooterButtons from '@components/Search/SearchFilterPageFooterButtons';
@@ -16,6 +17,7 @@ import type {WorkspaceListItem} from '@hooks/useWorkspaceList';
 import useWorkspaceList from '@hooks/useWorkspaceList';
 import {updateAdvancedFilters} from '@libs/actions/Search';
 import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
@@ -105,10 +107,14 @@ function SearchFiltersWorkspacePage() {
                         }}
                     />
                     {shouldShowLoadingIndicator ? (
-                        <FullScreenLoadingIndicator
-                            style={[styles.flex1, styles.pRelative]}
-                            reasonAttributes={{context: 'SearchFiltersWorkspacePage', shouldShowLoadingIndicator}}
-                        />
+                        <View style={[StyleSheet.absoluteFill, styles.fullScreenLoading, styles.w100, styles.flex1, styles.pRelative]}>
+                            <View style={styles.w100}>
+                                <ActivityIndicator
+                                    size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                                    reasonAttributes={{context: 'SearchFiltersWorkspacePage', shouldShowLoadingIndicator}}
+                                />
+                            </View>
+                        </View>
                     ) : (
                         <SelectionList<WorkspaceListItem>
                             data={data}

From 708290cfca1bb14f094658d26ae8426b3606ac34 Mon Sep 17 00:00:00 2001
From: "Situ Chandra Shil (via MelvinBot)" <infra+melvinbot@expensify.com>
Date: Thu, 14 May 2026 14:47:09 +0000
Subject: [PATCH 2/2] Simplify loading indicator View structure

Apply review suggestion from situchan: use a single View with
flex1 and fullScreenLoading instead of nested Views with
absoluteFill, w100, and pRelative.

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
---
 .../SearchFiltersWorkspacePage.tsx                 | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
index 2170ec92066e..94fc462cb89e 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersWorkspacePage.tsx
@@ -1,6 +1,6 @@
 import {emailSelector} from '@selectors/Session';
 import React, {useCallback, useMemo, useState} from 'react';
-import {StyleSheet, View} from 'react-native';
+import {View} from 'react-native';
 import ActivityIndicator from '@components/ActivityIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -107,13 +107,11 @@ function SearchFiltersWorkspacePage() {
                         }}
                     />
                     {shouldShowLoadingIndicator ? (
-                        <View style={[StyleSheet.absoluteFill, styles.fullScreenLoading, styles.w100, styles.flex1, styles.pRelative]}>
-                            <View style={styles.w100}>
-                                <ActivityIndicator
-                                    size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
-                                    reasonAttributes={{context: 'SearchFiltersWorkspacePage', shouldShowLoadingIndicator}}
-                                />
-                            </View>
+                        <View style={[styles.flex1, styles.fullScreenLoading]}>
+                            <ActivityIndicator
+                                size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                                reasonAttributes={{context: 'SearchFiltersWorkspacePage', shouldShowLoadingIndicator}}
+                            />
                         </View>
                     ) : (
                         <SelectionList<WorkspaceListItem>