From 492ac2a59fb9c48490bbc52d65046263915e60dc Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 9 Aug 2024 00:31:59 +0200 Subject: [PATCH 1/3] Remove the note of cards from the settings --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/pages/home/sidebar/AllSettingsScreen.tsx | 2 +- src/pages/settings/InitialSettingsPage.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index a139a5ca4d72..cad21264c8f3 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -625,7 +625,7 @@ export default { }, allSettingsScreen: { subscription: 'Subscription', - cardsAndDomains: 'Cards & Domains', + domains: 'Domains', }, tabSelector: { chat: 'Chat', diff --git a/src/languages/es.ts b/src/languages/es.ts index 30086da1fa89..97df59eadf62 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -618,7 +618,7 @@ export default { }, allSettingsScreen: { subscription: 'Suscripcion', - cardsAndDomains: 'Tarjetas y Dominios', + domains: 'Dominios', }, tabSelector: { chat: 'Chat', diff --git a/src/pages/home/sidebar/AllSettingsScreen.tsx b/src/pages/home/sidebar/AllSettingsScreen.tsx index b01f3573bcc0..65ccb6d9fe8a 100644 --- a/src/pages/home/sidebar/AllSettingsScreen.tsx +++ b/src/pages/home/sidebar/AllSettingsScreen.tsx @@ -65,7 +65,7 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) { ] : []), { - translationKey: 'allSettingsScreen.cardsAndDomains', + translationKey: 'allSettingsScreen.domains', icon: Expensicons.CardsAndDomains, action: () => { Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL); diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index 39e3dc9a8989..d43a2d75e195 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -194,7 +194,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined, }, { - translationKey: 'allSettingsScreen.cardsAndDomains', + translationKey: 'allSettingsScreen.domains', icon: Expensicons.CardsAndDomains, action: () => { Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL); From 4e7461ea064ce85addceb044f89c09d9d73190ec Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 9 Aug 2024 01:54:46 +0200 Subject: [PATCH 2/3] Use globe icon for the domains row --- src/pages/home/sidebar/AllSettingsScreen.tsx | 2 +- src/pages/settings/InitialSettingsPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/sidebar/AllSettingsScreen.tsx b/src/pages/home/sidebar/AllSettingsScreen.tsx index 65ccb6d9fe8a..dc969cb98622 100644 --- a/src/pages/home/sidebar/AllSettingsScreen.tsx +++ b/src/pages/home/sidebar/AllSettingsScreen.tsx @@ -66,7 +66,7 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) { : []), { translationKey: 'allSettingsScreen.domains', - icon: Expensicons.CardsAndDomains, + icon: Expensicons.Globe, action: () => { Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL); }, diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index d43a2d75e195..bc98a9432630 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -195,7 +195,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa }, { translationKey: 'allSettingsScreen.domains', - icon: Expensicons.CardsAndDomains, + icon: Expensicons.Globe, action: () => { Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL); }, From 6e64eec82b9c46b3737866dee911e635c4aa1d34 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 9 Aug 2024 02:07:27 +0200 Subject: [PATCH 3/3] Remove unused icon --- assets/images/cards-and-domains.svg | 1 - src/components/Icon/Expensicons.ts | 2 -- 2 files changed, 3 deletions(-) delete mode 100644 assets/images/cards-and-domains.svg diff --git a/assets/images/cards-and-domains.svg b/assets/images/cards-and-domains.svg deleted file mode 100644 index a6a3918f6423..000000000000 --- a/assets/images/cards-and-domains.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index de7aff8059f3..cb68f33face7 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -32,7 +32,6 @@ import Calendar from '@assets/images/calendar.svg'; import Camera from '@assets/images/camera.svg'; import CarWithKey from '@assets/images/car-with-key.svg'; import Car from '@assets/images/car.svg'; -import CardsAndDomains from '@assets/images/cards-and-domains.svg'; import Cash from '@assets/images/cash.svg'; import Chair from '@assets/images/chair.svg'; import ChatBubbleAdd from '@assets/images/chatbubble-add.svg'; @@ -220,7 +219,6 @@ export { Calendar, Camera, Car, - CardsAndDomains, Cash, ChatBubble, ChatBubbles,