Skip to content

[Internal QA] Fix migrated users see prolonged Search loading #67050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 4 commits into from
Jul 25, 2025
Merged

[Internal QA] Fix migrated users see prolonged Search loading #67050

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
965f569
Call Search API call if user just finished the migration
VickyStash Jul 24, 2025
8d6eb10
Apply reviewer feedback
VickyStash Jul 25, 2025
499252c
Rename the variable
VickyStash Jul 25, 2025
6d396cc
Simplify the check
VickyStash Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/components/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native';
import {findFocusedRoute, useFocusEffect, useIsFocused, useNavigation} from '@react-navigation/native';
import type {ContentStyle} from '@shopify/flash-list';
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import type {NativeScrollEvent, NativeSyntheticEvent, ViewToken} from 'react-native';
Expand Down Expand Up @@ -41,12 +41,14 @@ import {
shouldShowYear as shouldShowYearUtil,
} from '@libs/SearchUIUtils';
import {isOnHold, isTransactionPendingDelete} from '@libs/TransactionUtils';
import Navigation from '@navigation/Navigation';
import Navigation, {navigationRef} from '@navigation/Navigation';
import type {SearchFullscreenNavigatorParamList} from '@navigation/types';
import EmptySearchView from '@pages/Search/EmptySearchView';
import CONST from '@src/CONST';
import NAVIGATORS from '@src/NAVIGATORS';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import SCREENS from '@src/SCREENS';
import type {ReportAction} from '@src/types/onyx';
import type SearchResults from '@src/types/onyx/SearchResults';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
Expand Down Expand Up @@ -235,7 +237,10 @@ function Search({queryJSON, searchResults, onSearchListScroll, contentContainerS
}, [isSmallScreenWidth, selectedTransactions, isMobileSelectionModeEnabled]);

useEffect(() => {
if (!isFocused || isOffline) {
const focusedRoute = findFocusedRoute(navigationRef.getRootState());
const isMigratedModalDisplayed = focusedRoute?.name === NAVIGATORS.MIGRATED_USER_MODAL_NAVIGATOR || focusedRoute?.name === SCREENS.MIGRATED_USER_WELCOME_MODAL.ROOT;

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

Expand Down