fix unsupported chain message issue

BreadchainCoop · Oct 6, 2023 · 40e68a0 · 40e68a0
1 parent c85c93d
commit 40e68a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/src/hooks/useConnectedUser.tsx b/src/hooks/useConnectedUser.tsx
@@ -9,11 +9,18 @@ import {
 import { useAccount, useNetwork } from 'wagmi';
 import config, { ChainConfiguration } from '../config';
 
-export type TConnectedUserState = null | {
-  address: `0x${string}`;
-  config: ChainConfiguration;
-  isActiveChainSupported: boolean;
-};
+export type TConnectedUserState =
+  | null
+  | {
+      address: `0x${string}`;
+      config: ChainConfiguration | null;
+      isActiveChainSupported: boolean;
+    }
+  | {
+      address: `0x${string}`;
+      config: ChainConfiguration | null;
+      isActiveChainSupported: boolean;
+    };
 
 const ConnectedUserContext = createContext<{
   user: TConnectedUserState | null;
@@ -35,17 +42,9 @@ function ConnectedUserProvider({ children }: IConnectedUserProviderProps) {
 
   useEffect(() => {
     const configuration =
-      activeChain?.id && config[activeChain.id]
-        ? config[activeChain.id]
-        : undefined;
+      activeChain?.id && config[activeChain.id] ? config[activeChain.id] : null;
 
-    if (
-      activeConnector &&
-      activeChain &&
-      accountAddress &&
-      isConnected &&
-      configuration
-    ) {
+    if (activeConnector && activeChain && accountAddress && isConnected) {
       setUser({
         address: accountAddress,
         config: configuration,

diff --git a/src/modules/dashboard/components/Yield/ClaimYield.tsx b/src/modules/dashboard/components/Yield/ClaimYield.tsx
@@ -85,7 +85,7 @@ export default function ClaimYield({ amount }: IProps) {
 
   return (
     <section className="m-auto flex w-2/3 items-center justify-between p-6">
-      {user ? (
+      {user && user.config ? (
         <>
           <span>Claim Yield</span>
           <ClaimYieldButton amount={amount} config={user.config} />

diff --git a/src/routes/bake.tsx b/src/routes/bake.tsx
@@ -20,15 +20,13 @@ export function Bake() {
     );
   }
 
-  if (!user.isActiveChainSupported)
+  if (!user.config)
     return (
       <BakeLayout>
         <UnsupportedNetwork />
       </BakeLayout>
     );
 
-  if (!user.config) throw new Error(`Missing chain config!`);
-
   return (
     <BakeLayout>
       <Suspense