Merge pull request #43095 from VickyStash/bugfix/send-invoice-params

Update `SendInvoiceParams` typing
Expensify · Jun 5, 2024 · 0efe60a · 0efe60a
2 parents e8f46a8 + 72b8618
commit 0efe60a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/src/libs/API/parameters/SendInvoiceParams.ts b/src/libs/API/parameters/SendInvoiceParams.ts
@@ -1,20 +1,25 @@
-type SendInvoiceParams = {
-    senderWorkspaceID: string;
-    accountID: number;
-    receiverEmail?: string;
-    receiverInvoiceRoomID?: string;
-    amount: number;
-    currency: string;
-    comment: string;
-    merchant: string;
-    date: string;
-    category?: string;
-    invoiceRoomReportID?: string;
-    createdChatReportActionID: string;
-    invoiceReportID: string;
-    reportPreviewReportActionID: string;
-    transactionID: string;
-    transactionThreadReportID: string;
-};
+import type {RequireAtLeastOne} from 'type-fest';
+
+type SendInvoiceParams = RequireAtLeastOne<
+    {
+        senderWorkspaceID: string;
+        accountID: number;
+        receiverEmail?: string;
+        receiverInvoiceRoomID?: string;
+        amount: number;
+        currency: string;
+        comment: string;
+        merchant: string;
+        date: string;
+        category?: string;
+        invoiceRoomReportID?: string;
+        createdChatReportActionID: string;
+        invoiceReportID: string;
+        reportPreviewReportActionID: string;
+        transactionID: string;
+        transactionThreadReportID: string;
+    },
+    'receiverEmail' | 'receiverInvoiceRoomID'
+>;
 
 export default SendInvoiceParams;
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -3514,7 +3514,7 @@ function sendInvoice(
     const {senderWorkspaceID, receiver, invoiceRoom, createdChatReportActionID, invoiceReportID, reportPreviewReportActionID, transactionID, transactionThreadReportID, onyxData} =
         getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories);
 
-    let parameters: SendInvoiceParams = {
+    const parameters: SendInvoiceParams = {
         senderWorkspaceID,
         accountID: currentUserAccountID,
         amount: transaction?.amount ?? 0,
@@ -3529,20 +3529,9 @@ function sendInvoice(
         reportPreviewReportActionID,
         transactionID,
         transactionThreadReportID,
+        ...(invoiceChatReport?.reportID ? {receiverInvoiceRoomID: invoiceChatReport.reportID} : {receiverEmail: receiver.login ?? ''}),
     };
 
-    if (invoiceChatReport) {
-        parameters = {
-            ...parameters,
-            receiverInvoiceRoomID: invoiceChatReport.reportID,
-        };
-    } else {
-        parameters = {
-            ...parameters,
-            receiverEmail: receiver.login,
-        };
-    }
-
     API.write(WRITE_COMMANDS.SEND_INVOICE, parameters, onyxData);
 
     Navigation.dismissModalWithReport(invoiceRoom);