|
1 | | -import {useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native'; |
| 1 | +import {findFocusedRoute, useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native'; |
2 | 2 | import type {ContentStyle} from '@shopify/flash-list'; |
3 | 3 | import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; |
4 | 4 | import type {NativeScrollEvent, NativeSyntheticEvent, ViewToken} from 'react-native'; |
@@ -41,12 +41,14 @@ import { |
41 | 41 | shouldShowYear as shouldShowYearUtil, |
42 | 42 | } from '@libs/SearchUIUtils'; |
43 | 43 | import {isOnHold, isTransactionPendingDelete} from '@libs/TransactionUtils'; |
44 | | -import Navigation from '@navigation/Navigation'; |
| 44 | +import Navigation, {navigationRef} from '@navigation/Navigation'; |
45 | 45 | import type {SearchFullscreenNavigatorParamList} from '@navigation/types'; |
46 | 46 | import EmptySearchView from '@pages/Search/EmptySearchView'; |
47 | 47 | import CONST from '@src/CONST'; |
| 48 | +import NAVIGATORS from '@src/NAVIGATORS'; |
48 | 49 | import ONYXKEYS from '@src/ONYXKEYS'; |
49 | 50 | import ROUTES from '@src/ROUTES'; |
| 51 | +import SCREENS from '@src/SCREENS'; |
50 | 52 | import type {ReportAction} from '@src/types/onyx'; |
51 | 53 | import type SearchResults from '@src/types/onyx/SearchResults'; |
52 | 54 | import {isEmptyObject} from '@src/types/utils/EmptyObject'; |
@@ -235,7 +237,10 @@ function Search({queryJSON, searchResults, onSearchListScroll, contentContainerS |
235 | 237 | }, [isSmallScreenWidth, selectedTransactions, isMobileSelectionModeEnabled]); |
236 | 238 |
|
237 | 239 | 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) { |
239 | 244 | return; |
240 | 245 | } |
241 | 246 |
|
|
0 commit comments