From c88e3f9b65e55b6a6b47fe543cf732a9799d3ee9 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 12 Dec 2022 17:59:42 -0500
Subject: [PATCH 1/2] Merge pull request #13541 from
Expensify/version-BUILD-AF3CA9B2-0939-44D4-9EE5-9CD27DBBC3F4
Update version to 1.2.38-3 on main
(cherry picked from commit 60cb0333b69c6980cabea432721df9ab6d2b567c)
---
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 3f97c14819b0..a9d5716b2963 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 1001023802
- versionName "1.2.38-2"
+ versionCode 1001023803
+ versionName "1.2.38-3"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 22a0de420c86..dba2c9895f05 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.38.2
+ 1.2.38.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 8c4c9ae06c04..e922988b2858 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.38.2
+ 1.2.38.3
diff --git a/package-lock.json b/package-lock.json
index 5bee6ae212b5..eaa8756ed925 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.38-2",
+ "version": "1.2.38-3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.38-2",
+ "version": "1.2.38-3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index db075e1c00ec..d6e6eb86f930 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.38-2",
+ "version": "1.2.38-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 1ef20ec590beceecc4555d8f55a770d11ae639a2 Mon Sep 17 00:00:00 2001
From: Chirag Chandrakant Salian
Date: Mon, 12 Dec 2022 14:46:10 -0800
Subject: [PATCH 2/2] Merge pull request #13530 from
daraksha-dk/fixButtonPosition
fix button position
(cherry picked from commit a1932a6a59e76a865ffd69a7497331708775746d)
---
src/components/Form.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Form.js b/src/components/Form.js
index 72ee4afc6b00..3c4135716175 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -294,7 +294,7 @@ class Form extends React.Component {
focusInput.focus();
}
}}
- containerStyles={[styles.mh0, styles.mt5]}
+ containerStyles={[styles.mh0, styles.mt5, styles.flex1]}
enabledWhenOffline={this.props.enabledWhenOffline}
isDangerousAction={this.props.isDangerousAction}
/>