make merchant and comment as optional

Expensify · Feb 5, 2025 · fb818ef · fb818ef
1 parent ff4079a
commit fb818ef
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 17 deletions.
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -452,8 +452,8 @@ type TrackExpenseTransactionParams = {
     amount: number;
     currency: string;
     created: string | undefined;
-    merchant: string;
-    comment: string;
+    merchant?: string;
+    comment?: string;
     receipt?: Receipt;
     category?: string;
     tag?: string;
@@ -4688,8 +4688,8 @@ function trackExpense(params: CreateTrackExpenseParams) {
         amount,
         currency,
         created = '',
-        merchant,
-        comment,
+        merchant = '',
+        comment = '',
         receipt,
         category,
         tag,

diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx
@@ -232,7 +232,6 @@ function IOURequestStepAmount({
                             currency: currency ?? 'USD',
                             created: transaction?.created,
                             merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
-                            comment: '',
                         },
                     });
                     return;

diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx
@@ -336,7 +336,6 @@ function IOURequestStepDistance({
                             currency: transaction?.currency ?? 'USD',
                             created: transaction?.created ?? '',
                             merchant: translate('iou.fieldPending'),
-                            comment: '',
                             receipt: {},
                             billable: false,
                             validWaypoints: getValidWaypoints(waypoints, true),

diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
@@ -263,8 +263,6 @@ function IOURequestStepScan({
                         amount: 0,
                         currency: transaction?.currency ?? 'USD',
                         created: transaction?.created,
-                        merchant: '',
-                        comment: '',
                         receipt,
                     },
                 });
@@ -358,8 +356,6 @@ function IOURequestStepScan({
                                         amount: 0,
                                         currency: transaction?.currency ?? 'USD',
                                         created: transaction?.created,
-                                        merchant: '',
-                                        comment: '',
                                         receipt,
                                         billable: false,
                                         gpsPoints: {

diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -288,8 +288,6 @@ function IOURequestStepScan({
                         amount: 0,
                         currency: transaction?.currency ?? 'USD',
                         created: transaction?.created,
-                        merchant: '',
-                        comment: '',
                         receipt,
                     },
                 });
@@ -384,8 +382,6 @@ function IOURequestStepScan({
                                         amount: 0,
                                         currency: transaction?.currency ?? 'USD',
                                         created: transaction?.created,
-                                        merchant: '',
-                                        comment: '',
                                         receipt,
                                         billable: false,
                                         gpsPoints: {

diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
@@ -204,7 +204,6 @@ describe('actions/IOU', () => {
                     currency: fakeTransaction.currency,
                     created: format(new Date(), CONST.DATE.FNS_FORMAT_STRING),
                     merchant: fakeTransaction.merchant,
-                    comment: '',
                     billable: false,
                     validWaypoints: fakeWayPoints,
                     actionableWhisperReportActionID: fakeTransaction?.actionableWhisperReportActionID,
@@ -296,7 +295,6 @@ describe('actions/IOU', () => {
                     currency: transactionDraft?.currency ?? fakeTransaction.currency,
                     created: format(new Date(), CONST.DATE.FNS_FORMAT_STRING),
                     merchant: transactionDraft?.merchant ?? fakeTransaction.merchant,
-                    comment: '',
                     category: Object.keys(fakeCategories).at(0) ?? '',
                     validWaypoints: Object.keys(transactionDraft?.comment?.waypoints ?? {}).length ? getValidWaypoints(transactionDraft?.comment?.waypoints, true) : undefined,
                     actionableWhisperReportActionID: transactionDraft?.actionableWhisperReportActionID,
@@ -4449,7 +4447,6 @@ describe('actions/IOU', () => {
                     currency: CONST.CURRENCY.USD,
                     created: '2024-10-30',
                     merchant: 'KFC',
-                    comment: '',
                     receipt: {},
                     actionableWhisperReportActionID: '1',
                     linkedTrackedExpenseReportAction: {