@tomo-inc/wallet-adaptor-base 0.0.2 → 0.0.3

package/src/wallets/default/solflareWallet/solflareWallet.ts

@@ -19,5 +19,12 @@ export const solflareWallet = (): WalletConfig => {
       mobile: "https://solflare.com/",
       qrCode: "https://solflare.com/",
     },
+    mobile: {
+      getDeeplink: (dappUrl?: string): string => {
+        if (!dappUrl) return "";
+        const encodedDappUrl = encodeURIComponent(dappUrl);
+        return `https://solflare.com/ul/v1/browse/${encodedDappUrl}?ref=${encodedDappUrl}`;
+      },
+    },
   };
 };

package/src/wallets/default/tokenPocketWallet/tokenPocketWallet.ts

@@ -20,5 +20,11 @@ export const tokenPocketWallet = (): WalletConfig => {
       qrCode: "https://tokenpocket.pro/en/download/app",
       mobile: "https://tokenpocket.pro/en/download/app",
     },
+    mobile: {
+      getDeeplink: (dappUrl?: string): string => {
+        if (!dappUrl) return "";
+        return `tpdapp://open?params={"url":"${dappUrl}"}`;
+      },
+    },
   };
 };

package/src/wallets/default/trustWallet/trustWallet.ts

@@ -19,5 +19,11 @@ export const trustWallet = (): WalletConfig => {
       chrome: "https://chrome.google.com/webstore/detail/trust-wallet/egjidjbpglichdcondbcbdnbeeppgdph",
       browserExtension: "https://trustwallet.com/browser-extension",
     },
+    mobile: {
+      getDeeplink: (dappUrl?: string): string => {
+        if (!dappUrl) return "";
+        return `https://link.trustwallet.com/open_url?coin_id=60&url=${dappUrl}`;
+      },
+    },
   };
 };

package/src/wallets/default/uniswapWallet/uniswapWallet.ts

@@ -12,4 +12,9 @@ export const uniswapWallet = (): WalletConfig => ({
     mobile: "https://wallet.uniswap.org/",
     qrCode: "https://wallet.uniswap.org/",
   },
+  mobile: {
+    getUri: (uri: string) => {
+      return `uniswap://wc?uri=${encodeURIComponent(uri)}`;
+    },
+  },
 });

package/src/wallets/default/valoraWallet/valoraWallet.ts

@@ -1,4 +1,5 @@
 import type { WalletConfig } from "../../Wallet";
+import { isAndroid } from "../../../utils/isMobile";
 import icon from "./valoraWallet.svg";
 
 export const valoraWallet = (): WalletConfig => ({
@@ -13,4 +14,7 @@ export const valoraWallet = (): WalletConfig => ({
     mobile: "https://valora.xyz",
     qrCode: "https://valora.xyz",
   },
+  mobile: {
+    getUri: (uri: string) => (isAndroid() ? uri : `celo://wallet/wc?uri=${encodeURIComponent(uri)}`),
+  },
 });

package/src/wallets/default/zealWallet/zealWallet.ts

@@ -19,5 +19,10 @@ export const zealWallet = (): WalletConfig => {
       mobile: "https://zeal.app",
       qrCode: "https://zeal.app",
     },
+    mobile: {
+      getUri: (uri: string) => {
+        return `zeal://wc?uri=${encodeURIComponent(uri)}`;
+      },
+    },
   };
 };

package/src/wallets/default/zerionWallet/zerionWallet.ts

@@ -1,4 +1,5 @@
 import type { WalletConfig } from "../../Wallet";
+import { isIOS } from "../../../utils/isMobile";
 import icon from "./zerionWallet.svg";
 
 export const zerionWallet = (): WalletConfig => {
@@ -18,5 +19,10 @@ export const zerionWallet = (): WalletConfig => {
       chrome: "https://chrome.google.com/webstore/detail/klghhnkeealcohjjanjjdaeeggmfmlpl",
       browserExtension: "https://zerion.io/extension",
     },
+    mobile: {
+      getUri: (uri: string) => {
+        return isIOS() ? `zerion://wc?uri=${encodeURIComponent(uri)}` : uri;
+      },
+    },
   };
 };

package/src/wallets/detector.ts

@@ -1,5 +1,5 @@
-import { WagmiWalletConfig, WalletConfig } from "./Wallet";
 import { Connector, ProviderProtocol, WalletConnectorType } from "../type";
+import { WagmiWalletConfig, WalletConfig } from "./Wallet";
 
 type WalletProviderFlags = string;
 type WindowProvider = any;
@@ -98,23 +98,38 @@ export function connectorDector(wallet: WalletConfig): Connector {
   const isInstalled = isEvmExists || isSolanaExists || isAptosExists;
 
   const providers: any = {};
-  if (isEvmExists) {
-    providers.evm = {
-      provider: getInjectedProvider(evmNS),
-      protocol: ProviderProtocol.EIP6963,
-    };
+  if (evmNS.namespace || evmNS.flag) {
+    providers.evm = isEvmExists
+      ? {
+          provider: getInjectedProvider(evmNS),
+          protocol: ProviderProtocol.EIP6963,
+        }
+      : {
+          provider: undefined,
+          protocol: undefined,
+        };
   }
-  if (isSolanaExists) {
-    providers.solana = {
-      provider: getInjectedProvider(solanaNS),
-      protocol: ProviderProtocol.INJECT,
-    };
+  if (solanaNS.namespace) {
+    providers.solana = isSolanaExists
+      ? {
+          provider: getInjectedProvider(solanaNS),
+          protocol: ProviderProtocol.INJECT,
+        }
+      : {
+          provider: undefined,
+          protocol: undefined,
+        };
   }
-  if (isAptosExists) {
-    providers.aptos = {
-      provider: getInjectedProvider(aptosNS),
-      protocol: ProviderProtocol.INJECT,
-    };
+  if (aptosNS.namespace) {
+    providers.aptos = isAptosExists
+      ? {
+          provider: getInjectedProvider(aptosNS),
+          protocol: ProviderProtocol.INJECT,
+        }
+      : {
+          provider: undefined,
+          protocol: undefined,
+        };
   }
   return {
     info: {
@@ -124,6 +139,7 @@ export function connectorDector(wallet: WalletConfig): Connector {
       iconBackground: wallet?.iconBackground,
       rdns: wallet?.rdns,
       deeplink: wallet?.deeplink,
+      mobile: wallet?.mobile,
       links: {
         homepage: wallet?.downloadUrls?.qrCode || "",
         ios_install: wallet?.downloadUrls?.ios || "",

package/src/wallets/providers/WalletConnectProvider.ts

@@ -67,7 +67,7 @@ export class WalletConnectProvider {
       if (sessions.length > 0) {
         this.session = sessions[0];
         this.updateAccountsFromSession();
-        this.emit("connect", { chainId: this.chainId });
+        this.emit("connect", { chainId: this.chainId, accounts: this.accounts });
       }
     });
 
@@ -157,6 +157,7 @@ export class WalletConnectProvider {
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
         reject(new Error("Connection timeout"));
+        this.emit("error", new Error("Connection timeout"));
       }, 300000); // 5 minutes
 
       const checkConnection = () => {
@@ -166,7 +167,7 @@ export class WalletConnectProvider {
           clearTimeout(timeout);
           this.session = newSessions[0];
           this.updateAccountsFromSession();
-          this.emit("connect", { chainId: this.chainId });
+          this.emit("connect", { chainId: this.chainId, accounts: this.accounts });
           resolve(true);
         } else {
           setTimeout(checkConnection, 500);

package/src/wallets/wallet-walletconnect.ts

@@ -81,7 +81,7 @@ function convertWalletToConnector(wallet: ReturnType<typeof walletConnectWallet>
  * Create a WalletConnect provider instance
  * Provider will be initialized when connect() is called
  */
-function createWalletConnectEVMProvider(): any {
+export function createWalletConnectEVMProvider(): any {
   const getProvider = async () => {
     if (!providerInstance) {
       if (!walletConnectConfig) {