Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/eslint/eslint.seatbelt.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -1068,8 +1068,8 @@
"../../src/pages/iou/request/step/IOURequestStepScan/hooks/useScanRouteParams.ts" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/iou/request/step/IOURequestStepScan/utils/getFileSource.ts" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/iou/request/step/IOURequestStepSubrate.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/iou/request/step/IOURequestStepSubrate.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx" "react-hooks/set-state-in-effect" 1
"../../src/pages/iou/request/step/IOURequestStepWaypoint.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/pages/iou/request/step/StepScreenWrapper.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/iou/request/step/withFullTransactionOrNotFound.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
Expand Down
20 changes: 10 additions & 10 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,16 @@ const DYNAMIC_ROUTES = {
// In the new manual expense flow the confirmation fields are inlined on the create page, so it is also an entry point.
entryScreens: [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION, SCREENS.MONEY_REQUEST.CREATE],
},
MONEY_REQUEST_STEP_SUBRATE: {
path: 'per-diem-subrate/:pageIndex',
entryScreens: [SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TIME],
getRoute: (pageIndex: string | number = 0) => `per-diem-subrate/${pageIndex}` as const,
},
MONEY_REQUEST_STEP_SUBRATE_EDIT: {
path: 'per-diem-subrate-edit/:pageIndex',
entryScreens: [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION],
getRoute: (pageIndex: string | number) => `per-diem-subrate-edit/${pageIndex}` as const,
},
PROFILE: {
path: 'a/:accountID',
entryScreens: ['*'],
Expand Down Expand Up @@ -2452,16 +2462,6 @@ const ROUTES = {
return getUrlWithBackToParam(`${action as string}/${iouType as string}/vendor/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo);
},
},
MONEY_REQUEST_STEP_SUBRATE: {
route: ':action/:iouType/subrate/:transactionID/:reportID/:backToReport?/:pageIndex',
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string, backTo = '') =>
getUrlWithBackToParam(`${action as string}/${iouType as string}/subrate/${transactionID}/${reportID}${backToReport ? `/${backToReport}` : ''}/0`, backTo),
},
MONEY_REQUEST_STEP_SUBRATE_EDIT: {
route: ':action/:iouType/subrate/:transactionID/:reportID/edit/:pageIndex',
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, pageIndex = 0, backTo = '') =>
getUrlWithBackToParam(`${action as string}/${iouType as string}/subrate/${transactionID}/${reportID}/edit/${pageIndex}`, backTo),
},
MONEY_REQUEST_RECEIPT_PREVIEW: {
route: ':action/:iouType/receipt/:transactionID/:reportID',
getRoute: (reportID: string, transactionID: string, action: IOUAction, iouType: IOUType) => {
Expand Down
4 changes: 2 additions & 2 deletions src/SCREENS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,10 @@ const SCREENS = {
DYNAMIC_STEP_ACCOUNTANT: 'Dynamic_Money_Request_Accountant',
DYNAMIC_STEP_DESTINATION: 'Dynamic_Money_Request_Destination',
DYNAMIC_STEP_TIME: 'Dynamic_Money_Request_Time',
STEP_SUBRATE: 'Money_Request_SubRate',
DYNAMIC_STEP_SUBRATE: 'Dynamic_Money_Request_SubRate',
DYNAMIC_STEP_DESTINATION_EDIT: 'Dynamic_Money_Request_Destination_Edit',
DYNAMIC_STEP_TIME_EDIT: 'Dynamic_Money_Request_Time_Edit',
STEP_SUBRATE_EDIT: 'Money_Request_SubRate_Edit',
DYNAMIC_STEP_SUBRATE_EDIT: 'Dynamic_Money_Request_SubRate_Edit',
DYNAMIC_STEP_REPORT: 'Dynamic_Money_Request_Report',
DYNAMIC_EDIT_REPORT: 'Dynamic_Money_Request_Edit_Report',
SPLIT_EXPENSE: 'Money_Request_Split_Expense',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import Navigation from '@libs/Navigation/Navigation';
import {getDestinationForDisplay, getSubratesFields, getSubratesForDisplay, getTimeDifferenceIntervals, getTimeForDisplay} from '@libs/PerDiemRequestUtils';

import CONST from '@src/CONST';
import type {IOUAction, IOUType} from '@src/CONST';
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
import {DYNAMIC_ROUTES} from '@src/ROUTES';
import type * as OnyxTypes from '@src/types/onyx';
import type {CustomUnit} from '@src/types/onyx/Policy';

Expand All @@ -26,14 +25,11 @@ type PerDiemFieldsProps = {
isReadOnly: boolean;
didConfirm: boolean;
transactionID: string | undefined;
action: IOUAction;
iouType: Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>;
reportID: string;
shouldDisplayFieldError: boolean;
formError: string;
};

function PerDiemFields({perDiemCustomUnit, transaction, isReadOnly, didConfirm, transactionID, action, iouType, reportID, shouldDisplayFieldError, formError}: PerDiemFieldsProps) {
function PerDiemFields({perDiemCustomUnit, transaction, isReadOnly, didConfirm, transactionID, shouldDisplayFieldError, formError}: PerDiemFieldsProps) {
const styles = useThemeStyles();
const {translate, dateFnsLocale} = useLocalize();
const icons = useMemoizedLazyExpensifyIcons(['Stopwatch', 'CalendarSolid']);
Expand All @@ -53,7 +49,7 @@ function PerDiemFields({perDiemCustomUnit, transaction, isReadOnly, didConfirm,
if (!transactionID) {
return;
}
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SUBRATE_EDIT.getRoute(action, iouType, transactionID, reportID, index, Navigation.getActiveRoute()));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_SUBRATE_EDIT.getRoute(index)));
}}
disabled={didConfirm}
interactive={!isReadOnly}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function PerDiemSection({policy, shouldDisplayFieldError, formError}: PerDiemSec
}

function PerDiemSectionContent({policy, shouldDisplayFieldError, formError}: PerDiemSectionProps) {
const {action, iouType, transactionID, reportID, isReadOnly, didConfirm} = useConfirmationFields();
const {transactionID, isReadOnly, didConfirm} = useConfirmationFields();
const transaction = useTransactionSelector(transactionID, perDiemSliceSelector);

const perDiemCustomUnit = getPerDiemCustomUnit(policy);
Expand All @@ -55,9 +55,6 @@ function PerDiemSectionContent({policy, shouldDisplayFieldError, formError}: Per
isReadOnly={isReadOnly}
didConfirm={didConfirm}
transactionID={transactionID}
action={action}
iouType={iouType}
reportID={reportID}
shouldDisplayFieldError={shouldDisplayFieldError}
formError={formError}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,10 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator<MoneyRequestNa
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_UPGRADE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/DynamicIOURequestStepUpgrade').default,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_DESTINATION]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/DynamicIOURequestStepDestination').default,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TIME]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/DynamicIOURequestStepTime').default,
[SCREENS.MONEY_REQUEST.STEP_SUBRATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepSubrate').default,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/DynamicIOURequestStepSubrate').default,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_DESTINATION_EDIT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/DynamicIOURequestStepDestination').default,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TIME_EDIT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/DynamicIOURequestStepTime').default,
[SCREENS.MONEY_REQUEST.STEP_SUBRATE_EDIT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepSubrate').default,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE_EDIT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/DynamicIOURequestStepSubrate').default,
[SCREENS.MONEY_REQUEST.DYNAMIC_RECEIPT_VIEW]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepScan/DynamicReceiptView').default,
[SCREENS.MONEY_REQUEST.SPLIT_EXPENSE]: () => require<ReactComponentModule>('../../../../pages/iou/SplitExpensePage').default,
[SCREENS.MONEY_REQUEST.SPLIT_EXPENSE_SEARCH]: () => require<ReactComponentModule>('../../../../pages/iou/SplitExpensePage').default,
Expand Down
3 changes: 3 additions & 0 deletions src/libs/Navigation/linkingConfig/OldRoutes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ const oldRoutes: Record<string, string> = {
'/*/*/destination/*/*': '/$1/$2/start/$3/$4/per-diem-destination',
'/*/*/time/*/*/edit': '/$1/$2/confirmation/$3/$4/per-diem-time-edit',
'/*/*/time/*/*': '/$1/$2/destination/$3/$4/per-diem-time',
'/*/*/subrate/*/*/edit/*': '/$1/$2/confirmation/$3/$4/per-diem-subrate-edit/$5',
Comment thread
suneox marked this conversation as resolved.
Resolved
'/*/*/subrate/*/*/*/*': '/$1/$2/start/$3/$4/$5/per-diem-time/per-diem-subrate/$6',
'/*/*/subrate/*/*/*': '/$1/$2/start/$3/$4/per-diem-time/per-diem-subrate/$5',
'/settings/*/category/*/edit': '/settings/$1/categories/category-settings/$2/category-edit',
'/settings/*/category/*': '/settings/$1/categories/category-settings/$2',
'/settings/*/tags/*/edit': '/settings/$1/tags/settings-tags-edit/$2',
Expand Down
4 changes: 2 additions & 2 deletions src/libs/Navigation/linkingConfig/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1806,10 +1806,10 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_UPGRADE]: DYNAMIC_ROUTES.MONEY_REQUEST_UPGRADE.path,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_DESTINATION]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DESTINATION.path,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TIME]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TIME.path,
[SCREENS.MONEY_REQUEST.STEP_SUBRATE]: ROUTES.MONEY_REQUEST_STEP_SUBRATE.route,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_SUBRATE.path,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_DESTINATION_EDIT]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DESTINATION_EDIT.path,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_TIME_EDIT]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TIME_EDIT.path,
[SCREENS.MONEY_REQUEST.STEP_SUBRATE_EDIT]: ROUTES.MONEY_REQUEST_STEP_SUBRATE_EDIT.route,
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE_EDIT]: DYNAMIC_ROUTES.MONEY_REQUEST_STEP_SUBRATE_EDIT.path,
[SCREENS.MONEY_REQUEST.STEP_TIME_RATE]: ROUTES.MONEY_REQUEST_STEP_TIME_RATE.route,
[SCREENS.MONEY_REQUEST.STEP_HOURS]: ROUTES.MONEY_REQUEST_STEP_HOURS.route,
[SCREENS.MONEY_REQUEST.STEP_HOURS_EDIT]: ROUTES.MONEY_REQUEST_STEP_HOURS_EDIT.route,
Expand Down
9 changes: 3 additions & 6 deletions src/libs/Navigation/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2319,12 +2319,10 @@ type MoneyRequestNavigatorParamList = {
reportID: string;
backToReport?: string;
};
[SCREENS.MONEY_REQUEST.STEP_SUBRATE]: {
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE]: {
iouType: Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>;
reportID: string;
backToReport?: string;
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
backTo: Routes | undefined;
action: IOUAction;
pageIndex: string;
transactionID: string;
Expand All @@ -2343,11 +2341,10 @@ type MoneyRequestNavigatorParamList = {
reportID: string;
backToReport?: string;
};
[SCREENS.MONEY_REQUEST.STEP_SUBRATE_EDIT]: {
[SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE_EDIT]: {
iouType: Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>;
reportID: string;
// eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
backTo: Routes | undefined;
backToReport?: string;
action: IOUAction;
pageIndex: string;
transactionID: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,19 @@ import TextInput from '@components/TextInput';
import ValuePicker from '@components/ValuePicker';

import useConfirmModal from '@hooks/useConfirmModal';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDynamicBackPath from '@hooks/useDynamicBackPath';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
import useThemeStyles from '@hooks/useThemeStyles';

import {addErrorMessage} from '@libs/ErrorUtils';
import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
import Navigation from '@libs/Navigation/Navigation';
import TransitionTracker from '@libs/Navigation/TransitionTracker';
import {getPerDiemCustomUnit} from '@libs/PolicyUtils';
import {getActivePoliciesWithExpenseChatAndPerDiemEnabled, getPerDiemCustomUnit} from '@libs/PolicyUtils';

import {getIOURequestPolicyID} from '@userActions/IOU/MoneyRequest';
import {addSubrate, removeSubrate, updateSubrate} from '@userActions/IOU/PerDiem';
Expand All @@ -29,7 +32,7 @@ import CONST from '@src/CONST';
import type {TranslationPaths} from '@src/languages/types';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import SCREENS from '@src/SCREENS';
import type * as OnyxTypes from '@src/types/onyx';
import type {Subrate} from '@src/types/onyx/Policy';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
Expand All @@ -38,15 +41,16 @@ import type {OnyxEntry} from 'react-native-onyx';

import {useNavigation} from '@react-navigation/native';
import {SafeString} from 'expensify-common';
import React, {useCallback, useEffect, useRef, useState} from 'react';
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
import {View} from 'react-native';

import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';

import buildPerDiemTimeBasePath from './perDiemTimeBasePath';
import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
import withWritableReportOrNotFound from './withWritableReportOrNotFound';

type IOURequestStepSubrateProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_SUBRATE> & {
type DynamicIOURequestStepSubrateProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE | typeof SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE_EDIT> & {
transaction: OnyxEntry<OnyxTypes.Transaction>;

/** The report linked to the transaction */
Expand All @@ -71,14 +75,21 @@ function getSubrateOptions(subRates: Subrate[], filledSubRates: CommentSubrate[]
}));
}

function IOURequestStepSubrate({
function DynamicIOURequestStepSubrate({
route: {
params: {action, backTo, iouType, pageIndex, reportID, transactionID, backToReport},
params: {action, iouType, pageIndex, reportID, transactionID, backToReport},
name: routeName,
},
transaction,
report,
}: IOURequestStepSubrateProps) {
}: DynamicIOURequestStepSubrateProps) {
const isEditPage = routeName === SCREENS.MONEY_REQUEST.DYNAMIC_STEP_SUBRATE_EDIT;
const editBackPath = useDynamicBackPath(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_SUBRATE_EDIT.path);
const styles = useThemeStyles();
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const {login: currentUserLogin} = useCurrentUserPersonalDetails();
const policiesWithPerDiemEnabled = useMemo(() => getActivePoliciesWithExpenseChatAndPerDiemEnabled(allPolicies, currentUserLogin), [allPolicies, currentUserLogin]);
const hasMoreThanOnePolicyWithPerDiemEnabled = policiesWithPerDiemEnabled.length > 1;
const iouPolicyID = getIOURequestPolicyID(transaction, report);
const {policy} = usePolicyForTransaction({
transaction,
Expand Down Expand Up @@ -124,14 +135,14 @@ function IOURequestStepSubrate({
const validOptions = getSubrateOptions(allPossibleSubrates, allSubrates, currentSubrate?.id);

const goBack = () => {
if (backTo) {
Navigation.goBack(backTo);
if (isEditPage) {
Navigation.goBack(editBackPath);
return;
}
Navigation.goBack(
createDynamicRoute(
DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TIME.path,
createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DESTINATION.path, ROUTES.MONEY_REQUEST_CREATE.getRoute(action, iouType, transactionID, reportID, backToReport)),
buildPerDiemTimeBasePath({transaction, action, iouType, transactionID, reportID, backToReport, hasMoreThanOnePolicyWithPerDiemEnabled}),
),
);
};
Expand Down Expand Up @@ -169,7 +180,7 @@ function IOURequestStepSubrate({
updateSubrate(transaction, pageIndex, quantityInt, subrateVal, name, rate);
}

if (backTo) {
if (isEditPage) {
goBack();
} else {
Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, reportID, backToReport));
Expand Down Expand Up @@ -212,11 +223,11 @@ function IOURequestStepSubrate({
<ScreenWrapper
includeSafeAreaPaddingBottom
shouldEnableMaxHeight
testID={IOURequestStepSubrate.displayName}
testID={DynamicIOURequestStepSubrate.displayName}
>
<FullPageNotFoundView shouldShow={shouldDisableEditor}>
<HeaderWithBackButton
title={backTo ? translate('common.subrate') : tabTitles[iouType]}
title={isEditPage ? translate('common.subrate') : tabTitles[iouType]}
shouldShowBackButton
onBackButtonPress={goBack}
shouldShowThreeDotsButton={shouldShowThreeDotsButton}
Expand Down Expand Up @@ -288,6 +299,6 @@ function IOURequestStepSubrate({
);
}

IOURequestStepSubrate.displayName = 'IOURequestStepSubrate';
DynamicIOURequestStepSubrate.displayName = 'DynamicIOURequestStepSubrate';

export default withWritableReportOrNotFound(withFullTransactionOrNotFound(IOURequestStepSubrate));
export default withWritableReportOrNotFound(withFullTransactionOrNotFound(DynamicIOURequestStepSubrate));
Loading
Loading