diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index f6e92b2b6764..f79bd0a78a46 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -1225,7 +1225,7 @@ function initMoneyRequest({ newIouRequestType, report, parentReport, - currentDate = '', + currentDate, lastSelectedDistanceRates, currentUserPersonalDetails, hasOnlyPersonalPolicies, @@ -1235,9 +1235,7 @@ function initMoneyRequest({ const newTransactionID = CONST.IOU.OPTIMISTIC_TRANSACTION_ID; const currency = policy?.outputCurrency ?? personalPolicy?.outputCurrency ?? CONST.CURRENCY.USD; - // Disabling this line since currentDate can be an empty string - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - const created = currentDate || format(new Date(), 'yyyy-MM-dd'); + const created = currentDate ?? format(new Date(), 'yyyy-MM-dd'); // We remove draft transactions created during multi scanning if there are some removeDraftTransactions(true, draftTransactions); diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx index b642e8d2bd0e..81b9bbfdf0d8 100644 --- a/src/pages/iou/request/IOURequestStartPage.tsx +++ b/src/pages/iou/request/IOURequestStartPage.tsx @@ -1,6 +1,8 @@ import {useFocusEffect} from '@react-navigation/native'; +import {iouRequestPolicyCollectionSelector} from '@selectors/Policy'; import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; import {Keyboard, View} from 'react-native'; +import type {OnyxEntry} from 'react-native-onyx'; import DragAndDropProvider from '@components/DragAndDrop/Provider'; import FocusTrapContainerElement from '@components/FocusTrap/FocusTrapContainerElement'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -25,7 +27,6 @@ import getPlatform from '@libs/getPlatform'; import type Platform from '@libs/getPlatform/types'; import Navigation from '@libs/Navigation/Navigation'; import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator'; -import {getIsUserSubmittedExpenseOrScannedReceipt} from '@libs/OptionsListUtils'; import { getActivePoliciesWithExpenseChatAndPerDiemEnabledAndHasRates, getActivePoliciesWithExpenseChatAndTimeEnabled, @@ -41,7 +42,7 @@ import {initMoneyRequest} from '@userActions/IOU'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; -import type {SelectedTabRequest} from '@src/types/onyx'; +import type {DismissedProductTraining, SelectedTabRequest} from '@src/types/onyx'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import IOURequestStepAmount from './step/IOURequestStepAmount'; @@ -60,6 +61,11 @@ type IOURequestStartPageProps = WithWritableReportOrNotFoundProps): boolean => !!nvp?.[CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP]; + function IOURequestStartPage({ route, route: { @@ -77,18 +83,22 @@ function IOURequestStartPage({ const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`); const policy = usePolicy(report?.policyID); const [lastSelectedTab, selectedTabResult] = useOnyx(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.IOU_REQUEST_TYPE}`); - const [selectedTab, setSelectedTab] = useState(lastSelectedTab); + // Derive selectedTab directly instead of using state + const selectedTab = lastSelectedTab; const isLoadingSelectedTab = shouldUseTab ? isLoadingOnyxValue(selectedTabResult) : false; const [transaction, transactionResult] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${getNonEmptyStringOnyxID(route?.params.transactionID)}`); const isLoadingTransaction = isLoadingOnyxValue(transactionResult); - const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY); + const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, { + selector: iouRequestPolicyCollectionSelector, + }); + const [lastSelectedDistanceRates] = useOnyx(ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES); const [draftTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT); const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false); const [currentDate] = useOnyx(ONYXKEYS.CURRENT_DATE); const {isOffline} = useNetwork(); - const [nvpDismissedProductTraining] = useOnyx(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING); + const [hasUserSubmittedExpenseOrScannedReceipt] = useOnyx(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {selector: isTestReceiptTooltipDismissedSelector}); const hasOnlyPersonalPolicies = useMemo(() => hasOnlyPersonalPoliciesUtil(allPolicies), [allPolicies]); const perDiemInputRef = useRef(null); @@ -109,8 +119,7 @@ function IOURequestStartPage({ // We requestAnimationFrame since the function is called in the animate block in the web implementation // which fixes a locked animation glitch when swiping between tabs, and aligns with the native implementation internal delay requestAnimationFrame(() => { - // 2 - PerDiem - if (index !== 2) { + if (index !== PER_DIEM_TAB_INDEX) { return; } perDiemInputRef.current?.focus?.(); @@ -164,13 +173,6 @@ function IOURequestStartPage({ // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - useEffect(() => { - if (isLoadingSelectedTab || selectedTab) { - return; - } - setSelectedTab(lastSelectedTab); - }, [isLoadingSelectedTab, selectedTab, lastSelectedTab]); - const navigateBack = () => { Navigation.closeRHPFlow(); }; @@ -219,7 +221,6 @@ function IOURequestStartPage({ const onTabSelected = useCallback( (newIouType: IOURequestType) => { - setSelectedTab(newIouType); resetIOUTypeIfChanged(newIouType); }, [resetIOUTypeIfChanged], @@ -256,10 +257,7 @@ function IOURequestStartPage({ const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext( CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP, // The test receipt image is served via our server on web so it requires internet connection - !getIsUserSubmittedExpenseOrScannedReceipt(nvpDismissedProductTraining) && - isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && - selectedTab === CONST.TAB_REQUEST.SCAN && - !(isOffline && isWeb), + !hasUserSubmittedExpenseOrScannedReceipt && isBetaEnabled(CONST.BETAS.NEWDOT_MANAGER_MCTEST) && selectedTab === CONST.TAB_REQUEST.SCAN && !(isOffline && isWeb), { onConfirm: () => { setTestReceiptAndNavigateRef?.current?.(); diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx index e34c62f7fbfb..cac0e151130c 100644 --- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx @@ -160,7 +160,6 @@ function IOURequestStepConfirmation({ const draftPolicyID = getIOURequestPolicyID(initialTransaction, reportDraft); const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${draftPolicyID}`); const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${realPolicyID}`); - const [reportDrafts] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT); const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS); const [betas] = useOnyx(ONYXKEYS.BETAS); @@ -312,9 +311,9 @@ function IOURequestStepConfirmation({ const privateIsArchived = privateIsArchivedMap[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${participant.reportID}`]; return participant.accountID ? getParticipantsOption(participant, personalDetails) - : getReportOption(participant, privateIsArchived, policy, currentUserPersonalDetails.accountID, personalDetails, reportAttributesDerived, reportDrafts); + : getReportOption(participant, privateIsArchived, policy, currentUserPersonalDetails.accountID, personalDetails, reportAttributesDerived); }) ?? [], - [transaction?.participants, iouType, personalDetails, reportAttributesDerived, reportDrafts, privateIsArchivedMap, policy, currentUserPersonalDetails.accountID], + [transaction?.participants, iouType, personalDetails, reportAttributesDerived, privateIsArchivedMap, policy, currentUserPersonalDetails.accountID], ); const isPolicyExpenseChat = useMemo(() => participants?.some((participant) => participant.isPolicyExpenseChat), [participants]); const shouldGenerateTransactionThreadReport = !isBetaEnabled(CONST.BETAS.NO_OPTIMISTIC_TRANSACTION_THREADS); diff --git a/src/selectors/Policy.ts b/src/selectors/Policy.ts index cacceaf6874c..f66d29768392 100644 --- a/src/selectors/Policy.ts +++ b/src/selectors/Policy.ts @@ -87,6 +87,40 @@ const groupPaidPoliciesWithExpenseChatEnabledSelector = (policies: OnyxCollectio const shouldRedirectToExpensifyClassicSelector = (policies: OnyxCollection) => areAllGroupPoliciesExpenseChatDisabled(policies); +const iouRequestPolicyCollectionSelector = (policies: OnyxCollection): OnyxCollection => { + if (!policies) { + return {}; + } + + const result: Record = {}; + + for (const [id, policyItem] of Object.entries(policies)) { + if (!policyItem) { + continue; + } + + result[id] = { + id: policyItem.id, + type: policyItem.type, + name: policyItem.name, + pendingAction: policyItem.pendingAction, + isPolicyExpenseChatEnabled: policyItem.isPolicyExpenseChatEnabled, + role: policyItem.role, + chatReportIDAdmins: policyItem.chatReportIDAdmins, + employeeList: policyItem.employeeList, + arePerDiemRatesEnabled: policyItem.arePerDiemRatesEnabled, + customUnits: policyItem.customUnits, + units: policyItem.units, + isJoinRequestPending: policyItem.isJoinRequestPending, + errors: policyItem.errors, + owner: policyItem.owner, + areInvoicesEnabled: policyItem.areInvoicesEnabled, + } as Policy; + } + + return result; +}; + export { activePolicySelector, createAllPolicyReportFieldsSelector, @@ -96,5 +130,6 @@ export { policyTimeTrackingSelector, hasMultipleOutputCurrenciesSelector, groupPaidPoliciesWithExpenseChatEnabledSelector, + iouRequestPolicyCollectionSelector, shouldRedirectToExpensifyClassicSelector, };