From a3c202e98ad54607ec1a2d7e7b1349549cd1dd6b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 30 Jul 2021 11:00:31 -0700
Subject: [PATCH 1/2] Merge pull request #4326 from
Expensify/version-BUILD-0c49bcfe406ecdc9a3b25b41a0890465317c3cee
(cherry picked from commit 5988631897a4cf73d5bf54805df7f4cddfe9d2fa)
---
android/app/build.gradle | 4 ++--
ios/ExpensifyCash/Info.plist | 2 +-
ios/ExpensifyCashTests/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 7468a7878092..985385d9aa7e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001008103
- versionName "1.0.81-3"
+ versionCode 1001008104
+ versionName "1.0.81-4"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index ed8938afed34..cf17a6eb0301 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.81.3
+ 1.0.81.4
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index ac439ff2064b..194967d37a2a 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.81.3
+ 1.0.81.4
diff --git a/package-lock.json b/package-lock.json
index c148d6824939..39d49d969ce8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.81-3",
+ "version": "1.0.81-4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 3bb5c5544a1a..92ecd8be5afb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.81-3",
+ "version": "1.0.81-4",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 2a54315c29d983ba4166a29c27010818e4aacdca Mon Sep 17 00:00:00 2001
From: Joe Gambino
Date: Fri, 30 Jul 2021 10:58:19 -0700
Subject: [PATCH 2/2] Merge pull request #4322 from
aman-atg/aman-atg-minorFixFor#4190
Patch for PR #4190
(cherry picked from commit 0c49bcfe406ecdc9a3b25b41a0890465317c3cee)
---
src/pages/settings/Profile/ProfilePage.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index c8d7e5ba0b09..9190dc420bf9 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -172,8 +172,8 @@ class ProfilePage extends Component {
} = this.state;
setPersonalDetails({
- firstName,
- lastName,
+ firstName: firstName.trim(),
+ lastName: lastName.trim(),
pronouns: pronouns === this.props.translate('pronouns.selfSelect')
? selfSelectedPronouns
: pronouns,