From c1f7a0f8808da36990919ed7da64286f4233a80a Mon Sep 17 00:00:00 2001
From: Viktor Fomin <viktor.fomin@onlyoffice.com>
Date: Thu, 31 Mar 2022 00:40:39 +0300
Subject: [PATCH] Web: Client: Settings: fix

---
 .../src/components/pages/Settings/index.js       |  7 +------
 .../pages/Settings/utils/settingsTree.js         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/web/ASC.Web.Client/src/components/pages/Settings/index.js b/web/ASC.Web.Client/src/components/pages/Settings/index.js
index 6f9b43048b..cf1ed143fd 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/index.js
@@ -4,7 +4,6 @@ import { withRouter } from "react-router";
 import Layout from "./Layout";
 import { combineUrl } from "@appserver/common/utils";
 import AppServerConfig from "@appserver/common/constants/AppServerConfig";
-import { isMobile } from "react-device-detect";
 
 const SecuritySettings = lazy(() => import("./categories/security/index.js"));
 const Admins = lazy(() =>
@@ -96,11 +95,7 @@ const Settings = () => {
           /> */}
           <Route exact path={SECURITY_URLS} component={SecuritySettings} />
           <Route path={ADMINS_URL} component={Admins} />
-          <Route
-            exact
-            path={TFA_PAGE_URL}
-            component={isMobile ? TfaPage : SecuritySettings}
-          />
+          <Route exact path={TFA_PAGE_URL} component={TfaPage} />
 
           <Route exact path={THIRD_PARTY_URL} component={ThirdPartyServices} />
           <Route
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js b/web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
index 69f78cdedb..c82ea0ca98 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
@@ -55,30 +55,30 @@ export const settingsTree = [
       {
         key: "1-0",
         icon: "",
-        link: "access-rights",
-        tKey: "AccessRights",
+        link: "access-portal",
+        tKey: "PortalAccess",
         isCategory: true,
         children: [
           {
             key: "1-0-0",
             icon: "",
-            link: "admins",
-            tKey: "Admins",
+            link: "tfa",
+            tKey: "TwoFactorAuth",
           },
         ],
       },
       {
         key: "1-1",
         icon: "",
-        link: "access-portal",
-        tKey: "PortalAccess",
+        link: "access-rights",
+        tKey: "AccessRights",
         isCategory: true,
         children: [
           {
             key: "1-1-0",
             icon: "",
-            link: "tfa",
-            tKey: "TwoFactorAuth",
+            link: "admins",
+            tKey: "Admins",
           },
         ],
       },