Merge pull request #5434 from Expensify/OSBotify-cherry-pick-staging-…

…5430
Expensify · Sep 23, 2021 · 6ac9bde · 6ac9bde
2 parents 1e4c5a8 + 7def926
commit 6ac9bde
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.1.2</string>
+	<string>1.1.1.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.1.2</string>
+	<string>1.1.1.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git 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.",

diff --git 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
@@ -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});