Skip to content

Commit 36e3f45

Browse files
committed
fix: minor fixes contact imports
1 parent 54fa032 commit 36e3f45

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/libs/ContactPermission/useContactsImporter.ts renamed to src/hooks/useContactImport.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import {RESULTS} from 'react-native-permissions';
33
import type {PermissionStatus} from 'react-native-permissions';
44
import contactImport from '@libs/ContactImport';
55
import type {ContactImportResult} from '@libs/ContactImport/types';
6+
import useContactPermissions from '@libs/ContactPermission/useContactPermissions';
67
import getContacts from '@libs/ContactUtils';
78
import type {SearchOption} from '@libs/OptionsListUtils';
89
import type {PersonalDetails} from '@src/types/onyx';
9-
import useContactPermissions from './useContactPermissions';
1010

1111
/**
12-
* Return type of the useContactsImporter hook.
12+
* Return type of the useContactImport hook.
1313
*/
14-
type UseContactsImporterResult = {
14+
type useContactImportResult = {
1515
contacts: Array<SearchOption<PersonalDetails>>;
1616
contactPermissionState: PermissionStatus;
1717
importAndSaveContacts: () => void;
@@ -23,7 +23,7 @@ type UseContactsImporterResult = {
2323
* managing permissions, and transforming contact data
2424
* into a format suitable for use in the app.
2525
*/
26-
function useContactsImporter(): UseContactsImporterResult {
26+
function useContactImport(): useContactImportResult {
2727
const [contactPermissionState, setContactPermissionState] = useState<PermissionStatus>(RESULTS.UNAVAILABLE);
2828
const [contacts, setContacts] = useState<Array<SearchOption<PersonalDetails>>>([]);
2929

@@ -50,4 +50,4 @@ function useContactsImporter(): UseContactsImporterResult {
5050
};
5151
}
5252

53-
export default useContactsImporter;
53+
export default useContactImport;

src/pages/NewChatPage.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import SelectCircle from '@components/SelectCircle';
1111
import SelectionList from '@components/SelectionList';
1212
import type {ListItem, SelectionListHandle} from '@components/SelectionList/types';
1313
import UserListItem from '@components/SelectionList/UserListItem';
14+
import useContactImport from '@hooks/useContactImport';
1415
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
1516
import useDebouncedState from '@hooks/useDebouncedState';
1617
import useDismissedReferralBanners from '@hooks/useDismissedReferralBanners';
@@ -21,7 +22,6 @@ import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
2122
import useScreenWrapperTransitionStatus from '@hooks/useScreenWrapperTransitionStatus';
2223
import useThemeStyles from '@hooks/useThemeStyles';
2324
import {navigateToAndOpenReport, searchInServer, setGroupDraft} from '@libs/actions/Report';
24-
import useContactsImporter from '@libs/ContactPermission/useContactsImporter';
2525
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
2626
import Log from '@libs/Log';
2727
import memoize from '@libs/memoize';
@@ -61,7 +61,7 @@ function useOptions() {
6161
const [newGroupDraft] = useOnyx(ONYXKEYS.NEW_GROUP_CHAT_DRAFT, {canBeMissing: true});
6262
const personalData = useCurrentUserPersonalDetails();
6363
const {didScreenTransitionEnd} = useScreenWrapperTransitionStatus();
64-
const {contacts} = useContactsImporter();
64+
const {contacts} = useContactImport();
6565
const {options: listOptions, areOptionsInitialized} = useOptionsList({
6666
shouldInitialize: didScreenTransitionEnd,
6767
});
@@ -78,9 +78,9 @@ function useOptions() {
7878
},
7979
);
8080
return filteredOptions;
81-
}, [betas, listOptions.personalDetails, listOptions.reports]);
81+
}, [betas, listOptions.personalDetails, listOptions.reports, contacts]);
8282

83-
const unselectedOptions = useMemo(() => filterSelectedOptions(defaultOptions, new Set(selectedOptions.map(({accountID}) => accountID))), [defaultOptions, selectedOptions, contacts]);
83+
const unselectedOptions = useMemo(() => filterSelectedOptions(defaultOptions, new Set(selectedOptions.map(({accountID}) => accountID))), [defaultOptions, selectedOptions]);
8484

8585
const options = useMemo(() => {
8686
const filteredOptions = filterAndOrderOptions(unselectedOptions, debouncedSearchTerm, {

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import useOnyx from '@hooks/useOnyx';
2626
import usePolicy from '@hooks/usePolicy';
2727
import useScreenWrapperTransitionStatus from '@hooks/useScreenWrapperTransitionStatus';
2828
import useThemeStyles from '@hooks/useThemeStyles';
29-
import useContactsImporter from '@libs/ContactPermission/useContactsImporter';
29+
import useContactImport from '@hooks/useContactImport';
3030
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
3131
import getPlatform from '@libs/getPlatform';
3232
import goToSettings from '@libs/goToSettings';
@@ -100,7 +100,7 @@ function MoneyRequestParticipantsSelector(
100100
const {translate} = useLocalize();
101101
const styles = useThemeStyles();
102102
const [betas] = useOnyx(ONYXKEYS.BETAS, {canBeMissing: true});
103-
const {contactPermissionState, contacts, setContactPermissionState, importAndSaveContacts} = useContactsImporter();
103+
const {contactPermissionState, contacts, setContactPermissionState, importAndSaveContacts} = useContactImport();
104104
const platform = getPlatform();
105105
const isNative = platform === CONST.PLATFORM.ANDROID || platform === CONST.PLATFORM.IOS;
106106
const showImportContacts = isNative && !(contactPermissionState === RESULTS.GRANTED || contactPermissionState === RESULTS.LIMITED);

0 commit comments

Comments
 (0)