Merge pull request #2721 from Expensify/marcaaron-updateLastRead

Fix crash on new chat creation due to undefined sequenceNumber
Expensify · May 7, 2021 · 4253f79 · 4253f79
2 parents 13d9a2a + 651801a
commit 4253f79
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -41,7 +41,7 @@ const getInitialReportScreenParams = _.once((reports) => {
 
     // Fallback to empty if for some reason reportID cannot be derived - prevents the app from crashing
     const reportID = lodashGet(last, 'reportID', '');
-    return {reportID};
+    return {reportID: String(reportID)};
 });
 
 const MainDrawerNavigator = (props) => {

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -940,6 +940,13 @@ function addAction(reportID, text, file) {
  *  is last read (meaning that the entire report history has been read)
  */
 function updateLastReadActionID(reportID, sequenceNumber) {
+    // If we aren't specifying a sequenceNumber and have no maxSequenceNumber for this report then we should not update
+    // the last read. Most likely, we have just created the report and it has no comments. But we should err on the side
+    // of caution and do nothing in this case.
+    if (_.isUndefined(sequenceNumber) && _.isUndefined(reportMaxSequenceNumbers[reportID])) {
+        return;
+    }
+
     // Need to subtract 1 from sequenceNumber so that the "New" marker appears in the right spot (the last read
     // action). If 1 isn't subtracted then the "New" marker appears one row below the action (the first unread action)
     const lastReadSequenceNumber = (sequenceNumber - 1) || reportMaxSequenceNumbers[reportID];

diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
@@ -194,15 +194,15 @@ const OptionRow = ({
                         <View style={[styles.flexRow, styles.alignItemsCenter]}>
                             {option.hasDraftComment && (
                                 <View style={styles.ml2}>
-                                    <Icon src={Pencil} height="16" width="16" />
+                                    <Icon src={Pencil} height={16} width={16} />
                                 </View>
                             )}
                             {option.hasOutstandingIOU && (
                                 <IOUBadge iouReportID={option.iouReportID} />
                             )}
                             {option.isPinned && (
                                 <View style={styles.ml2}>
-                                    <Icon src={Pin} height="16" width="16" />
+                                    <Icon src={Pin} height={16} width={16} />
                                 </View>
                             )}
                         </View>