diff --git a/packages/client/src/pages/Bonus/sub-components/OfficialDocumentation.js b/packages/client/src/pages/Bonus/sub-components/OfficialDocumentation.js index 77ce2661ab..8e77e20437 100644 --- a/packages/client/src/pages/Bonus/sub-components/OfficialDocumentation.js +++ b/packages/client/src/pages/Bonus/sub-components/OfficialDocumentation.js @@ -37,9 +37,9 @@ const OfficialDocumentation = ({ dataBackupUrl }) => { const { t } = useTranslation("PaymentsEnterprise"); const dockerLink = - "https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-docker.aspx"; + "https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-script.aspx"; const linuxDocker = - "https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-linux.aspx"; + "https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-script.aspx"; const windowsDocker = "https://helpcenter.onlyoffice.com/installation/docspace-enterprise-install-windows.aspx"; diff --git a/packages/client/src/pages/Confirm/sub-components/LanguageCombobox.tsx b/packages/client/src/pages/Confirm/sub-components/LanguageCombobox.tsx index e69c84a573..0379f3104c 100644 --- a/packages/client/src/pages/Confirm/sub-components/LanguageCombobox.tsx +++ b/packages/client/src/pages/Confirm/sub-components/LanguageCombobox.tsx @@ -55,7 +55,7 @@ const LanguageComboboxWrapper = (props: TLanguageCombobox) => { onSelectLanguage={onLanguageSelect} cultures={cultures} selectedCulture={currentCultureName} - withBorder={false} + withBorder={!isMobileView} /> ); }; diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js index 0db86fc8c9..560928f164 100644 --- a/packages/client/src/pages/Confirm/sub-components/createUser.js +++ b/packages/client/src/pages/Confirm/sub-components/createUser.js @@ -320,7 +320,9 @@ const CreateUserForm = (props) => { culture: currentCultureName, }; - signupOAuth(signupAccount) + const confirmKey = linkData.confirmHeader; + + signupOAuth(signupAccount, confirmKey) .then(() => { const url = roomData.roomId ? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}/` diff --git a/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js b/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js index f8ba2d2ee6..45c74f06fc 100644 --- a/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js +++ b/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js @@ -605,6 +605,7 @@ const PeopleTableRow = (props) => { onClick={onEmailClick} isTextOverflow dir="auto" + enableUserSelect > {email} diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js b/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js index 76b188ceb9..2e65b2b9eb 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js @@ -379,6 +379,7 @@ class FilesTableHeader extends React.Component { columnInfoPanelStorageName, sortBy, sortOrder, + isRecentTab, }); } else { this.state = { @@ -388,6 +389,7 @@ class FilesTableHeader extends React.Component { columnInfoPanelStorageName, sortBy, sortOrder, + isRecentTab, }; } }; @@ -447,7 +449,7 @@ class FilesTableHeader extends React.Component { isTrashFolder !== prevProps.isTrashFolder || columnStorageName !== prevProps.columnStorageName || columnInfoPanelStorageName !== prevProps.columnInfoPanelStorageName || - isRecentTab !== prevProps.isRecentTab || + isRecentTab !== this.state.isRecentTab || showStorageInfo !== prevProps.showStorageInfo || sortBy !== this.state.sortBy || sortOrder !== this.state.sortOrder diff --git a/packages/login/src/components/LanguageCombobox/index.tsx b/packages/login/src/components/LanguageCombobox/index.tsx index aff0a09439..723bc795f1 100644 --- a/packages/login/src/components/LanguageCombobox/index.tsx +++ b/packages/login/src/components/LanguageCombobox/index.tsx @@ -70,7 +70,7 @@ const LanguageComboboxWrapper = () => { onSelectLanguage={onLanguageSelect} cultures={cultures} selectedCulture={currentCulture} - withBorder={false} + withBorder={!isMobileView} isMobileView={isMobileView} /> ); diff --git a/packages/shared/api/people/index.ts b/packages/shared/api/people/index.ts index b64cfcf53f..2a994e3f1c 100644 --- a/packages/shared/api/people/index.ts +++ b/packages/shared/api/people/index.ts @@ -346,12 +346,16 @@ export function linkOAuth(serializedProfile) { }); } -export function signupOAuth(signupAccount) { - return request({ +export function signupOAuth(signupAccount, confirmKey = null) { + const options = { method: "post", url: "people/thirdparty/signup", data: signupAccount, - }); + }; + + if (confirmKey) options.headers = { confirm: confirmKey }; + + return request(options); } export function unlinkOAuth(provider) {