From 1c77db756d6cad3dcadde8eddd318a177d43f0d7 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:28:28 +0100
Subject: [PATCH 1/6] update force upgrade modal

---
 src/libs/actions/AppUpdate/updateApp/index.android.ts | 6 +++++-
 src/libs/actions/AppUpdate/updateApp/index.desktop.ts | 3 ++-
 src/libs/actions/AppUpdate/updateApp/index.ios.ts     | 6 +++++-
 src/libs/actions/AppUpdate/updateApp/index.ts         | 3 ++-
 src/pages/ErrorPage/UpdateRequiredView.tsx            | 5 ++++-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/libs/actions/AppUpdate/updateApp/index.android.ts b/src/libs/actions/AppUpdate/updateApp/index.android.ts
index 3f2cde77f466..aac98a1928aa 100644
--- a/src/libs/actions/AppUpdate/updateApp/index.android.ts
+++ b/src/libs/actions/AppUpdate/updateApp/index.android.ts
@@ -1,6 +1,10 @@
 import {Linking, NativeModules} from 'react-native';
 import CONST from '@src/CONST';
 
-export default function updateApp() {
+export default function updateApp(isProduction: boolean) {
+    if (isProduction) {
+        Linking.openURL(CONST.APP_DOWNLOAD_LINKS.OLD_DOT_ANDROID);
+        return;
+    }
     Linking.openURL(NativeModules.HybridAppModule ? CONST.APP_DOWNLOAD_LINKS.OLD_DOT_ANDROID : CONST.APP_DOWNLOAD_LINKS.ANDROID);
 }
diff --git a/src/libs/actions/AppUpdate/updateApp/index.desktop.ts b/src/libs/actions/AppUpdate/updateApp/index.desktop.ts
index 5c1ecbe05742..cbd961ff653b 100644
--- a/src/libs/actions/AppUpdate/updateApp/index.desktop.ts
+++ b/src/libs/actions/AppUpdate/updateApp/index.desktop.ts
@@ -1,5 +1,6 @@
 import ELECTRON_EVENTS from '@desktop/ELECTRON_EVENTS';
 
-export default function updateApp() {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export default function updateApp(isProduction: boolean) {
     window.electron.send(ELECTRON_EVENTS.SILENT_UPDATE);
 }
diff --git a/src/libs/actions/AppUpdate/updateApp/index.ios.ts b/src/libs/actions/AppUpdate/updateApp/index.ios.ts
index 930a57881128..608c7ab028ca 100644
--- a/src/libs/actions/AppUpdate/updateApp/index.ios.ts
+++ b/src/libs/actions/AppUpdate/updateApp/index.ios.ts
@@ -1,6 +1,10 @@
 import {Linking, NativeModules} from 'react-native';
 import CONST from '@src/CONST';
 
-export default function updateApp() {
+export default function updateApp(isProduction: boolean) {
+    if (isProduction) {
+        Linking.openURL(CONST.APP_DOWNLOAD_LINKS.OLD_DOT_IOS);
+        return;
+    }
     Linking.openURL(NativeModules.HybridAppModule ? CONST.APP_DOWNLOAD_LINKS.OLD_DOT_IOS : CONST.APP_DOWNLOAD_LINKS.IOS);
 }
diff --git a/src/libs/actions/AppUpdate/updateApp/index.ts b/src/libs/actions/AppUpdate/updateApp/index.ts
index 8c2b191029a2..3b6d9e666bfa 100644
--- a/src/libs/actions/AppUpdate/updateApp/index.ts
+++ b/src/libs/actions/AppUpdate/updateApp/index.ts
@@ -1,6 +1,7 @@
 /**
  * On web or mWeb we can simply refresh the page and the user should have the new version of the app downloaded.
  */
-export default function updateApp() {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export default function updateApp(isProduction: boolean) {
     window.location.reload();
 }
diff --git a/src/pages/ErrorPage/UpdateRequiredView.tsx b/src/pages/ErrorPage/UpdateRequiredView.tsx
index 494ff4899887..9f3c4b224759 100644
--- a/src/pages/ErrorPage/UpdateRequiredView.tsx
+++ b/src/pages/ErrorPage/UpdateRequiredView.tsx
@@ -6,6 +6,7 @@ import HeaderGap from '@components/HeaderGap';
 import Lottie from '@components/Lottie';
 import LottieAnimations from '@components/LottieAnimations';
 import Text from '@components/Text';
+import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
@@ -19,6 +20,8 @@ function UpdateRequiredView() {
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isProduction} = useEnvironment();
+
     return (
         <View style={[styles.appBG, styles.h100, StyleUtils.getSafeAreaPadding(insets)]}>
             <HeaderGap />
@@ -47,7 +50,7 @@ function UpdateRequiredView() {
                 <Button
                     success
                     large
-                    onPress={() => AppUpdate.updateApp()}
+                    onPress={() => AppUpdate.updateApp(isProduction)}
                     text={translate('common.update')}
                     style={styles.updateRequiredViewTextContainer}
                 />

From 5d546772d1594f54aa43f2c9ba01849c3fdf8651 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:37:29 +0100
Subject: [PATCH 2/6] update text

---
 src/languages/en.ts                        | 2 ++
 src/languages/es.ts                        | 2 ++
 src/pages/ErrorPage/UpdateRequiredView.tsx | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 591f7eb0ed42..e90626871a6d 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1173,7 +1173,9 @@ const translations = {
     updateRequiredView: {
         updateRequired: 'Update required',
         pleaseInstall: 'Please update to the latest version of New Expensify',
+        pleaseInstallExpensifyClassic: 'Please install the latest version of Expensify',
         toGetLatestChanges: 'For mobile or desktop, download and install the latest version. For web, refresh your browser.',
+        newAppNotAvailable: 'The New Expensify app is no longer available.',
     },
     initialSettingsPage: {
         about: 'About',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 91557c9defbf..becbd5d1495c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1172,7 +1172,9 @@ const translations = {
     updateRequiredView: {
         updateRequired: 'Actualización requerida',
         pleaseInstall: 'Por favor, actualiza a la última versión de Nuevo Expensify',
+        pleaseInstallExpensifyClassic: 'Por favor, instala la última versión de Expensify',
         toGetLatestChanges: 'Para móvil o escritorio, descarga e instala la última versión. Para la web, actualiza tu navegador.',
+        newAppNotAvailable: 'La nueva aplicación de Expensify ya no está disponible.',
     },
     initialSettingsPage: {
         about: 'Acerca de',
diff --git a/src/pages/ErrorPage/UpdateRequiredView.tsx b/src/pages/ErrorPage/UpdateRequiredView.tsx
index 9f3c4b224759..c1f45e9916de 100644
--- a/src/pages/ErrorPage/UpdateRequiredView.tsx
+++ b/src/pages/ErrorPage/UpdateRequiredView.tsx
@@ -40,10 +40,14 @@ function UpdateRequiredView() {
                 <View style={[styles.ph5, styles.alignItemsCenter, styles.mt5]}>
                     <View style={styles.updateRequiredViewTextContainer}>
                         <View style={[styles.mb3]}>
-                            <Text style={[styles.newKansasLarge, styles.textAlignCenter]}>{translate('updateRequiredView.pleaseInstall')}</Text>
+                            <Text style={[styles.newKansasLarge, styles.textAlignCenter]}>
+                                {isProduction ? translate('updateRequiredView.pleaseInstallExpensifyClassic') : translate('updateRequiredView.pleaseInstall')}
+                            </Text>
                         </View>
                         <View style={styles.mb5}>
-                            <Text style={[styles.textAlignCenter, styles.textSupporting]}>{translate('updateRequiredView.toGetLatestChanges')}</Text>
+                            <Text style={[styles.textAlignCenter, styles.textSupporting]}>
+                                {isProduction ? translate('updateRequiredView.newAppNotAvailable') : translate('updateRequiredView.toGetLatestChanges')}
+                            </Text>
                         </View>
                     </View>
                 </View>

From fab1c5af15767fa5d839242930de83ca13dbb785 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:07:10 +0100
Subject: [PATCH 3/6] show updated text for standalone new app on production

---
 src/pages/ErrorPage/UpdateRequiredView.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/ErrorPage/UpdateRequiredView.tsx b/src/pages/ErrorPage/UpdateRequiredView.tsx
index c1f45e9916de..750a3c891b0f 100644
--- a/src/pages/ErrorPage/UpdateRequiredView.tsx
+++ b/src/pages/ErrorPage/UpdateRequiredView.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {View} from 'react-native';
+import {NativeModules, View} from 'react-native';
 import Button from '@components/Button';
 import Header from '@components/Header';
 import HeaderGap from '@components/HeaderGap';
@@ -20,7 +20,9 @@ function UpdateRequiredView() {
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+
     const {isProduction} = useEnvironment();
+    const isStandaloneNewAppProduction = isProduction && !NativeModules.HybridAppModule;
 
     return (
         <View style={[styles.appBG, styles.h100, StyleUtils.getSafeAreaPadding(insets)]}>
@@ -41,12 +43,12 @@ function UpdateRequiredView() {
                     <View style={styles.updateRequiredViewTextContainer}>
                         <View style={[styles.mb3]}>
                             <Text style={[styles.newKansasLarge, styles.textAlignCenter]}>
-                                {isProduction ? translate('updateRequiredView.pleaseInstallExpensifyClassic') : translate('updateRequiredView.pleaseInstall')}
+                                {isStandaloneNewAppProduction ? translate('updateRequiredView.pleaseInstallExpensifyClassic') : translate('updateRequiredView.pleaseInstall')}
                             </Text>
                         </View>
                         <View style={styles.mb5}>
                             <Text style={[styles.textAlignCenter, styles.textSupporting]}>
-                                {isProduction ? translate('updateRequiredView.newAppNotAvailable') : translate('updateRequiredView.toGetLatestChanges')}
+                                {isStandaloneNewAppProduction ? translate('updateRequiredView.newAppNotAvailable') : translate('updateRequiredView.toGetLatestChanges')}
                             </Text>
                         </View>
                     </View>

From ff9dc0b34f0e2c911796906685f7e06bbe42ef69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Warcho=C5=82?=
 <61014013+war-in@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:25:05 +0100
Subject: [PATCH 4/6] Update es.ts

---
 src/languages/es.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index becbd5d1495c..331b3804e919 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1174,7 +1174,7 @@ const translations = {
         pleaseInstall: 'Por favor, actualiza a la última versión de Nuevo Expensify',
         pleaseInstallExpensifyClassic: 'Por favor, instala la última versión de Expensify',
         toGetLatestChanges: 'Para móvil o escritorio, descarga e instala la última versión. Para la web, actualiza tu navegador.',
-        newAppNotAvailable: 'La nueva aplicación de Expensify ya no está disponible.',
+        newAppNotAvailable: 'La aplicación New Expensify ya no está disponible.',
     },
     initialSettingsPage: {
         about: 'Acerca de',

From c24597d699a2efab407ea9b33f8542de164ae3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Warcho=C5=82?=
 <61014013+war-in@users.noreply.github.com>
Date: Thu, 21 Nov 2024 11:48:48 +0100
Subject: [PATCH 5/6] Update src/languages/es.ts

Co-authored-by: Tom Rhys Jones <tom@expensify.com>
---
 src/languages/es.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 331b3804e919..2f7d8fbc8fbc 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1174,7 +1174,7 @@ const translations = {
         pleaseInstall: 'Por favor, actualiza a la última versión de Nuevo Expensify',
         pleaseInstallExpensifyClassic: 'Por favor, instala la última versión de Expensify',
         toGetLatestChanges: 'Para móvil o escritorio, descarga e instala la última versión. Para la web, actualiza tu navegador.',
-        newAppNotAvailable: 'La aplicación New Expensify ya no está disponible.',
+        newAppNotAvailable: 'La App New Expensify ya no está disponible.',
     },
     initialSettingsPage: {
         about: 'Acerca de',

From ef4f0a2c06b1db6e5b451a6cfaa6a36baf45c904 Mon Sep 17 00:00:00 2001
From: war-in <war-in@users.noreply.github.com>
Date: Thu, 21 Nov 2024 13:03:07 +0100
Subject: [PATCH 6/6] fix lint and prettier

---
 src/languages/es.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index d56c860792ef..11994c6681c8 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1172,7 +1172,7 @@ const translations = {
     updateRequiredView: {
         updateRequired: 'Actualización requerida',
         pleaseInstall: 'Por favor, actualiza a la última versión de New Expensify',
-      pleaseInstallExpensifyClassic: 'Por favor, instala la última versión de Expensify',
+        pleaseInstallExpensifyClassic: 'Por favor, instala la última versión de Expensify',
         toGetLatestChanges: 'Para móvil o escritorio, descarga e instala la última versión. Para la web, actualiza tu navegador.',
         newAppNotAvailable: 'La App New Expensify ya no está disponible.',
     },