From da02a60b78203dc32b3582cb80917be6aacbc8cf Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 22 Sep 2021 14:06:44 -0700
Subject: [PATCH 1/2] Merge pull request #5426 from
Expensify/version-BUILD-64e21400ac5600aaa747f722fca464b97f078f67
(cherry picked from commit 2f75ce747e1e0062e548e7b7e97d4329e6ef9413)
---
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 652cbd06f9a..49f654baae5 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 1001010101
- versionName "1.1.1-1"
+ versionCode 1001010102
+ versionName "1.1.1-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index c9f09a32813..090b9d5a159 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.1.1
+ 1.1.1.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 8b36f2111c9..0dd1c6e73ea 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.1.1
+ 1.1.1.2
diff --git a/package-lock.json b/package-lock.json
index 555a0c3eba8..b0b2abee15c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.1-1",
+ "version": "1.1.1-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index a971ca85e4e..7278b79fa78 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.1-1",
+ "version": "1.1.1-2",
"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 011d0411a13ee2cb42dc3a257bf7226a8ed76fee Mon Sep 17 00:00:00 2001
From: Amal Nazeem
Date: Wed, 22 Sep 2021 17:04:27 -0400
Subject: [PATCH 2/2] Merge pull request #5425 from
Expensify/amal-dont-log-token
Avoid logging AuthToken from transition links
(cherry picked from commit 64e21400ac5600aaa747f722fca464b97f078f67)
---
src/libs/Navigation/NavigationRoot.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
index 903b71f161c..6c1c58fd8ba 100644
--- a/src/libs/Navigation/NavigationRoot.js
+++ b/src/libs/Navigation/NavigationRoot.js
@@ -30,7 +30,13 @@ class NavigationRoot extends Component {
}
const path = getPathFromState(state, linkingConfig.config);
- Log.info('Navigating to route', false, {path});
+
+ // Don't log the route transitions from OldDot because they contain authTokens
+ if (path.includes('/transition/')) {
+ Log.info('Navigating from transition link from OldDot using short lived authToken');
+ } else {
+ Log.info('Navigating to route', false, {path});
+ }
setCurrentURL(path);
}