fix: Fixed multiple wallets conficts resulting in undetectable issues. (

#51) * docs: Add test result table to PULL_REQUEST_TEMPLATE * fix: fixed multiple wallet conflicts resulting in undetectable issues * chore: Add changeset log
node-real · Dec 4, 2023 · 78c9fc8 · 78c9fc8
1 parent 27335c0
commit 78c9fc8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/.changeset/honest-numbers-hug.md b/.changeset/honest-numbers-hug.md
@@ -0,0 +1,5 @@
+---
+'@totejs/walletkit': patch
+---
+
+Fixed multiple wallets conficts resulting in undetectable issues.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -33,17 +33,19 @@
 
 ## For adding a new wallet
 
+For more detail, please click [here](../CONTRIBUTING.md#notice-test-cases-for-adding-a-new-wallet)
+
 <!--- If you are adding a new wallet, we hope you can complete the following tests before the code is merged into the main branch -->
 |test case|support?|connected?|switch networks?|support testnet?|
 |-|-|-|-|-|
-|PC, browser extension|[ ]|[ ]|[ ]|[ ]|
-|Android, in system browser|[ ]|[ ]|[ ]|[ ]|
-|Android, in wallet dapp browser|[ ]|[ ]|[ ]|[ ]|
-|iOS, in system browser|[ ]|[ ]|[ ]|[ ]|
-|iOS, in wallet dapp browser|[ ]|[ ]|[ ]|[ ]|
-|WalletConnect, PC|[ ]|[ ]|[ ]|[ ]|
-|WalletConnect, Android, in system browser|[ ]|[ ]|[ ]|[ ]|
-|WalletConnect, Android, in wallet dapp browser|[ ]|[ ]|[ ]|[ ]|
-|WalletConnect, iOS, in system browser|[ ]|[ ]|[ ]|[ ]|
-|WalletConnect, iOS, in wallet dapp browser|[ ]|[ ]|[ ]|[ ]|
+|PC, browser extension| ✔️ | ✔️ | ❌ | ❌ |
+|Android, in system browser| | | | |
+|Android, in wallet dapp browser| | | | |
+|iOS, in system browser| | | | |
+|iOS, in wallet dapp browser| | | | |
+|WalletConnect, PC| | | | |
+|WalletConnect, Android, in system browser| | | | |
+|WalletConnect, Android, in wallet dapp browser| | | | |
+|WalletConnect, iOS, in system browser| | | | |
+|WalletConnect, iOS, in wallet dapp browser| | | | |
 
diff --git a/packages/walletkit/src/wallets/coinbaseWallet/index.tsx b/packages/walletkit/src/wallets/coinbaseWallet/index.tsx
@@ -56,5 +56,5 @@ export function coinbaseWallet(props: CoinbaseWalletProps = {}): WalletProps {
 export function isCoinbaseWallet() {
   if (typeof window === 'undefined') return false;
 
-  return hasInjectedProvider('isCoinbaseWallet');
+  return hasInjectedProvider('isCoinbaseWallet') || !!window.coinbaseWalletExtension;
 }
diff --git a/packages/walletkit/src/wallets/metaMask/index.tsx b/packages/walletkit/src/wallets/metaMask/index.tsx
@@ -1,7 +1,8 @@
 import { Chain, Connector } from 'wagmi';
 import { MetaMaskConnector } from 'wagmi/connectors/metaMask';
-import { PartialWalletProps, WalletProps, isTokenPocket } from '..';
+import { PartialWalletProps, WalletProps } from '..';
 import { MetaMaskIcon, MetaMaskTransparentIcon } from './icon';
+import { getInjectedProvider, hasInjectedProvider } from '../utils';
 
 export const META_MASK_ID = 'metaMask';
 
@@ -35,8 +36,11 @@ export function metaMask(props: MetaMaskProps = {}): WalletProps {
         options: {
           shimDisconnect: true,
           UNSTABLE_shimOnConnectSelectAccount: false,
+          getProvider() {
+            return getInjectedProvider('isMetaMask');
+          },
           ...connectorOptions,
-        },
+        } as any,
       });
     },
     getDeepLink: () => {
@@ -51,11 +55,7 @@ export function metaMask(props: MetaMaskProps = {}): WalletProps {
 }
 
 export function isMetaMask() {
-  if (typeof window === 'undefined') return false;
-
-  if (isTokenPocket()) return false;
-
-  return window?.ethereum?.isMetaMask;
+  return hasInjectedProvider('isMetaMask');
 }
 
 export function isMetaMaskConnector(connector?: Connector) {

diff --git a/packages/walletkit/src/wallets/tokenPocket/index.tsx b/packages/walletkit/src/wallets/tokenPocket/index.tsx
@@ -32,7 +32,11 @@ export function tokenPocket(props: PartialCustomProps = {}): WalletProps {
           getProvider() {
             if (typeof window === 'undefined') return;
 
-            const provider = getInjectedProvider('isTokenPocket') ?? window.tokenpocket;
+            const provider =
+              getInjectedProvider('isTokenPocket') ??
+              window.tokenpocket?.ethereum ??
+              window.tokenpocket;
+
             return provider;
           },
           ...connectorOptions,
@@ -55,5 +59,5 @@ export function tokenPocket(props: PartialCustomProps = {}): WalletProps {
 export function isTokenPocket() {
   if (typeof window === 'undefined') return false;
 
-  return hasInjectedProvider('isTokenPocket') || window.tokenpocket;
+  return hasInjectedProvider('isTokenPocket') || window.tokenpocket?.ethereum || window.tokenpocket;
 }