From 450471aacacc735049c0d2c5b0a6405a043cabdd Mon Sep 17 00:00:00 2001 From: bartektomczyk Date: Tue, 12 Dec 2023 22:04:28 +0100 Subject: [PATCH 1/2] feat: add needed icon and new menu item --- assets/images/expensify-logo-round.svg | 6 ++++++ src/CONST.ts | 1 + src/components/Icon/Expensicons.ts | 2 ++ src/languages/en.ts | 1 + src/languages/es.ts | 1 + src/pages/settings/InitialSettingsPage.js | 10 ++++++++++ 6 files changed, 21 insertions(+) create mode 100644 assets/images/expensify-logo-round.svg diff --git a/assets/images/expensify-logo-round.svg b/assets/images/expensify-logo-round.svg new file mode 100644 index 000000000000..f1d5d74ab747 --- /dev/null +++ b/assets/images/expensify-logo-round.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/CONST.ts b/src/CONST.ts index d4208d51a78c..266334b8c89c 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -463,6 +463,7 @@ const CONST = { ONFIDO_TERMS_OF_SERVICE_URL: 'https://onfido.com/terms-of-service/', // Use Environment.getEnvironmentURL to get the complete URL with port number DEV_NEW_EXPENSIFY_URL: 'https://dev.new.expensify.com:', + EXPENSIFY_INBOX_URL: 'https://www.expensify.com/inbox', SIGN_IN_FORM_WIDTH: 300, diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index b47daf0711b2..2bee87a039b5 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -53,6 +53,7 @@ import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; import ExpensifyFooterLogoVertical from '@assets/images/expensify-footer-logo-vertical.svg'; import ExpensifyFooterLogo from '@assets/images/expensify-footer-logo.svg'; +import ExpensifyRoundLogo from '@assets/images/expensify-logo-round.svg'; import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg'; import ExpensifyCard from '@assets/images/expensifycard.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; @@ -185,6 +186,7 @@ export { ExpensifyWordmark, ExpensifyFooterLogo, ExpensifyFooterLogoVertical, + ExpensifyRoundLogo, Expand, Eye, EyeDisabled, diff --git a/src/languages/en.ts b/src/languages/en.ts index ee642dd8f333..115f975510e3 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -747,6 +747,7 @@ export default { label: 'macOS', }, }, + goToExpensifyClassic: 'Go to Expensify Classic', security: 'Security', signOut: 'Sign out', signOutConfirmationText: "You'll lose any offline changes if you sign-out.", diff --git a/src/languages/es.ts b/src/languages/es.ts index 10401d4822f7..a8e2266effbf 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -746,6 +746,7 @@ export default { signOut: 'Desconectar', signOutConfirmationText: 'Si cierras sesión perderás los cambios hechos mientras estabas desconectado', versionLetter: 'v', + goToExpensifyClassic: 'Ir a Expensify Classic', readTheTermsAndPrivacy: { phrase1: 'Leer los', phrase2: 'Términos de Servicio', diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index 8ca1f96b3796..2e44398ba9bd 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -256,6 +256,16 @@ function InitialSettingsPage(props) { Navigation.navigate(ROUTES.SETTINGS_ABOUT); }), }, + { + translationKey: 'initialSettingsPage.goToExpensifyClassic', + icon: Expensicons.ExpensifyRoundLogo, + action: () => { + Link.openExternalLink(CONST.EXPENSIFY_INBOX_URL); + }, + shouldShowRightIcon: true, + iconRight: Expensicons.NewWindow, + link: CONST.EXPENSIFY_INBOX_URL, + }, { translationKey: 'initialSettingsPage.signOut', icon: Expensicons.Exit, From 43ceb71636111159989c087c582cf41f2fcfd1c1 Mon Sep 17 00:00:00 2001 From: bartektomczyk Date: Thu, 14 Dec 2023 08:23:01 +0100 Subject: [PATCH 2/2] feat: use a proper icon --- assets/images/expensify-logo-round.svg | 6 ------ src/components/Icon/Expensicons.ts | 4 ++-- src/pages/settings/InitialSettingsPage.js | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 assets/images/expensify-logo-round.svg diff --git a/assets/images/expensify-logo-round.svg b/assets/images/expensify-logo-round.svg deleted file mode 100644 index f1d5d74ab747..000000000000 --- a/assets/images/expensify-logo-round.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index 2bee87a039b5..66a162bf2e5f 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -53,7 +53,6 @@ import Exit from '@assets/images/exit.svg'; import Expand from '@assets/images/expand.svg'; import ExpensifyFooterLogoVertical from '@assets/images/expensify-footer-logo-vertical.svg'; import ExpensifyFooterLogo from '@assets/images/expensify-footer-logo.svg'; -import ExpensifyRoundLogo from '@assets/images/expensify-logo-round.svg'; import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg'; import ExpensifyCard from '@assets/images/expensifycard.svg'; import EyeDisabled from '@assets/images/eye-disabled.svg'; @@ -87,6 +86,7 @@ import Menu from '@assets/images/menu.svg'; import MoneyBag from '@assets/images/money-bag.svg'; import MoneyCircle from '@assets/images/money-circle.svg'; import Monitor from '@assets/images/monitor.svg'; +import NewExpensify from '@assets/images/new-expensify.svg'; import NewWindow from '@assets/images/new-window.svg'; import NewWorkspace from '@assets/images/new-workspace.svg'; import OfflineCloud from '@assets/images/offline-cloud.svg'; @@ -186,7 +186,6 @@ export { ExpensifyWordmark, ExpensifyFooterLogo, ExpensifyFooterLogoVertical, - ExpensifyRoundLogo, Expand, Eye, EyeDisabled, @@ -223,6 +222,7 @@ export { MoneyBag, MoneyCircle, Monitor, + NewExpensify, NewWindow, NewWorkspace, Offline, diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index 2e44398ba9bd..774e18379368 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -258,7 +258,7 @@ function InitialSettingsPage(props) { }, { translationKey: 'initialSettingsPage.goToExpensifyClassic', - icon: Expensicons.ExpensifyRoundLogo, + icon: Expensicons.NewExpensify, action: () => { Link.openExternalLink(CONST.EXPENSIFY_INBOX_URL); },