fix

rooch-network · Oct 20, 2023 · 646282f · 646282f
1 parent 0f7b730
commit 646282f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/dashboard/src/@core/components/session/SessionGuard.tsx b/dashboard/src/@core/components/session/SessionGuard.tsx
@@ -30,7 +30,6 @@ interface Props {
 const AuthDialog: React.FC<Props> = ({ open, onReqAuthorize, onLogout }) => {
   const [scope, setScope] = useState<Array<string>>(['0x1::*::*', '0x3::*::*'])
   const [maxInactiveInterval, setMaxInactiveInterval] = useState<number>(1200)
-
   const handleAuth = () => {
     onReqAuthorize && onReqAuthorize(scope, maxInactiveInterval)
   }

diff --git a/dashboard/src/context/auth/AuthContext.tsx b/dashboard/src/context/auth/AuthContext.tsx
@@ -54,13 +54,9 @@ const AuthProvider = ({ children }: Props) => {
   const rooch = useRooch()
 
   // ** States
-  const [defaultAccount, setDefaultAccount] = useState<AccountDataType | null>(() => {
-    if (defaultProvider.accounts && defaultProvider.accounts.size > 0) {
-      return defaultProvider.accounts.values().next().value
-    }
-
-    return null
-  })
+  const [defaultAccount, setDefaultAccount] = useState<AccountDataType | null>(
+    defaultProvider.defaultAccount,
+  )
 
   const [accounts, setAccounts] = useState<Map<string, AccountDataType> | null>(
     defaultProvider.accounts,
@@ -294,7 +290,11 @@ const AuthProvider = ({ children }: Props) => {
   }
 
   const getDefaultAccount = (): AccountDataType | null => {
-    return defaultAccount ?? metamask.accounts.length > 0
+    if (defaultAccount) {
+      return defaultAccount
+    }
+
+    return metamask.accounts.length > 0
       ? {
           roochAddress: metamask.accounts[0],
           address: metamask.accounts[0],