From 6d0fa0b4965c159517722812c2e4171b763a93f2 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 1 Jun 2022 16:01:08 -0700
Subject: [PATCH 1/2] Merge pull request #9285 from
Expensify/version-BUILD-026e4cd6568bee432189914594ca8f68144f0121
Update version to 1.1.70-3 on main
(cherry picked from commit d2f9d6124a50b8420ce1378a2a3c9422df691c18)
---
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 47c964dc187..d6d3e5dc151 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001017002
- versionName "1.1.70-2"
+ versionCode 1001017003
+ versionName "1.1.70-3"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 35bb5c0abe9..e753f996c65 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.70.2
+ 1.1.70.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index fe19515cd8f..a0f1f6647e1 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.70.2
+ 1.1.70.3
diff --git a/package-lock.json b/package-lock.json
index 2ac942b3c2d..02e142e47bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.70-2",
+ "version": "1.1.70-3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 196d773e4ae..794312e38aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.70-2",
+ "version": "1.1.70-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 5db3f869b0ab2c0174cf2dd30c5780e05eed0996 Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Wed, 1 Jun 2022 16:49:06 -0600
Subject: [PATCH 2/2] Merge pull request #9284 from
Expensify/revert-9210-fix-status-bar
Revert "Fix status bar color when a modal is open"
(cherry picked from commit 026e4cd6568bee432189914594ca8f68144f0121)
---
src/components/Modal/BaseModal.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
index 105d4cef323..3779304830f 100644
--- a/src/components/Modal/BaseModal.js
+++ b/src/components/Modal/BaseModal.js
@@ -77,7 +77,6 @@ class BaseModal extends PureComponent {
);
return (
{
if (e && e.type === 'keydown' && e.key === 'Enter') {
return;