From 6d0dd000521d64bdd21836c8cd5017fc2de30030 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <timofey.boyko@onlyoffice.com>
Date: Thu, 8 Feb 2024 12:58:28 +0300
Subject: [PATCH] Fix after merge 'develop'

---
 .../OAuth/sub-components/List/TableView/index.tsx     | 11 +++++++++--
 .../sub-components/TableView/index.tsx                | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/TableView/index.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/TableView/index.tsx
index 3263173a7b..46f95759f0 100644
--- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/TableView/index.tsx
+++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/TableView/index.tsx
@@ -12,6 +12,7 @@ import Header from "./Header";
 
 import { TableViewProps } from "./TableView.types";
 import { TableWrapper } from "./TableView.styled";
+import { UserStore } from "@docspace/shared/store/UserStore";
 
 const TABLE_VERSION = "1";
 const COLUMNS_SIZE = `oauthConfigColumnsSize_ver-${TABLE_VERSION}`;
@@ -139,8 +140,14 @@ const TableView = ({
 };
 
 export default inject(
-  ({ auth, oauthStore }: { auth: any; oauthStore: OAuthStoreProps }) => {
-    const { id: userId } = auth.userStore.user;
+  ({
+    userStore,
+    oauthStore,
+  }: {
+    userStore: UserStore;
+    oauthStore: OAuthStoreProps;
+  }) => {
+    const userId = userStore.user?.id;
 
     const {
       viewAs,
diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/TableView/index.tsx b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/TableView/index.tsx
index 944ea78cbd..b7243dafd4 100644
--- a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/TableView/index.tsx
+++ b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/TableView/index.tsx
@@ -10,6 +10,7 @@ import Header from "./Header";
 
 import { TableViewProps } from "./TableView.types";
 import { TableWrapper } from "./TableView.styled";
+import { UserStore } from "@docspace/shared/store/UserStore";
 
 const TABLE_VERSION = "1";
 const COLUMNS_SIZE = `consentColumnsSize_ver-${TABLE_VERSION}`;
@@ -95,8 +96,14 @@ const TableView = ({
 };
 
 export default inject(
-  ({ auth, oauthStore }: { auth: any; oauthStore: OAuthStoreProps }) => {
-    const { id: userId } = auth.userStore.user;
+  ({
+    userStore,
+    oauthStore,
+  }: {
+    userStore: UserStore;
+    oauthStore: OAuthStoreProps;
+  }) => {
+    const userId = userStore.user?.id;
 
     const {
       viewAs,