Skip to content

Duplicate Distance Expenses fixes #84282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JS00001 merged 6 commits into from
Mar 16, 2026
+12 −3
Merged

Duplicate Distance Expenses fixes #84282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b2d261
fix: pass required params for odometer expenses
jjcoffee Mar 5, 2026
8ff6d72
fix: duplicating split map distance expense should remain as a manual…
jjcoffee Mar 10, 2026
e85546d
Merge branch 'main' into fix/duplicate-distance-expense-fixes
jjcoffee Mar 12, 2026
675eee3
Merge branch 'main' into fix/duplicate-distance-expense-fixes
jjcoffee Mar 12, 2026
ddab4ee
fix: pass modifiedAmount when duplicating distance expenses
jjcoffee Mar 13, 2026
b55595c
fix: ts error
jjcoffee Mar 13, 2026
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
1 change: 1 addition & 0 deletions src/libs/API/parameters/CreateDistanceRequestParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ type CreateDistanceRequestParams = {
iouReportID?: string;
createdIOUReportActionID?: string;
reportPreviewReportActionID?: string;
amount?: number;
category?: string;
receipt?: Receipt;
tag?: string;
Expand Down
12 changes: 9 additions & 3 deletions src/libs/actions/IOU/Duplicate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
buildTransactionThread,
getTransactionDetails,
} from '@libs/ReportUtils';
import {getRequestType, getTransactionType, isDistanceRequest, isExpenseSplit} from '@libs/TransactionUtils';
import {getRequestType, getTransactionType, isDistanceRequest, isExpenseSplit, isOdometerDistanceRequest} from '@libs/TransactionUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type * as OnyxTypes from '@src/types/onyx';
Expand Down Expand Up @@ -564,6 +564,8 @@ function duplicateExpenseTransaction({
merchant: transaction?.modifiedMerchant ? transaction.modifiedMerchant : (transaction?.merchant ?? ''),
modifiedAmount: undefined,
originalTransactionID: undefined,
odometerStart: transaction?.comment?.odometerStart ?? undefined,
odometerEnd: transaction?.comment?.odometerEnd ?? undefined,
receipt: undefined,
source: undefined,
waypoints,
Expand All @@ -587,8 +589,9 @@ function duplicateExpenseTransaction({
personalDetails,
};

// Since we remove waypoints for split distance expenses, we need to re-add the distance param here
if (isExpenseSplit(transaction) && isDistanceRequest(transaction)) {
// We remove waypoints for split distance expenses, so we have to re-add the distance param here.
// Odometer expenses don't have the distance parameter so we also need to pass it here.
if (isDistanceRequest(transaction) && (isExpenseSplit(transaction) || isOdometerDistanceRequest(transaction))) {
params.transactionParams.distance = transaction.comment?.customUnit?.quantity ?? undefined;
}

Expand All @@ -606,6 +609,7 @@ function duplicateExpenseTransaction({
...transaction.comment,
originalTransactionID: undefined,
source: undefined,
waypoints,
},
iouRequestType: getRequestType(transaction),
modifiedCreated: '',
Expand Down Expand Up @@ -648,6 +652,7 @@ function duplicateExpenseTransaction({
...transaction.comment,
originalTransactionID: undefined,
source: undefined,
waypoints,
},
iouRequestType: getRequestType(transaction),
modifiedCreated: '',
Expand All @@ -658,6 +663,7 @@ function duplicateExpenseTransaction({
...(params.transactionParams ?? {}),
comment: Parser.htmlToMarkdown(transactionDetails?.comment ?? ''),
validWaypoints: waypoints,
modifiedAmount: transactionDetails?.amount,
},
policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [],
quickAction,
Expand Down
2 changes: 2 additions & 0 deletions src/libs/actions/IOU/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@

let allPersonalDetails: OnyxTypes.PersonalDetailsList = {};
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,

Check warning on line 775 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
callback: (value) => {
allPersonalDetails = value ?? {};
},
Expand Down Expand Up @@ -872,7 +872,7 @@

let allTransactions: NonNullable<OnyxCollection<OnyxTypes.Transaction>> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION,

Check warning on line 875 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
waitForCollectionCallback: true,
callback: (value) => {
if (!value) {
Expand All @@ -886,7 +886,7 @@

let allTransactionDrafts: NonNullable<OnyxCollection<OnyxTypes.Transaction>> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,

Check warning on line 889 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
waitForCollectionCallback: true,
callback: (value) => {
allTransactionDrafts = value ?? {};
Expand All @@ -895,7 +895,7 @@

let allTransactionViolations: NonNullable<OnyxCollection<OnyxTypes.TransactionViolations>> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,

Check warning on line 898 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
waitForCollectionCallback: true,
callback: (value) => {
if (!value) {
Expand All @@ -909,7 +909,7 @@

let allPolicyTags: OnyxCollection<OnyxTypes.PolicyTagLists> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.POLICY_TAGS,

Check warning on line 912 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
waitForCollectionCallback: true,
callback: (value) => {
if (!value) {
Expand All @@ -922,7 +922,7 @@

let allReports: OnyxCollection<OnyxTypes.Report>;
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT,

Check warning on line 925 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
waitForCollectionCallback: true,
callback: (value) => {
allReports = value;
Expand All @@ -931,7 +931,7 @@

let allReportNameValuePairs: OnyxCollection<OnyxTypes.ReportNameValuePairs>;
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS,

Check warning on line 934 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
waitForCollectionCallback: true,
callback: (value) => {
allReportNameValuePairs = value;
Expand All @@ -941,7 +941,7 @@
let userAccountID = -1;
let currentUserEmail = '';
Onyx.connect({
key: ONYXKEYS.SESSION,

Check warning on line 944 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
callback: (value) => {
currentUserEmail = value?.email ?? '';
userAccountID = value?.accountID ?? CONST.DEFAULT_NUMBER_ID;
Expand All @@ -950,7 +950,7 @@

let deprecatedCurrentUserPersonalDetails: OnyxEntry<OnyxTypes.PersonalDetails>;
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,

Check warning on line 953 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
callback: (value) => {
deprecatedCurrentUserPersonalDetails = value?.[userAccountID] ?? undefined;
},
Expand All @@ -958,7 +958,7 @@

let allReportActions: OnyxCollection<OnyxTypes.ReportActions>;
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,

Check warning on line 961 in src/libs/actions/IOU/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
waitForCollectionCallback: true,
callback: (actions) => {
if (!actions) {
Expand Down Expand Up @@ -7580,6 +7580,7 @@
taxAmount,
taxCode,
merchant,
modifiedAmount,
billable,
reimbursable,
validWaypoints,
Expand Down Expand Up @@ -7757,6 +7758,7 @@
}

parameters = {
amount: modifiedAmount ?? undefined,
comment,
iouReportID: iouReport.reportID,
chatReportID: chatReport.reportID,
Expand Down
Loading