Skip to content

Stabilised ens resolution & wallet selection #876

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

Merged
0xTxbi merged 2 commits into from
Dec 2, 2025
Merged

Stabilised ens resolution & wallet selection #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59dd1d4
fix ens resolution
0xTxbi Dec 2, 2025
e71ba73
prioritise active wallets
0xTxbi Dec 2, 2025
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
17 changes: 12 additions & 5 deletions packages/ui/src/components/common/MultiWalletDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,20 @@ export const MultiWalletDropdown: FC<MultiWalletDropdownProps> = ({

const showDropdown = context !== 'origin' || filteredWallets.length > 0

const isEnsCapableVmType =
chain?.vmType === 'evm' ||
chain?.vmType === 'hypevm' ||
selectedWallet?.vmType === 'evm' ||
selectedWallet?.vmType === 'hypevm'

const shouldResolveEns = isEnsCapableVmType && isSupportedSelectedWallet

const { displayName } = useENSResolver(selectedWalletAddress, {
enabled:
(chain?.vmType === 'evm' || chain?.vmType === 'hypevm') &&
isSupportedSelectedWallet
enabled: shouldResolveEns
})

const shouldShowEns = isEnsCapableVmType && Boolean(displayName)

return (
<Dropdown
open={showDropdown ? open : false}
Expand Down Expand Up @@ -174,8 +182,7 @@ export const MultiWalletDropdown: FC<MultiWalletDropdownProps> = ({
{isSupportedSelectedWallet &&
selectedWalletAddress &&
selectedWalletAddress != ''
? displayName &&
(chain?.vmType === 'evm' || chain?.vmType === 'hypevm')
? shouldShowEns
? displayName
: truncateAddress(selectedWalletAddress)
: 'Select wallet'}
Expand Down
24 changes: 14 additions & 10 deletions packages/ui/src/components/widgets/TokenWidget/widget/TokenWidgetRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import type { DebouncedState } from 'usehooks-ts'
import type { AdaptedWallet } from '@relayprotocol/relay-sdk'
import type { LinkedWallet } from '../../../../types/index.js'
import {
addressesEqual,
addressWithFallback,
isValidAddress
} from '../../../../utils/address.js'
Expand Down Expand Up @@ -293,22 +294,25 @@ const TokenWidgetRenderer: FC<TokenWidgetRendererProps> = ({
return defaultAddress
}

// Find the first wallet that supports the target chain's VM type
const compatibleWallet = linkedWallets.find((wallet) => {
// Check if wallet VM matches chain VM
if (wallet.vmType !== targetChain.vmType) {
return false
}

// Additional validation for specific chains
return isValidAddress(
const isCompatibleWallet = (wallet: LinkedWallet) =>
wallet.vmType === targetChain.vmType &&
isValidAddress(
targetChain.vmType,
wallet.address,
targetChain.id,
wallet.connector,
connectorKeyOverrides
)
})

const activeLinkedWallet = linkedWallets.find((wallet) =>
addressesEqual(wallet.vmType, wallet.address, defaultAddress)
)

if (activeLinkedWallet && isCompatibleWallet(activeLinkedWallet)) {
return activeLinkedWallet.address
}

const compatibleWallet = linkedWallets.find(isCompatibleWallet)

return compatibleWallet?.address || defaultAddress
}, [
Expand Down