Skip to content

Commit 9a1f97f

Browse files
authored
Merge pull request Expensify#67050 from callstack-internal/VickyStash/bugfix/67040-prolonged-search-loading
[Internal QA] Fix migrated users see prolonged Search loading
2 parents 9711e7f + 6d396cc commit 9a1f97f

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

src/components/Search/index.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native';
1+
import {findFocusedRoute, useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native';
22
import type {ContentStyle} from '@shopify/flash-list';
33
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
44
import type {NativeScrollEvent, NativeSyntheticEvent, ViewToken} from 'react-native';
@@ -41,12 +41,14 @@ import {
4141
shouldShowYear as shouldShowYearUtil,
4242
} from '@libs/SearchUIUtils';
4343
import {isOnHold, isTransactionPendingDelete} from '@libs/TransactionUtils';
44-
import Navigation from '@navigation/Navigation';
44+
import Navigation, {navigationRef} from '@navigation/Navigation';
4545
import type {SearchFullscreenNavigatorParamList} from '@navigation/types';
4646
import EmptySearchView from '@pages/Search/EmptySearchView';
4747
import CONST from '@src/CONST';
48+
import NAVIGATORS from '@src/NAVIGATORS';
4849
import ONYXKEYS from '@src/ONYXKEYS';
4950
import ROUTES from '@src/ROUTES';
51+
import SCREENS from '@src/SCREENS';
5052
import type {ReportAction} from '@src/types/onyx';
5153
import type SearchResults from '@src/types/onyx/SearchResults';
5254
import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -235,7 +237,10 @@ function Search({queryJSON, searchResults, onSearchListScroll, contentContainerS
235237
}, [isSmallScreenWidth, selectedTransactions, isMobileSelectionModeEnabled]);
236238

237239
useEffect(() => {
238-
if (!isFocused || isOffline) {
240+
const focusedRoute = findFocusedRoute(navigationRef.getRootState());
241+
const isMigratedModalDisplayed = focusedRoute?.name === NAVIGATORS.MIGRATED_USER_MODAL_NAVIGATOR || focusedRoute?.name === SCREENS.MIGRATED_USER_WELCOME_MODAL.ROOT;
242+
243+
if ((!isFocused && !isMigratedModalDisplayed) || isOffline) {
239244
return;
240245
}
241246

0 commit comments

Comments
 (0)