From ed7bfe2ecb6c0d3b1f134ba3ccfdccb637277c81 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 8 Oct 2021 11:13:57 -0700
Subject: [PATCH 1/2] Merge pull request #5731 from
Expensify/version-BUILD-13ac7928bdb002f2669c4502e223a915e0e07b6c
(cherry picked from commit a1e2a9f6be76638b2d8c36a4af52658c173defaf)
---
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 c1fa15755ee..af13c4643c3 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 1001010700
- versionName "1.1.7-0"
+ versionCode 1001010701
+ versionName "1.1.7-1"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 7d48d901f2e..0a142fe7776 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.7.0
+ 1.1.7.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 672d9880718..b35ffd0b033 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.7.0
+ 1.1.7.1
diff --git a/package-lock.json b/package-lock.json
index 413c3fdd5f1..1d100b2fd0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-0",
+ "version": "1.1.7-1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index dafee33e402..ff6f50dcce9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-0",
+ "version": "1.1.7-1",
"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 da373219e6576c943db48ebeb0186c87a3b2ee2e Mon Sep 17 00:00:00 2001
From: Luke Donahue <49007721+Luke9389@users.noreply.github.com>
Date: Fri, 8 Oct 2021 12:11:46 -0600
Subject: [PATCH 2/2] Merge pull request #5729 from
Expensify/amal-invite-lodash-fix
Fix invite page not loading after creating new workspace
(cherry picked from commit 13ac7928bdb002f2669c4502e223a915e0e07b6c)
---
src/pages/workspace/WorkspaceInvitePage.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
index 2ad3862a36c..13b0fd34c45 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.js
@@ -107,7 +107,7 @@ class WorkspaceInvitePage extends React.Component {
* @returns {Boolean}
*/
getShouldShowAlertPrompt() {
- return _.size(lodashGet(this.props.policy, 'errors', {})) > 0 || this.props.policy.alertMessage.length > 0;
+ return _.size(lodashGet(this.props.policy, 'errors', {})) > 0 || lodashGet(this.props.policy, 'alertMessage.length') > 0;
}
clearErrors() {