diff --git a/package.json b/package.json index 3c43f535f9..1fc7c94ee9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "docspace", - "version": "1.2.0", + "version": "1.0.0", "private": true, "workspaces": { "packages": [ @@ -8,7 +8,7 @@ ] }, "engines": { - "node": ">=14", + "node": ">=18", "yarn": ">=3" }, "scripts": { diff --git a/packages/client/package.json b/packages/client/package.json index 4f85b0b06f..92606fea0c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@docspace/client", - "version": "1.2.0", + "version": "1.0.0", "private": true, "homepage": "", "scripts": { diff --git a/packages/client/public/locales/en/Settings.json b/packages/client/public/locales/en/Settings.json index 6a2076a12e..2743ab88d9 100644 --- a/packages/client/public/locales/en/Settings.json +++ b/packages/client/public/locales/en/Settings.json @@ -123,7 +123,6 @@ "NewColorScheme": "New color scheme", "PasswordMinLenght": "Minimal password length", "Path": "Path", - "Payments": "Payments", "PleaseNote": "Please note", "PleaseNoteDescription": "<0>{{pleaseNote}}: your old space address will become available to new users once you click the <2>{{save}} button.", "Plugins": "Plugins", diff --git a/packages/client/public/locales/ru/Settings.json b/packages/client/public/locales/ru/Settings.json index 2444cbda67..c6a5d7c77e 100644 --- a/packages/client/public/locales/ru/Settings.json +++ b/packages/client/public/locales/ru/Settings.json @@ -122,7 +122,6 @@ "NewColorScheme": "Новая цветовая схема", "PasswordMinLenght": "Минимальная длина пароля", "Path": "Путь", - "Payments": "Платежи", "PleaseNote": "Пожалуйста, обратите внимание", "PleaseNoteDescription": "<0>{{pleaseNote}}: ваш старый адрес портала станет доступен для новых пользователей, как только вы нажмете кнопку <2>{{save}}.", "Plugins": "Плагины", diff --git a/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js b/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js index 3781f9d9f4..89a71298b9 100644 --- a/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js +++ b/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js @@ -52,7 +52,7 @@ const getTreeItems = (data, path, t) => { case "PortalDeletion": return t("PortalDeletion"); case "Payments": - return t("Payments"); + return t("Common:PaymentsTitle"); case "SingleSignOn": return t("SingleSignOn"); case "DeveloperTools": @@ -223,7 +223,7 @@ class ArticleBodyContent extends React.Component { case "Backup": return t("Backup"); case "Payments": - return t("Payments"); + return t("Common:PaymentsTitle"); case "ManagementCategoryDataManagement": return t("ManagementCategoryDataManagement"); case "RestoreBackup": diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js index 108a03fe5f..80e0de38ec 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js @@ -23,7 +23,7 @@ import { } from "SRC_DIR/components/dialogs"; import { StyledWrapper, StyledInfo } from "./styled-main-profile"; -import { HelpButton } from "@docspace/components"; +import { HelpButton, Tooltip } from "@docspace/components"; const MainProfile = (props) => { const { t } = useTranslation(["Profile", "Common"]); @@ -93,12 +93,24 @@ const MainProfile = (props) => {
{profile.email} + {withActivationBar && ( + ( + {dataTip} + )} + effect="float" + place="bottom" + /> + )} (l.Value.Light, l.Value.Dark)); }