fix

crustio · Oct 21, 2024 · d707f17 · d707f17
1 parent 634ec83
commit d707f17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/lib/wallet/MWalletConnect.ts b/lib/wallet/MWalletConnect.ts
@@ -1,11 +1,10 @@
 import IEthereumProvider, { EthereumProvider } from "@walletconnect/ethereum-provider";
-import { WalletConnectModal } from "@walletconnect/modal";
-import { BaseWallet, LoginUser } from "./types";
 import _ from "lodash";
+import { BaseWallet, LoginUser } from "./types";
 
 export class MWalletConnect extends BaseWallet {
   name = "Wallet Connect";
-  icon = "/images/wallet_connect.png";
+  icon = "/images/group_wallet_connect.png";
   ethereumProvider: IEthereumProvider;
   accounts: string[] = [];
   account: string;
@@ -88,7 +87,7 @@ export class MWalletConnect extends BaseWallet {
   }
 
   async sign(data: string, account: string | undefined): Promise<string> {
-    const res = await this.ethereumProvider.request({ method: "personal_sign", params: [Buffer.from(data, "utf8").toString("hex"), account] });
+    const res = await this.ethereumProvider.request({ method: "personal_sign", params: [data, account] });
     console.info("res:", res);
     // const res = await this.connector?.signPersonalMessage([convertUtf8ToHex(data), account]);
     return res as string;

diff --git a/lib/wallet/Metamask.ts b/lib/wallet/Metamask.ts
@@ -39,7 +39,7 @@ export class Metamask extends BaseWallet {
         const ethereum = mWin.ethereum;
         console.info("ethereum::", mWin.ethereum);
         this.ethereum = ethereum;
-        if (this.ethereum) {
+        if (this.ethereum && typeof this.ethereum.chainId == "string") {
           this.chainId = parseInt(ethereum.chainId.replace("0x", ""), 16);
           this.setLis();
         }

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -23,15 +23,14 @@ declare global {
   }
 }
 
-const recomendWallets: BaseWallet[] = [WALLETMAP.crust, WALLETMAP.metamask, WALLETMAP["ton-connect"]];
+const recomendWallets: BaseWallet[] = [WALLETMAP.crust, WALLETMAP.metamask, WALLETMAP['wallet-connect'], WALLETMAP["ton-connect"]];
 const moreWallets: BaseWallet[] = [
   WALLETMAP.algorand,
   WALLETMAP["aptos-martian"],
   WALLETMAP["aptos-petra"],
   WALLETMAP.elrond,
   WALLETMAP.metax,
   WALLETMAP.mimir,
-  WALLETMAP["wallet-connect"],
   WALLETMAP["polkadot-js"],
   WALLETMAP.solana,
   WALLETMAP.subWallet,