From 50fd6a7d213f4730e0ecb9e676ca628a11ec9a53 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 16 Nov 2021 10:39:30 -0800
Subject: [PATCH 1/2] Merge pull request #6330 from
 Expensify/version-BUILD-84a6ee8e53a109f899fc7f3429d98adc89ae9351

(cherry picked from commit 5e5eb9d5acc5941310e8889398390b45325c85b0)
---
 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 decb50efb8fb..b3d17758c12d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001011501
-        versionName "1.1.15-1"
+        versionCode 1001011502
+        versionName "1.1.15-2"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index b7ed93d7b245..6152efe0ec1a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.15.1</string>
+	<string>1.1.15.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 00ce6d9e60a2..5c3e36aa51cb 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.15.1</string>
+	<string>1.1.15.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 73bb16aa0a29..44ff0f881840 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.15-1",
+  "version": "1.1.15-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 90cf260f1501..f17a5a7cedc7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.15-1",
+  "version": "1.1.15-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 e3a3dc6b92ec34b22540417656b394546550f8ae Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 16 Nov 2021 13:36:45 -0500
Subject: [PATCH 2/2] Merge pull request #6327 from
 Expensify/cmartins-removeDivs

Fix blank screen displayed on Company Step VBA flow

(cherry picked from commit 84a6ee8e53a109f899fc7f3429d98adc89ae9351)
---
 src/pages/ReimbursementAccount/CompanyStep.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 01790024fece..4abf30188122 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -218,7 +218,7 @@ class CompanyStep extends React.Component {
                         errorText={this.getErrorText('companyName')}
                     />
                     {!this.state.manualAddress && (
-                        <div>
+                        <>
                             <AddressSearch
                                 label={this.props.translate('common.companyAddress')}
                                 containerStyles={[styles.mt4]}
@@ -232,10 +232,10 @@ class CompanyStep extends React.Component {
                             >
                                 Can&apos;t find your address? Enter it manually
                             </TextLink>
-                        </div>
+                        </>
                     )}
                     {this.state.manualAddress && (
-                        <div>
+                        <>
                             <ExpensiTextInput
                                 label={this.props.translate('common.companyAddress')}
                                 containerStyles={[styles.mt4]}
@@ -270,7 +270,7 @@ class CompanyStep extends React.Component {
                                 value={this.state.addressZipCode}
                                 errorText={this.getErrorText('addressZipCode')}
                             />
-                        </div>
+                        </>
                     )}
 
                     <ExpensiTextInput