fixed ark project logo link not working when both wallets connected

ArkProjectNFTs · Apr 5, 2024 · 8c65f90 · 8c65f90
1 parent 1e4b6fc
commit 8c65f90
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/apps/web/src/app/(routes)/page.tsx b/apps/web/src/app/(routes)/page.tsx
@@ -1,27 +1,12 @@
 "use client";
 
-import { useAccount as useStarknetAccount } from "@starknet-react/core";
 import { Typography } from "design-system";
 import Image from "next/image";
-import { useRouter } from "next/navigation";
-import { useEffect } from "react";
-import { useAccount as useEthereumAccount } from "wagmi";
 
 import ConnectWalletsButton from "../_components/ConnectWalletsButton";
 import Footer from "../_components/Footer";
 
 export default function Page() {
-  const { address: starknetAddress } = useStarknetAccount();
-  const { address: ethereumAddress } = useEthereumAccount();
-
-  const router = useRouter();
-
-  useEffect(() => {
-    if (starknetAddress !== undefined && ethereumAddress !== undefined) {
-      void router.push("/bridge");
-    }
-  }, [starknetAddress, ethereumAddress, router]);
-
   return (
     <>
       <div className="flex">

diff --git a/apps/web/src/app/(routes)/providers.tsx b/apps/web/src/app/(routes)/providers.tsx
@@ -26,7 +26,7 @@ const wagmiConfig = createConfig({
   // chains: [goerli],
   chains: [mainnet],
   connectors: ethereumConnectors,
-  ssr: true,
+  ssr: false,
   transports: {
     [mainnet.id]: http(
       process.env.NEXT_PUBLIC_ALCHEMY_ETHEREUM_RPC_ENDPOINT ?? ""

diff --git a/apps/web/src/app/_components/ConnectWalletsButton.tsx b/apps/web/src/app/_components/ConnectWalletsButton.tsx
@@ -28,7 +28,7 @@ export default function ConnectWalletsButton() {
       toggleConnectEthereumWalletModal();
       return;
     }
-    toggleConnectWalletsModal;
+    toggleConnectWalletsModal();
   }
 
   return (

diff --git a/apps/web/src/app/_components/WalletModals/WalletModalsContext.tsx b/apps/web/src/app/_components/WalletModals/WalletModalsContext.tsx
@@ -3,7 +3,7 @@ import {
   useNetwork as useStarknetNetwork,
 } from "@starknet-react/core";
 import { SideDialog } from "design-system";
-import { usePathname } from "next/navigation";
+import { usePathname, useRouter } from "next/navigation";
 import {
   type PropsWithChildren,
   createContext,
@@ -38,6 +38,7 @@ export function WalletModalsProvider({ children }: PropsWithChildren) {
   >(null);
 
   const pathname = usePathname();
+  const router = useRouter();
 
   const toggleConnectEthereumWalletModal = useCallback(() => {
     if (userOpenedModal === "ethereumWallet") {
@@ -88,6 +89,7 @@ export function WalletModalsProvider({ children }: PropsWithChildren) {
       ethereumAddress !== undefined
     ) {
       setUserOpenedModal(null);
+      void router.push("/bridge");
       return;
     }
   }, [starknetAddress, ethereumAddress, userOpenedModal]);
@@ -111,8 +113,7 @@ export function WalletModalsProvider({ children }: PropsWithChildren) {
         return;
       }
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [pathname]);
+  }, [pathname, starknetAddress, ethereumAddress]);
 
   return (
     <WalletModalsContext.Provider