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

Merged
davidecarpini merged 6 commits into from
Jun 5, 2026
Merged

fix: v2 apis #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 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
39ec05e
fix(deps): bump @vechain/dapp-kit-react to 2.2.0
davidecarpini Jun 5, 2026
e92b1cc
Merge branch 'main' into multisig-veworld-v2-apis
davidecarpini Jun 5, 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
4 changes: 2 additions & 2 deletions packages/vechain-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@tanstack/react-query": "^5.64.2",
"@tanstack/react-query-devtools": "^5.64.1",
"@vechain/contract-getters": "1.3.0",
"@vechain/dapp-kit-react": "2.1.0-rc.5",
"@vechain/dapp-kit-react": "2.2.0",
"@vechain/picasso": "^2.1.1",
"@vechain/vechain-contract-types": "1.6.0-rc",
"@wagmi/core": "^2.17.2",
Expand Down Expand Up @@ -103,7 +103,7 @@
"@emotion/react": "^11.0.0",
"@emotion/styled": "^11.0.0",
"@tanstack/react-query": "^5.64.2",
"@vechain/dapp-kit-react": "2.1.0-rc.5",
"@vechain/dapp-kit-react": "2.2.0",
"framer-motion": "^11.0.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
Expand Down
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
Loading
Loading