From 0acdf28334146de4ed22ed7bda3805ca962a7046 Mon Sep 17 00:00:00 2001 From: Keyrxng <106303466+Keyrxng@users.noreply.github.com> Date: Wed, 13 Mar 2024 19:03:22 +0000 Subject: [PATCH] fix: use mm provider as default --- .vscode/settings.json | 4 +++- .../lib/hooks/contracts/useManagerManaged.tsx | 1 + packages/dapp/components/lib/hooks/useWeb3.tsx | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 799ab6d97..d8fd4140f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,7 +17,9 @@ "files.autoSave": "onFocusChange", "prettier.requireConfig": false, "prettier.semi": false, - "editor.codeActionsOnSave": { "source.fixAll": true }, + "editor.codeActionsOnSave": { + "source.fixAll": "explicit" + }, "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnPaste": true, "editor.formatOnSave": true, diff --git a/packages/dapp/components/lib/hooks/contracts/useManagerManaged.tsx b/packages/dapp/components/lib/hooks/contracts/useManagerManaged.tsx index 9232686dc..024dd6a16 100644 --- a/packages/dapp/components/lib/hooks/contracts/useManagerManaged.tsx +++ b/packages/dapp/components/lib/hooks/contracts/useManagerManaged.tsx @@ -27,6 +27,7 @@ export const ManagedContractsContext = createContext(null); export const ManagedContractsContextProvider: React.FC = ({ children }) => { const [{ provider }] = useWeb3(); + const deployedContracts = useDeployedContracts(); const [managedContracts, setManagedContracts] = useState(null); diff --git a/packages/dapp/components/lib/hooks/useWeb3.tsx b/packages/dapp/components/lib/hooks/useWeb3.tsx index b87909429..383257884 100644 --- a/packages/dapp/components/lib/hooks/useWeb3.tsx +++ b/packages/dapp/components/lib/hooks/useWeb3.tsx @@ -1,4 +1,4 @@ -import { JsonRpcProvider, JsonRpcSigner, Web3Provider } from "@ethersproject/providers"; +import { JsonRpcProvider, JsonRpcSigner, Web3Provider, WebSocketProvider } from "@ethersproject/providers"; import { useAccount, useProvider, useSigner } from "wagmi"; import { WagmiConfig, createClient, chain } from "wagmi"; import { ConnectKitProvider, getDefaultClient } from "connectkit"; @@ -47,7 +47,17 @@ export const UseWeb3Provider: FC = ({ children }) => { }; const useWeb3 = (): [Web3State] => { - const provider = useProvider(); + let provider: PossibleProviders = null; + if (typeof window !== "undefined") { + if (window.ethereum) { + provider = new Web3Provider(window.ethereum); + } else if (IS_DEV) { + provider = new JsonRpcProvider(LOCAL_NODE_ADDRESS); + } else { + provider = new WebSocketProvider("wss://ethereum-rpc.publicnode.com", 1); + } + } + const { isConnecting, address } = useAccount(); const { data: signer } = useSigner();