Merge pull request #43814 from abzokhattab/fix-app-crash

Fix app crash on loading null reportActions
Expensify · Jun 17, 2024 · 1e0831e · 1e0831e
2 parents df9689f + 7ed4689
commit 1e0831e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 20 deletions.
diff --git a/src/hooks/useReportIDs.tsx b/src/hooks/useReportIDs.tsx
@@ -76,22 +76,24 @@ const chatReportSelector = (report: OnyxEntry<OnyxTypes.Report>): ChatReportSele
 
 const reportActionsSelector = (reportActions: OnyxEntry<OnyxTypes.ReportActions>): ReportActionsSelector =>
     (reportActions &&
-        Object.values(reportActions).map((reportAction) => {
-            const {reportActionID, actionName, errors = [], originalMessage} = reportAction;
-            const decision = reportAction.message?.[0]?.moderationDecision?.decision;
-
-            return {
-                reportActionID,
-                actionName,
-                errors,
-                message: [
-                    {
-                        moderationDecision: {decision},
-                    },
-                ] as Message[],
-                originalMessage,
-            };
-        })) as ReportActionsSelector;
+        Object.values(reportActions)
+            .filter(Boolean)
+            .map((reportAction) => {
+                const {reportActionID, actionName, errors = [], originalMessage} = reportAction;
+                const decision = reportAction.message?.[0]?.moderationDecision?.decision;
+
+                return {
+                    reportActionID,
+                    actionName,
+                    errors,
+                    message: [
+                        {
+                            moderationDecision: {decision},
+                        },
+                    ] as Message[],
+                    originalMessage,
+                };
+            })) as ReportActionsSelector;
 
 const policySelector = (policy: OnyxEntry<OnyxTypes.Policy>): PolicySelector =>
     (policy && {

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
@@ -703,7 +703,7 @@ function getSortedReportActionsForDisplay(reportActions: OnyxEntry<ReportActions
     }
 
     if (shouldIncludeInvisibleActions) {
-        filteredReportActions = Object.values(reportActions);
+        filteredReportActions = Object.values(reportActions).filter(Boolean);
     } else {
         filteredReportActions = Object.entries(reportActions)
             .filter(([key, reportAction]) => shouldReportActionBeVisible(reportAction, key))

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -6756,7 +6756,9 @@ function getIndicatedMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, rep
  */
 function hasMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, iouReportID: string): boolean {
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`] ?? {};
-    return Object.values(reportActions).some((action) => getIndicatedMissingPaymentMethod(userWallet, iouReportID, action) !== undefined);
+    return Object.values(reportActions)
+        .filter(Boolean)
+        .some((action) => getIndicatedMissingPaymentMethod(userWallet, iouReportID, action) !== undefined);
 }
 
 /**
@@ -6782,7 +6784,9 @@ function getTripTransactions(tripRoomReportID: string | undefined): Transaction[
  */
 function hasActionsWithErrors(reportID: string): boolean {
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {};
-    return Object.values(reportActions).some((action) => !isEmptyObject(action.errors));
+    return Object.values(reportActions)
+        .filter(Boolean)
+        .some((action) => !isEmptyObject(action.errors));
 }
 
 function isNonAdminOrOwnerOfPolicyExpenseChat(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>): boolean {
@@ -6884,7 +6888,9 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
         return;
     }
 
-    const linkedTrackedExpenseReportAction = Object.values(reportActions).find((action) => (action.originalMessage as IOUMessage)?.IOUTransactionID === transactionID);
+    const linkedTrackedExpenseReportAction = Object.values(reportActions)
+        .filter(Boolean)
+        .find((action) => (action.originalMessage as IOUMessage)?.IOUTransactionID === transactionID);
 
     const {created, amount, currency, merchant, mccGroup} = getTransactionDetails(transaction) ?? {};
     const comment = getTransactionCommentObject(transaction);