Remove window.web3 (#104)

src/context/RariContext.tsx

@@ -35,7 +35,8 @@ import WalletLink from "walletlink";
 
 async function launchModalLazy(
   t: (text: string, extra?: any) => string,
-  cacheProvider: boolean = true
+  cacheProvider: boolean = true,
+  brave: boolean
 ) {
   const [WalletConnectProvider, Web3Modal] = await Promise.all([
     import("@walletconnect/web3-provider"),
@@ -45,6 +46,8 @@ async function launchModalLazy(
   const providerOptions = {
     injected: {
       display: {
+        logo: brave ? "/static/brave.png" : "/static/metamask.png",
+        name: brave ? "Brave Wallet" : "Metamask",
         description: t("Connect with a browser extension"),
       },
       package: null,
@@ -138,23 +141,6 @@ export const RariProvider = ({ children }: { children: ReactNode }) => {
     }
   }, [requestedAddress])
 
-
-  useEffect(() => {
-    //toast on brave users
-    if(typeof navigator !== 'object') return
-    const isBrave = (navigator as any).brave
-    if(isBrave){
-      toast({
-        title: "Warning",
-        description: "Brave Users may experience issues connecting. Please use Chrome/FF for now for optimal experience.",
-        status: "warning",
-        position: "bottom-right",
-        duration: 300000,
-        isClosable: true,
-      });
-    }
-  }, [])
-
   // Check the user's network:
   // First render only
   useEffect(() => {
@@ -239,7 +225,9 @@ export const RariProvider = ({ children }: { children: ReactNode }) => {
     async (cacheProvider: boolean = true) => {
       try {
         setIsAttemptingLogin(true);
-        const providerWeb3Modal = await launchModalLazy(t, cacheProvider);
+        const clientVersion = await provider.send('web3_clientVersion',[])
+        const isBrave = clientVersion.split('/')[0] !== 'MetaMask'
+        const providerWeb3Modal = await launchModalLazy(t, cacheProvider, isBrave);
         setWeb3ModalProvider(providerWeb3Modal);
         setRariAndAddressFromModal(providerWeb3Modal, "login");
         setIsAttemptingLogin(false);

src/utils/web3Providers.ts

@@ -20,19 +20,19 @@ export function chooseBestWeb3Provider(
 ): JsonRpcProvider | Web3Provider {
 
   let providerURL = getChainMetadata(chainId).rpcUrl ?? "";
-  console.log({ chainId, providerURL });
-  // return new JsonRpcProvider(providerURL);
 
   const isClient = typeof window === "object";
   if (!isClient || vaults) {
     return new JsonRpcProvider(providerURL);
   }
 
-  if (window.web3) {
-    return new Web3Provider(window.web3.currentProvider);
+  if (window.ethereum) {
+    // @ts-ignore
+    return new Web3Provider(window.ethereum)
   } else {
     return new JsonRpcProvider(providerURL);
   }
+
 }
 
 export const initFuseWithProviders = (