Pull main into

Expensify · Oct 15, 2021 · 739cc4e · 739cc4e
2 parents 273d81f + e31c8f4
commit 739cc4e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 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 1001010723
-        versionName "1.1.7-23"
+        versionCode 1001010727
+        versionName "1.1.7-27"
     }
     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.7.23</string>
+	<string>1.1.7.27</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.7.23</string>
+	<string>1.1.7.27</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.7-23",
+  "version": "1.1.7-27",
   "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/languages/en.js b/src/languages/en.js
@@ -315,7 +315,7 @@ export default {
         addPaymentMethod: 'Add payment method',
         accountLastFour: 'Account ending in',
         cardLastFour: 'Card ending in',
-        addFirstPaymentMethod: 'Add a payment method to send and receive payments directly in the app',
+        addFirstPaymentMethod: 'Add a payment method to send and receive payments directly in the app.',
     },
     preferencesPage: {
         mostRecent: 'Most recent',
@@ -652,7 +652,7 @@ export default {
             header: 'Unlock free Expensify Cards',
             headerWithEcard: 'Cards are ready!',
             noVBACopy: 'Connect a bank account to issue unlimited Expensify Cards for your workspace members and access all of these incredible benefits:',
-            VBANoECardCopy: 'Issue unlimited Expensify Cards for your workspace members, as well as all of these incredible benefits:',
+            VBANoECardCopy: 'Add a work email address to issue unlimited Expensify Cards for your workspace members, as well as all of these incredible benefits:',
             conciergeCanHelp: 'Concierge can help you add a work email address to enable the Expensify Card.',
             VBAWithECardCopy: 'Enjoy all these incredible benefits:',
             benefit1: 'Up to 2% cash back',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -315,7 +315,7 @@ export default {
         addPaymentMethod: 'Agrega método de pago',
         accountLastFour: 'Cuenta con terminación',
         cardLastFour: 'Tarjeta con terminacíon',
-        addFirstPaymentMethod: 'Añade un método de pago para enviar y recibir pagos directamente desde la aplicación',
+        addFirstPaymentMethod: 'Añade un método de pago para enviar y recibir pagos directamente desde la aplicación.',
     },
     preferencesPage: {
         mostRecent: 'Más recientes',
@@ -654,7 +654,7 @@ export default {
             header: 'Desbloquea Tarjetas Expensify gratis',
             headerWithEcard: '¡Tus tarjetas están listas!',
             noVBACopy: 'Conecta una cuenta bancaria para emitir Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:',
-            VBANoECardCopy: 'Emite Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y accede a todas estas increíbles ventajas:',
+            VBANoECardCopy: 'Agrega tu correo electrónico de trabajo para emitir Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:',
             conciergeCanHelp: 'Concierge te puede ayudar a añadir un correo electrónico de trabajo para activar la Tarjeta Expensify.',
             VBAWithECardCopy: 'Disfruta de todas estas increíbles ventajas:',
             benefit1: 'Hasta un 2% de devolución en tus gastos',

diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -170,10 +170,15 @@ class AuthScreens extends React.Component {
         // Load policies, maybe creating a new policy first.
         Linking.getInitialURL()
             .then((url) => {
-                const path = new URL(url).pathname;
-                const exitTo = new URLSearchParams(url).get('exitTo');
-                const shouldCreateFreePolicy = Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN)) && exitTo === ROUTES.WORKSPACE_NEW;
-                getPolicyList(shouldCreateFreePolicy);
+                // url is null on mobile unless the app was opened via a deeplink
+                if (url) {
+                    const path = new URL(url).pathname;
+                    const exitTo = new URLSearchParams(url).get('exitTo');
+                    const shouldCreateFreePolicy = Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN)) && exitTo === ROUTES.WORKSPACE_NEW;
+                    getPolicyList(shouldCreateFreePolicy);
+                } else {
+                    getPolicyList(false);
+                }
             });
 
         // Refresh the personal details, timezone and betas every 30 minutes