From 7c2158a9552c9057e73dac1e0daadd4aaa363a73 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 26 Jul 2021 19:43:30 -0700
Subject: [PATCH 1/2] Merge pull request #4248 from
 Expensify/version-BUILD-c00186d05b9f29a78d604915cf1dc2550bbc5b54

(cherry picked from commit 70309a098056b053882200cd8e3782b4a26524c2)
---
 android/app/build.gradle          | 4 ++--
 ios/ExpensifyCash/Info.plist      | 2 +-
 ios/ExpensifyCashTests/Info.plist | 2 +-
 package-lock.json                 | 2 +-
 package.json                      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2d7aa0b46534b..a3a6cd83df466 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008001
-        versionName "1.0.80-1"
+        versionCode 1001008002
+        versionName "1.0.80-2"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index c24b4495add52..c69435b113145 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.80.1</string>
+	<string>1.0.80.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 237fd0793fc77..ced27dd4ac02d 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.80.1</string>
+	<string>1.0.80.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index d093e4575523c..b955b2077ef8e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.80-1",
+  "version": "1.0.80-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 166318fe73bf1..868ff2d6e21b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.80-1",
+  "version": "1.0.80-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From d596722c7fec662900b5ef2ccf72c9def0f76254 Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amalnazeem@gmail.com>
Date: Mon, 26 Jul 2021 22:41:24 -0400
Subject: [PATCH 2/2] Merge pull request #4239 from Expensify/yuwen-stateStatus

(cherry picked from commit c00186d05b9f29a78d604915cf1dc2550bbc5b54)
---
 src/libs/actions/Report.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 94347c7608cd8..09e9875d19e42 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -140,8 +140,8 @@ function getChatReportName(fullReport, chatType) {
     if (isDefaultRoom({chatType})) {
         return `#${fullReport.reportName}${(isArchivedRoom({
             chatType,
-            stateNum: fullReport.stateNum,
-            statusNum: fullReport.reportStatus,
+            stateNum: fullReport.state,
+            statusNum: fullReport.status,
         })
             ? ` (${translateLocal('common.deleted')})`
             : '')}`;