From d1611e63680e988f6065f9076d1a414107e81980 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:12:11 -0500
Subject: [PATCH 1/2] Merge pull request #14732 from
Expensify/version-BUILD-3A0CA0E5-235D-40EE-BABB-5CC7055CB6F4
Update version to 1.2.63-1 on main
(cherry picked from commit 79d6c13f732a966b5963cf8b6dad9d308c7713b7)
---
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 65e23327413b..f41e0e7f8fec 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 1001026300
- versionName "1.2.63-0"
+ versionCode 1001026301
+ versionName "1.2.63-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3621576a0b65..6d5e5b26c6f3 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.63.0
+ 1.2.63.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b58f399ae634..4a1d8af8ac9e 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.63.0
+ 1.2.63.1
diff --git a/package-lock.json b/package-lock.json
index 4231ff8845b5..b793c153ee6c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.63-0",
+ "version": "1.2.63-1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.63-0",
+ "version": "1.2.63-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index d95ceb2e3cee..db52903f6d17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.63-0",
+ "version": "1.2.63-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 cea6c075a1701622454384a5169277b3ebc0e3e6 Mon Sep 17 00:00:00 2001
From: Alex Beaman
Date: Wed, 1 Feb 2023 18:04:30 +0200
Subject: [PATCH 2/2] Merge pull request #14730 from
Expensify/beaman-onlyAllowPasswordlessForThatBeta
Only show `passwordless` flow if user is on `passwordless` or `all` betas
(cherry picked from commit dbc17642e6def57503e1cac98f303a066cfc5e23)
---
src/libs/Permissions.js | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index 5de388f8f605..f1689c7a1371 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -94,6 +94,17 @@ function canUsePolicyExpenseChat(betas) {
return _.contains(betas, CONST.BETAS.POLICY_EXPENSE_CHAT) || canUseAllBetas(betas);
}
+<<<<<<< HEAD
+=======
+/**
+ * @param {Array} betas
+ * @returns {Boolean}
+ */
+function canUsePasswordlessLogins(betas) {
+ return _.contains(betas, CONST.BETAS.PASSWORDLESS) || _.contains(betas, CONST.BETAS.ALL);
+}
+
+>>>>>>> dbc17642e6 (Merge pull request #14730 from Expensify/beaman-onlyAllowPasswordlessForThatBeta)
export default {
canUseChronos,
canUseIOU,