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
9 changes: 6 additions & 3 deletions config/eslint/eslint.seatbelt.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -1132,11 +1132,14 @@
"../../src/pages/TransactionDuplicate/Confirmation.tsx" "no-restricted-imports" 1
"../../src/pages/TransactionDuplicate/Confirmation.tsx" "react-hooks/refs" 12
"../../src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx" "@typescript-eslint/no-unsafe-type-assertion" 2
"../../src/pages/TransactionMerge/ConfirmationPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/TransactionMerge/DetailsReviewPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/TransactionDuplicate/Review.tsx" "no-restricted-imports" 1
"../../src/pages/TransactionMerge/DynamicConfirmationPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/TransactionMerge/DynamicConfirmationPage.tsx" "no-restricted-imports" 1
"../../src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx" "no-restricted-imports" 1
"../../src/pages/TransactionMerge/MergeTransactionItem.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/TransactionMerge/MergeTransactionsListContent.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1
"../../src/pages/TransactionMerge/ReceiptReviewPage.tsx" "no-restricted-imports" 1
"../../src/pages/TransactionMerge/DynamicReceiptReviewPage.tsx" "no-restricted-imports" 1
"../../src/pages/TransactionMerge/TransactionMergeReceipts.tsx" "no-restricted-imports" 1
"../../src/pages/Travel/DynamicDomainPermissionInfoPage.tsx" "no-restricted-imports" 1
"../../src/pages/Travel/DynamicDomainSelectorPage.tsx" "no-restricted-imports" 1
Expand Down
80 changes: 48 additions & 32 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,54 @@ const DYNAMIC_ROUTES = {
path: 'initial-list-value',
entryScreens: [SCREENS.WORKSPACE.REPORT_FIELDS_CREATE],
},
MERGE_TRANSACTION_LIST: {
path: 'merge/:transactionID',
entryScreens: [SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.RIGHT_MODAL.EXPENSE_REPORT, SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, SCREENS.SEARCH.ROOT],
getRoute: (transactionID: string, isOnSearch?: boolean) => `merge/${transactionID}${isOnSearch ? '?isOnSearch=true' : ''}` as const,
queryParams: ['isOnSearch'],
},
MERGE_TRANSACTION_RECEIPT: {
path: 'merge/:transactionID/receipt',
entryScreens: [
SCREENS.REPORT,
SCREENS.RIGHT_MODAL.SEARCH_REPORT,
SCREENS.RIGHT_MODAL.EXPENSE_REPORT,
SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT,
SCREENS.SEARCH.ROOT,
SCREENS.MERGE_TRANSACTION.DYNAMIC_LIST_PAGE,
],
getRoute: (transactionID: string, isOnSearch?: boolean) => `merge/${transactionID}/receipt${isOnSearch ? '?isOnSearch=true' : ''}` as const,
queryParams: ['isOnSearch'],
},
MERGE_TRANSACTION_DETAILS: {
path: 'merge/:transactionID/details',
entryScreens: [
SCREENS.REPORT,
SCREENS.RIGHT_MODAL.SEARCH_REPORT,
SCREENS.RIGHT_MODAL.EXPENSE_REPORT,
SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT,
SCREENS.SEARCH.ROOT,
SCREENS.MERGE_TRANSACTION.DYNAMIC_LIST_PAGE,
SCREENS.MERGE_TRANSACTION.DYNAMIC_RECEIPT_PAGE,
],
getRoute: (transactionID: string, isOnSearch?: boolean) => `merge/${transactionID}/details${isOnSearch ? '?isOnSearch=true' : ''}` as const,
queryParams: ['isOnSearch'],
},
MERGE_TRANSACTION_CONFIRMATION: {
path: 'merge/:transactionID/confirmation',
entryScreens: [
SCREENS.REPORT,
SCREENS.RIGHT_MODAL.SEARCH_REPORT,
SCREENS.RIGHT_MODAL.EXPENSE_REPORT,
SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT,
SCREENS.SEARCH.ROOT,
SCREENS.MERGE_TRANSACTION.DYNAMIC_LIST_PAGE,
SCREENS.MERGE_TRANSACTION.DYNAMIC_RECEIPT_PAGE,
SCREENS.MERGE_TRANSACTION.DYNAMIC_DETAILS_PAGE,
],
getRoute: (transactionID: string, isOnSearch?: boolean) => `merge/${transactionID}/confirmation${isOnSearch ? '?isOnSearch=true' : ''}` as const,
queryParams: ['isOnSearch'],
},
MONEY_REQUEST_STEP_TAX_RATE: {
path: 'taxRate',
entryScreens: [
Expand Down Expand Up @@ -3591,38 +3639,6 @@ const ROUTES = {

getRoute: (threadReportID: string, backTo?: string) => getUrlWithBackToParam(`r/${threadReportID}/duplicates/confirm` as const, backTo),
},
MERGE_TRANSACTION_LIST_PAGE: {
route: 'merge/:transactionID',

getRoute: (transactionID: string, backTo: string, isOnSearch = false) => {
const url = getUrlWithBackToParam(`merge/${transactionID}` as const, backTo);
return isOnSearch ? (`${url}&isOnSearch=true` as const) : url;
},
},
MERGE_TRANSACTION_RECEIPT_PAGE: {
route: 'merge/:transactionID/receipt',

getRoute: (transactionID: string, backTo: string, isOnSearch = false) => {
const url = getUrlWithBackToParam(`merge/${transactionID}/receipt` as const, backTo);
return isOnSearch ? (`${url}&isOnSearch=true` as const) : url;
},
},
MERGE_TRANSACTION_DETAILS_PAGE: {
route: 'merge/:transactionID/details',

getRoute: (transactionID: string, backTo: string, isOnSearch = false) => {
const url = getUrlWithBackToParam(`merge/${transactionID}/details` as const, backTo);
return isOnSearch ? (`${url}&isOnSearch=true` as const) : url;
},
},
MERGE_TRANSACTION_CONFIRMATION_PAGE: {
route: 'merge/:transactionID/confirmation',

getRoute: (transactionID: string, backTo: string, isOnSearch = false) => {
const url = getUrlWithBackToParam(`merge/${transactionID}/confirmation` as const, backTo);
return isOnSearch ? (`${url}&isOnSearch=true` as const) : url;
},
},
POLICY_ACCOUNTING_XERO_SETUP: {
route: 'workspaces/:policyID/accounting/xero/setup',
getRoute: (policyID: string) => `workspaces/${policyID}/accounting/xero/setup` as const,
Expand Down
8 changes: 4 additions & 4 deletions src/SCREENS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@ const SCREENS = {
},

MERGE_TRANSACTION: {
LIST_PAGE: 'Merge_Transaction_List_Page',
RECEIPT_PAGE: 'Merge_Transaction_Receipt_Page',
DETAILS_PAGE: 'Merge_Transaction_Details_Page',
CONFIRMATION_PAGE: 'Merge_Transaction_Confirmation_Page',
DYNAMIC_LIST_PAGE: 'Dynamic_Merge_Transaction_List_Page',
DYNAMIC_RECEIPT_PAGE: 'Dynamic_Merge_Transaction_Receipt_Page',
DYNAMIC_DETAILS_PAGE: 'Dynamic_Merge_Transaction_Details_Page',
DYNAMIC_CONFIRMATION_PAGE: 'Dynamic_Merge_Transaction_Confirmation_Page',
},

IOU_SEND: {
Expand Down
3 changes: 1 addition & 2 deletions src/components/MoneyRequestHeaderSecondaryActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
if (!transaction) {
return;
}
const isOnSearch = route.name.toLowerCase().startsWith('search');
setupMergeTransactionDataAndNavigate(transaction.transactionID, [transaction], localeCompare, getCurrencyDecimals, [], false, isOnSearch);
setupMergeTransactionDataAndNavigate(transaction.transactionID, [transaction], localeCompare, getCurrencyDecimals, [], false, isReportInSearch);
},
},
[CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DUPLICATE]: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1180,10 +1180,10 @@ const TransactionDuplicateStackNavigator = createModalStackNavigator<Transaction
});

const MergeTransactionStackNavigator = createModalStackNavigator<MergeTransactionNavigatorParamList>({
[SCREENS.MERGE_TRANSACTION.LIST_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/MergeTransactionsListPage').default,
[SCREENS.MERGE_TRANSACTION.RECEIPT_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/ReceiptReviewPage').default,
[SCREENS.MERGE_TRANSACTION.DETAILS_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/DetailsReviewPage').default,
[SCREENS.MERGE_TRANSACTION.CONFIRMATION_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/ConfirmationPage').default,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_LIST_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/DynamicMergeTransactionsListPage').default,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_RECEIPT_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/DynamicReceiptReviewPage').default,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_DETAILS_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/DynamicDetailsReviewPage').default,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_CONFIRMATION_PAGE]: () => require<ReactComponentModule>('../../../../pages/TransactionMerge/DynamicConfirmationPage').default,
});

const SearchReportActionsModalStackNavigator = createModalStackNavigator<SearchReportActionsParamList>({
Expand Down
1 change: 1 addition & 0 deletions src/libs/Navigation/linkingConfig/OldRoutes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const oldRoutes: Record<string, string> = {
'/flag/*/*': '/r/$1/flag/$1/$2',
'/r/*/details/shareCode': '/r/$1/share-code',
'/e/*/details/shareCode': '/e/$1/share-code',
'/merge/*': '/search/merge/$1',
'/referral/*': '/home/referral/$1',
'/a/*/avatar': '/avatar/$1',
'/settings/profile/contact-methods/verify': '/settings/profile/contact-methods/verify-account',
Expand Down
8 changes: 4 additions & 4 deletions src/libs/Navigation/linkingConfig/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1878,10 +1878,10 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
},
[SCREENS.RIGHT_MODAL.MERGE_TRANSACTION]: {
screens: {
[SCREENS.MERGE_TRANSACTION.LIST_PAGE]: ROUTES.MERGE_TRANSACTION_LIST_PAGE.route,
[SCREENS.MERGE_TRANSACTION.RECEIPT_PAGE]: ROUTES.MERGE_TRANSACTION_RECEIPT_PAGE.route,
[SCREENS.MERGE_TRANSACTION.DETAILS_PAGE]: ROUTES.MERGE_TRANSACTION_DETAILS_PAGE.route,
[SCREENS.MERGE_TRANSACTION.CONFIRMATION_PAGE]: ROUTES.MERGE_TRANSACTION_CONFIRMATION_PAGE.route,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_LIST_PAGE]: DYNAMIC_ROUTES.MERGE_TRANSACTION_LIST.path,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_RECEIPT_PAGE]: DYNAMIC_ROUTES.MERGE_TRANSACTION_RECEIPT.path,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_DETAILS_PAGE]: DYNAMIC_ROUTES.MERGE_TRANSACTION_DETAILS.path,
[SCREENS.MERGE_TRANSACTION.DYNAMIC_CONFIRMATION_PAGE]: DYNAMIC_ROUTES.MERGE_TRANSACTION_CONFIRMATION.path,
},
},
[SCREENS.RIGHT_MODAL.SPLIT_DETAILS]: {
Expand Down
16 changes: 4 additions & 12 deletions src/libs/Navigation/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2587,28 +2587,20 @@ type TransactionDuplicateNavigatorParamList = {
};

type MergeTransactionNavigatorParamList = {
[SCREENS.MERGE_TRANSACTION.LIST_PAGE]: {
[SCREENS.MERGE_TRANSACTION.DYNAMIC_LIST_PAGE]: {
transactionID: 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;
isOnSearch?: boolean;
};
[SCREENS.MERGE_TRANSACTION.RECEIPT_PAGE]: {
[SCREENS.MERGE_TRANSACTION.DYNAMIC_RECEIPT_PAGE]: {
transactionID: 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;
isOnSearch?: boolean;
};
[SCREENS.MERGE_TRANSACTION.DETAILS_PAGE]: {
[SCREENS.MERGE_TRANSACTION.DYNAMIC_DETAILS_PAGE]: {
transactionID: 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;
isOnSearch?: boolean;
};
[SCREENS.MERGE_TRANSACTION.CONFIRMATION_PAGE]: {
[SCREENS.MERGE_TRANSACTION.DYNAMIC_CONFIRMATION_PAGE]: {
transactionID: 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;
isOnSearch?: boolean;
};
};
Expand Down
34 changes: 29 additions & 5 deletions src/libs/actions/MergeTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import {
shouldNavigateToReceiptReview,
} from '@libs/MergeTransactionUtils';
import type {MergeFieldKey, MergeTransactionUpdateValues} from '@libs/MergeTransactionUtils';
import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
import findAllMatchingDynamicSuffixes from '@libs/Navigation/helpers/dynamicRoutesUtils/findAllMatchingDynamicSuffixes';
import getPathWithoutDynamicSuffix from '@libs/Navigation/helpers/dynamicRoutesUtils/getPathWithoutDynamicSuffix';
import Navigation from '@libs/Navigation/Navigation';
import {isPaidGroupPolicy, isPolicyAdmin} from '@libs/PolicyUtils';
import {getIOUActionForReportID, getReportAction, getTrackExpenseActionableWhisper} from '@libs/ReportActionsUtils';
Expand All @@ -30,7 +33,7 @@ import {
import CONST from '@src/CONST';
import {isDistanceRequest, isTransactionPendingDelete} from '@src/libs/TransactionUtils';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import {DYNAMIC_ROUTES} from '@src/ROUTES';
import type {
CardList,
MergeTransaction,
Expand Down Expand Up @@ -69,6 +72,27 @@ function setMergeTransactionKey(transactionID: string, values: MergeTransactionU
Onyx.merge(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${transactionID}`, values as OnyxMergeInput<`${typeof ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${string}`>);
}

const MERGE_TRANSACTION_DYNAMIC_PATHS: ReadonlySet<string> = new Set([
DYNAMIC_ROUTES.MERGE_TRANSACTION_LIST.path,
DYNAMIC_ROUTES.MERGE_TRANSACTION_RECEIPT.path,
DYNAMIC_ROUTES.MERGE_TRANSACTION_DETAILS.path,
DYNAMIC_ROUTES.MERGE_TRANSACTION_CONFIRMATION.path,
]);

/**
* Navigating between merge-transaction steps can start from a URL that already ends with a
* previous step's (self-contained) dynamic suffix, e.g. `merge/:transactionID/receipt`. Strip
* it so the next step's suffix replaces it instead of stacking on top of it.
*/
function getMergeTransactionBasePath(): string {
const activeRoute = Navigation.getActiveRoute();
const match = findAllMatchingDynamicSuffixes(activeRoute).find((candidate) => MERGE_TRANSACTION_DYNAMIC_PATHS.has(candidate.pattern));
if (!match) {
return activeRoute;
}
return getPathWithoutDynamicSuffix(match.pathUsedForMatching, match.actualSuffix, match.pattern) || activeRoute;
}

function setupMergeTransactionDataAndNavigate(
navigationTransactionID: string,
transactions: Transaction[],
Expand All @@ -87,7 +111,7 @@ function setupMergeTransactionDataAndNavigate(
const transaction = transactions.at(0);
if (transaction) {
setupMergeTransactionData(navigationTransactionID, {targetTransactionID: transaction.transactionID});
Navigation.navigate(ROUTES.MERGE_TRANSACTION_LIST_PAGE.getRoute(transaction.transactionID, Navigation.getActiveRoute(), isOnSearch));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MERGE_TRANSACTION_LIST.getRoute(transaction.transactionID, isOnSearch), getMergeTransactionBasePath()));
return;
}
}
Expand All @@ -110,7 +134,7 @@ function setupMergeTransactionDataAndNavigate(
}
if (shouldNavigateToReceiptReview([targetTransaction, sourceTransaction])) {
// Navigate to the receipt review page if both transactions have a receipt
Navigation.navigate(ROUTES.MERGE_TRANSACTION_RECEIPT_PAGE.getRoute(navigationTransactionID, Navigation.getActiveRoute(), isOnSearch));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MERGE_TRANSACTION_RECEIPT.getRoute(navigationTransactionID, isOnSearch), getMergeTransactionBasePath()));
} else {
const receipt = targetTransaction.receipt?.receiptID ? targetTransaction.receipt : sourceTransaction.receipt;
if (receipt) {
Expand All @@ -130,11 +154,11 @@ function setupMergeTransactionDataAndNavigate(
if (!conflictFields.length) {
// If there are no conflict fields, we should set mergeable data and navigate to the confirmation page
setMergeTransactionKey(navigationTransactionID, mergeableData);
Navigation.navigate(ROUTES.MERGE_TRANSACTION_CONFIRMATION_PAGE.getRoute(navigationTransactionID, Navigation.getActiveRoute(), isOnSearch));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MERGE_TRANSACTION_CONFIRMATION.getRoute(navigationTransactionID, isOnSearch), getMergeTransactionBasePath()));
return;
}

Navigation.navigate(ROUTES.MERGE_TRANSACTION_DETAILS_PAGE.getRoute(navigationTransactionID, Navigation.getActiveRoute(), isOnSearch));
Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MERGE_TRANSACTION_DETAILS.getRoute(navigationTransactionID, isOnSearch), getMergeTransactionBasePath()));
}
}

Expand Down
Loading
Loading