Skip to content

fix: show WalletConnect instead of MetaMask on mobile MetaMask browser for non-FULL sign-in modes #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
braianj wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: show WalletConnect instead of MetaMask on mobile MetaMask browser for non-FULL sign-in modes #342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fd8eae
fix: show WalletConnect instead of MetaMask on mobile MetaMask browse…
braianj Mar 10, 2026
b86111a
Merge branch 'main' into fix/wallet-connect-mobile-metamask-browser
braianj Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/hooks/useWalletOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,22 @@ export const useWalletOptions = ({ connectionOptions, signInOptionsMode }: UseWa

// For ONE and TWO modes: determine which wallet options to show
const hasEthereumProvider = !!window.ethereum
const isMobileMetaMaskBrowser =
hasEthereumProvider && !!(window.ethereum as { isMetaMask?: boolean })?.isMetaMask && /Mobi|Android/i.test(navigator.userAgent)
const googleOption = allWalletOptions.find(opt => opt === ConnectionOptionType.GOOGLE)
const metamaskOption = allWalletOptions.find(opt => opt === ConnectionOptionType.METAMASK)
const walletConnectOption = allWalletOptions.find(opt => opt === ConnectionOptionType.WALLET_CONNECT)

// TWO mode: Show Google + MetaMask (if Ethereum provider exists)
// On mobile MetaMask browser, prefer WalletConnect over MetaMask
const preferredWalletOption = isMobileMetaMaskBrowser && walletConnectOption ? walletConnectOption : metamaskOption

// TWO mode: Show Google + wallet option (if Ethereum provider exists)
if (signInOptionsMode === SignInOptionsMode.TWO) {
if (hasEthereumProvider && metamaskOption) {
if (hasEthereumProvider && preferredWalletOption) {
return {
firstWalletOption: googleOption,
secondWalletOption: metamaskOption,
remainingWalletOptions: allWalletOptions.filter(opt => opt !== googleOption && opt !== metamaskOption)
secondWalletOption: preferredWalletOption,
remainingWalletOptions: allWalletOptions.filter(opt => opt !== googleOption && opt !== preferredWalletOption)
}
}

Expand All @@ -67,12 +73,12 @@ export const useWalletOptions = ({ connectionOptions, signInOptionsMode }: UseWa
}
}

// ONE mode: Show MetaMask (if Ethereum provider exists) or nothing
if (hasEthereumProvider && metamaskOption) {
// ONE mode: Show wallet option (if Ethereum provider exists) or nothing
if (hasEthereumProvider && preferredWalletOption) {
return {
firstWalletOption: metamaskOption,
firstWalletOption: preferredWalletOption,
secondWalletOption: undefined,
remainingWalletOptions: allWalletOptions.filter(opt => opt !== metamaskOption)
remainingWalletOptions: allWalletOptions.filter(opt => opt !== preferredWalletOption)
}
}

Expand Down
Loading