Skip to content

Commit c470f91

Browse files
authored
Merge pull request Expensify#65639 from Eskalifer1/fix/65263
2 parents 42b2088 + 08c1a03 commit c470f91

2 files changed

Lines changed: 5 additions & 15 deletions

File tree

src/components/Search/FilterDropdowns/UserSelectPopup.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import isEmpty from 'lodash/isEmpty';
2-
import React, {memo, useCallback, useEffect, useMemo, useState} from 'react';
2+
import React, {memo, useCallback, useMemo, useState} from 'react';
33
import {View} from 'react-native';
44
import Button from '@components/Button';
55
import {usePersonalDetails} from '@components/OnyxProvider';
66
import {useOptionsList} from '@components/OptionListContextProvider';
77
import SelectionList from '@components/SelectionList';
88
import UserSelectionListItem from '@components/SelectionList/Search/UserSelectionListItem';
9-
import useDebouncedState from '@hooks/useDebouncedState';
109
import useLocalize from '@hooks/useLocalize';
1110
import useOnyx from '@hooks/useOnyx';
1211
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -16,7 +15,6 @@ import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
1615
import type {Option, Section} from '@libs/OptionsListUtils';
1716
import {filterAndOrderOptions, getValidOptions} from '@libs/OptionsListUtils';
1817
import type {OptionData} from '@libs/ReportUtils';
19-
import {searchInServer} from '@userActions/Report';
2018
import CONST from '@src/CONST';
2119
import ONYXKEYS from '@src/ONYXKEYS';
2220

@@ -45,7 +43,7 @@ function UserSelectPopup({value, closeOverlay, onChange}: UserSelectPopupProps)
4543
const [accountID] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true, selector: (onyxSession) => onyxSession?.accountID});
4644
const shouldFocusInputOnScreenFocus = canFocusInputOnScreenFocus();
4745

48-
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
46+
const [searchTerm, setSearchTerm] = useState('');
4947
const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false, canBeMissing: true});
5048
const [selectedOptions, setSelectedOptions] = useState<Option[]>(() => {
5149
return value.reduce<OptionData[]>((acc, id) => {
@@ -83,6 +81,7 @@ function UserSelectPopup({value, closeOverlay, onChange}: UserSelectPopupProps)
8381
const {personalDetails: filteredOptionsList, recentReports} = filterAndOrderOptions(optionsList, cleanSearchTerm, {
8482
excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
8583
maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
84+
canInviteUser: false,
8685
});
8786

8887
const personalDetailList = filteredOptionsList
@@ -154,10 +153,6 @@ function UserSelectPopup({value, closeOverlay, onChange}: UserSelectPopupProps)
154153
closeOverlay();
155154
}, [closeOverlay, onChange]);
156155

157-
useEffect(() => {
158-
searchInServer(debouncedSearchTerm.trim());
159-
}, [debouncedSearchTerm]);
160-
161156
const isLoadingNewOptions = !!isSearchingForReports;
162157
const dataLength = sections.flatMap((section) => section.data).length;
163158

src/components/Search/SearchFiltersParticipantsSelector.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {usePersonalDetails} from '@components/OnyxProvider';
33
import {useOptionsList} from '@components/OptionListContextProvider';
44
import SelectionList from '@components/SelectionList';
55
import UserSelectionListItem from '@components/SelectionList/Search/UserSelectionListItem';
6-
import useDebouncedState from '@hooks/useDebouncedState';
76
import useLocalize from '@hooks/useLocalize';
87
import useOnyx from '@hooks/useOnyx';
98
import useScreenWrapperTransitionStatus from '@hooks/useScreenWrapperTransitionStatus';
@@ -13,7 +12,6 @@ import type {Option, Section} from '@libs/OptionsListUtils';
1312
import type {OptionData} from '@libs/ReportUtils';
1413
import {getDisplayNameForParticipant} from '@libs/ReportUtils';
1514
import Navigation from '@navigation/Navigation';
16-
import {searchInServer} from '@userActions/Report';
1715
import CONST from '@src/CONST';
1816
import ONYXKEYS from '@src/ONYXKEYS';
1917
import ROUTES from '@src/ROUTES';
@@ -47,7 +45,7 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
4745

4846
const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {canBeMissing: false, initWithStoredValues: false});
4947
const [selectedOptions, setSelectedOptions] = useState<OptionData[]>([]);
50-
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
48+
const [searchTerm, setSearchTerm] = useState('');
5149
const cleanSearchTerm = useMemo(() => searchTerm.trim().toLowerCase(), [searchTerm]);
5250

5351
const defaultOptions = useMemo(() => {
@@ -72,6 +70,7 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
7270
selectedOptions,
7371
excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
7472
maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
73+
canInviteUser: false,
7574
});
7675
}, [defaultOptions, cleanSearchTerm, selectedOptions]);
7776

@@ -156,10 +155,6 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
156155
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- this should react only to changes in form data
157156
}, [initialAccountIDs, personalDetails]);
158157

159-
useEffect(() => {
160-
searchInServer(debouncedSearchTerm.trim());
161-
}, [debouncedSearchTerm]);
162-
163158
const handleParticipantSelection = useCallback(
164159
(option: Option) => {
165160
const foundOptionIndex = selectedOptions.findIndex((selectedOption: Option) => {

0 commit comments

Comments
 (0)