Refactor OpenReport API call for Report GetHistory

src/libs/actions/Report.js

@@ -1038,23 +1038,48 @@ function deleteReportComment(reportID, reportAction) {
  * @param {Number} reportID
  */
 function openReport(reportID) {
-    const sequenceNumber = getMaxSequenceNumber(reportID);
-    API.write('OpenReport',
+    let onyxData;
+    let commonOptimisticData = {
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+        value: {
+            lastVisitedTimestamp: Date.now(),
+            unreadActionCount: 0,
+        }
+    };
+    // only show loading state if the report has not been open yet
+    if (getLastReadSequenceNumber(reportID) === 0) {
+        onyxData = {
+            optimisticData: [
+                {
+                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    key: `${ONYXKEYS.IS_LOADING_REPORT_DATA}`,
+                    value: true,
+                },
+                commonOptimisticData,
+            ],
+            successData: [{
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: `${ONYXKEYS.IS_LOADING_REPORT_DATA}`,
+                value: false,
+            }],
+            failureData: [{
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: `${ONYXKEYS.IS_LOADING_REPORT_DATA}`,
+                value: false,
+            }],
+        };
+    } else {
+        onyxData = {
+            optimisticData: [commonOptimisticData],
+        };
+    }
+
+    API.read('OpenReport',
         {
             reportID,
-            sequenceNumber,
         },
-        {
-            optimisticData: [{
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-                value: {
-                    lastReadSequenceNumber: sequenceNumber,
-                    lastVisitedTimestamp: Date.now(),
-                    unreadActionCount: 0,
-                },
-            }],
-        });
+        onyxData);
 }
 
 /**

src/pages/home/report/ReportActionsView.js

@@ -145,7 +145,7 @@ class ReportActionsView extends React.Component {
             this.updateNewMarkerAndMarkReadOnce();
         }
 
-        this.fetchData();
+        Report.openReport(this.props.reportID);
     }
 
     shouldComponentUpdate(nextProps, nextState) {
@@ -201,10 +201,7 @@ class ReportActionsView extends React.Component {
 
     componentDidUpdate(prevProps) {
         if (prevProps.network.isOffline && !this.props.network.isOffline) {
-            if (this.getIsReportFullyVisible()) {
-                Report.openReport(this.props.reportID);
-            }
-            this.fetchData();
+            Report.openReport(this.props.reportID);
         }
 
         // Update the last read action for the report currently in view when report data finishes loading.
@@ -274,10 +271,6 @@ class ReportActionsView extends React.Component {
         return Visibility.isVisible() && !isSidebarCoveringReportView;
     }
 
-    fetchData() {
-        Report.fetchActions(this.props.reportID);
-    }
-
     /**
      * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
      * displaying.