fix types

software-mansion-labs · Jan 31, 2024 · 3ea3027 · 3ea3027
1 parent 2c67081
commit 3ea3027
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/components/AttachmentModal.tsx b/src/components/AttachmentModal.tsx
@@ -281,7 +281,7 @@ function AttachmentModal({
     const deleteAndCloseModal = useCallback(() => {
         IOU.detachReceipt(transaction?.transactionID);
         setIsDeleteReceiptConfirmModalVisible(false);
-        Navigation.dismissModalWithReportID(report?.reportID ?? '');
+        Navigation.dismissModalWithReportID(report?.reportID);
     }, [transaction, report]);
 
     const isValidFile = useCallback((fileObject: FileObject) => {

diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
@@ -58,7 +58,11 @@ const dismissModal = (ref = navigationRef) => originalDismissModal(ref);
 // Then we can pass the report as a param without getting it from the Onyx.
 const dismissModalWithReport = (report: Report | EmptyObject, ref = navigationRef) => originalDismissModalWithReport(report, ref);
 
-const dismissModalWithReportID = (reportID: string, ref = navigationRef) => {
+const dismissModalWithReportID = (reportID?: string, ref = navigationRef) => {
+    if (!reportID) {
+        dismissModal(ref);
+        return;
+    }
     const report = getReport(reportID);
     originalDismissModalWithReport({reportID, ...report}, ref);
 };

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -1553,7 +1553,7 @@ function navigateToConciergeChat(ignoreConciergeReportID = false, shouldDismissM
             navigateToAndOpenReport([CONST.EMAIL.CONCIERGE], shouldDismissModal);
         });
     } else if (shouldDismissModal) {
-        Navigation.dismissModal(conciergeChatReportID);
+        Navigation.dismissModalWithReportID(conciergeChatReportID);
     } else {
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID));
     }