From b802f6c036abea5eca075c04ade8cd3ab7063df2 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 4 Nov 2021 11:04:25 -0700
Subject: [PATCH 1/2] Merge pull request #6214 from
 Expensify/version-BUILD-9b9f6940157242e053bc9aad10d9e976f8291fd1

(cherry picked from commit 18a7153db75fd1729cdd7ac474e7ce8da958fc2a)
---
 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 c3a7128857dd..d93d02f45666 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 1001011301
-        versionName "1.1.13-1"
+        versionCode 1001011302
+        versionName "1.1.13-2"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 30b9dea3cca2..5f7db05ebe8d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.13.1</string>
+	<string>1.1.13.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 906e2784b519..18efe869debd 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.13.1</string>
+	<string>1.1.13.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 3e063c54e723..d6b2630dd038 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.13-1",
+  "version": "1.1.13-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 54ca7bcd7522..46f5b9754b88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.13-1",
+  "version": "1.1.13-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 4f48badf7156452511a93c85f2504d6ec0de679b Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 4 Nov 2021 10:58:19 -0700
Subject: [PATCH 2/2] Merge pull request #6201 from
 Expensify/joe-fix-menu-crash

(cherry picked from commit 9b9f6940157242e053bc9aad10d9e976f8291fd1)
---
 src/components/PopoverMenu/BasePopoverMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/PopoverMenu/BasePopoverMenu.js b/src/components/PopoverMenu/BasePopoverMenu.js
index 82e0727c163b..2b4c926168aa 100644
--- a/src/components/PopoverMenu/BasePopoverMenu.js
+++ b/src/components/PopoverMenu/BasePopoverMenu.js
@@ -37,7 +37,7 @@ class BasePopoverMenu extends PureComponent {
                 animationOut={this.props.animationOut}
             >
                 <View style={this.props.isSmallScreenWidth ? {} : styles.createMenuContainer}>
-                    {this.props.headerText && (
+                    {!_.isEmpty(this.props.headerText) && (
                         <View style={styles.createMenuItem}>
                             <Text
                                 style={[styles.createMenuHeaderText, styles.ml3]}