From 74ba6cf007996300ce2718dcf0cace5f686cf3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= Date: Wed, 14 Aug 2024 15:00:54 +0200 Subject: [PATCH] cleanup: remove unused betas params --- src/libs/OptionsListUtils.ts | 16 ++++++---------- src/libs/SidebarUtils.ts | 4 ++-- src/pages/ChatFinderPage/index.tsx | 4 ++-- src/pages/NewChatPage.tsx | 3 +-- .../request/MoneyRequestParticipantsSelector.tsx | 3 +-- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index 287bbcdfb2dd..0be3129f8fb2 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -185,7 +185,6 @@ type GetUserToInviteConfig = { excludeUnknownUsers?: boolean; optionsToExclude?: Array>; selectedOptions?: Array>; - betas: OnyxEntry; reportActions?: ReportActions; showChatPreviewLine?: boolean; }; @@ -219,10 +218,10 @@ type Options = { type PreviewConfig = {showChatPreviewLine?: boolean; forcePolicyNamePreview?: boolean; showPersonalDetails?: boolean}; -type FilterOptionsConfig = Pick< - GetOptionsConfig, - 'sortByReportTypeInSearch' | 'canInviteUser' | 'betas' | 'selectedOptions' | 'excludeUnknownUsers' | 'excludeLogins' | 'maxRecentReportsToShow' -> & {preferChatroomsOverThreads?: boolean; includeChatRoomsByParticipants?: boolean}; +type FilterOptionsConfig = Pick & { + preferChatroomsOverThreads?: boolean; + includeChatRoomsByParticipants?: boolean; +}; type HasText = { text?: string; @@ -1727,7 +1726,7 @@ function getUserToInviteOption({ /** * Check whether report has violations */ -function shouldShowViolations(report: Report, betas: OnyxEntry, transactionViolations: OnyxCollection) { +function shouldShowViolations(report: Report, transactionViolations: OnyxCollection) { const {parentReportID, parentReportActionID} = report ?? {}; const canGetParentReport = parentReportID && parentReportActionID && allReportActions; if (!canGetParentReport) { @@ -1850,7 +1849,7 @@ function getOptions( // Filter out all the reports that shouldn't be displayed const filteredReportOptions = options.reports.filter((option) => { const report = option.item; - const doesReportHaveViolations = shouldShowViolations(report, betas, transactionViolations); + const doesReportHaveViolations = shouldShowViolations(report, transactionViolations); return ReportUtils.shouldReportBeInOptionList({ report, @@ -2053,7 +2052,6 @@ function getOptions( excludeUnknownUsers, optionsToExclude, selectedOptions, - betas, reportActions, showChatPreviewLine, }); @@ -2421,7 +2419,6 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt const { sortByReportTypeInSearch = false, canInviteUser = true, - betas = [], maxRecentReportsToShow = 0, excludeLogins = [], preferChatroomsOverThreads = false, @@ -2526,7 +2523,6 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt if (recentReports.length === 0 && personalDetails.length === 0) { userToInvite = getUserToInviteOption({ searchValue, - betas, selectedOptions: config?.selectedOptions, optionsToExclude, }); diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 473697708b14..1737cc5f01a6 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -102,7 +102,7 @@ function getOrderedReportIDs( } const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {}; const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1'); - const doesReportHaveViolations = OptionsListUtils.shouldShowViolations(report, betas ?? [], transactionViolations); + const doesReportHaveViolations = OptionsListUtils.shouldShowViolations(report, transactionViolations); const isHidden = report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN; const isFocused = report.reportID === currentReportId; const allReportErrors = OptionsListUtils.getAllReportErrors(report, reportActions) ?? {}; @@ -111,7 +111,7 @@ function getOrderedReportIDs( let doesTransactionThreadReportHasViolations = false; if (oneTransactionThreadReportID) { const transactionReport = ReportUtils.getReport(oneTransactionThreadReportID); - doesTransactionThreadReportHasViolations = !!transactionReport && OptionsListUtils.shouldShowViolations(transactionReport, betas ?? [], transactionViolations); + doesTransactionThreadReportHasViolations = !!transactionReport && OptionsListUtils.shouldShowViolations(transactionReport, transactionViolations); } const hasErrorsOtherThanFailedReceipt = doesTransactionThreadReportHasViolations || diff --git a/src/pages/ChatFinderPage/index.tsx b/src/pages/ChatFinderPage/index.tsx index 1a990b5daffe..1246bc156278 100644 --- a/src/pages/ChatFinderPage/index.tsx +++ b/src/pages/ChatFinderPage/index.tsx @@ -104,7 +104,7 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa } Timing.start(CONST.TIMING.SEARCH_FILTER_OPTIONS); - const newOptions = OptionsListUtils.filterOptions(searchOptions, debouncedSearchValue, {sortByReportTypeInSearch: true, betas, preferChatroomsOverThreads: true}); + const newOptions = OptionsListUtils.filterOptions(searchOptions, debouncedSearchValue, {sortByReportTypeInSearch: true, preferChatroomsOverThreads: true}); Timing.end(CONST.TIMING.SEARCH_FILTER_OPTIONS); const header = OptionsListUtils.getHeaderMessage(newOptions.recentReports.length + Number(!!newOptions.userToInvite) > 0, false, debouncedSearchValue); @@ -114,7 +114,7 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa userToInvite: newOptions.userToInvite, headerMessage: header, }; - }, [debouncedSearchValue, searchOptions, betas]); + }, [debouncedSearchValue, searchOptions]); const {recentReports, personalDetails: localPersonalDetails, userToInvite, headerMessage} = debouncedSearchValue.trim() !== '' ? filteredOptions : searchOptions; diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx index 7694b616f8d2..805fd90ab369 100755 --- a/src/pages/NewChatPage.tsx +++ b/src/pages/NewChatPage.tsx @@ -116,7 +116,6 @@ function useOptions({isGroupChat}: NewChatPageProps) { if (!participantOption) { participantOption = OptionsListUtils.getUserToInviteOption({ searchValue: participant.login, - betas, }); } if (!participantOption) { @@ -128,7 +127,7 @@ function useOptions({isGroupChat}: NewChatPageProps) { }); }); setSelectedOptions(newSelectedOptions); - }, [newGroupDraft?.participants, listOptions.personalDetails, betas, personalData.accountID]); + }, [newGroupDraft?.participants, listOptions.personalDetails, personalData.accountID]); return { ...options, diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx index 6ff64128cbbc..d512d41e476f 100644 --- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx +++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx @@ -158,13 +158,12 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF } const newOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, { - betas, selectedOptions: participants as Participant[], excludeLogins: CONST.EXPENSIFY_EMAILS, maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW, }); return newOptions; - }, [areOptionsInitialized, betas, defaultOptions, debouncedSearchTerm, participants]); + }, [areOptionsInitialized, defaultOptions, debouncedSearchTerm, participants]); /** * Returns the sections needed for the OptionsSelector