Merge pull request #4590 from Expensify/marcaaron-consolidateOnyxConnect

[No QA] Remove duplicate subscription in Report.js file
Expensify · Aug 13, 2021 · 53e30cd · 53e30cd
2 parents 1c3a797 + 15d53e0
commit 53e30cd
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -53,19 +53,6 @@ Onyx.connect({
 
 const allReports = {};
 let conciergeChatReportID;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    callback: (val) => {
-        if (val && val.reportID) {
-            allReports[val.reportID] = val;
-
-            if (isConciergeChatReport(val)) {
-                conciergeChatReportID = val.reportID;
-            }
-        }
-    },
-});
-
 const typingWatchTimers = {};
 
 /**
@@ -1233,6 +1220,14 @@ function handleReportChanged(report) {
         return;
     }
 
+    if (report && report.reportID) {
+        allReports[report.reportID] = report;
+
+        if (isConciergeChatReport(report)) {
+            conciergeChatReportID = report.reportID;
+        }
+    }
+
     // A report can be missing a name if a comment is received via pusher event
     // and the report does not yet exist in Onyx (eg. a new DM created with the logged in person)
     if (report.reportID && report.reportName === undefined) {