Apply suggestions from code review

Co-authored-by: Abdelhafidh Belalia <[email protected]>
Expensify · Oct 11, 2023 · 45d90fb · 45d90fb
1 parent e3dc941
commit 45d90fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -167,11 +167,11 @@ export default {
     },
     EDIT_SPLIT_BILL: {
         route: `r/:reportID/split/:reportActionID/edit/:field`,
-        getRoute: (reportID: number, reportActionID: number, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${reportID}/split/${reportActionID}/edit/${field}`,
+        getRoute: (reportID: string, reportActionID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${reportID}/split/${reportActionID}/edit/${field}`,
     },
     EDIT_SPLIT_BILL_CURRENCY: {
         route: 'r/:reportID/split/:reportActionID/edit/currency',
-        getRoute: (reportID: number, reportActionID: number, currency: string, backTo: string) => `r/${reportID}/split/${reportActionID}/edit/currency?currency=${currency}&backTo=${backTo}`,
+        getRoute: (reportID: string, reportActionID: string, currency: string, backTo: string) => `r/${reportID}/split/${reportActionID}/edit/currency?currency=${currency}&backTo=${backTo}`,
     },
     TASK_TITLE: {
         route: 'r/:reportID/title',

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
@@ -58,12 +58,7 @@ Onyx.connect({
     key: ONYXKEYS.COLLECTION.DRAFT_SPLIT_TRANSACTION,
     waitForCollectionCallback: true,
     callback: (val) => {
-        if (!val) {
-            allDraftSplitTransactions = {};
-            return;
-        }
-
-        allDraftSplitTransactions = val;
+        allDraftSplitTransactions = val || {};
     },
 });
 
@@ -1564,7 +1559,7 @@ function completeSplitBill(chatReportID, reportAction, updatedTransaction, curre
     const splits = [];
     _.each(splitParticipants, (participant) => {
         // Skip creating the transaction for the current user
-        if (participant.email && participant.email === currentUserEmail) {
+        if (participant.email === currentUserEmailForIOUSplit) {
             return;
         }
         const isPolicyExpenseChat = !_.isEmpty(participant.policyID);
@@ -1612,7 +1607,7 @@ function completeSplitBill(chatReportID, reportAction, updatedTransaction, curre
             isPolicyExpenseChat ? -splitAmount : splitAmount,
             currency,
             oneOnOneIOUReport.reportID,
-            updatedTransaction.comment,
+            updatedTransaction.comment.comment,
             updatedTransaction.modifiedCreated,
             CONST.IOU.MONEY_REQUEST_TYPE.SPLIT,
             updatedTransaction.transactionID,
@@ -1627,7 +1622,7 @@ function completeSplitBill(chatReportID, reportAction, updatedTransaction, curre
             CONST.IOU.REPORT_ACTION_TYPE.CREATE,
             splitAmount,
             currency,
-            updatedTransaction.modifiedComment,
+            updatedTransaction.comment.comment,
             [participant],
             oneOnOneTransaction.transactionID,
             '',

diff --git a/src/pages/EditSplitBillPage.js b/src/pages/EditSplitBillPage.js
@@ -29,7 +29,7 @@ const propTypes = {
             field: PropTypes.string,
 
             /** reportID for the "transaction thread" */
-            threadReportID: PropTypes.string,
+            reportActionID: PropTypes.string,
         }),
     }).isRequired,
 
@@ -88,12 +88,12 @@ function EditSplitBillPage({report, route, transactions, draftSplitTransactions}
             <EditRequestDescriptionPage
                 defaultDescription={transactionDescription}
                 onSubmit={(transactionChanges) => {
-                    if (transactionChanges.comment === transactionDescription) {
+                    if (transactionChanges.comment.trim() === transactionDescription) {
                         Navigation.dismissModal();
                         return;
                     }
                     setDraftSplitTransaction({
-                        comment: transactionChanges.comment,
+                        comment: transactionChanges.comment.trim(),
                     });
                 }}
             />