From e88561bc0d7a22794d447600890b3f5f940ddd43 Mon Sep 17 00:00:00 2001
From: Sergej Sakac <73715684+Szegoo@users.noreply.github.com>
Date: Thu, 11 Apr 2024 09:55:47 +0200
Subject: [PATCH] Fix wallet connect issue (#63)

* Fix wallet connect issue

* fix imports
---
 src/components/Modals/WalletConnect/index.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/Modals/WalletConnect/index.tsx b/src/components/Modals/WalletConnect/index.tsx
index dbca7c32..7338f680 100644
--- a/src/components/Modals/WalletConnect/index.tsx
+++ b/src/components/Modals/WalletConnect/index.tsx
@@ -14,6 +14,7 @@ import {
   useInkathon,
 } from '@scio-labs/use-inkathon';
 import Image from 'next/image';
+import { useEffect, useState } from 'react';
 
 import { useCoretimeApi, useRelayApi } from '@/contexts/apis';
 
@@ -25,16 +26,27 @@ interface WalletModalProps {
 }
 
 export const WalletModal = (props: WalletModalProps) => {
-  const { connect: connectContract, activeChain } = useInkathon();
+  const { connect: connectContract, activeChain, isConnected } = useInkathon();
   const { connectRelay } = useRelayApi();
   const { connectCoretime } = useCoretimeApi();
+
+  const [wallet, setWallet] = useState<SubstrateWallet | null>(null);
+
   const onConnect = async (wallet: SubstrateWallet) => {
+    setWallet(wallet);
     if (!connectContract) return;
     connectRelay();
     connectCoretime();
     connectContract(activeChain, wallet);
     props.onClose();
   };
+
+  useEffect(() => {
+    if (wallet) {
+      onConnect(wallet);
+    }
+  }, [isConnected]);
+
   return (
     <Dialog {...props} fullWidth maxWidth='sm'>
       <DialogTitle>Choose your wallet extension</DialogTitle>