From 9f8319d2ab1c107b7603fa70fc659cb17ebb96dc Mon Sep 17 00:00:00 2001 From: Nikki Wines Date: Thu, 14 Oct 2021 11:09:30 -0700 Subject: [PATCH 1/9] add full stop to 'addFirstPaymentMethod' copy --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 18f6d317f719..9e2a2827bf50 100755 --- 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', diff --git a/src/languages/es.js b/src/languages/es.js index 95476967924a..54b4d61b6410 100644 --- 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', From e6e88bea82cf066ccc86e12ebe1c8de47fc529fd Mon Sep 17 00:00:00 2001 From: Aldo Canepa Date: Thu, 14 Oct 2021 19:46:49 -0700 Subject: [PATCH 2/9] Just load policy list when url not available --- src/libs/Navigation/AppNavigator/AuthScreens.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js index 10f22a0ca3cd..49455ee31eef 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.js +++ b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -170,10 +170,14 @@ 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); + 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 From 6086b07608ca32a5fe13675d514aa9c36f0fbc95 Mon Sep 17 00:00:00 2001 From: Aldo Canepa Date: Thu, 14 Oct 2021 19:55:45 -0700 Subject: [PATCH 3/9] Add comment --- src/libs/Navigation/AppNavigator/AuthScreens.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js index 49455ee31eef..809d6d1bffb8 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.js +++ b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -170,6 +170,7 @@ class AuthScreens extends React.Component { // Load policies, maybe creating a new policy first. Linking.getInitialURL() .then((url) => { + // 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'); From 806f0621bd39d3f5865ee5272d5a09008f2e50d4 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 15 Oct 2021 03:51:19 +0000 Subject: [PATCH 4/9] Update version to 1.1.7-24 --- 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 caa5c6517828..923492edac1b 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 1001010723 - versionName "1.1.7-23" + versionCode 1001010724 + versionName "1.1.7-24" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 37cd6a5c64c3..8410c1fc1b1d 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.7.23 + 1.1.7.24 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 28eb092f08e0..744177fb7c0e 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.7.23 + 1.1.7.24 diff --git a/package-lock.json b/package-lock.json index 85383f273aa5..e30c8484b93a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-23", + "version": "1.1.7-24", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5a78ed0a8baa..a18d0c924c4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-23", + "version": "1.1.7-24", "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 10157b4fb7dfd0d01ed6d2db2c3f131944c14a1b Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 15 Oct 2021 05:27:49 +0000 Subject: [PATCH 5/9] Update version to 1.1.7-25 --- 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 923492edac1b..2567a772bac9 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 1001010724 - versionName "1.1.7-24" + versionCode 1001010725 + versionName "1.1.7-25" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 8410c1fc1b1d..bbb748db7bb3 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.7.24 + 1.1.7.25 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 744177fb7c0e..f8eca4bf8bbf 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.7.24 + 1.1.7.25 diff --git a/package-lock.json b/package-lock.json index e30c8484b93a..31637edc5ffb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-24", + "version": "1.1.7-25", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a18d0c924c4e..139a795c7c6c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-24", + "version": "1.1.7-25", "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 9722a8c6f3fdadf2d62906af24bc2226da58f6df Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 15 Oct 2021 06:46:37 +0000 Subject: [PATCH 6/9] Update version to 1.1.7-26 --- 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 2567a772bac9..6018bc6ab744 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 1001010725 - versionName "1.1.7-25" + versionCode 1001010726 + versionName "1.1.7-26" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index bbb748db7bb3..b99f475b8a4f 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.7.25 + 1.1.7.26 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index f8eca4bf8bbf..e16f809b5a4d 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.7.25 + 1.1.7.26 diff --git a/package-lock.json b/package-lock.json index 31637edc5ffb..a009750698a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-25", + "version": "1.1.7-26", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 139a795c7c6c..05c1733a5128 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-25", + "version": "1.1.7-26", "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 b8340ec65029ad7d19216a6a84f9f1155b03e5eb Mon Sep 17 00:00:00 2001 From: Tom Rhys Jones Date: Fri, 15 Oct 2021 11:57:16 +0100 Subject: [PATCH 7/9] Quick copy update to the VBANoECard message --- src/languages/en.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.js b/src/languages/en.js index 93b9406b2ac0..60f45635c347 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -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', From a443dd85de9da5e974326598118be590ccfa6764 Mon Sep 17 00:00:00 2001 From: Tom Rhys Jones Date: Fri, 15 Oct 2021 12:36:10 +0100 Subject: [PATCH 8/9] Spanish update --- src/languages/es.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.js b/src/languages/es.js index 54b4d61b6410..97e07a8b1d04 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -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', From 931a2992f84861c38dac03ab0b44acb8a9fc8381 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 15 Oct 2021 12:32:13 +0000 Subject: [PATCH 9/9] Update version to 1.1.7-27 --- 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 6018bc6ab744..8f4cb6a9a90d 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 1001010726 - versionName "1.1.7-26" + versionCode 1001010727 + versionName "1.1.7-27" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index b99f475b8a4f..ab03538f3111 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.7.26 + 1.1.7.27 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index e16f809b5a4d..c764516e9c29 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.7.26 + 1.1.7.27 diff --git a/package-lock.json b/package-lock.json index a009750698a8..66cf408ddbb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-26", + "version": "1.1.7-27", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 05c1733a5128..c774d4805b92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-26", + "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.",