Skip to content

Commit 6d396cc

Browse files
committed
Simplify the check
1 parent 499252c commit 6d396cc

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

src/components/Search/index.tsx

Lines changed: 5 additions & 6 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,10 +41,11 @@ 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';
5051
import SCREENS from '@src/SCREENS';
@@ -236,10 +237,8 @@ function Search({queryJSON, searchResults, onSearchListScroll, contentContainerS
236237
}, [isSmallScreenWidth, selectedTransactions, isMobileSelectionModeEnabled]);
237238

238239
useEffect(() => {
239-
const activeRoute = Navigation.getActiveRoute();
240-
const screenParamMatch = activeRoute.match(/screen=([^&]+)/);
241-
const screenParam = screenParamMatch ? decodeURIComponent(screenParamMatch[1]) : null;
242-
const isMigratedModalDisplayed = activeRoute.includes(ROUTES.MIGRATED_USER_WELCOME_MODAL.getRoute(true)) || screenParam === SCREENS.MIGRATED_USER_WELCOME_MODAL.ROOT;
240+
const focusedRoute = findFocusedRoute(navigationRef.getRootState());
241+
const isMigratedModalDisplayed = focusedRoute?.name === NAVIGATORS.MIGRATED_USER_MODAL_NAVIGATOR || focusedRoute?.name === SCREENS.MIGRATED_USER_WELCOME_MODAL.ROOT;
243242

244243
if ((!isFocused && !isMigratedModalDisplayed) || isOffline) {
245244
return;

0 commit comments

Comments
 (0)