From d2dbcf2795dace7541255230a4cb7949d0329d82 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 9 Dec 2022 17:50:07 -0500
Subject: [PATCH 1/2] Merge pull request #13486 from
 Expensify/version-BUILD-0041C992-1B03-4B6F-81BB-372A234AE089

Update version to 1.2.37-2 on main

(cherry picked from commit 3fa96a92c2b50b3501af6b75584121d0fa1a076c)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1bae507f51d3..9d2e43f4a3f2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001023701
-        versionName "1.2.37-1"
+        versionCode 1001023702
+        versionName "1.2.37-2"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a1b84fed17a1..99a8e1deb4b0 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.37.1</string>
+	<string>1.2.37.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 44cb1b6af9b7..a048ac1f7d92 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.2.37.1</string>
+	<string>1.2.37.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index bec790b4de32..76212d7615a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.37-1",
+  "version": "1.2.37-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.37-1",
+      "version": "1.2.37-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 400c52db75aa..4e3a3b6799c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.37-1",
+  "version": "1.2.37-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 1417c25574293d62f951197052d9c6116cbc7f07 Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Fri, 9 Dec 2022 14:25:47 -0800
Subject: [PATCH 2/2] Merge pull request #13475 from
 Expensify/alberto-closedStyle

(cherry picked from commit 63e00b659a0a0717794f6d81e3b75aa767027383)
---
 src/styles/styles.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/styles/styles.js b/src/styles/styles.js
index 9161b2db5513..a943925cdb4d 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -2486,7 +2486,6 @@ const styles = {
 
     dotIndicatorMessage: {
         display: 'flex',
-        flex: 1,
         flexDirection: 'row',
         alignItems: 'center',
     },