diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index a63f5503f492..1dcf2e389d89 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -1135,8 +1135,6 @@ const ONYXKEYS = { SPEND_RULE_FORM_DRAFT: 'spendRuleFormDraft', ADD_DOMAIN_MEMBER_FORM: 'addDomainMemberForm', ADD_DOMAIN_MEMBER_FORM_DRAFT: 'addDomainMemberFormDraft', - ADD_WORK_EMAIL_FORM: 'addWorkEmailForm', - ADD_WORK_EMAIL_FORM_DRAFT: 'addWorkEmailFormDraft', EDIT_DOMAIN_GROUP_NAME_FORM: 'editDomainGroupNameForm', EDIT_DOMAIN_GROUP_NAME_FORM_DRAFT: 'editDomainGroupNameFormDraft', SPEND_RULE_MAX_AMOUNT_FORM: 'spendRuleMaxAmountForm', @@ -1294,7 +1292,6 @@ type OnyxFormValuesMapping = { [ONYXKEYS.FORMS.MERCHANT_RULE_FORM]: FormTypes.MerchantRuleForm; [ONYXKEYS.FORMS.SPEND_RULE_FORM]: FormTypes.SpendRuleForm; [ONYXKEYS.FORMS.ADD_DOMAIN_MEMBER_FORM]: FormTypes.AddDomainMemberForm; - [ONYXKEYS.FORMS.ADD_WORK_EMAIL_FORM]: FormTypes.AddWorkEmailForm; [ONYXKEYS.FORMS.EDIT_DOMAIN_GROUP_NAME_FORM]: FormTypes.DomainGroupEditNameForm; [ONYXKEYS.FORMS.SPEND_RULE_MAX_AMOUNT_FORM]: FormTypes.SpendRuleMaxAmountForm; [ONYXKEYS.FORMS.SPEND_RULE_MERCHANT_EDIT_FORM]: FormTypes.SpendRuleMerchantEditForm; diff --git a/src/languages/de.ts b/src/languages/de.ts index a6cf5c09960f..a8302095d75d 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5454,6 +5454,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU }, deletedCard: 'Gelöschte Karte', assignNewCards: {title: 'Neue Karten zuweisen', description: 'Holen Sie die neuesten Karten zum Zuweisen von Ihrer Bank'}, + openContactMethods: 'Kontaktmethoden öffnen', }, expensifyCard: { issueAndManageCards: 'Geben Sie Expensify Karten aus und verwalten Sie sie', diff --git a/src/languages/en.ts b/src/languages/en.ts index 0b50e1b7b55e..c95b4b889f28 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -5320,6 +5320,7 @@ const translations = { fromOtherWorkspaces: 'From other workspaces', addWorkEmail: 'Add your work email', addWorkEmailDescription: 'Please add your work email in order to use existing feeds from other workspaces.', + openContactMethods: 'Open Contact Methods', error: { workspaceFeedsCouldNotBeLoadedTitle: "Couldn't load card feeds", workspaceFeedsCouldNotBeLoadedMessage: 'An error occurred while loading workspace card feeds. Please try again or contact your administrator.', diff --git a/src/languages/es.ts b/src/languages/es.ts index f84ec9f6a162..419429b6e5a6 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5131,6 +5131,7 @@ ${amount} para ${merchant} - ${date}`, fromOtherWorkspaces: 'De otros espacios de trabajo', addWorkEmail: 'Añade tu correo electrónico de trabajo', addWorkEmailDescription: 'Por favor, añade tu correo de trabajo para poder usar los feeds existentes de otros espacios de trabajo.', + openContactMethods: 'Abrir métodos de contacto', error: { workspaceFeedsCouldNotBeLoadedTitle: 'Error al cargar las fuentes de tarjetas del espacio de trabajo', workspaceFeedsCouldNotBeLoadedMessage: diff --git a/src/languages/fr.ts b/src/languages/fr.ts index eb8b2d3b96f3..8876871b0f76 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5465,6 +5465,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. }, deletedCard: 'Carte supprimée', assignNewCards: {title: 'Assigner de nouvelles cartes', description: 'Obtenez les dernières cartes à assigner depuis votre banque'}, + openContactMethods: 'Ouvrir les moyens de contact', }, expensifyCard: { issueAndManageCards: 'Émettre et gérer vos Cartes Expensify', diff --git a/src/languages/it.ts b/src/languages/it.ts index 8b55789d977a..a9edf94fb595 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5435,6 +5435,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. }, deletedCard: 'Carta eliminata', assignNewCards: {title: 'Assegna nuove carte', description: 'Ottieni le ultime carte da assegnare dalla tua banca'}, + openContactMethods: 'Apri metodi di contatto', }, expensifyCard: { issueAndManageCards: 'Emetti e gestisci le tue Carte Expensify', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 7dadd52e6801..7502dce01c04 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5385,6 +5385,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO }, deletedCard: '削除されたカード', assignNewCards: {title: '新しいカードを割り当てる', description: '銀行から割り当て可能な最新のカードを取得します'}, + openContactMethods: '連絡方法を開く', }, expensifyCard: { issueAndManageCards: 'Expensify カードを発行して管理する', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 9a7bb8d0ffb0..f14dda4eb9c5 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5426,6 +5426,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ }, deletedCard: 'Verwijderde kaart', assignNewCards: {title: 'Nieuwe kaarten toewijzen', description: 'Haal de nieuwste kaarten op om toe te wijzen vanuit je bank'}, + openContactMethods: 'Contactmethoden openen', }, expensifyCard: { issueAndManageCards: 'Geef Expensify Kaarten uit en beheer ze', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index f4011e201ee0..d3cdb8104057 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5415,6 +5415,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy }, deletedCard: 'Usunięta karta', assignNewCards: {title: 'Przydziel nowe karty', description: 'Pobierz z banku najnowsze karty do przypisania'}, + openContactMethods: 'Otwórz metody kontaktu', }, expensifyCard: { issueAndManageCards: 'Wydawaj i zarządzaj Kartami Expensify', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index da031573508b..01146c41ba4c 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5418,6 +5418,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS }, deletedCard: 'Cartão excluído', assignNewCards: {title: 'Atribuir novos cartões', description: 'Obtenha do seu banco os cartões mais recentes para atribuir'}, + openContactMethods: 'Abrir métodos de contato', }, expensifyCard: { issueAndManageCards: 'Emita e gerencie seus Cartões Expensify', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index ea9c4e854831..828992efca66 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -5290,6 +5290,7 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM }, deletedCard: '已删除的卡片', assignNewCards: {title: '分配新卡', description: '从您的银行获取可分配的最新银行卡'}, + openContactMethods: '打开联系方式', }, expensifyCard: { issueAndManageCards: '发放并管理您的 Expensify 卡', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 24eb086ebc38..ac2159ba40b0 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -941,7 +941,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/companyCards/BrokenCardFeedConnectionPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_REFRESH_CARD_FEED_CONNECTION]: () => require('../../../../pages/workspace/companyCards/RefreshCardFeedConnectionPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_VERIFY_ACCOUNT]: () => require('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsVerifyAccountPage').default, - [SCREENS.WORKSPACE.COMPANY_CARD_ADD_WORK_EMAIL]: () => require('../../../../pages/workspace/companyCards/WorkspaceCompanyCardAddWorkEmailPage').default, + [SCREENS.WORKSPACE.COMPANY_CARD_ADD_WORK_EMAIL]: () => require('../../../../pages/workspace/cardFeed/WorkspaceCardFeedAddWorkEmailPage').default, [SCREENS.WORKSPACE.COMPANY_CARD_VERIFY_WORK_EMAIL]: () => require('../../../../pages/workspace/companyCards/WorkspaceVerifyWorkAccountPage').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE]: () => require('../../../../pages/workspace/companyCards/assignCard/AssigneeStep').default, [SCREENS.WORKSPACE.COMPANY_CARDS_ASSIGN_CARD_CARD_SELECTION]: () => require('../../../../pages/workspace/companyCards/assignCard/CardSelectionStep').default, @@ -975,7 +975,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/Travel/TravelLegalNamePage').default, [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED]: () => require('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage').default, - [SCREENS.WORKSPACE.EXPENSIFY_CARD_ADD_WORK_EMAIL]: () => require('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardAddWorkEmailPage').default, + [SCREENS.WORKSPACE.EXPENSIFY_CARD_ADD_WORK_EMAIL]: () => require('../../../../pages/workspace/cardFeed/WorkspaceCardFeedAddWorkEmailPage').default, [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_SPEND_RULE_SELECTION]: () => require('../../../../pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage').default, [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW_SPEND_RULE_MERCHANTS]: () => diff --git a/src/pages/workspace/cardFeed/WorkspaceCardFeedAddWorkEmailPage.tsx b/src/pages/workspace/cardFeed/WorkspaceCardFeedAddWorkEmailPage.tsx new file mode 100644 index 000000000000..cb6acaa22614 --- /dev/null +++ b/src/pages/workspace/cardFeed/WorkspaceCardFeedAddWorkEmailPage.tsx @@ -0,0 +1,43 @@ +import React from 'react'; +import {View} from 'react-native'; +import Button from '@components/Button'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import Text from '@components/Text'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; +import Navigation from '@libs/Navigation/Navigation'; +import ROUTES from '@src/ROUTES'; + +function WorkspaceCardFeedAddWorkEmailPage() { + const styles = useThemeStyles(); + const {translate} = useLocalize(); + + const openContactMethods = () => { + Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(Navigation.getActiveRoute())); + }; + + return ( + + + + {translate('workspace.companyCards.addWorkEmail')} + {translate('workspace.companyCards.addWorkEmailDescription')} + +