diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 47dbc171a2b7..37cf5fb7cac2 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -949,6 +949,8 @@ const ONYXKEYS = { TEXT_PICKER_MODAL_FORM_DRAFT: 'textPickerModalFormDraft', REPORTS_DEFAULT_TITLE_MODAL_FORM: 'ReportsDefaultTitleModalForm', REPORTS_DEFAULT_TITLE_MODAL_FORM_DRAFT: 'ReportsDefaultTitleModalFormDraft', + RESET_DOMAIN_FORM: 'resetDomainForm', + RESET_DOMAIN_FORM_DRAFT: 'resetDomainFormDraft', RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM: 'rulesAutoApproveReportsUnderModalForm', RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM_DRAFT: 'rulesAutoApproveReportsUnderModalFormDraft', RULES_RANDOM_REPORT_AUDIT_MODAL_FORM: 'rulesRandomReportAuditModalForm', @@ -1043,6 +1045,7 @@ type OnyxFormValuesMapping = { [ONYXKEYS.FORMS.REPORT_VIRTUAL_CARD_FRAUD]: FormTypes.ReportVirtualCardFraudForm; [ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM]: FormTypes.ReportPhysicalCardForm; [ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM]: FormTypes.ReportFieldsEditForm; + [ONYXKEYS.FORMS.RESET_DOMAIN_FORM]: FormTypes.ResetDomainForm; [ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM]: FormTypes.ReimbursementAccountForm; [ONYXKEYS.FORMS.ENTER_SINGER_INFO_FORM]: FormTypes.EnterSignerInfoForm; [ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM]: FormTypes.PersonalBankAccountForm; diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 16c126be5dfe..2ca954477aeb 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -3653,6 +3653,10 @@ const ROUTES = { route: 'domain/:domainAccountID/members/:accountID', getRoute: (domainAccountID: number, accountID: number) => `domain/${domainAccountID}/members/${accountID}` as const, }, + DOMAIN_RESET_DOMAIN: { + route: 'domain/:domainAccountID/admins/:accountID/reset-domain', + getRoute: (domainAccountID: number, accountID: number) => `domain/${domainAccountID}/admins/${accountID}/reset-domain` as const, + }, } as const; /** diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 989a9ae3fe92..b8dd170e1554 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -878,6 +878,7 @@ const SCREENS = { ADD_ADMIN: 'Domain_Add_Admin', MEMBERS: 'Domain_Members', MEMBER_DETAILS: 'Member_Details', + RESET_DOMAIN: 'Domain_Reset', }, } as const; diff --git a/src/components/Domain/DomainMenuItem.tsx b/src/components/Domain/DomainMenuItem.tsx index 2e0a5356b9a2..c8f207b9a43a 100644 --- a/src/components/Domain/DomainMenuItem.tsx +++ b/src/components/Domain/DomainMenuItem.tsx @@ -8,7 +8,9 @@ import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; import CONST from '@src/CONST'; +import {clearDomainErrors} from '@src/libs/actions/Domain'; import ROUTES from '@src/ROUTES'; +import type {Errors} from '@src/types/onyx/OnyxCommon'; import DomainsListRow from './DomainsListRow'; type DomainMenuItemProps = { @@ -37,6 +39,9 @@ type DomainItem = { /** Whether the row's domain is validated (aka verified) */ isValidated: boolean; + + /** Current errors for domain */ + errors?: Errors; } & Pick; function DomainMenuItem({item, index}: DomainMenuItemProps) { @@ -68,12 +73,14 @@ function DomainMenuItem({item, index}: DomainMenuItemProps) { clearDomainErrors(item.accountID)} > {({hovered}) => ( diff --git a/src/languages/de.ts b/src/languages/de.ts index 596d3229b084..921b34ec35d8 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -7950,7 +7950,15 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`, addAdminError: 'Dieser Benutzer kann nicht als Admin hinzugefügt werden. Bitte versuche es erneut.', revokeAdminAccess: 'Administratorzugriff widerrufen', cantRevokeAdminAccess: 'Adminzugriff kann dem technischen Ansprechpartner nicht entzogen werden', - error: {removeAdmin: 'Dieser Benutzer kann nicht als Admin entfernt werden. Bitte versuchen Sie es erneut.'}, + error: { + removeAdmin: 'Dieser Benutzer kann nicht als Administrator entfernt werden. Bitte versuche es erneut.', + removeDomain: 'Diese Domain kann nicht entfernt werden. Bitte versuche es erneut.', + removeDomainNameInvalid: 'Bitte gib deinen Domainnamen ein, um ihn zurückzusetzen.', + }, + resetDomain: 'Domain zurücksetzen', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Bitte geben Sie ${domainName} ein, um das Zurücksetzen der Domain zu bestätigen.`, + enterDomainName: 'Geben Sie hier Ihren Domänennamen ein', + resetDomainInfo: `Diese Aktion ist dauerhaft und die folgenden Daten werden gelöscht:
  • Firmenkarten-Verbindungen und alle nicht eingereichten Ausgaben von diesen Karten
  • SAML- und Gruppeneinstellungen
Alle Konten, Workspaces, Berichte, Ausgaben und anderen Daten bleiben erhalten.

Hinweis: Sie können diese Domain aus Ihrer Domainliste entfernen, indem Sie die zugehörige E-Mail aus Ihren Kontaktmethoden löschen.`, }, members: {title: 'Mitglieder', findMember: 'Mitglied suchen'}, }, diff --git a/src/languages/en.ts b/src/languages/en.ts index 4eba58e91e09..9eadcf0bc10f 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -7874,7 +7874,13 @@ const translations = { cantRevokeAdminAccess: "Can't revoke admin access from the technical contact", error: { removeAdmin: 'Unable to remove this user as an Admin. Please try again.', + removeDomain: 'Unable to remove this domain. Please try again.', + removeDomainNameInvalid: 'Please enter your domain name to reset it.', }, + resetDomain: 'Reset domain', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Please type ${domainName} to confirm the domain reset.`, + enterDomainName: 'Enter your domain name here', + resetDomainInfo: `This action is permanent and the following data will be deleted:
  • Company card connections and any unreported expenses from those cards
  • SAML and group settings
All accounts, workspaces, reports, expenses, and other data will remain.

Note: You can clear this domain from your domains list by removing the associated email from your contact methods.`, }, members: { title: 'Members', diff --git a/src/languages/es.ts b/src/languages/es.ts index 80e29ddee6c9..743afa41211c 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -8030,7 +8030,15 @@ ${amount} para ${merchant} - ${date}`, addAdminError: 'No se pudo añadir a este miembro como administrador. Por favor, inténtalo de nuevo.', revokeAdminAccess: 'Revocar acceso de administrador', cantRevokeAdminAccess: 'No se puede revocar el acceso de administrador del contacto técnico', - error: {removeAdmin: 'No se pudo eliminar a este usuario como administrador. Por favor, inténtalo de nuevo.'}, + error: { + removeAdmin: 'No se pudo eliminar a este usuario como administrador. Por favor, inténtalo de nuevo.', + removeDomain: 'No se pudo eliminar este dominio. Inténtalo de nuevo.', + removeDomainNameInvalid: 'Introduce el nombre de tu dominio para restablecerlo.', + }, + resetDomain: 'Restablecer dominio', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Escribe ${domainName} para confirmar el restablecimiento del dominio.`, + enterDomainName: 'Introduce aquí tu nombre de dominio', + resetDomainInfo: `Esta acción es permanente y se eliminarán los siguientes datos:
  • Conexiones de tarjeta corporativa y cualquier gasto no reportado de esas tarjetas
  • Configuración de SAML y grupos
Todas las cuentas, espacios de trabajo, informes, gastos y otros datos se conservarán.

Nota: Puedes eliminar este dominio de tu lista de dominios eliminando el correo electrónico asociado de tus métodos de contacto.`, }, members: { title: 'Miembros', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 6d549456652e..86e3c72e1465 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -7955,7 +7955,15 @@ Voici un *reçu test* pour vous montrer comment cela fonctionne :`, addAdminError: 'Impossible d’ajouter ce membre en tant qu’administrateur. Veuillez réessayer.', revokeAdminAccess: 'Révoquer l’accès administrateur', cantRevokeAdminAccess: 'Impossible de révoquer l’accès administrateur au contact technique', - error: {removeAdmin: 'Impossible de supprimer cet utilisateur en tant qu’administrateur. Veuillez réessayer.'}, + error: { + removeAdmin: 'Impossible de supprimer cet utilisateur en tant qu’administrateur. Veuillez réessayer.', + removeDomain: 'Impossible de supprimer ce domaine. Veuillez réessayer.', + removeDomainNameInvalid: 'Veuillez saisir votre nom de domaine pour le réinitialiser.', + }, + resetDomain: 'Réinitialiser le domaine', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Veuillez saisir ${domainName} pour confirmer la réinitialisation du domaine.`, + enterDomainName: 'Saisissez votre nom de domaine ici', + resetDomainInfo: `Cette action est définitive et les données suivantes seront supprimées :
  • Connexions aux cartes d'entreprise et toutes les dépenses non déclarées de ces cartes
  • Paramètres SAML et de groupe
Tous les comptes, espaces de travail, rapports, dépenses et autres données seront conservés.

Remarque : Vous pouvez supprimer ce domaine de votre liste de domaines en retirant l'adresse e-mail associée de vos méthodes de contact.`, }, members: {title: 'Membres', findMember: 'Rechercher un membre'}, }, diff --git a/src/languages/it.ts b/src/languages/it.ts index ed74ff8d04b0..e593f9c6306e 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -7932,7 +7932,15 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`, addAdminError: 'Impossibile aggiungere questo membro come amministratore. Riprova.', revokeAdminAccess: 'Revoca accesso amministratore', cantRevokeAdminAccess: 'Impossibile revocare i privilegi di amministratore dal referente tecnico', - error: {removeAdmin: 'Impossibile rimuovere questo utente come amministratore. Riprova.'}, + error: { + removeAdmin: 'Impossibile rimuovere questo utente come amministratore. Riprova.', + removeDomain: 'Impossibile rimuovere questo dominio. Riprova.', + removeDomainNameInvalid: 'Inserisci il tuo nome di dominio per reimpostarlo.', + }, + resetDomain: 'Reimposta dominio', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Per favore digita ${domainName} per confermare il ripristino del dominio.`, + enterDomainName: 'Inserisci qui il tuo nome di dominio', + resetDomainInfo: `Questa azione è permanente e i seguenti dati verranno eliminati:
  • Connessioni alle carte aziendali e tutte le spese non riportate da tali carte
  • Impostazioni SAML e di gruppo
Tutti gli account, gli spazi di lavoro, i report, le spese e gli altri dati rimarranno.

Nota: puoi rimuovere questo dominio dall'elenco dei tuoi domini eliminando l'email associata dalle tue modalità di contatto.`, }, members: {title: 'Membri', findMember: 'Trova membro'}, }, diff --git a/src/languages/ja.ts b/src/languages/ja.ts index b05c8be8d62a..bddb954ab7f7 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -7871,7 +7871,15 @@ Expensify の使い方をお見せするための*テストレシート*がこ addAdminError: 'このメンバーを管理者として追加できません。もう一度お試しください。', revokeAdminAccess: '管理者アクセスを取り消す', cantRevokeAdminAccess: '技術連絡先から管理者アクセス権を取り消すことはできません', - error: {removeAdmin: 'このユーザーを管理者として削除できません。もう一度お試しください。'}, + error: { + removeAdmin: 'このユーザーを管理者として削除できません。もう一度お試しください。', + removeDomain: 'このドメインを削除できません。もう一度お試しください。', + removeDomainNameInvalid: 'リセットするドメイン名を入力してください。', + }, + resetDomain: 'ドメインをリセット', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `ドメインのリセットを確認するため、${domainName} と入力してください。`, + enterDomainName: 'ここにドメイン名を入力してください', + resetDomainInfo: `この操作は永久的であり、次のデータが削除されます:
  • 会社カードの接続およびそれらのカードからの未報告の経費
  • SAML とグループ設定
すべてのアカウント、ワークスペース、レポート、経費、およびその他のデータは保持されます。

注:関連付けられているメールアドレスを連絡先方法から削除することで、このドメインをドメイン一覧から消去できます。`, }, members: {title: 'メンバー', findMember: 'メンバーを検索'}, }, diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 60de38a79867..a0d62b075fdc 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -7921,7 +7921,15 @@ Hier is een *testbon* om je te laten zien hoe het werkt:`, addAdminError: 'Kan dit lid niet als beheerder toevoegen. Probeer het opnieuw.', revokeAdminAccess: 'Beheerdersrechten intrekken', cantRevokeAdminAccess: 'Kan de beheerdersrechten niet intrekken van de technische contactpersoon', - error: {removeAdmin: 'Kan deze gebruiker niet als beheerder verwijderen. Probeer het opnieuw.'}, + error: { + removeAdmin: 'Kan deze gebruiker niet als beheerder verwijderen. Probeer het opnieuw.', + removeDomain: 'Kan dit domein niet verwijderen. Probeer het opnieuw.', + removeDomainNameInvalid: 'Voer uw domeinnaam in om deze opnieuw in te stellen.', + }, + resetDomain: 'Domein resetten', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Typ hier ${domainName} om het resetten van het domein te bevestigen.`, + enterDomainName: 'Voer hier uw domeinnaam in', + resetDomainInfo: `Deze actie is definitief en de volgende gegevens worden verwijderd:
  • Bedrijfskaartverbindingen en niet-ingediende uitgaven van die kaarten
  • SAML- en groepsinstellingen
Alle accounts, werkruimten, rapporten, uitgaven en andere gegevens blijven behouden.

Opmerking: je kunt dit domein uit je domeinenlijst verwijderen door het gekoppelde e-mailadres uit je contactmethoden te verwijderen.`, }, members: {title: 'Leden', findMember: 'Lid zoeken'}, }, diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 536cec1da2f7..3245d42c7de7 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -7901,7 +7901,15 @@ Oto *paragon testowy*, który pokazuje, jak to działa:`, addAdminError: 'Nie można dodać tego członka jako administratora. Spróbuj ponownie.', revokeAdminAccess: 'Cofnij uprawnienia administratora', cantRevokeAdminAccess: 'Nie można odebrać uprawnień administratora kontaktowi technicznemu', - error: {removeAdmin: 'Nie można usunąć tego użytkownika jako administratora. Spróbuj ponownie.'}, + error: { + removeAdmin: 'Nie można usunąć tego użytkownika jako administratora. Spróbuj ponownie.', + removeDomain: 'Nie można usunąć tej domeny. Spróbuj ponownie.', + removeDomainNameInvalid: 'Wprowadź swoją nazwę domeny, aby ją zresetować.', + }, + resetDomain: 'Resetuj domenę', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Wpisz proszę ${domainName}, aby potwierdzić reset domeny.`, + enterDomainName: 'Wpisz tutaj swoją nazwę domeny', + resetDomainInfo: `Ta akcja jest trwała i następujące dane zostaną usunięte:
  • Połączenia kart firmowych i wszystkie nierozliczone wydatki z tych kart
  • Ustawienia SAML i grup
Wszystkie konta, przestrzenie robocze, raporty, wydatki i inne dane pozostaną bez zmian.

Uwaga: Możesz usunąć tę domenę z listy swoich domen, usuwając powiązany adres e-mail z metod kontaktu.`, }, members: {title: 'Członkowie', findMember: 'Znajdź członka'}, }, diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index f4d070481d45..975d18618b5b 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -7908,7 +7908,15 @@ Aqui está um *recibo de teste* para mostrar como funciona:`, addAdminError: 'Não foi possível adicionar este membro como administrador. Tente novamente.', revokeAdminAccess: 'Revogar acesso de administrador', cantRevokeAdminAccess: 'Não é possível revogar o acesso de administrador do contato técnico', - error: {removeAdmin: 'Não foi possível remover este usuário como Administrador. Tente novamente.'}, + error: { + removeAdmin: 'Não foi possível remover este usuário como Administrador. Tente novamente.', + removeDomain: 'Não foi possível remover este domínio. Tente novamente.', + removeDomainNameInvalid: 'Insira o nome do seu domínio para redefini-lo.', + }, + resetDomain: 'Redefinir domínio', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `Digite ${domainName} para confirmar a redefinição do domínio.`, + enterDomainName: 'Insira seu nome de domínio aqui', + resetDomainInfo: `Esta ação é permanente e os seguintes dados serão excluídos:
  • Conexões de cartão corporativo e quaisquer despesas não reportadas desses cartões
  • Configurações de SAML e de grupo
Todas as contas, workspaces, relatórios, despesas e outros dados permanecerão.

Observação: Você pode remover este domínio da sua lista de domínios excluindo o e-mail associado dos seus métodos de contato.`, }, members: {title: 'Membros', findMember: 'Encontrar membro'}, }, diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index e7c85607477d..4698229cca10 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -7725,7 +7725,11 @@ ${reportName} addAdminError: '无法将此成员添加为管理员。请重试。', revokeAdminAccess: '撤销管理员访问权限', cantRevokeAdminAccess: '无法撤销技术联系人的管理员访问权限', - error: {removeAdmin: '无法将此用户移除管理员角色。请重试。'}, + error: {removeAdmin: '无法将此用户从管理员中移除。请重试。', removeDomain: '无法移除此域名。请重试。', removeDomainNameInvalid: '请输入您的域名以重置。'}, + resetDomain: '重置域名', + resetDomainExplanation: ({domainName}: {domainName?: string}) => `请输入 ${domainName} 以确认重置该域名。`, + enterDomainName: '在此输入您的域名', + resetDomainInfo: `此操作是永久性的,并且以下数据将被删除:
  • 公司卡连接以及这些卡片上所有未报销的费用
  • SAML 和群组设置
所有账户、工作区、报表、费用以及其他数据将会保留。

注意:您可以通过从联系方法中移除关联的邮箱,将此域名从您的域名列表中清除。`, }, members: {title: '成员', findMember: '查找成员'}, }, diff --git a/src/libs/API/parameters/DeleteDomainParams.ts b/src/libs/API/parameters/DeleteDomainParams.ts new file mode 100644 index 000000000000..49a67873820a --- /dev/null +++ b/src/libs/API/parameters/DeleteDomainParams.ts @@ -0,0 +1,6 @@ +type DeleteDomainParams = { + domainAccountID: number; + domainName: string; +}; + +export default DeleteDomainParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index 33efdf52df1f..d8c95fa911cc 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -458,3 +458,4 @@ export type {default as SetPolicyRequireCompanyCardsEnabledParams} from './SetPo export type {default as SetTechnicalContactEmailParams} from './SetTechnicalContactEmailParams'; export type {default as ToggleConsolidatedDomainBillingParams} from './ToggleConsolidatedDomainBillingParams'; export type {default as RemoveDomainAdminParams} from './RemoveDomainAdminParams'; +export type {default as DeleteDomainParams} from './DeleteDomainParams'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index b808473b64bc..092ecce76039 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -534,6 +534,7 @@ const WRITE_COMMANDS = { TOGGLE_CONSOLIDATED_DOMAIN_BILLING: 'ToggleConsolidatedDomainBilling', ADD_DOMAIN_ADMIN: 'AddDomainAdmin', REMOVE_DOMAIN_ADMIN: 'RemoveDomainAdmin', + DELETE_DOMAIN: 'DeleteDomain', } as const; type WriteCommand = ValueOf; @@ -1088,6 +1089,7 @@ type WriteCommandParameters = { [WRITE_COMMANDS.SET_TECHNICAL_CONTACT_EMAIL]: Parameters.SetTechnicalContactEmailParams; [WRITE_COMMANDS.TOGGLE_CONSOLIDATED_DOMAIN_BILLING]: Parameters.ToggleConsolidatedDomainBillingParams; [WRITE_COMMANDS.REMOVE_DOMAIN_ADMIN]: Parameters.RemoveDomainAdminParams; + [WRITE_COMMANDS.DELETE_DOMAIN]: Parameters.DeleteDomainParams; [WRITE_COMMANDS.ADD_DOMAIN_ADMIN]: Parameters.AddAdminToDomainParams; }; diff --git a/src/libs/LoginUtils.ts b/src/libs/LoginUtils.ts index de75b75158ab..a760ca84f50c 100644 --- a/src/libs/LoginUtils.ts +++ b/src/libs/LoginUtils.ts @@ -115,6 +115,10 @@ function formatE164PhoneNumber(phoneNumber: string, countryCode: number) { return parsedPhoneNumber.number?.e164; } +function sanitizePhoneOrEmail(phoneOrEmail: string) { + return phoneOrEmail.replaceAll(CONST.REGEX.WHITESPACE, '').toLowerCase(); +} + export { getPhoneNumberWithoutSpecialChars, appendCountryCode, @@ -127,4 +131,5 @@ export { formatE164PhoneNumber, getEmailDomain, isDomainPublic, + sanitizePhoneOrEmail, }; diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 8e70d3686499..f27cf58031b3 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -811,6 +811,7 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/domain/Admins/DomainAddPrimaryContactPage').default, [SCREENS.DOMAIN.ADD_ADMIN]: () => require('../../../../pages/domain/Admins/DomainAddAdminPage').default, [SCREENS.DOMAIN.MEMBER_DETAILS]: () => require('../../../../pages/domain/Members/DomainMemberDetailsPage').default, + [SCREENS.DOMAIN.RESET_DOMAIN]: () => require('../../../../pages/domain/DomainResetPage').default, }); const TwoFactorAuthenticatorStackNavigator = createModalStackNavigator({ diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts index 5a00d2e990fd..20cb613aa5b1 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/DOMAIN_TO_RHP.ts @@ -5,7 +5,7 @@ import SCREENS from '@src/SCREENS'; const DOMAIN_TO_RHP: Partial> = { [SCREENS.DOMAIN.INITIAL]: [], [SCREENS.DOMAIN.SAML]: [SCREENS.DOMAIN.VERIFY, SCREENS.DOMAIN.VERIFIED], - [SCREENS.DOMAIN.ADMINS]: [SCREENS.DOMAIN.ADMIN_DETAILS, SCREENS.DOMAIN.ADMINS_SETTINGS, SCREENS.DOMAIN.ADD_PRIMARY_CONTACT, SCREENS.DOMAIN.ADD_ADMIN], + [SCREENS.DOMAIN.ADMINS]: [SCREENS.DOMAIN.ADMIN_DETAILS, SCREENS.DOMAIN.ADMINS_SETTINGS, SCREENS.DOMAIN.ADD_PRIMARY_CONTACT, SCREENS.DOMAIN.ADD_ADMIN, SCREENS.DOMAIN.RESET_DOMAIN], [SCREENS.DOMAIN.MEMBERS]: [SCREENS.DOMAIN.MEMBER_DETAILS], }; diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 5dee953b2270..adb3dd96ca6e 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1159,6 +1159,9 @@ const config: LinkingOptions['config'] = { [SCREENS.DOMAIN.MEMBER_DETAILS]: { path: ROUTES.DOMAIN_MEMBER_DETAILS.route, }, + [SCREENS.DOMAIN.RESET_DOMAIN]: { + path: ROUTES.DOMAIN_RESET_DOMAIN.route, + }, }, }, [SCREENS.RIGHT_MODAL.TWO_FACTOR_AUTH]: { diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index 7854b8717bcd..a3ea51f2f607 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -2523,6 +2523,10 @@ type DomainSplitNavigatorParamList = { [SCREENS.DOMAIN.MEMBERS]: { domainAccountID: number; }; + [SCREENS.DOMAIN.RESET_DOMAIN]: { + domainAccountID: number; + accountID: number; + }; }; type OnboardingModalNavigatorParamList = { diff --git a/src/libs/StringUtils/index.ts b/src/libs/StringUtils/index.ts index c79a8b765f1e..80bffc7e21ba 100644 --- a/src/libs/StringUtils/index.ts +++ b/src/libs/StringUtils/index.ts @@ -106,7 +106,7 @@ function normalizeAccents(text: string) { function normalize(text: string): string { return removeInvisibleCharacters(text) .replaceAll(/[\u00A0\u1680\u2000-\u200A\u202F\u205F\u3000]/g, ' ') // space-like -> ' ' - .replaceAll(/\s+/g, ' ') // collapse spaces + .replaceAll(CONST.REGEX.WHITESPACE, ' ') // collapse spaces .trim(); } diff --git a/src/libs/actions/Domain.ts b/src/libs/actions/Domain.ts index ea7268e5d114..00c2da4b3f23 100644 --- a/src/libs/actions/Domain.ts +++ b/src/libs/actions/Domain.ts @@ -1,11 +1,12 @@ import Onyx from 'react-native-onyx'; import type {OnyxUpdate} from 'react-native-onyx'; import * as API from '@libs/API'; -import type {AddAdminToDomainParams, RemoveDomainAdminParams, SetTechnicalContactEmailParams, ToggleConsolidatedDomainBillingParams} from '@libs/API/parameters'; +import type {AddAdminToDomainParams, DeleteDomainParams, RemoveDomainAdminParams, SetTechnicalContactEmailParams, ToggleConsolidatedDomainBillingParams} from '@libs/API/parameters'; import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import type {Domain} from '@src/types/onyx'; import type PrefixedRecord from '@src/types/utils/PrefixedRecord'; import type {ScimTokenWithState} from './ScimToken/ScimTokenUtils'; import {ScimTokenState} from './ScimToken/ScimTokenUtils'; @@ -622,6 +623,12 @@ function addAdminToDomain(domainAccountID: number, accountID: number, targetEmai * Removes an error and pending actions after trying to add admin */ function clearAdminError(domainAccountID: number, accountID: number) { + const PERMISSION_KEY = `${CONST.DOMAIN.EXPENSIFY_ADMIN_ACCESS_PREFIX}${accountID}`; + + Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, { + [PERMISSION_KEY]: null, + }); + Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, { adminErrors: { [accountID]: null, @@ -695,6 +702,82 @@ function revokeDomainAdminAccess(domainAccountID: number, accountID: number) { API.write(WRITE_COMMANDS.REMOVE_DOMAIN_ADMIN, parameters, {optimisticData, successData, failureData}); } +/** + * Removes the domain + */ +function resetDomain(domainAccountID: number, domainName: string, domain: Domain) { + const optimisticData: OnyxUpdate[] = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, + value: { + pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, + }, + }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, + value: null, + }, + ]; + const successData: OnyxUpdate[] = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, + value: { + pendingAction: null, + }, + }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, + value: { + errors: null, + }, + }, + ]; + const failureData: OnyxUpdate[] = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, + value: domain, + }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, + value: { + pendingAction: null, + }, + }, + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, + value: { + errors: getMicroSecondOnyxErrorWithTranslationKey('domain.admins.error.removeDomain'), + }, + }, + ]; + + const parameters: DeleteDomainParams = { + domainAccountID, + domainName, + }; + + API.write(WRITE_COMMANDS.DELETE_DOMAIN, parameters, {optimisticData, successData, failureData}); +} + +/** + * Clears errors after trying to reset domain + */ +function clearDomainErrors(domainAccountID: number) { + Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, { + errors: null, + }); + Onyx.merge(`${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, { + pendingAction: null, + }); +} + export { getDomainValidationCode, validateDomain, @@ -716,4 +799,6 @@ export { addAdminToDomain, clearAdminError, revokeDomainAdminAccess, + resetDomain, + clearDomainErrors, }; diff --git a/src/pages/domain/Admins/DomainAdminDetailsPage.tsx b/src/pages/domain/Admins/DomainAdminDetailsPage.tsx index a36c705c946f..eacb2df24358 100644 --- a/src/pages/domain/Admins/DomainAdminDetailsPage.tsx +++ b/src/pages/domain/Admins/DomainAdminDetailsPage.tsx @@ -15,6 +15,7 @@ import type {SettingsNavigatorParamList} from '@navigation/types'; import BaseDomainMemberDetailsComponent from '@pages/domain/BaseDomainMemberDetailsComponent'; import {revokeDomainAdminAccess} from '@userActions/Domain'; import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import type {PersonalDetailsList} from '@src/types/onyx'; @@ -72,6 +73,14 @@ function DomainAdminDetailsPage({route}: DomainAdminDetailsPageProps) { domainAccountID={domainAccountID} accountID={accountID} > + {domainHasOnlyOneAdmin && ( + Navigation.navigate(ROUTES.DOMAIN_RESET_DOMAIN.getRoute(domainAccountID, accountID))} + /> + )} {!domainHasOnlyOneAdmin && ( { diff --git a/src/pages/domain/DomainResetPage.tsx b/src/pages/domain/DomainResetPage.tsx new file mode 100644 index 000000000000..260f2bf9d63f --- /dev/null +++ b/src/pages/domain/DomainResetPage.tsx @@ -0,0 +1,127 @@ +import React, {useEffect} from 'react'; +import {View} from 'react-native'; +import FormProvider from '@components/Form/FormProvider'; +import InputWrapper from '@components/Form/InputWrapper'; +import type {FormOnyxValues} from '@components/Form/types'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import RenderHTML from '@components/RenderHTML'; +import ScreenWrapper from '@components/ScreenWrapper'; +import TextInput from '@components/TextInput'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useThemeStyles from '@hooks/useThemeStyles'; +import Log from '@libs/Log'; +import {sanitizePhoneOrEmail} from '@libs/LoginUtils'; +import {getFieldRequiredErrors} from '@libs/ValidationUtils'; +import Navigation from '@navigation/Navigation'; +import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types'; +import type {DomainSplitNavigatorParamList} from '@navigation/types'; +import {resetDomain} from '@userActions/Domain'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import type SCREENS from '@src/SCREENS'; +import {adminAccountIDsSelector, domainNameSelector} from '@src/selectors/Domain'; +import INPUT_IDS from '@src/types/form/ResetDomainForm'; +import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; + +type DomainResetDomainPageProps = PlatformStackScreenProps; + +function DomainResetDomainPage({route}: DomainResetDomainPageProps) { + const {domainAccountID, accountID} = route.params; + + const {translate} = useLocalize(); + const styles = useThemeStyles(); + + const [domain, domainMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${route.params.domainAccountID}`, {canBeMissing: true}); + + // Selectors used this way bc when useOnyx with it the metadata is wrong + we're already have domain data here + const domainName = domainNameSelector(domain); + const adminAccountIDs = adminAccountIDsSelector(domain); + const domainHasOnlyOneAdmin = adminAccountIDs?.length === 1; + const isLoadingDomain = isLoadingOnyxValue(domainMetadata); + + useEffect(() => { + // Make sure reset domain page cannot be accessed if there is more than 1 admin + if (isLoadingDomain || domainHasOnlyOneAdmin) { + return; + } + Navigation.goBack(ROUTES.DOMAIN_ADMIN_DETAILS.getRoute(domainAccountID, accountID)); + }, [accountID, domainAccountID, domainHasOnlyOneAdmin, isLoadingDomain]); + + const missingDomainData = !domain || !domainName; + const isSubmitDisabled = missingDomainData || !domainHasOnlyOneAdmin; + + const handleResetDomain = () => { + if (isSubmitDisabled) { + Log.hmmm('Domain data is missing or there are more than 1 admin left'); + return; + } + resetDomain(route.params.domainAccountID, domainName, domain); + Navigation.goBack(ROUTES.WORKSPACES_LIST.route); + }; + + const validate = (values: FormOnyxValues) => { + const errors = getFieldRequiredErrors(values, ['domainName']); + + if (values.domainName && domainName) { + const isValid = sanitizePhoneOrEmail(domainName) === sanitizePhoneOrEmail(values.domainName); + + if (!isValid) { + errors.domainName = translate('domain.admins.error.removeDomainNameInvalid'); + } + } + + return errors; + }; + + return ( + + Navigation.goBack()} + /> + + + + + Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(Navigation.getActiveRoute()))} + /> + + + + + + + + + ); +} + +export default DomainResetDomainPage; diff --git a/src/pages/settings/Security/CloseAccountPage.tsx b/src/pages/settings/Security/CloseAccountPage.tsx index db99fe85ccba..a9113ffc59bf 100644 --- a/src/pages/settings/Security/CloseAccountPage.tsx +++ b/src/pages/settings/Security/CloseAccountPage.tsx @@ -13,7 +13,7 @@ import TextInput from '@components/TextInput'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; -import {formatE164PhoneNumber, getPhoneNumberWithoutSpecialChars} from '@libs/LoginUtils'; +import {formatE164PhoneNumber, getPhoneNumberWithoutSpecialChars, sanitizePhoneOrEmail} from '@libs/LoginUtils'; import Navigation from '@libs/Navigation/Navigation'; import {getFieldRequiredErrors} from '@libs/ValidationUtils'; import variables from '@styles/variables'; @@ -57,13 +57,6 @@ function CloseAccountPage() { const userEmailOrPhone = session?.email ? formatPhoneNumber(session.email) : null; - /** - * Removes spaces and transform the input string to lowercase. - * @param phoneOrEmail - The input string to be sanitized. - * @returns The sanitized string - */ - const sanitizePhoneOrEmail = (phoneOrEmail: string): string => phoneOrEmail.replaceAll(/\s+/g, '').toLowerCase(); - const validate = (values: FormOnyxValues): FormInputErrors => { const errors = getFieldRequiredErrors(values, ['phoneOrEmail']); diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx index a6e8e5f107df..70c9d4781672 100755 --- a/src/pages/workspace/WorkspacesListPage.tsx +++ b/src/pages/workspace/WorkspacesListPage.tsx @@ -150,6 +150,7 @@ function WorkspacesListPage() { const [reimbursementAccountError] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {canBeMissing: true, selector: reimbursementAccountErrorSelector}); const [allDomains] = useOnyx(ONYXKEYS.COLLECTION.DOMAIN, {canBeMissing: false}); + const [allDomainErrors] = useOnyx(ONYXKEYS.COLLECTION.DOMAIN_ERRORS, {canBeMissing: true}); const [adminAccess] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_ADMIN_ACCESS, {canBeMissing: false}); const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID, {canBeMissing: true}); @@ -610,7 +611,6 @@ function WorkspacesListPage() { if (!domain || !domain.accountID || !domain.email) { return domainItems; } - const isAdmin = !!adminAccess?.[`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_ADMIN_ACCESS}${domain.accountID}`]; domainItems.push({ listItemType: 'domain', @@ -620,11 +620,12 @@ function WorkspacesListPage() { isAdmin, isValidated: domain.validated, pendingAction: domain.pendingAction, + errors: allDomainErrors?.[`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domain.accountID}`]?.errors, }); return domainItems; }, []); - }, [navigateToDomain, allDomains, adminAccess]); + }, [allDomains, allDomainErrors, adminAccess, navigateToDomain]); useEffect(() => { const duplicatedWSPolicyID = duplicateWorkspace?.policyID; diff --git a/src/types/form/ResetDomainForm.ts b/src/types/form/ResetDomainForm.ts new file mode 100644 index 000000000000..faac22b333f2 --- /dev/null +++ b/src/types/form/ResetDomainForm.ts @@ -0,0 +1,18 @@ +import type {ValueOf} from 'type-fest'; +import type Form from './Form'; + +const INPUT_IDS = { + DOMAIN_NAME: 'domainName', +} as const; + +type InputID = ValueOf; + +type ResetDomainForm = Form< + InputID, + { + [INPUT_IDS.DOMAIN_NAME]: string; + } +>; + +export type {ResetDomainForm}; +export default INPUT_IDS; diff --git a/src/types/form/index.ts b/src/types/form/index.ts index 41ab635811d3..cfb5cb4a795b 100644 --- a/src/types/form/index.ts +++ b/src/types/form/index.ts @@ -101,3 +101,4 @@ export type {EnableGlobalReimbursementsForm} from './EnableGlobalReimbursementsF export type {EnterSignerInfoForm} from './EnterSignerInfoForm'; export type {CreateDomainForm} from './CreateDomainForm'; export type {SplitExpenseEditDateForm} from './SplitExpenseEditDateForm'; +export type {ResetDomainForm} from './ResetDomainForm'; diff --git a/src/types/onyx/DomainErrors.ts b/src/types/onyx/DomainErrors.ts index 8d60af4ab8b3..26645c35ad8e 100644 --- a/src/types/onyx/DomainErrors.ts +++ b/src/types/onyx/DomainErrors.ts @@ -28,6 +28,6 @@ type DomainErrors = { * Errors related to the "use technical contact billing card" setting */ useTechnicalContactBillingCardErrors?: OnyxCommon.Errors; -}; +} & GeneralDomainAdminErrors; export default DomainErrors; diff --git a/src/types/onyx/DomainPendingActions.ts b/src/types/onyx/DomainPendingActions.ts index fda27e5a1cf4..b59ff7e638f4 100644 --- a/src/types/onyx/DomainPendingActions.ts +++ b/src/types/onyx/DomainPendingActions.ts @@ -29,6 +29,11 @@ type DomainPendingAction = { * Pending action for the "use technical contact billing card" setting */ useTechnicalContactBillingCard?: OnyxCommon.PendingAction; + + /** + * Pending action for the domain itself + */ + pendingAction?: OnyxCommon.PendingAction; }; export default DomainPendingAction; diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts index f984caf83a36..4e2e544aceb4 100644 --- a/tests/actions/DomainTest.ts +++ b/tests/actions/DomainTest.ts @@ -1,10 +1,11 @@ import Onyx from 'react-native-onyx'; -import {createDomain, resetCreateDomainForm} from '@libs/actions/Domain'; +import {clearDomainErrors, createDomain, resetCreateDomainForm, resetDomain} from '@libs/actions/Domain'; import {WRITE_COMMANDS} from '@libs/API/types'; import CONST from '@src/CONST'; import IntlStore from '@src/languages/IntlStore'; import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager'; import ONYXKEYS from '@src/ONYXKEYS'; +import type {Domain} from '@src/types/onyx'; import * as TestHelper from '../utils/TestHelper'; import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; @@ -21,7 +22,7 @@ describe('actions/Domain', () => { return Onyx.clear().then(waitForBatchedUpdates); }); - describe('createDomain', () => { + it('createDomain', () => { const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve()); createDomain('test.com'); @@ -38,25 +39,82 @@ describe('actions/Domain', () => { apiWriteSpy.mockRestore(); }); - describe('resetCreateDomainForm', () => { - it('clears form onyx data', async () => { - const timestamp = 123; - - await Onyx.set(ONYXKEYS.FORMS.CREATE_DOMAIN_FORM, { - hasCreationSucceeded: true, - errors: {[timestamp]: 'error'}, - }); - - resetCreateDomainForm(); - - await TestHelper.getOnyxData({ - key: ONYXKEYS.FORMS.CREATE_DOMAIN_FORM, - waitForCollectionCallback: false, - callback: (form) => { - expect(form?.hasCreationSucceeded).toBeFalsy(); - expect(form?.errors).toBeFalsy(); - }, - }); + it('resetCreateDomainForm - clears form onyx data', async () => { + const timestamp = 123; + + await Onyx.set(ONYXKEYS.FORMS.CREATE_DOMAIN_FORM, { + hasCreationSucceeded: true, + errors: {[timestamp]: 'error'}, + }); + + resetCreateDomainForm(); + + await TestHelper.getOnyxData({ + key: ONYXKEYS.FORMS.CREATE_DOMAIN_FORM, + waitForCollectionCallback: false, + callback: (form) => { + expect(form?.hasCreationSucceeded).toBeFalsy(); + expect(form?.errors).toBeFalsy(); + }, + }); + }); + + it('resetDomain', () => { + const apiWriteSpy = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve()); + const domainAccountID = 123; + const domainName = 'test.com'; + const domain = { + accountID: domainAccountID, + } as Domain; + + resetDomain(domainAccountID, domainName, domain); + + expect(apiWriteSpy).toHaveBeenCalledWith( + WRITE_COMMANDS.DELETE_DOMAIN, + {domainAccountID, domainName}, + { + optimisticData: [expect.objectContaining({value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}}), expect.objectContaining({value: null})], + successData: [expect.objectContaining({value: {pendingAction: null}}), expect.objectContaining({value: {errors: null}})], + failureData: [ + expect.objectContaining({value: domain}), + expect.objectContaining({value: {pendingAction: null}}), + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + expect.objectContaining({value: {errors: expect.any(Object)}}), + ], + }, + ); + + apiWriteSpy.mockRestore(); + }); + + it('clearDomainErrors- clears domain errors and pending actions', async () => { + const domainAccountID = 123; + const timestamp = 456; + + await Onyx.set(`${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}` as const, { + errors: {[timestamp]: 'error'}, + }); + + await Onyx.set(`${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}` as const, { + pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, + }); + + clearDomainErrors(domainAccountID); + + await TestHelper.getOnyxData({ + key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, + waitForCollectionCallback: false, + callback: (errors) => { + expect(errors?.errors).toBeFalsy(); + }, + }); + + await TestHelper.getOnyxData({ + key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, + waitForCollectionCallback: false, + callback: (pendingActions) => { + expect(pendingActions?.pendingAction).toBeFalsy(); + }, }); }); }); diff --git a/tests/unit/CloseAccountPageTest.ts b/tests/unit/CloseAccountPageTest.ts index 4f012793c82a..8ee549ea7dee 100644 --- a/tests/unit/CloseAccountPageTest.ts +++ b/tests/unit/CloseAccountPageTest.ts @@ -1,9 +1,7 @@ import {Str} from 'expensify-common'; -import {formatE164PhoneNumber, getPhoneNumberWithoutSpecialChars} from '@libs/LoginUtils'; +import {formatE164PhoneNumber, getPhoneNumberWithoutSpecialChars, sanitizePhoneOrEmail} from '@libs/LoginUtils'; import CONST from '@src/CONST'; -const sanitizePhoneOrEmail = (value: string) => value.replaceAll(/\s/g, '').toLowerCase(); - const validatePhoneOrEmail = (inputValue: string, storedValue: string, translate: (key: string) => string, countryCode?: number) => { const errors: {phoneOrEmail?: string} = {}; diff --git a/tests/unit/LoginUtilsTest.ts b/tests/unit/LoginUtilsTest.ts index d43f3786d86d..6fdf6bc377c7 100644 --- a/tests/unit/LoginUtilsTest.ts +++ b/tests/unit/LoginUtilsTest.ts @@ -1,5 +1,14 @@ import Onyx from 'react-native-onyx'; -import {appendCountryCode, getEmailDomain, getPhoneLogin, getPhoneNumberWithoutSpecialChars, isDomainPublic, isEmailPublicDomain, validateNumber} from '@libs/LoginUtils'; +import { + appendCountryCode, + getEmailDomain, + getPhoneLogin, + getPhoneNumberWithoutSpecialChars, + isDomainPublic, + isEmailPublicDomain, + sanitizePhoneOrEmail, + validateNumber, +} from '@libs/LoginUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; @@ -154,4 +163,39 @@ describe('LoginUtils', () => { expect(getEmailDomain('user.name@example.com')).toBe('example.com'); }); }); + + describe('sanitizePhoneOrEmail', () => { + it.each([ + ['email without spaces', 'test@example.com', 'test@example.com'], + ['email with spaces', 'test @example. com', 'test@example.com'], + ['email with multiple spaces', 'test @ example . com', 'test@example.com'], + ['email with tabs and spaces', 'test\t@ example .com', 'test@example.com'], + ['email with uppercase', 'Test@Example.COM', 'test@example.com'], + ['email with spaces and uppercase', 'Test @Example. COM', 'test@example.com'], + ])('Should sanitize email - %s', (_description, input, expected) => { + expect(sanitizePhoneOrEmail(input)).toBe(expected); + }); + + it.each([ + ['phone without spaces', '+12345678901', '+12345678901'], + ['phone with spaces', '+1 234 567 8901', '+12345678901'], + ['phone with multiple spaces', '+1 234 567 8901', '+12345678901'], + ['phone with tabs', '+1\t234\t567\t8901', '+12345678901'], + ['phone with mixed whitespace', '+1 234\t567 8901', '+12345678901'], + ])('Should sanitize phone number - %s', (_description, input, expected) => { + expect(sanitizePhoneOrEmail(input)).toBe(expected); + }); + + it.each([ + ['empty string', '', ''], + ['string with only spaces', ' ', ''], + ['string with only tabs', '\t\t\t', ''], + ['string with mixed whitespace', ' \t \t ', ''], + ['email with newlines', 'test\n@example.\ncom', 'test@example.com'], + ['phone with newlines', '+1\n234\n567\n8901', '+12345678901'], + ['mixed newlines and spaces', 'test \n @example. \n com', 'test@example.com'], + ])('Should handle edge cases - %s', (_description, input, expected) => { + expect(sanitizePhoneOrEmail(input)).toBe(expected); + }); + }); });