From fd749e1a2e8df5e533ccf293898cce8e69d057de Mon Sep 17 00:00:00 2001
From: eglehelms <e.helms@cognigy.com>
Date: Fri, 9 Dec 2022 14:37:27 +0100
Subject: [PATCH] fix user name

---
 src/api/types.ts                                 | 4 ++++
 src/containers/internal/layout.tsx               | 6 +++---
 src/containers/internal/views/accounts/index.tsx | 8 ++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/api/types.ts b/src/api/types.ts
index 8555a09..47ccb2d 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -147,6 +147,10 @@ export interface UserJWT {
   name: string;
 }
 
+export interface CurrentUserData {
+  user: User;
+}
+
 export interface ServiceProvider {
   name: string;
   ms_teams_fqdn: null | string;
diff --git a/src/containers/internal/layout.tsx b/src/containers/internal/layout.tsx
index 46c8143..934e9d7 100644
--- a/src/containers/internal/layout.tsx
+++ b/src/containers/internal/layout.tsx
@@ -12,11 +12,11 @@ import { MSG_LOGGED_OUT } from "src/constants";
 import "./styles.scss";
 import { ROUTE_INTERNAL_USERS } from "src/router/routes";
 import { useApiData } from "src/api";
-import { User } from "src/api/types";
+import { CurrentUserData } from "src/api/types";
 
 export const Layout = () => {
   const user = useSelectState("user");
-  const [userData] = useApiData<User>("Users/me");
+  const [userData] = useApiData<CurrentUserData>("Users/me");
   const [active, setActive] = useState(false);
   const { signout } = useAuth();
   const mobile = useMobileMedia();
@@ -56,7 +56,7 @@ export const Layout = () => {
                   to={`${ROUTE_INTERNAL_USERS}/${user?.user_sid}/edit`}
                   title="Edit user"
                 >
-                  <strong>{userData?.name}</strong>
+                  <strong>{userData?.user.name}</strong>
                 </Link>
               </div>
               <div>
diff --git a/src/containers/internal/views/accounts/index.tsx b/src/containers/internal/views/accounts/index.tsx
index 2a35939..55bc9fa 100644
--- a/src/containers/internal/views/accounts/index.tsx
+++ b/src/containers/internal/views/accounts/index.tsx
@@ -11,6 +11,8 @@ import { hasLength, hasValue, useFilteredResults } from "src/utils";
 
 import type { Account } from "src/api/types";
 import { USER_ACCOUNT } from "src/api/constants";
+// import { useScopedRedirect } from "src/utils/use-scoped-redirect";
+// import { Scope } from "src/store/types";
 
 export const Accounts = () => {
   const user = useSelectState("user");
@@ -20,6 +22,12 @@ export const Accounts = () => {
 
   const filteredAccounts = useFilteredResults<Account>(filter, accounts);
 
+  // useScopedRedirect(
+  //   user,
+  //   Scope.service_provider,
+  //   `${ROUTE_INTERNAL_ACCOUNTS}/${user?.account_sid}/edit`
+  // );
+
   const handleDelete = () => {
     if (account) {
       if (