From 07660b5aae5979a8321b4d8c5c7f04abe7e4bf5a Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 25 Mar 2022 07:06:17 -0700
Subject: [PATCH 1/2] Merge pull request #8318 from
Expensify/version-BUILD-3f6396c3552509815455cc4498517414ddb398da
Update version to 1.1.46-1 on main
(cherry picked from commit c04fca7d9bd69ee8717f81714b41c0be60acde38)
---
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 c90ef81ae2bf..afe12eaac310 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 1001014600
- versionName "1.1.46-0"
+ versionCode 1001014601
+ versionName "1.1.46-1"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 367919e8dacb..1b63ca0115ff 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.46.0
+ 1.1.46.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 204054a1c2e6..ea036e57b69c 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.46.0
+ 1.1.46.1
diff --git a/package-lock.json b/package-lock.json
index 0f1f200a5ac5..c24cafd54a27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.46-0",
+ "version": "1.1.46-1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index f4fc3812c2b6..8c49d4138976 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.46-0",
+ "version": "1.1.46-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 173ffcc4cd0bfd211514ae39023854317bc6d571 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Fri, 25 Mar 2022 03:54:38 -1000
Subject: [PATCH 2/2] Merge pull request #8314 from rushatgabhane/fix-8308
IOU - Fix Infinite loading spinner on split bill with invalid phone number
(cherry picked from commit 3f6396c3552509815455cc4498517414ddb398da)
---
src/libs/actions/IOU.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 686cb51e15e0..b7ce3d7c2e34 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -138,6 +138,10 @@ function createIOUSplit(params) {
emailList: _.map(params.splits, participant => participant.email).join(','),
})
.then((response) => {
+ if (response.jsonCode !== 200) {
+ return response;
+ }
+
chatReportID = response.reportID;
return API.CreateIOUSplit({
...params,