From 2468ed6c6869410201d78e2a9f4a2e695d2cc64d Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 8 Nov 2021 07:18:29 -0800
Subject: [PATCH 1/2] Merge pull request #6262 from
 Expensify/version-BUILD-bf8c8f6a37eb6ae6fea15bb54581ed7ca8d72c91

(cherry picked from commit 180c7e721bec7c4b150d2bb06abc3d44fc50a28a)
---
 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 27b562cc9504..a8776f4536da 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 1001011402
-        versionName "1.1.14-2"
+        versionCode 1001011403
+        versionName "1.1.14-3"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 9d73d0919834..9fb614746f94 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.14.2</string>
+	<string>1.1.14.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 45d472b8c951..7c4f6f1bc4bf 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.14.2</string>
+	<string>1.1.14.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 6e97be92c972..a7ecfea82640 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.14-2",
+  "version": "1.1.14-3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 78365ada8472..013434c78577 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.14-2",
+  "version": "1.1.14-3",
   "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 272b16d947a26d91a0ad059d5bfdafd420ef1596 Mon Sep 17 00:00:00 2001
From: Tim Szot <tim@expensify.com>
Date: Fri, 5 Nov 2021 08:57:44 -0700
Subject: [PATCH 2/2] Merge pull request #6237 from
 Santhosh-Sellavel/Improve_Payment_Options_Floating_Button

padding using wrapperStyle

(cherry picked from commit 3d2203735e8c53cb2fb29c5967cee26f35f444c6)
---
 src/pages/settings/Payments/PaymentsPage.js | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentsPage.js b/src/pages/settings/Payments/PaymentsPage.js
index 19adca736e72..7a9cb9a14c47 100644
--- a/src/pages/settings/Payments/PaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {ScrollView, View} from 'react-native';
+import {ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
 import PaymentMethodList from './PaymentMethodList';
@@ -143,20 +143,20 @@ class PaymentsPage extends React.Component {
                             left: this.state.anchorPositionLeft,
                         }}
                     >
-                        <View style={styles.pr15}>
-                            {!this.props.payPalMeUsername && (
-                                <MenuItem
-                                    title={this.props.translate('common.payPalMe')}
-                                    icon={PayPal}
-                                    onPress={() => this.addPaymentMethodTypePressed(PAYPAL)}
-                                />
-                            )}
+                        {!this.props.payPalMeUsername && (
                             <MenuItem
-                                title={this.props.translate('common.debitCard')}
-                                icon={CreditCard}
-                                onPress={() => this.addPaymentMethodTypePressed(DEBIT_CARD)}
+                                title={this.props.translate('common.payPalMe')}
+                                icon={PayPal}
+                                onPress={() => this.addPaymentMethodTypePressed(PAYPAL)}
+                                wrapperStyle={styles.pr15}
                             />
-                        </View>
+                        )}
+                        <MenuItem
+                            title={this.props.translate('common.debitCard')}
+                            icon={CreditCard}
+                            onPress={() => this.addPaymentMethodTypePressed(DEBIT_CARD)}
+                            wrapperStyle={styles.pr15}
+                        />
                     </Popover>
                 </KeyboardAvoidingView>
             </ScreenWrapper>