Skip to content

refactor: improve wallet management integration #675

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
chybisov merged 1 commit into from
Mar 18, 2026
Merged

refactor: improve wallet management integration #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions examples/connectkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"@solana/wallet-adapter-base": "^0.9.27",
"@solana/wallet-adapter-react": "^0.15.39",
"@solana/web3.js": "^1.98.4",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"connectkit": "^1.9.1",
"mitt": "^3.0.1",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^2.19.4"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/deposit-flow/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"@lifi/sdk": "^3.16.2",
"@lifi/widget": "^3.40.12",
"@mui/material": "^7.3.6",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"events": "^3.3.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^2.19.4"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/dynamic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"@solana/wallet-adapter-react": "^0.15.39",
"@solana/wallet-standard-features": "^1.3.0",
"@solana/web3.js": "^1.98.4",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"@wagmi/core": "^2.22.1",
"@wallet-standard/base": "^1.1.0",
"@wallet-standard/features": "^1.1.0",
"bs58": ">=4.0.1",
"mitt": "^3.0.1",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"vite-plugin-env-compatible": "^2.0.1",
"wagmi": "^2.19.4"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/nft-checkout/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"@mui/material": "^7.3.6",
"@mui/system": "^7.3.6",
"@opensea/seaport-js": "4.0.7",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"bignumber.js": "^9.3.0",
"ethers": "^6.16.0",
"events": "^3.3.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"react-router-dom": "^7.13.0",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^3.5.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/privy-ethers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"@solana/wallet-adapter-base": "^0.9.27",
"@solana/wallet-adapter-react": "^0.15.39",
"@solana/web3.js": "^1.98.4",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"ethers": "^6.16.0",
"mitt": "^3.0.1",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^2.19.4"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions examples/privy/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"@mui/material": "^7.3.6",
"@privy-io/react-auth": "^2.25.0",
"@privy-io/wagmi": "^1.0.6",
"@solana/kit": "^6.3.1",
"@solana/kit": "^6.4.0",
"@solana/wallet-adapter-base": "^0.9.27",
"@solana/wallet-adapter-react": "^0.15.39",
"@solana/web3.js": "^1.98.4",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"mitt": "^3.0.1",
"permissionless": "^0.2.57",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^2.19.4"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/rainbowkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"@lifi/wallet-management": "^3.22.8",
"@lifi/widget": "^3.40.12",
"@rainbow-me/rainbowkit": "^2.2.10",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^2.19.4"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/reown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"@solana/wallet-adapter-base": "^0.9.27",
"@solana/wallet-adapter-react": "^0.15.39",
"@solana/web3.js": "^1.98.4",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"mitt": "^3.0.1",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^3.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@types/node": "^25.5.0",
"@types/react": "^19.2.13",
"@types/react-dom": "^19.2.3",
"svelte": "^5.53.12",
"svelte": "^5.54.0",
"svelte-check": "^4.4.5",
"svelte-preprocess": "^6.0.3",
"tslib": "^2.8.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/tanstack-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@lifi/widget": "workspace:*",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"@tanstack/react-router": "^1.167.4",
"react": "^19.2.4",
"react-dom": "^19.2.4"
Expand Down
4 changes: 2 additions & 2 deletions examples/vite-iframe-wagmi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
},
"dependencies": {
"@lifi/widget-light": "workspace:*",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^3.5.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/vite-iframe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"@lifi/widget-provider-sui": "workspace:*",
"@mui/material": "^7.3.6",
"@mysten/dapp-kit-react": "^2.0.1",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"@wagmi/connectors": "^7.1.6",
"bs58": ">=4.0.1",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^3.5.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"@lifi/wallet-management": "^3.22.8",
"@lifi/widget": "^3.40.12",
"@mui/material": "^7.3.6",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"@wagmi/connectors": "^7.1.6",
"events": "^3.3.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^2.19.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/zustand-widget-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@lifi/widget": "^3.40.12",
"@mui/material": "^7.3.6",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"wagmi": "^2.19.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/wallet-management/src/components/SuiListItemButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export const SuiListItemButton = ({
setLastConnectedAccount(connector)
emitter.emit(WalletManagementEvent.WalletConnected, {
address: address,
chainId: ChainId.SOL,
chainType: ChainType.SVM,
chainId: ChainId.SUI,
chainType: ChainType.MVM,
connectorId: connector.id ?? connector.name,
connectorName: connector.name,
})
Expand Down
1 change: 1 addition & 0 deletions packages/wallet-management/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export * from './hooks/useWalletManagementEvents.js'
export * from './icons.js'
export * from './providers/WalletManagementProvider/types.js'
export * from './providers/WalletManagementProvider/WalletManagementProvider.js'
export * from './providers/WalletManagementProviders.js'
export type { WalletMenuOpenArgs } from './providers/WalletMenuProvider/types.js'
export * from './providers/WalletMenuProvider/WalletMenuContext.js'
export * from './types/events.js'
Expand Down
63 changes: 63 additions & 0 deletions packages/wallet-management/src/providers/WalletManagementProviders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import type { ExtendedChain } from '@lifi/sdk'
import type { WidgetProviderProps } from '@lifi/widget-provider'
import { type PropsWithChildren, type ReactNode, useMemo, useRef } from 'react'
import type { WalletManagementProviderProps } from './WalletManagementProvider/types.js'
import { WalletManagementProvider } from './WalletManagementProvider/WalletManagementProvider.js'

type WidgetProvider = (
props: PropsWithChildren<WidgetProviderProps>
) => ReactNode

export interface WalletManagementProvidersProps
extends WalletManagementProviderProps {
providers?: WidgetProvider[]
chains?: ExtendedChain[]
forceInternalWalletManagement?: boolean
}

export const WalletManagementProviders = ({
config,
providers,
chains,
forceInternalWalletManagement,
children,
}: PropsWithChildren<WalletManagementProvidersProps>) => {
const prevProvidersRef = useRef(providers)

const memoizedProviders = useMemo(() => {
if (!providers?.length) {
return prevProvidersRef.current ?? []
}
if (
prevProvidersRef.current?.length === providers.length &&
prevProvidersRef.current.every((p, i) => p === providers[i])
) {
return prevProvidersRef.current
}
prevProvidersRef.current = providers
return providers
}, [providers])

const baseContent = (
<WalletManagementProvider config={config}>
{children}
</WalletManagementProvider>
)

if (!memoizedProviders?.length) {
return baseContent
}

return memoizedProviders.reduceRight(
(acc, ProviderComponent) => (
<ProviderComponent
key={ProviderComponent.name}
forceInternalWalletManagement={forceInternalWalletManagement}
chains={chains ?? []}
>
{acc}
</ProviderComponent>
),
baseContent
)
}
6 changes: 3 additions & 3 deletions packages/widget-embedded/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"@lifi/widget-provider-ethereum": "workspace:*",
"@lifi/widget-provider-solana": "workspace:*",
"@lifi/widget-provider-sui": "workspace:*",
"@mysten/sui": "^2.8.0",
"@tanstack/react-query": "^5.90.20",
"@mysten/sui": "^2.9.0",
"@tanstack/react-query": "^5.91.0",
"@wagmi/core": "^3.3.2",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^3.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/widget-light/src/config/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export const name = '@lifi/widget-light'
export const version = '4.0.0-alpha.4'
export const version = '4.0.0-beta.0'
2 changes: 1 addition & 1 deletion packages/widget-playground-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@lifi/widget-playground": "workspace:*",
"@mui/material": "^7.3.6",
"@mui/material-nextjs": "^7.3.6",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"core-js": "^3.49.0",
"next": "^16.1.1",
"react": "^19.2.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/widget-playground-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"author": "Eugene Chybisov <eugene@li.finance>",
"dependencies": {
"@lifi/widget-playground": "workspace:*",
"@tanstack/react-query": "^5.90.20",
"@tanstack/react-query": "^5.91.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"vite-plugin-mkcert": "^1.17.9"
Expand Down
2 changes: 1 addition & 1 deletion packages/widget-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"porto": "^0.2.37",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"viem": "^2.47.4",
"viem": "^2.47.5",
"wagmi": "^3.5.0",
"zustand": "^5.0.12"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/widget-provider-ethereum/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@lifi/sdk": "4.0.0-beta.1",
"@lifi/sdk-provider-ethereum": "^4.0.0-beta.1",
"@lifi/widget-provider": "workspace:*",
"viem": "^2.47.4"
"viem": "^2.47.5"
},
"peerDependencies": {
"@wagmi/core": "^3.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/widget-provider-sui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@lifi/sdk": "4.0.0-beta.1",
"@lifi/sdk-provider-sui": "^4.0.0-beta.1",
"@lifi/widget-provider": "workspace:*",
"@mysten/sui": "^2.8.0"
"@mysten/sui": "^2.9.0"
},
"peerDependencies": {
"@mysten/dapp-kit-react": "^2.0.0"
Expand Down
Loading