feat: handle wallet instalation

golemfactory · Feb 14, 2024 · 6a7b185 · 6a7b185
1 parent 70d1133
commit 6a7b185
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/frontend/src/components/organisms/onboarding/steps/ConnectWallet.step.tsx b/frontend/src/components/organisms/onboarding/steps/ConnectWallet.step.tsx
@@ -11,7 +11,9 @@ import { useOnboarding } from 'hooks/useOnboarding'
 import { Commands } from 'state/commands'
 import { motion } from 'framer-motion'
 import { useHasFocus } from 'hooks/useHasFocus'
-
+import { InjectedConnector } from '@wagmi/connectors/injected'
+import { connect } from '@wagmi/core'
+import { polygon, mainnet } from 'viem/chains'
 TooltipProvider.registerTooltip({
   id: 'connect-wallet',
   tooltip: {
@@ -98,6 +100,19 @@ export const ConnectWallet = () => {
   const { send } = useOnboarding()
   const hasFocus = useHasFocus()
   const [shouldReload, setShouldReload] = useState(false)
+  const [shouldConnect, setShouldConnect] = useState(false)
+
+  useEffect(() => {
+    if (shouldConnect) {
+      connect({
+        chainId: polygon.id,
+        connector: new InjectedConnector({
+          chains: [polygon, mainnet],
+        }),
+      })
+      setShouldConnect(false)
+    }
+  }, [shouldConnect])
   useEffect(() => {
     if (address) {
       send({ type: Commands.NEXT })
@@ -113,6 +128,7 @@ export const ConnectWallet = () => {
   useEffect(() => {
     if (hasFocus && shouldReload) {
       setShouldReload(false)
+      setShouldConnect(true)
       window.location.reload()
     }
   }, [hasFocus])

diff --git a/frontend/src/hooks/useNetwork.ts b/frontend/src/hooks/useNetwork.ts
@@ -2,7 +2,6 @@ import { useNetwork as useNetworkWagmi } from 'wagmi'
 import { toHex } from 'viem'
 import { Chain } from 'types/wagmi'
 import { Chain as ChainWagmi } from 'wagmi'
-import { assertSupportedChainId } from 'types/ethereum'
 
 type GetNetworkResult = ReturnType<typeof useNetworkWagmi>
 
@@ -37,7 +36,6 @@ export const useNetwork = (): Omit<GetNetworkResult, 'chain' | 'chains'> & {
   const network = useNetworkWagmi()
   let chain = undefined
   if (network.chain) {
-    console.log('network.chain', network.chain)
     chain = formatChain(network.chain)
   }
 

diff --git a/frontend/src/hooks/useWallet.ts b/frontend/src/hooks/useWallet.ts
@@ -11,9 +11,10 @@ export const useWallet = (): WalletProviderType => {
   //for now we support only metamask or trust wallet
   // so we rely on window.ethereum.isMetaMask
 
-  const isMetaMask = window.ethereum.isMetaMask
+  const isMetaMask = window?.ethereum?.isMetaMask
   if (isMetaMask) {
     return WalletProvider.METAMASK
   }
+
   return WalletProvider.TRUST_WALLET
 }