From 96957e8f5e3b4036cd39fad4f120ea7203d7a843 Mon Sep 17 00:00:00 2001 From: Vladimir Khvan Date: Fri, 21 Jun 2024 15:12:15 +0500 Subject: [PATCH] Web: Client: Data Import: translate NoEmailUsersBlock to ts --- .../data-import/components/AddEmailsStep/index.tsx | 6 +----- .../{NoEmailUsersBlock.js => NoEmailUsersBlock.tsx} | 13 +++---------- .../categories/data-import/types/index.ts | 5 +++++ 3 files changed, 9 insertions(+), 15 deletions(-) rename packages/client/src/pages/PortalSettings/categories/data-import/sub-components/{NoEmailUsersBlock.js => NoEmailUsersBlock.tsx} (82%) diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/index.tsx b/packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/index.tsx index 1f1ec79f02..88ac6bb26b 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/index.tsx +++ b/packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/index.tsx @@ -127,11 +127,7 @@ const AddEmailsStep = (props: AddEmailsStepProps) => { return ( {users.withoutEmail.length > 0 && ( - + )} {users.withoutEmail.length > 0 ? ( diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/NoEmailUsersBlock.js b/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/NoEmailUsersBlock.tsx similarity index 82% rename from packages/client/src/pages/PortalSettings/categories/data-import/sub-components/NoEmailUsersBlock.js rename to packages/client/src/pages/PortalSettings/categories/data-import/sub-components/NoEmailUsersBlock.tsx index 71f8554ca7..85526effd1 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/NoEmailUsersBlock.js +++ b/packages/client/src/pages/PortalSettings/categories/data-import/sub-components/NoEmailUsersBlock.tsx @@ -24,23 +24,16 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -import React from "react"; import { Trans } from "react-i18next"; +import { NoEmailUsersProps } from "../types"; -export const NoEmailUsersBlock = ({ t, users, isCurrentStep }) => { - return isCurrentStep ? ( +export const NoEmailUsersBlock = ({ t, users }: NoEmailUsersProps) => { + return (

We found {{ users }} users without emails. You can fill their emails or continue without this action.

- ) : ( -

- - We found {{ users }} users without emails. You can add necessary - data to their accounts on the next step. - -

); }; diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/types/index.ts b/packages/client/src/pages/PortalSettings/categories/data-import/types/index.ts index 95e7e93b05..d4e5d0f6f8 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-import/types/index.ts +++ b/packages/client/src/pages/PortalSettings/categories/data-import/types/index.ts @@ -400,3 +400,8 @@ export interface ImportSectionProps { exportSection: Omit; importSection: Omit; } + +export interface NoEmailUsersProps { + t: TFunciton; + users: number; +}