From c422a0b12642ed6a827d7c104bd41bf2240e6f4b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 15 Sep 2022 18:33:00 -0400
Subject: [PATCH 1/2] Merge pull request #11027 from
Expensify/version-BUILD-19BB1020-E87F-45B3-90F6-078E89841272
Update version to 1.2.0-7 on main
(cherry picked from commit 8dc0546eba827f3c5930cffe8644d92cf8a06039)
---
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 4f708c805d62..2494c07a08e7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001020006
- versionName "1.2.0-6"
+ versionCode 1001020007
+ versionName "1.2.0-7"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index b61ebf609f94..c5ab77c495f8 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.0.6
+ 1.2.0.7
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 3ebed1a25b84..4552d4e4c02d 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.0.6
+ 1.2.0.7
diff --git a/package-lock.json b/package-lock.json
index f073ddb4f0c8..24f8844e27a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.0-6",
+ "version": "1.2.0-7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.0-6",
+ "version": "1.2.0-7",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 11818bb9ed5b..f6e0d720a481 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.0-6",
+ "version": "1.2.0-7",
"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 785433c3e3fcf0ede2f413e5cafc4fdfe7f70852 Mon Sep 17 00:00:00 2001
From: Francois Laithier
Date: Thu, 15 Sep 2022 14:48:23 -0700
Subject: [PATCH 2/2] Merge pull request #11023 from
Expensify/francois-fixInvitePageOptionsAlternateText
Add missing `alternateText` option in option
(cherry picked from commit b5d2825a7e62838c802f998e3a46792e6465593c)
---
src/libs/OptionsListUtils.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 6d58122f0423..cc8a2b38b994 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -343,6 +343,7 @@ function createOption(logins, personalDetails, report, reportActions = {}, {
result.login = personalDetail.login;
result.phoneNumber = personalDetail.phoneNumber;
result.payPalMeAddress = personalDetail.payPalMeAddress;
+ result.alternateText = Str.removeSMSDomain(personalDetail.login);
}
const reportName = ReportUtils.getReportName(report, personalDetailMap, policies);