From e411161a09322d086dfc8803334784a5005acf64 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 23 Sep 2021 14:29:56 -0700
Subject: [PATCH 1/2] Merge pull request #5469 from
 Expensify/version-BUILD-420504ffcd09011e8a11716004273424a868a467

(cherry picked from commit ce65a8d4d3fc51550d4d1f79e36d748dadc62214)
---
 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 49cb7468ab7b..30f2d4fd20ba 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 1001010106
-        versionName "1.1.1-6"
+        versionCode 1001010107
+        versionName "1.1.1-7"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 291847f61d05..65fd3a6e423e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.1.6</string>
+	<string>1.1.1.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 3bd92b5bf06c..d4934e6da5f7 100644
--- 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.6</string>
+	<string>1.1.1.7</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 2e16cdc9d82d..778da9bb78d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.1-6",
+  "version": "1.1.1-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index fa509a486b20..24fe47831411 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.1-6",
+  "version": "1.1.1-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 6305a8c9565bbb31c75e9e97bcc3ed000d12d69d Mon Sep 17 00:00:00 2001
From: Joe Gambino <joe@expensify.com>
Date: Thu, 23 Sep 2021 14:11:38 -0700
Subject: [PATCH 2/2] Merge pull request #5466 from
 Expensify/marcaaron-fixNewToOldDotLinks

Use correct api params for NewDot>OldDot links

(cherry picked from commit 420504ffcd09011e8a11716004273424a868a467)
---
 src/libs/actions/App.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index c466fa7e4deb..d0c4b0b71ed8 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -10,10 +10,12 @@ import Performance from '../Performance';
 import Timing from './Timing';
 
 let currentUserAccountID;
+let currentUserEmail;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
         currentUserAccountID = lodashGet(val, 'accountID', '');
+        currentUserEmail = lodashGet(val, 'email', '');
     },
 });
 
@@ -48,8 +50,8 @@ function setLocale(locale) {
  * @param {string} url relative URL starting with `/` to open in expensify.com
  */
 function openSignedInLink(url = '') {
-    API.GetShortLivedAuthToken().then((response) => {
-        Linking.openURL(`${CONFIG.EXPENSIFY.URL_EXPENSIFY_COM}${url}${url.indexOf('?') === -1 ? '?' : '&'}authToken=${response.authToken}&email=${encodeURIComponent(response.email)}`);
+    API.GetShortLivedAuthToken().then(({shortLivedAuthToken}) => {
+        Linking.openURL(`${CONFIG.EXPENSIFY.URL_EXPENSIFY_COM}${url}${url.indexOf('?') === -1 ? '?' : '&'}authToken=${shortLivedAuthToken}&email=${encodeURIComponent(currentUserEmail)}`);
     });
 }