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

…6479

🍒 Cherry pick PR #6479 to staging 🍒

android/app/build.gradle

@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001011608
-        versionName "1.1.16-8"
+        versionCode 1001011609
+        versionName "1.1.16-9"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.16.8</string>
+	<string>1.1.16.9</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.16.8</string>
+	<string>1.1.16.9</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.16-8",
+  "version": "1.1.16-9",
   "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.",

src/CONST.js

@@ -137,7 +137,7 @@ const CONST = {
     PRIVACY_URL: 'https://use.expensify.com/privacy',
     LICENSES_URL: 'https://use.expensify.com/licenses',
     PLAY_STORE_URL: 'https://play.google.com/store/apps/details?id=com.expensify.chat&hl=en',
-    ADD_SECONDARY_LOGIN_URL: 'settings?param={%22section%22:%22account%22}',
+    ADD_SECONDARY_LOGIN_URL: encodeURI('settings?param={"section":"account","openModal":"secondaryLogin"}'),
     MANAGE_CARDS_URL: 'domain_companycards',
     FEES_URL: 'https://use.expensify.com/fees',
     CFPB_PREPAID_URL: 'https://cfpb.gov/prepaid',

src/pages/ReimbursementAccount/EnableStep.js

@@ -76,7 +76,7 @@ class EnableStep extends React.Component {
                 title: this.props.translate('workspace.bankAccount.addWorkEmail'),
                 icon: Mail,
                 onPress: () => {
-                    openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}');
+                    openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
                     subscribeToExpensifyCardUpdates();
                 },
                 shouldShowRightIcon: true,

src/pages/workspace/card/WorkspaceCardVBANoECardView.js

@@ -13,6 +13,7 @@ import {openOldDotLink} from '../../../libs/actions/Link';
 import {subscribeToExpensifyCardUpdates} from '../../../libs/actions/User';
 import ONYXKEYS from '../../../ONYXKEYS';
 import compose from '../../../libs/compose';
+import CONST from '../../../CONST';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -28,7 +29,7 @@ const WorkspaceCardVBANoECardView = props => (
                     title: props.translate('workspace.card.addWorkEmail'),
                     onPress: () => {
                         Navigation.dismissModal();
-                        openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}');
+                        openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
                         subscribeToExpensifyCardUpdates();
                     },
                     icon: Mail,