@bosonprotocol/react-kit 0.29.0-alpha.9 → 0.29.0

package/src/stories/helpers/connect-wallet.ts

@@ -1,19 +1,49 @@
 import { initializeConnector } from "@web3-react/core";
 import { MetaMask } from "@web3-react/metamask";
+import { utils } from "ethers";
 
-export const [metaMask, hooks] = initializeConnector<MetaMask>(
-  (actions) => new MetaMask(actions)
-);
+import { Web3ReactHooks } from "@web3-react/core";
 
-export function connectWallet(chainId?: number) {
-  metaMask.provider
-    ?.request({
-      method: "wallet_requestPermissions",
-      params: [
-        {
-          eth_accounts: {}
-        }
-      ]
-    })
-    .then(() => metaMask.activate(chainId));
-}
+export const [metaMask, hooks] = initializeConnector<MetaMask>((actions) => {
+  return new MetaMask({ actions });
+});
+
+export const connectWallet = async (chainId?: string) => {
+  try {
+    const currentChainId = window.ethereum
+      ? Number(
+          await (window.ethereum as any)?.request({ method: "eth_chainId" })
+        )
+      : undefined;
+    if (
+      chainId &&
+      window.ethereum &&
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      currentChainId !== Number(chainId)
+    ) {
+      try {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        await window.ethereum.request({
+          method: "wallet_switchEthereumChain",
+          params: [
+            { chainId: utils.hexStripZeros(utils.hexlify(Number(chainId))) }
+          ]
+        });
+      } catch (err) {
+        console.error("Network changed rejected", err);
+      }
+    } else {
+      try {
+        await metaMask.activate(Number(chainId));
+      } catch (err) {
+        console.error("User rejected the request", err);
+      }
+    }
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+export const connectors: [MetaMask, Web3ReactHooks][] = [[metaMask, hooks]];

package/src/stories/widgets/Finance.stories.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { ComponentMeta, ComponentStory, Story } from "@storybook/react";
 
-import FinanceWidget from "../../components/widgets/finance/FinanceWidget";
+import { FinanceWidget } from "../../components/widgets/finance/FinanceWidget";
 import { EnvironmentType, getEnvConfigs } from "@bosonprotocol/core-sdk";
 // More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 export default {