fix: update metamask change option (#48)

Author: osiastedian

components/Bridge/WalletSwitch/NEVMConnect.tsx

@@ -7,6 +7,7 @@ import { ITransfer } from "@contexts/Transfer/types";
 import { useNevmBalance } from "utils/balance-hooks";
 import { MIN_AMOUNT } from "@constants";
 import { useFeatureFlags } from "../hooks/useFeatureFlags";
+import { useConnectedWallet } from "@contexts/ConnectedWallet/useConnectedWallet";
 
 type NEVMConnectProps = {
   transfer: ITransfer;
@@ -21,15 +22,21 @@ const NEVMConnect: React.FC<NEVMConnectProps> = ({ setNevm, transfer }) => {
   const { isBitcoinBased, switchTo, changeAccount, isEVMInjected } =
     usePaliWalletV2();
   const balance = useNevmBalance(transfer.nevmAddress);
+  const { connectNEVM, nevm } = useConnectedWallet();
 
   const setTransferNevm = () => {
     if (!account) return;
     setNevm({ address: account });
   };
 
   const change = () => {
-    const prom = isBitcoinBased ? switchTo("ethereum") : Promise.resolve();
     setNevm({ address: "" });
+    if (nevm.type === "metamask") {
+      connectNEVM("metamask");
+      return;
+    }
+
+    const prom = isBitcoinBased ? switchTo("ethereum") : Promise.resolve();
     prom.then(() => changeAccount());
   };
 

contexts/ConnectedWallet/NEVMProvider.tsx

@@ -134,7 +134,16 @@ const NEVMProvider: React.FC<NEVMProviderProps> = ({ children }) => {
   };
 
   const connect = () => {
-    account.refetch();
+    let prePromise = account.isFetched
+      ? window.ethereum.request({
+          method: "wallet_revokePermissions",
+          params: [{ eth_accounts: {} }],
+        })
+      : Promise.resolve();
+
+    prePromise.then(() => {
+      return account.refetch();
+    });
   };
 
   const signMessage = (message: string): Promise<string> => {

yarn.lock

@@ -3839,13 +3839,6 @@ eth-object@^1.0.3, "eth-object@https://github.com/syscoin/eth-object.git":
   dependencies:
     eth-util-lite "^1.0.1"
 
-"eth-object@git+https://github.com/syscoin/eth-object.git":
-  version "1.0.3"
-  uid b5ff300f57c136138b31d6e570c816a147e0f1c9
-  resolved "git+https://github.com/syscoin/eth-object.git#b5ff300f57c136138b31d6e570c816a147e0f1c9"
-  dependencies:
-    eth-util-lite "^1.0.1"
-
 eth-proof@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/eth-proof/-/eth-proof-2.1.6.tgz#6c8a468f82334d9c79347324e6eb237f1ecc965f"