From 2b266ca91e4e606944deab52c779871da22128c9 Mon Sep 17 00:00:00 2001 From: Lochie Axon Date: Mon, 17 Jun 2024 10:15:09 +1000 Subject: [PATCH] use sdk on mobile --- .../src/components/Common/ConnectorList/index.tsx | 5 ++++- packages/connectkit/src/wallets/useWallets.tsx | 12 +++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/connectkit/src/components/Common/ConnectorList/index.tsx b/packages/connectkit/src/components/Common/ConnectorList/index.tsx index 436c21d5..8f15a667 100644 --- a/packages/connectkit/src/components/Common/ConnectorList/index.tsx +++ b/packages/connectkit/src/components/Common/ConnectorList/index.tsx @@ -18,6 +18,7 @@ import { WalletProps, useWallets } from '../../../wallets/useWallets'; import { detectBrowser, isCoinbaseWalletConnector, + isMetaMaskConnector, isWalletConnectConnector, } from '../../../utils'; import { useLastConnector } from '../../../hooks/useLastConnector'; @@ -105,7 +106,9 @@ const ConnectorItem = ({ // Safari requires opening popup on user gesture, so we connect immediately here const shouldConnectImmediately = (detectBrowser() === 'safari' || detectBrowser() === 'ios') && - isCoinbaseWalletConnector(wallet.connector.id); + // TODO: convert this to a flag in the configs + (isCoinbaseWalletConnector(wallet.connector.id) || + isMetaMaskConnector(wallet.connector.id)); if (redirectToMoreWallets || shouldConnectImmediately) deeplink = undefined; // mobile redirects to more wallets page diff --git a/packages/connectkit/src/wallets/useWallets.tsx b/packages/connectkit/src/wallets/useWallets.tsx index 7dcd31d5..a86b0c5b 100644 --- a/packages/connectkit/src/wallets/useWallets.tsx +++ b/packages/connectkit/src/wallets/useWallets.tsx @@ -3,7 +3,11 @@ import { Connector } from 'wagmi'; import { useConnectors } from '../hooks/useConnectors'; import { walletConfigs, WalletConfigProps } from './walletConfigs'; import { useContext } from '../components/ConnectKit'; -import { isCoinbaseWalletConnector, isInjectedConnector } from '../utils'; +import { + isCoinbaseWalletConnector, + isInjectedConnector, + isMetaMaskConnector, +} from '../utils'; export type WalletProps = { id: string; @@ -46,8 +50,10 @@ export const useWallets = (): WalletProps[] => { connector, iconShape: 'squircle', isInstalled: - (connector.type === 'injected' && connector.id !== 'metaMask') || - isCoinbaseWalletConnector(connector.id), // always run coinbase wallet SDK + connector.type === 'injected' || + // TODO: convert this to a flag in the configs + isCoinbaseWalletConnector(connector.id) || // always run coinbase wallet SDK || + isMetaMaskConnector(connector.id), // always run metamask SDK }; if (walletId) {