chore: migrate old SelectionList to new SelectionListWithSections in MoneyRe… #82662
+108
−73
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,10 +12,9 @@ import FormHelpMessage from '@components/FormHelpMessage'; | |
| import MenuItem from '@components/MenuItem'; | ||
| import {usePersonalDetails} from '@components/OnyxListItemProvider'; | ||
| import ReferralProgramCTA from '@components/ReferralProgramCTA'; | ||
| import InviteMemberListItem from '@components/SelectionList/ListItem/InviteMemberListItem'; | ||
| import SelectionListWithSections from '@components/SelectionList/SelectionListWithSections'; | ||
| import type {Section, SelectionListWithSectionsHandle} from '@components/SelectionList/SelectionListWithSections/types'; | ||
| import useContactImport from '@hooks/useContactImport'; | ||
| import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; | ||
| import useDismissedReferralBanners from '@hooks/useDismissedReferralBanners'; | ||
|
|
@@ -34,8 +33,9 @@ import getPlatform from '@libs/getPlatform'; | |
| import goToSettings from '@libs/goToSettings'; | ||
| import {isMovingTransactionFromTrackExpense} from '@libs/IOUUtils'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import type {Option} from '@libs/OptionsListUtils'; | ||
| import {formatSectionsFromSearchTerm, getHeaderMessage, getParticipantsOption, getPersonalDetailSearchTerms, getPolicyExpenseReportOption, isCurrentUser} from '@libs/OptionsListUtils'; | ||
| import type {OptionWithKey} from '@libs/OptionsListUtils/types'; | ||
| import {getActiveAdminWorkspaces, isPaidGroupPolicy as isPaidGroupPolicyUtil} from '@libs/PolicyUtils'; | ||
| import type {OptionData} from '@libs/ReportUtils'; | ||
| import {isInvoiceRoom} from '@libs/ReportUtils'; | ||
|
|
@@ -127,7 +127,7 @@ function MoneyRequestParticipantsSelector({ | |
| const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST); | ||
|
|
||
| const [textInputAutoFocus, setTextInputAutoFocus] = useState<boolean>(!isNative); | ||
| const selectionListRef = useRef<SelectionListWithSectionsHandle | null>(null); | ||
| const offlineMessage: string = isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : ''; | ||
|
|
||
| const isPaidGroupPolicy = useMemo(() => isPaidGroupPolicyUtil(policy), [policy]); | ||
|
|
@@ -279,7 +279,7 @@ function MoneyRequestParticipantsSelector({ | |
| * @returns {Array} | ||
| */ | ||
| const [sections, header] = useMemo(() => { | ||
| const newSections: Array<Section<OptionWithKey>> = []; | ||
| if (!areOptionsInitialized || !didScreenTransitionEnd) { | ||
| return [newSections, '']; | ||
| } | ||
|
|
@@ -297,34 +297,42 @@ function MoneyRequestParticipantsSelector({ | |
| ); | ||
| // Just a temporary fix to satisfy the type checker | ||
| // Will be fixed when migrating to use new SelectionListWithSections | ||
| newSections.push({...formatResults.section, sectionIndex: 0}); | ||
|
|
||
| if ((availableOptions.workspaceChats ?? []).length > 0) { | ||
| newSections.push({ | ||
| title: translate('workspace.common.workspace'), | ||
| data: availableOptions.workspaceChats ?? [], | ||
| sectionIndex: 1, | ||
| }); | ||
| } | ||
|
|
||
| if (availableOptions.selfDMChat) { | ||
| newSections.push({ | ||
| title: translate('workspace.invoices.paymentMethods.personal'), | ||
| data: availableOptions.selfDMChat ? [availableOptions.selfDMChat] : [], | ||
| sectionIndex: 2, | ||
| }); | ||
| } | ||
|
|
||
| if (!isWorkspacesOnly) { | ||
| if ((isPerDiemRequest ? availableOptions.recentReports.filter((report) => report.isPolicyExpenseChat) : availableOptions.recentReports).length > 0) { | ||
| newSections.push({ | ||
| title: translate('common.recents'), | ||
| data: isPerDiemRequest ? availableOptions.recentReports.filter((report) => report.isPolicyExpenseChat) : availableOptions.recentReports, | ||
| sectionIndex: 3, | ||
| }); | ||
| } | ||
|
|
||
| if (availableOptions.personalDetails.length > 0 && !isPerDiemRequest) { | ||
| newSections.push({ | ||
| title: translate('common.contacts'), | ||
| data: availableOptions.personalDetails, | ||
| sectionIndex: 4, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| if ( | ||
| !isWorkspacesOnly && | ||
| availableOptions.userToInvite && | ||
|
|
@@ -347,11 +355,11 @@ function MoneyRequestParticipantsSelector({ | |
| ? getPolicyExpenseReportOption(participant, currentUserAccountID, personalDetails, reportAttributesDerived) | ||
| : getParticipantsOption(participant, personalDetails); | ||
| }), | ||
| sectionIndex: 5, | ||
| }); | ||
| } | ||
|
|
||
| let headerMessage; | ||
| if (!showImportContacts) { | ||
| headerMessage = inputHelperText; | ||
| } | ||
|
|
@@ -430,9 +438,9 @@ function MoneyRequestParticipantsSelector({ | |
| return length; | ||
| }, [areOptionsInitialized, sections]); | ||
|
|
||
| const showListEmptyContent = useMemo(() => optionLength === 0 && !showLoadingPlaceholder, [optionLength, showLoadingPlaceholder]); | ||
|
|
||
| const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE && !showListEmptyContent; | ||
|
|
||
| const initiateContactImportAndSetState = useCallback(() => { | ||
| setContactPermissionState(RESULTS.GRANTED); | ||
|
|
@@ -561,6 +569,15 @@ function MoneyRequestParticipantsSelector({ | |
| }, | ||
| })); | ||
|
|
||
| const textInputOptions = { | ||
| value: searchTerm, | ||
| label: translate('selectionList.nameEmailOrPhoneNumber'), | ||
| hint: offlineMessage, | ||
| onChangeText: setSearchTerm, | ||
| disableAutoFocus: !textInputAutoFocus, | ||
| headerMessage: header, | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| <ContactPermissionModal | ||
|
|
@@ -570,19 +587,19 @@ function MoneyRequestParticipantsSelector({ | |
| setTextInputAutoFocus(true); | ||
| }} | ||
| /> | ||
| <SelectionListWithSections | ||
| confirmButtonOptions={{ | ||
| onConfirm: handleConfirmSelection, | ||
| }} | ||
| sections={sections} | ||
| ListItem={InviteMemberListItem} | ||
| textInputOptions={textInputOptions} | ||
| shouldPreventDefaultFocusOnSelectRow={!canUseTouchScreen()} | ||
| onSelectRow={onSelectRow} | ||
| shouldSingleExecuteRowSelect | ||
| canShowProductTrainingTooltip={canShowManagerMcTest} | ||
| customListHeaderContent={importContactsButtonComponent} | ||
| customHeaderContent={ | ||
|
There was a problem hiding this comment.
Switching this prop to Useful? React with 👍 / 👎.
Contributor
Author
There was a problem hiding this comment. @grgia yep, the comment was useful and I did change the code. |
||
| <ImportContactButton | ||
| showImportContacts={contactState?.showImportUI ?? showImportContacts} | ||
| inputHelperText={inputHelperText} | ||
|
|
@@ -591,14 +608,11 @@ function MoneyRequestParticipantsSelector({ | |
| } | ||
| footerContent={footerContent} | ||
| listEmptyContent={EmptySelectionListContentWithPermission} | ||
| showLoadingPlaceholder={showLoadingPlaceholder} | ||
| shouldShowTextInput | ||
| canSelectMultiple={isIOUSplit && isAllowedToSplit} | ||
| isLoadingNewOptions={!!isSearchingForReports} | ||
| showListEmptyContent={showListEmptyContent} | ||
| ref={selectionListRef} | ||
| onEndReached={onListEndReached} | ||
| /> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sharabai why did this if check change?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@grgia the if check is same. It was moved to from inside the object from prop
shouldShowto an outside beforehand if check.Look at this line It's hard to spot it in github diff.