liitlle tweaks

Author: cowboybeer

cms/Components/TopBar/index.tsx

@@ -13,7 +13,7 @@ import {
 import { Logo } from '../Sidebar/Logo'
 import { useRoute } from 'kabouter'
 import { styled } from '@based/ui'
-import { useAuthState } from '@based/react'
+import { useAuthState, useQuery } from '@based/react'
 import { languages as allLangs } from './languages'
 
 export const TopBar = ({
@@ -23,11 +23,15 @@ export const TopBar = ({
   selectedLang,
   setSelectedLang,
 }) => {
-  const authState = useAuthState()
   const route = useRoute('[section]')
-  const section = route.query.section
+
   const { theme, setTheme } = useTheme()
 
+  const { data: userData } = useQuery('db', {
+    $id: client.authState.userId,
+    name: true,
+  })
+
   const langOptions = languages?.map((lang) => ({
     value: lang,
     label: allLangs[lang],
@@ -60,7 +64,7 @@ export const TopBar = ({
         <Dropdown.Root>
           <Dropdown.Trigger>
             <Button size="xsmall">
-              <Avatar src={data?.profileImg}>{authState.userId}</Avatar>
+              <Avatar src={data?.profileImg}>{userData?.name}</Avatar>
             </Button>
           </Dropdown.Trigger>
           <Dropdown.Items>

cms/Settings/UserManagement/Management.tsx

@@ -68,9 +68,15 @@ export const Management = () => {
                   <Modal.Actions>
                     <Button onClick={close}>Cancel</Button>
                     <Button
-                      onClick={async () =>
-                        client.call('register', { name, email })
-                      }
+                      onClick={async () => {
+                        client
+                          .call('register', { name, email })
+                          .catch((err) => {
+                            console.error(err)
+                          })
+
+                        close()
+                      }}
                     >
                       Confirm
                     </Button>