From aff04409bb8224dc8754d2586955050ad76f628f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 30 May 2022 12:54:20 -0700
Subject: [PATCH 1/2] Merge pull request #9226 from
 Expensify/version-BUILD-214817e0f6b004b251f3ab6075057fde18a094de

Update version to 1.1.69-2 on main

(cherry picked from commit db27a3dc4a61c552b8e827819261310592ad7914)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/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 7d21e86e15c0..3c986bb00c83 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001016901
-        versionName "1.1.69-1"
+        versionCode 1001016902
+        versionName "1.1.69-2"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c9b98ac61971..bafd0eeef085 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.69.1</string>
+	<string>1.1.69.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7f444f60aba0..73a8f6666261 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.69.1</string>
+	<string>1.1.69.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 2159ca1ace90..6e4debfa7ceb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.69-1",
+  "version": "1.1.69-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 486a59e3dd3c..b25ab994e661 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.69-1",
+  "version": "1.1.69-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 4825edfbcade544f32d36a3bb9138682906ff629 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 30 May 2022 13:41:53 -0600
Subject: [PATCH 2/2] Merge pull request #9224 from
 Expensify/cmartins-fixOfflineMessage

Fix offline message

(cherry picked from commit 214817e0f6b004b251f3ab6075057fde18a094de)
---
 src/components/OfflineIndicator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OfflineIndicator.js b/src/components/OfflineIndicator.js
index 282ad07e0d41..37201c61e059 100644
--- a/src/components/OfflineIndicator.js
+++ b/src/components/OfflineIndicator.js
@@ -41,7 +41,7 @@ const OfflineIndicator = (props) => {
                 height={variables.iconSizeExtraSmall}
             />
             <Text style={[styles.ml2, styles.chatItemComposeSecondaryRowSubText]}>
-                {props.translate('reportActionCompose.youAppearToBeOffline')}
+                {props.translate('common.youAppearToBeOffline')}
             </Text>
         </View>
     );