Skip to content

fix: v2 apis #627

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

Draft
davidecarpini wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

fix: v2 apis #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37ba1fd
fix: v2 apis
davidecarpini May 20, 2026
f721445
Merge branch 'main' into multisig-veworld-v2-apis
davidecarpini May 20, 2026
321f1cf
fix: remove button
davidecarpini May 21, 2026
5865cf4
Merge branch 'main' into multisig-veworld-v2-apis
Agilulfo1820 May 28, 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
11 changes: 4 additions & 7 deletions packages/vechain-kit/src/components/AccountModal/Components/AccountSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { AccountAvatar } from '@/components/common';
import { useState } from 'react';
import { AccountModalContentTypes } from '../Types/Types';
import { useTranslation } from 'react-i18next';
import { useWallet, useSwitchWallet, useDAppKitWallet } from '@/hooks';
import { useSwitchWallet } from '@/hooks';

type Props = {
wallet: Wallet;
Expand All @@ -45,9 +45,8 @@ export const AccountSelector = ({
style,
}: Props) => {
const { t } = useTranslation();
const { connection } = useWallet();
const { switchWallet, isSwitching, isInAppBrowser } = useSwitchWallet();
const { isSwitchWalletEnabled } = useDAppKitWallet();
const { switchWallet, isSwitching, isInAppBrowser, canSwitchWallet } =
useSwitchWallet();

const [copied, setCopied] = useState(false);

Expand Down Expand Up @@ -125,9 +124,7 @@ export const AccountSelector = ({
</HStack>
</Button>

{(connection.isInAppBrowser && isSwitchWalletEnabled) ||
(!connection.isInAppBrowser &&
connection.isConnectedWithDappKit) ? (
{canSwitchWallet ? (
<IconButton
aria-label="Switch wallet"
icon={<Icon as={LuArrowLeftRight} />}
Expand Down
3 changes: 0 additions & 3 deletions ...n-kit/src/components/AccountModal/Contents/Profile/Components/ProfileCard/ProfileCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { AccountModalContentTypes } from '@/components/AccountModal/Types';
export type ProfileCardProps = {
address: string;
onEditClick?: () => void;
onLogout?: () => void;
showHeader?: boolean;
showLinks?: boolean;
showDescription?: boolean;
Expand All @@ -39,7 +38,6 @@ export const ProfileCard = ({
showDisplayName = true,
reserveNameDescriptionSpace = false,
setCurrentContent,
onLogout,
}: ProfileCardProps) => {
const { network } = useVeChainKitConfig();

Expand Down Expand Up @@ -209,7 +207,6 @@ export const ProfileCard = ({
)}

<AddressDisplay
onLogout={onLogout}
wallet={{
address,
domain: metadata?.domain,
Expand Down
26 changes: 8 additions & 18 deletions packages/vechain-kit/src/components/AccountModal/Contents/Profile/ProfileContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import {
useSwitchWallet,
useWallet,
useDAppKitWallet,
useTotalBalance,
LocalStorageKey,
useLocalStorage,
Expand Down Expand Up @@ -43,9 +42,9 @@ export const ProfileContent = ({
switchFeedback,
}: ProfileContentProps) => {
const { t } = useTranslation();
const { account, disconnect, connection } = useWallet();
const { switchWallet, isSwitching, isInAppBrowser } = useSwitchWallet();
const { isSwitchWalletEnabled } = useDAppKitWallet();
const { account, disconnect } = useWallet();
const { switchWallet, isSwitching, isInAppBrowser, canSwitchWallet } =
useSwitchWallet();
const { hasAnyBalance, formattedBalance } = useTotalBalance({
address: account?.address,
});
Expand Down Expand Up @@ -110,18 +109,14 @@ export const ProfileContent = ({
address={account?.address ?? ''}
showHeader={false}
setCurrentContent={setCurrentContent}
onLogout={() => {
disconnect();
onLogoutSuccess?.();
}}
/>
</VStack>
</ModalBody>
<ModalFooter w="full">
<HStack w="full" justify="space-between" spacing={4} mt={4}>
<HStack w="full" justify="space-between" spacing={3} mt={4}>
<Button
size="md"
width="full"
flex={1}
height="40px"
variant="vechainKitSecondary"
leftIcon={
Expand Down Expand Up @@ -149,18 +144,14 @@ export const ProfileContent = ({

{/* In VeWorld mobile we call switchWallet
on the desktop we call setCurrentContent to select-wallet
otherwise we show logout button
*/}
{(connection.isInAppBrowser && isSwitchWalletEnabled) ||
(!connection.isInAppBrowser &&
connection.isConnectedWithDappKit) ? (
{canSwitchWallet ? (
<Button
size="md"
width="full"
flex={1}
height="40px"
variant="vechainKitSecondary"
leftIcon={<Icon as={LuArrowLeftRight} />}
colorScheme="red"
onClick={async () => {
handleSwitchWallet();
}}
Expand All @@ -173,11 +164,10 @@ export const ProfileContent = ({
) : (
<Button
size="md"
width="full"
flex={1}
height="40px"
variant="vechainKitSecondary"
leftIcon={<Icon as={LuLogOut} />}
colorScheme="red"
onClick={() =>
setCurrentContent({
type: 'disconnect-confirm',
Expand Down
173 changes: 156 additions & 17 deletions ...ges/vechain-kit/src/components/AccountModal/Contents/SelectWallet/SelectWalletContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,20 @@ export const SelectWalletContent = ({
}: Props) => {
const { t } = useTranslation();
const { isolatedView } = useAccountModalOptions();
const { account, disconnect } = useWallet();
const { disconnect: dappKitDisconnect } = useDAppKitWallet();
const {
account,
accounts: kitAccounts,
setActiveAccount,
connection,
disconnect,
} = useWallet();
const {
disconnect: dappKitDisconnect,
switchWallet: dappKitSwitchWallet,
requestPermissions: dappKitRequestPermissions,
revokeAccount: dappKitRevokeAccount,
availableMethods: dappKitAvailableMethods,
} = useDAppKitWallet();
const { open: openDappKitModal } = useDAppKitWalletModal();
const { getStoredWallets, setActiveWallet, removeWallet } =
useSwitchWallet();
Expand All @@ -60,17 +72,65 @@ export const SelectWalletContent = ({

const textSecondary = useToken('colors', 'vechain-kit-text-secondary');

const [wallets, setWallets] = useState(getStoredWallets());
const walletsHashRef = useRef(hashWallets(getStoredWallets()));
// On desktop dapp-kit, use `kitAccounts` as the source of truth;
// otherwise fall back to legacy storage. Use a stable primitive key in
// dep arrays — `kitAccounts` reference changes on every valtio write.
const kitAccountsRef = useRef(kitAccounts);
kitAccountsRef.current = kitAccounts;
const kitAccountsKey = useMemo(
() =>
kitAccounts
.map((a) => a.address.toLowerCase())
.sort()
.join('|'),
[kitAccounts],
);

const useDappKitAccountsAsSource = useMemo(
() =>
connection.isConnectedWithDappKit &&
!connection.isInAppBrowser &&
kitAccounts.length > 0,
[
connection.isConnectedWithDappKit,
connection.isInAppBrowser,
kitAccounts.length,
],
);

const initialWallets = useMemo<StoredWallet[]>(() => {
if (useDappKitAccountsAsSource) {
const activeLower = account?.address?.toLowerCase();
return kitAccountsRef.current.map((a) => ({
address: a.address,
connectedAt: Date.now(),
isActive: a.address.toLowerCase() === activeLower,
}));
}
return getStoredWallets();
}, [useDappKitAccountsAsSource, kitAccountsKey, account?.address, getStoredWallets]);

const [wallets, setWallets] = useState<StoredWallet[]>(initialWallets);
const walletsHashRef = useRef(hashWallets(initialWallets));

// Function to refresh wallets list
const refreshWallets = useCallback(() => {
if (useDappKitAccountsAsSource) {
const activeLower = account?.address?.toLowerCase();
const next: StoredWallet[] = kitAccountsRef.current.map((a) => ({
address: a.address,
connectedAt: Date.now(),
isActive: a.address.toLowerCase() === activeLower,
}));
setWallets(next);
walletsHashRef.current = hashWallets(next);
return;
}
const updatedWallets = getStoredWallets();
setWallets(updatedWallets);
walletsHashRef.current = hashWallets(updatedWallets);
}, [getStoredWallets]);
}, [useDappKitAccountsAsSource, kitAccountsKey, account?.address, getStoredWallets]);

// Refresh wallets list when account changes (new wallet connected) or when wallets are updated
useEffect(() => {
refreshWallets();
}, [refreshWallets, account?.address]);
Expand Down Expand Up @@ -143,14 +203,16 @@ export const SelectWalletContent = ({
return;
}

// Ensure the wallet that was previously active is saved
// Metadata will be fetched dynamically when needed
if (activeWallet) {
saveWallet(activeWallet.address);
if (useDappKitAccountsAsSource) {
// Dapp-kit v2: switch without re-signing.
setActiveAccount(address);
} else {
if (activeWallet) {
saveWallet(activeWallet.address);
}
setActiveWallet(address);
}

setActiveWallet(address);

// Refresh wallets list immediately after switch
setTimeout(() => {
refreshWallets();
Expand All @@ -172,12 +234,14 @@ export const SelectWalletContent = ({
[
activeWalletAddress,
activeWallet,
account,
useDappKitAccountsAsSource,
setActiveAccount,
setActiveWallet,
refresh,
setCurrentContent,
refreshWallets,
saveWallet,
returnTo,
],
);

Expand All @@ -189,6 +253,13 @@ export const SelectWalletContent = ({
const remainingWallets = wallets.filter(
(w) => w.address.toLowerCase() !== wallet.address.toLowerCase(),
);
const supportsRevokeAccount =
useDappKitAccountsAsSource &&
Array.isArray(dappKitAvailableMethods) &&
dappKitAvailableMethods.includes(
'wallet_revokeAccountPermission',
) &&
typeof dappKitRevokeAccount === 'function';

// Navigate to remove wallet confirmation screen
setCurrentContent({
Expand All @@ -197,6 +268,29 @@ export const SelectWalletContent = ({
walletAddress: wallet.address,
walletDomain: null, // Domain will be fetched dynamically in RemoveWalletConfirmContent
onConfirm: async () => {
if (supportsRevokeAccount) {
await dappKitRevokeAccount(wallet.address);
setTimeout(() => {
refreshWallets();
}, 50);

if (remainingWallets.length === 0) {
_onLogoutSuccess?.();
return;
}

setCurrentContent({
type: 'select-wallet',
props: {
setCurrentContent,
onClose: () => {},
returnTo,
onLogoutSuccess: _onLogoutSuccess,
},
});
return;
}

// If removing the active wallet and there are other wallets, switch to the first one
if (isActiveWallet && remainingWallets.length > 0) {
const nextActiveWallet = remainingWallets[0];
Expand Down Expand Up @@ -263,12 +357,49 @@ export const SelectWalletContent = ({
wallets,
setActiveWallet,
dappKitDisconnect,
dappKitAvailableMethods,
dappKitRevokeAccount,
useDappKitAccountsAsSource,
],
);

const supportsRequestPermissions =
Array.isArray(dappKitAvailableMethods) &&
dappKitAvailableMethods.includes('wallet_requestPermissions') &&
typeof dappKitRequestPermissions === 'function';
const supportsRevokeAccount =
Array.isArray(dappKitAvailableMethods) &&
dappKitAvailableMethods.includes('wallet_revokeAccountPermission') &&
typeof dappKitRevokeAccount === 'function';

const handleAddNewWallet = useCallback(() => {
if (useDappKitAccountsAsSource) {
// VeWorld v2: prefer EIP-2255 `wallet_requestPermissions`,
// fall back to legacy `thor_switchWallet`.
if (supportsRequestPermissions) {
dappKitRequestPermissions()
.then(() => {
refresh();
})
.catch((e) => {
console.error('dapp-kit requestPermissions failed', e);
});
return;
}
dappKitSwitchWallet().catch((e) => {
console.error('dapp-kit switchWallet failed', e);
});
return;
}
openDappKitModal();
}, [openDappKitModal]);
}, [
useDappKitAccountsAsSource,
supportsRequestPermissions,
dappKitRequestPermissions,
dappKitSwitchWallet,
openDappKitModal,
refresh,
]);

const handleLogout = () => {
disconnect();
Expand Down Expand Up @@ -303,7 +434,10 @@ export const SelectWalletContent = ({
onRemove={() =>
handleRemoveWallet(activeWallet)
}
showRemove={wallets.length > 1}
showRemove={
!useDappKitAccountsAsSource &&
wallets.length > 1
}
/>
</VStack>
)}
Expand All @@ -322,7 +456,10 @@ export const SelectWalletContent = ({
handleWalletSelect(wallet.address)
}
onRemove={() => handleRemoveWallet(wallet)}
showRemove={true}
showRemove={
!useDappKitAccountsAsSource ||
supportsRevokeAccount
}
/>
))}
</VStack>
Expand All @@ -337,7 +474,9 @@ export const SelectWalletContent = ({
variant="vechainKitSecondary"
onClick={handleAddNewWallet}
>
{t('Add New Wallet')}
{useDappKitAccountsAsSource
? t('Change connected accounts')
: t('Add New Wallet')}
</Button>
<Button
w="full"
Expand Down
Loading
Loading