Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions packages/wallet-management/src/config/baseAccount.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import type { BaseAccountParameters } from 'wagmi/connectors'
import { lifiLogoUrl } from '../icons.js'

export const defaultBaseAccountConfig: BaseAccountParameters = {
appName: 'LI.FI',
appLogoUrl: lifiLogoUrl,
}
7 changes: 7 additions & 0 deletions packages/wallet-management/src/connectors/baseAccount.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import type { BaseAccountParameters } from 'wagmi/connectors'
import { baseAccount } from 'wagmi/connectors'
import { extendConnector } from './utils.js'

export const createBaseAccountConnector = /*#__PURE__*/ (
params: BaseAccountParameters
) => extendConnector(baseAccount(params), 'baseAccount', 'Base Account')
12 changes: 12 additions & 0 deletions packages/wallet-management/src/createDefaultWagmiConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ import { mainnet } from 'viem/chains'
import type { Config, CreateConnectorFn } from 'wagmi'
import { createConfig } from 'wagmi'
import type {
BaseAccountParameters,
CoinbaseWalletParameters,
MetaMaskParameters,
WalletConnectParameters,
} from 'wagmi/connectors'
import { safe } from 'wagmi/connectors'
import { createBaseAccountConnector } from './connectors/baseAccount.js'
import { createCoinbaseConnector } from './connectors/coinbase.js'
import { createMetaMaskConnector } from './connectors/metaMask.js'
import { createWalletConnectConnector } from './connectors/walletConnect.js'
Expand All @@ -17,6 +19,7 @@ export interface DefaultWagmiConfigProps {
walletConnect?: WalletConnectParameters
coinbase?: CoinbaseWalletParameters
metaMask?: MetaMaskParameters
baseAccount?: BaseAccountParameters
wagmiConfig?: {
ssr?: boolean
multiInjectedProviderDiscovery?: boolean
Expand Down Expand Up @@ -112,6 +115,15 @@ export function createDefaultWagmiConfig(
}
}

if (props?.baseAccount && !isWalletInstalled('baseAccount')) {
const recentConnectorId = localStorage?.getItem(
`${config.storage?.key}.recentConnectorId`
)
if (recentConnectorId?.includes?.('baseAccount') || !props.lazy) {
connectors.unshift(createBaseAccountConnector(props.baseAccount))
}
}

return {
config,
connectors,
Expand Down
13 changes: 13 additions & 0 deletions packages/wallet-management/src/hooks/useCombinedWallets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ import { useWallet } from '@solana/wallet-adapter-react'
import { useMemo } from 'react'
import type { Connector } from 'wagmi'
import { useConnect } from 'wagmi'
import { defaultBaseAccountConfig } from '../config/baseAccount.js'
import { defaultCoinbaseConfig } from '../config/coinbase.js'
import { defaultMetaMaskConfig } from '../config/metaMask.js'
import { defaultWalletConnectConfig } from '../config/walletConnect.js'
import { createBaseAccountConnector } from '../connectors/baseAccount.js'
import { createCoinbaseConnector } from '../connectors/coinbase.js'
import { createMetaMaskConnector } from '../connectors/metaMask.js'
import type { CreateConnectorFnExtended } from '../connectors/types.js'
Expand Down Expand Up @@ -172,6 +174,17 @@ export const useCombinedWallets = () => {
createMetaMaskConnector(walletConfig?.metaMask ?? defaultMetaMaskConfig)
)
}
if (
!evmConnectors.some((connector) =>
connector.id.toLowerCase().includes('baseaccount')
)
) {
evmConnectors.unshift(
createBaseAccountConnector(
walletConfig?.baseAccount ?? defaultBaseAccountConfig
)
)
}

const includeEcosystem = (chainType: ChainType) =>
!walletConfig.enabledChainTypes ||
Expand Down
2 changes: 2 additions & 0 deletions packages/wallet-management/src/icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export const getWalletIcon = (id: string): string | undefined => {
case 'metaMaskSDK':
case 'io.metamask':
return 'https://lifinance.github.io/types/src/assets/icons/wallets/metamask.svg'
case 'baseAccount':
return 'https://lifinance.github.io/types/src/assets/icons/wallets/baseAccount.svg'
default:
break
}
Expand Down
2 changes: 2 additions & 0 deletions packages/wallet-management/src/types/walletConfig.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type {
BaseAccountParameters,
CoinbaseWalletParameters,
MetaMaskParameters,
WalletConnectParameters,
Expand All @@ -8,4 +9,5 @@ export interface WalletConfig {
walletConnect?: WalletConnectParameters
coinbase?: CoinbaseWalletParameters
metaMask?: MetaMaskParameters
baseAccount?: BaseAccountParameters
}
6 changes: 5 additions & 1 deletion packages/wallet-management/src/utils/walletTags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ export const getConnectorTagType = (
return WalletTagType.QrCode
}

if (connectorId === 'metaMaskSDK' || connectorId === 'coinbaseWalletSDK') {
if (
connectorId === 'metaMaskSDK' ||
connectorId === 'coinbaseWalletSDK' ||
connectorId === 'baseAccount'
) {
return WalletTagType.GetStarted
}

Expand Down