From f5fb7b1e583f08ff07e5da3e4a84055f3f066e03 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 12 Dec 2022 17:33:54 -0500
Subject: [PATCH 1/2] Merge pull request #13537 from
Expensify/version-BUILD-CEF699AA-5914-4662-A96C-5ED46313CF96
Update version to 1.2.38-2 on main
(cherry picked from commit bc99c21c5e3c508b4b59a582ae4f98ff4c11f2d7)
---
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 e18a40826d28..3f97c14819b0 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 1001023801
- versionName "1.2.38-1"
+ versionCode 1001023802
+ versionName "1.2.38-2"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index ec4d96071611..22a0de420c86 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.38.1
+ 1.2.38.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0538a40dddca..8c4c9ae06c04 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.38.1
+ 1.2.38.2
diff --git a/package-lock.json b/package-lock.json
index 1b64fc21b440..5bee6ae212b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.38-1",
+ "version": "1.2.38-2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.38-1",
+ "version": "1.2.38-2",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index abad38c6968f..db075e1c00ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.38-1",
+ "version": "1.2.38-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 f154dc9090d47647597089de1f9d7422abc0190f Mon Sep 17 00:00:00 2001
From: Youssef Lourayad
Date: Mon, 12 Dec 2022 23:25:57 +0100
Subject: [PATCH 2/2] Merge pull request #13519 from
Expensify/alberto-moreClosed
Stop displaying Closed Account message when the user starts typing
(cherry picked from commit 8b960ef2160d0831bb2bfea76311f2b83d7973f2)
---
src/pages/signin/LoginForm.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index e9813c3bfb1f..e64705de8239 100755
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -111,6 +111,11 @@ class LoginForm extends React.Component {
if (this.props.account.errors) {
Session.clearAccountMessages();
}
+
+ // Clear the "Account successfully closed" message when the user starts typing
+ if (this.props.closeAccount.success) {
+ CloseAccount.setDefaultData();
+ }
}
/**