From e93f1cf795da9892acd432b8227bfbf4218f9074 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 22 Sep 2021 18:24:44 -0700
Subject: [PATCH 1/2] Merge pull request #5433 from
Expensify/version-BUILD-1c6c70fe9df222f5885581fd8674aacf4fdc0a8b
(cherry picked from commit bbb5eb2ee9eb8f867318194a3638f505e97acd07)
---
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 49f654baae5..4b9ebc7ed1a 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 1001010102
- versionName "1.1.1-2"
+ versionCode 1001010103
+ versionName "1.1.1-3"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 090b9d5a159..9cc22a96978 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.1.2
+ 1.1.1.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0dd1c6e73ea..b4f002a5fcf 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.1.2
+ 1.1.1.3
diff --git a/package-lock.json b/package-lock.json
index b0b2abee15c..d9ff846e425 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.1-2",
+ "version": "1.1.1-3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 7278b79fa78..0a4605b5561 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.1-2",
+ "version": "1.1.1-3",
"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 7def926daf43e665b356bcf48d232394b99d2aee Mon Sep 17 00:00:00 2001
From: Amal Nazeem
Date: Wed, 22 Sep 2021 21:22:34 -0400
Subject: [PATCH 2/2] Merge pull request #5430 from
Expensify/amal-query-param-transition
Rename route so that we expect traditional query paramters
(cherry picked from commit 1c6c70fe9df222f5885581fd8674aacf4fdc0a8b)
---
src/ROUTES.js | 2 +-
src/libs/Navigation/NavigationRoot.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ROUTES.js b/src/ROUTES.js
index e09bb4e8498..5e613866927 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -67,7 +67,7 @@ export default {
getReportDetailsRoute: reportID => `r/${reportID}/details`,
VALIDATE_LOGIN: 'v',
VALIDATE_LOGIN_WITH_VALIDATE_CODE: 'v/:accountID/:validateCode',
- LOGIN_WITH_SHORT_LIVED_TOKEN: 'transition/:accountID/:email/:shortLivedToken/:encryptedAuthToken/:exitTo',
+ LOGIN_WITH_SHORT_LIVED_TOKEN: 'transition',
// This is a special validation URL that will take the user to /workspace/new after validation. This is used
// when linking users from e.com in order to share a session in this app.
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
index 6c1c58fd8ba..ad516ebf0f5 100644
--- a/src/libs/Navigation/NavigationRoot.js
+++ b/src/libs/Navigation/NavigationRoot.js
@@ -32,7 +32,7 @@ class NavigationRoot extends Component {
const path = getPathFromState(state, linkingConfig.config);
// Don't log the route transitions from OldDot because they contain authTokens
- if (path.includes('/transition/')) {
+ if (path.includes('/transition')) {
Log.info('Navigating from transition link from OldDot using short lived authToken');
} else {
Log.info('Navigating to route', false, {path});