diff --git a/examples/hello/frontend/package.json b/examples/hello/frontend/package.json
index 670a41f3..5757f5c0 100644
--- a/examples/hello/frontend/package.json
+++ b/examples/hello/frontend/package.json
@@ -10,8 +10,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@zetachain/toolkit": "16.1.3",
-    "@zetachain/wallet": "1.0.12",
+    "@zetachain/toolkit": "16.1.4",
+    "@zetachain/wallet": "1.0.13",
     "clsx": "^2.1.1",
     "ethers": "^6.13.2",
     "react": "^19.1.0",
diff --git a/examples/hello/frontend/src/ConfirmedContent.tsx b/examples/hello/frontend/src/ConfirmedContent.tsx
index 30f4e702..7d5122c2 100644
--- a/examples/hello/frontend/src/ConfirmedContent.tsx
+++ b/examples/hello/frontend/src/ConfirmedContent.tsx
@@ -79,7 +79,7 @@ export function ConfirmedContent({
           <div className="confirmed-content-link-chain">
             {!connectedChainTxHash && <IconSpinner />}
             <a
-              href={`${supportedChain.explorerUrl}${connectedChainTxHash}`}
+              href={supportedChain.explorerUrl(connectedChainTxHash)}
               target="_blank"
               rel="noreferrer noopener"
               className={clsx('confirmed-content-link', {
@@ -95,7 +95,9 @@ export function ConfirmedContent({
           <div className="confirmed-content-link-chain">
             {!zetachainTxHash && <IconSpinner />}
             <a
-              href={`${ZETACHAIN_ATHENS_BLOCKSCOUT_EXPLORER_URL}${zetachainTxHash}`}
+              href={ZETACHAIN_ATHENS_BLOCKSCOUT_EXPLORER_URL(
+                zetachainTxHash || ''
+              )}
               target="_blank"
               rel="noreferrer noopener"
               className={clsx('confirmed-content-link', {
diff --git a/examples/hello/frontend/src/ConnectedContent.tsx b/examples/hello/frontend/src/ConnectedContent.tsx
index a6772493..0338f5e1 100644
--- a/examples/hello/frontend/src/ConnectedContent.tsx
+++ b/examples/hello/frontend/src/ConnectedContent.tsx
@@ -1,6 +1,8 @@
 import './ConnectedContent.css';
 
 import { type PrimaryWallet } from '@zetachain/wallet';
+import { useSwitchWallet, useUserWallets } from '@zetachain/wallet/react';
+import { useMemo } from 'react';
 
 import { NetworkSelector } from './components/NetworkSelector';
 import type { SupportedChain } from './constants/chains';
@@ -14,7 +16,8 @@ import type { EIP6963ProviderDetail } from './types/wallet';
 interface ConnectedContentProps {
   selectedProvider: EIP6963ProviderDetail | null;
   supportedChain: SupportedChain | undefined;
-  primaryWallet?: PrimaryWallet | null; // Dynamic wallet from context
+  primaryWallet?: PrimaryWallet | null;
+  account?: string | null;
 }
 
 const DynamicConnectedContent = ({
@@ -23,8 +26,29 @@ const DynamicConnectedContent = ({
   primaryWallet,
 }: ConnectedContentProps) => {
   const { switchChain } = useDynamicSwitchChainHook();
+  const userWallets = useUserWallets();
+  const switchWallet = useSwitchWallet();
+
+  const primaryWalletChain = primaryWallet?.chain;
+  const walletIds: Record<string, string> = useMemo(() => {
+    const solanaWallet = userWallets.find(
+      (wallet) => wallet.chain === 'SOL'
+    )?.id;
+    const evmWallet = userWallets.find((wallet) => wallet.chain === 'EVM')?.id;
+
+    return {
+      EVM: evmWallet || '',
+      SOL: solanaWallet || '',
+    };
+  }, [userWallets]);
 
   const handleNetworkSelect = (chain: SupportedChain) => {
+    // We only switch wallet if the chain type is
+    // different from the primary wallet chain (i.e.: EVM -> SOL)
+    if (chain.chainType !== primaryWalletChain) {
+      switchWallet(walletIds[chain.chainType]);
+    }
+
     switchChain(chain.chainId);
   };
 
@@ -60,7 +84,7 @@ const DynamicConnectedContent = ({
 const Eip6963ConnectedContent = ({
   selectedProvider,
   supportedChain,
-  primaryWallet,
+  account,
 }: ConnectedContentProps) => {
   const { switchChain } = useSwitchChain();
 
@@ -89,7 +113,7 @@ const Eip6963ConnectedContent = ({
         <MessageFlowCard
           selectedProvider={selectedProvider}
           supportedChain={supportedChain}
-          primaryWallet={primaryWallet}
+          account={account}
         />
       </div>
       <Footer />
@@ -101,6 +125,7 @@ export function ConnectedContent({
   selectedProvider,
   supportedChain,
   primaryWallet,
+  account,
 }: ConnectedContentProps) {
   return USE_DYNAMIC_WALLET ? (
     <DynamicConnectedContent
@@ -112,7 +137,7 @@ export function ConnectedContent({
     <Eip6963ConnectedContent
       selectedProvider={selectedProvider}
       supportedChain={supportedChain}
-      primaryWallet={primaryWallet}
+      account={account}
     />
   );
 }
diff --git a/examples/hello/frontend/src/DynamicAppContent.tsx b/examples/hello/frontend/src/DynamicAppContent.tsx
index cda54c54..5981418a 100644
--- a/examples/hello/frontend/src/DynamicAppContent.tsx
+++ b/examples/hello/frontend/src/DynamicAppContent.tsx
@@ -1,4 +1,5 @@
 import { useUniversalSignInContext } from '@zetachain/wallet/react';
+import { useMemo } from 'react';
 
 import { ConnectedContent } from './ConnectedContent';
 import { SUPPORTED_CHAINS } from './constants/chains';
@@ -8,7 +9,18 @@ export function DynamicAppContent() {
   const { primaryWallet, network } = useUniversalSignInContext();
 
   const account = primaryWallet?.address || null;
-  const decimalChainId = network || null;
+  const decimalChainId = useMemo(() => {
+    if (typeof network === 'number') {
+      return network;
+    }
+
+    // Solana Devnet id from `network` property
+    if (network === '103') {
+      return 901;
+    }
+
+    return null;
+  }, [network]);
 
   const supportedChain = SUPPORTED_CHAINS.find(
     (chain) => chain.chainId === decimalChainId
@@ -27,4 +39,4 @@ export function DynamicAppContent() {
       primaryWallet={primaryWallet}
     />
   );
-}
\ No newline at end of file
+}
diff --git a/examples/hello/frontend/src/Eip6963AppContent.tsx b/examples/hello/frontend/src/Eip6963AppContent.tsx
index 5344197b..b6b9035b 100644
--- a/examples/hello/frontend/src/Eip6963AppContent.tsx
+++ b/examples/hello/frontend/src/Eip6963AppContent.tsx
@@ -4,7 +4,7 @@ import { DisconnectedContent } from './DisconnectedContent';
 import { useEip6963Wallet } from './hooks/useEip6963Wallet';
 
 export function Eip6963AppContent() {
-  const { selectedProvider, decimalChainId } = useEip6963Wallet();
+  const { selectedProvider, decimalChainId, account } = useEip6963Wallet();
 
   const supportedChain = SUPPORTED_CHAINS.find(
     (chain) => chain.chainId === decimalChainId
@@ -20,6 +20,7 @@ export function Eip6963AppContent() {
     <ConnectedContent
       selectedProvider={selectedProvider}
       supportedChain={supportedChain}
+      account={account}
     />
   );
-}
\ No newline at end of file
+}
diff --git a/examples/hello/frontend/src/MessageFlowCard.tsx b/examples/hello/frontend/src/MessageFlowCard.tsx
index 9a7fbabc..9a0a973b 100644
--- a/examples/hello/frontend/src/MessageFlowCard.tsx
+++ b/examples/hello/frontend/src/MessageFlowCard.tsx
@@ -1,8 +1,6 @@
 import './MessageFlowCard.css';
 
-import { evmCall } from '@zetachain/toolkit/chains/evm';
 import { type PrimaryWallet } from '@zetachain/wallet';
-import { ZeroAddress } from 'ethers';
 import { useEffect, useRef, useState } from 'react';
 
 import { Button } from './components/Button';
@@ -10,22 +8,23 @@ import { IconApprove, IconEnvelope, IconSendTitle } from './components/icons';
 import { ConfirmedContent } from './ConfirmedContent';
 import type { SupportedChain } from './constants/chains';
 import { HELLO_UNIVERSAL_CONTRACT_ADDRESS } from './constants/contracts';
+import { useHandleCall } from './hooks/useHandleCall';
 import type { EIP6963ProviderDetail } from './types/wallet';
-import { getSignerAndProvider } from './utils/ethersHelpers';
 import { formatNumberWithLocale } from './utils/formatNumber';
 
 interface MessageFlowCardProps {
   selectedProvider: EIP6963ProviderDetail | null;
   supportedChain: SupportedChain | undefined;
   primaryWallet?: PrimaryWallet | null; // Dynamic wallet from context
+  account?: string | null; // EIP6963 account for non-dynamic route
 }
 
 export function MessageFlowCard({
   selectedProvider,
   supportedChain,
   primaryWallet = null,
+  account = null,
 }: MessageFlowCardProps) {
-
   const MAX_STRING_LENGTH = 2000;
   const [isUserSigningTx, setIsUserSigningTx] = useState(false);
   const [isTxReceiptLoading, setIsTxReceiptLoading] = useState(false);
@@ -37,55 +36,22 @@ export function MessageFlowCard({
     return new TextEncoder().encode(string).length;
   };
 
-  const handleEvmCall = async () => {
-    try {
-      const signerAndProvider = await getSignerAndProvider({
-        selectedProvider,
-        primaryWallet,
-      });
-
-      if (!signerAndProvider) {
-        throw new Error('Failed to get signer');
-      }
-
-      const { signer } = signerAndProvider;
-
-      const evmCallParams = {
-        receiver: HELLO_UNIVERSAL_CONTRACT_ADDRESS,
-        types: ['string'],
-        values: [stringValue],
-        revertOptions: {
-          callOnRevert: false,
-          revertAddress: ZeroAddress,
-          revertMessage: '',
-          abortAddress: ZeroAddress,
-          onRevertGasLimit: 1000000,
-        },
-      };
-
-      const evmCallOptions = {
-        signer,
-        txOptions: {
-          gasLimit: 1000000,
-        },
-      };
-
-      setIsUserSigningTx(true);
-
-      const result = await evmCall(evmCallParams, evmCallOptions);
-
-      setIsTxReceiptLoading(true);
-
-      await result.wait();
-
-      setConnectedChainTxHash(result.hash);
-    } catch (error) {
-      console.error(error);
-    } finally {
+  const { handleCall } = useHandleCall({
+    primaryWallet,
+    selectedProvider,
+    supportedChain,
+    receiver: HELLO_UNIVERSAL_CONTRACT_ADDRESS,
+    message: stringValue,
+    account,
+    onSigningStart: () => setIsUserSigningTx(true),
+    onTransactionSubmitted: () => setIsTxReceiptLoading(true),
+    onTransactionConfirmed: (txHash: string) => setConnectedChainTxHash(txHash),
+    onError: (error: Error) => console.error('Transaction error:', error),
+    onComplete: () => {
       setIsUserSigningTx(false);
       setIsTxReceiptLoading(false);
-    }
-  };
+    },
+  });
 
   // Auto-resize textarea based on content
   useEffect(() => {
@@ -168,7 +134,7 @@ export function MessageFlowCard({
         <div>
           <Button
             type="button"
-            onClick={handleEvmCall}
+            onClick={handleCall}
             disabled={
               !stringValue.length ||
               !supportedChain ||
diff --git a/examples/hello/frontend/src/components/NetworkSelector.tsx b/examples/hello/frontend/src/components/NetworkSelector.tsx
index 9fedd2c2..7b525cc7 100644
--- a/examples/hello/frontend/src/components/NetworkSelector.tsx
+++ b/examples/hello/frontend/src/components/NetworkSelector.tsx
@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 
 import { SUPPORTED_CHAINS, type SupportedChain } from '../constants/chains';
+import { USE_DYNAMIC_WALLET } from '../constants/wallets';
 import { Dropdown, type DropdownOption } from './Dropdown';
 
 interface NetworkSelectorProps {
@@ -21,7 +22,9 @@ export const NetworkSelector = ({
   // Convert chains to dropdown options
   const options: DropdownOption<SupportedChain>[] = useMemo(
     () =>
-      SUPPORTED_CHAINS.map((chain) => ({
+      SUPPORTED_CHAINS.filter(
+        (chain) => USE_DYNAMIC_WALLET || chain.chainType === 'EVM'
+      ).map((chain) => ({
         id: chain.chainId,
         label: chain.name,
         value: chain,
diff --git a/examples/hello/frontend/src/constants/chains.ts b/examples/hello/frontend/src/constants/chains.ts
index fdd6d1d4..1cdafe0c 100644
--- a/examples/hello/frontend/src/constants/chains.ts
+++ b/examples/hello/frontend/src/constants/chains.ts
@@ -1,59 +1,79 @@
 export interface SupportedChain {
-  explorerUrl: string;
+  explorerUrl: (txHash: string) => string;
   name: string;
   chainId: number;
+  chainType: 'EVM' | 'SOL';
   icon: string;
   colorHex: string;
 }
 
 export const SUPPORTED_CHAINS: SupportedChain[] = [
   {
-    explorerUrl: 'https://sepolia.arbiscan.io/tx/',
+    explorerUrl: (txHash: string) => `https://sepolia.arbiscan.io/tx/${txHash}`,
     name: 'Arbitrum Sepolia',
     chainId: 421614,
+    chainType: 'EVM',
     icon: '/logos/arbitrum-logo.svg',
     colorHex: '#28446A',
   },
   {
-    explorerUrl: 'https://testnet.snowtrace.io/tx/',
+    explorerUrl: (txHash: string) =>
+      `https://testnet.snowtrace.io/tx/${txHash}`,
     name: 'Avalanche Fuji',
     chainId: 43113,
+    chainType: 'EVM',
     icon: '/logos/avalanche-logo.svg',
     colorHex: '#FF394A',
   },
   {
-    explorerUrl: 'https://sepolia.basescan.org/tx/',
+    explorerUrl: (txHash: string) =>
+      `https://sepolia.basescan.org/tx/${txHash}`,
     name: 'Base Sepolia',
     chainId: 84532,
+    chainType: 'EVM',
     icon: '/logos/base-logo.svg',
     colorHex: '#0052FF',
   },
   {
-    explorerUrl: 'https://testnet.bscscan.com/tx/',
+    explorerUrl: (txHash: string) => `https://testnet.bscscan.com/tx/${txHash}`,
     name: 'BSC Testnet',
     chainId: 97,
+    chainType: 'EVM',
     icon: '/logos/bsc-logo.svg',
     colorHex: '#E1A411',
   },
   {
-    explorerUrl: 'https://sepolia.etherscan.io/tx/',
+    explorerUrl: (txHash: string) =>
+      `https://sepolia.etherscan.io/tx/${txHash}`,
     name: 'Ethereum Sepolia',
     chainId: 11155111,
+    chainType: 'EVM',
     icon: '/logos/ethereum-logo.svg',
     colorHex: '#3457D5',
   },
   {
-    explorerUrl: 'https://amoy.polygonscan.com/tx/',
+    explorerUrl: (txHash: string) =>
+      `https://amoy.polygonscan.com/tx/${txHash}`,
     name: 'Polygon Amoy',
     chainId: 80002,
+    chainType: 'EVM',
     icon: '/logos/polygon-logo.svg',
     colorHex: '#692BD7',
   },
+  {
+    explorerUrl: (txHash: string) =>
+      `https://solscan.io/tx/${txHash}?cluster=devnet`,
+    name: 'Solana Devnet',
+    chainId: 901,
+    chainType: 'SOL',
+    icon: '/logos/solana-logo.svg',
+    colorHex: '#9945FF',
+  },
 ];
 
 export const SUPPORTED_CHAIN_IDS = SUPPORTED_CHAINS.map(
   (chain) => chain.chainId
 );
 
-export const ZETACHAIN_ATHENS_BLOCKSCOUT_EXPLORER_URL =
-  'https://zetachain-testnet.blockscout.com/tx/';
+export const ZETACHAIN_ATHENS_BLOCKSCOUT_EXPLORER_URL = (txHash: string) =>
+  `https://zetachain-testnet.blockscout.com/tx/${txHash}`;
diff --git a/examples/hello/frontend/src/hooks/useHandleCall.ts b/examples/hello/frontend/src/hooks/useHandleCall.ts
new file mode 100644
index 00000000..c1fc744f
--- /dev/null
+++ b/examples/hello/frontend/src/hooks/useHandleCall.ts
@@ -0,0 +1,217 @@
+import { evmCall } from '@zetachain/toolkit/chains/evm';
+import { solanaCall } from '@zetachain/toolkit/chains/solana';
+import { type PrimaryWallet } from '@zetachain/wallet';
+import { getSolanaWalletAdapter } from '@zetachain/wallet/solana';
+import { ZeroAddress } from 'ethers';
+import { useCallback } from 'react';
+
+import type { SupportedChain } from '../constants/chains';
+import type { EIP6963ProviderDetail } from '../types/wallet';
+import { getSignerAndProvider } from '../utils/ethersHelpers';
+
+interface CallParams {
+  receiver: string;
+  types: string[];
+  values: (string | bigint | boolean)[];
+  revertOptions: {
+    callOnRevert: boolean;
+    revertAddress?: string;
+    revertMessage: string;
+    abortAddress?: string;
+    onRevertGasLimit?: string | number | bigint;
+  };
+}
+
+interface UseHandleCallParams {
+  primaryWallet?: PrimaryWallet | null;
+  selectedProvider: EIP6963ProviderDetail | null;
+  supportedChain: SupportedChain | undefined;
+  receiver: string;
+  message: string;
+  account?: string | null;
+  // Handler callbacks for state management
+  onSigningStart?: () => void;
+  onTransactionSubmitted?: () => void;
+  onTransactionConfirmed?: (txHash: string) => void;
+  onError?: (error: Error) => void;
+  onComplete?: () => void;
+}
+
+interface UseHandleCallReturn {
+  handleCall: () => Promise<void>;
+}
+
+/**
+ * Handles EVM-specific call logic
+ */
+async function handleEvmCall(
+  callParams: CallParams,
+  primaryWallet: PrimaryWallet | null,
+  selectedProvider: EIP6963ProviderDetail | null,
+  callbacks: {
+    onSigningStart?: UseHandleCallParams['onSigningStart'];
+    onTransactionSubmitted?: UseHandleCallParams['onTransactionSubmitted'];
+    onTransactionConfirmed?: UseHandleCallParams['onTransactionConfirmed'];
+  }
+): Promise<void> {
+  const signerAndProvider = await getSignerAndProvider({
+    selectedProvider,
+    primaryWallet,
+  });
+
+  if (!signerAndProvider) {
+    throw new Error('Failed to get signer');
+  }
+
+  const { signer } = signerAndProvider;
+
+  const evmCallOptions = {
+    signer,
+    txOptions: {
+      gasLimit: 1000000,
+    },
+  };
+
+  callbacks.onSigningStart?.();
+
+  const result = await evmCall(callParams, evmCallOptions);
+
+  callbacks.onTransactionSubmitted?.();
+
+  await result.wait();
+
+  callbacks.onTransactionConfirmed?.(result.hash);
+}
+
+/**
+ * Handles Solana-specific call logic
+ */
+async function handleSolanaCall(
+  callParams: CallParams,
+  primaryWallet: PrimaryWallet,
+  chainId: string,
+  callbacks: {
+    onSigningStart?: UseHandleCallParams['onSigningStart'];
+    onTransactionSubmitted?: UseHandleCallParams['onTransactionSubmitted'];
+    onTransactionConfirmed?: UseHandleCallParams['onTransactionConfirmed'];
+  }
+): Promise<void> {
+  const walletAdapter = await getSolanaWalletAdapter(primaryWallet);
+
+  const solanaCallOptions = {
+    signer: walletAdapter,
+    chainId,
+  };
+
+  callbacks.onSigningStart?.();
+
+  const result = await solanaCall(callParams, solanaCallOptions);
+
+  callbacks.onTransactionSubmitted?.();
+
+  callbacks.onTransactionConfirmed?.(result);
+}
+
+/**
+ * Custom hook for handling cross-chain calls with proper type safety
+ * and separation of concerns between chain-specific logic and UI state management.
+ */
+export function useHandleCall({
+  primaryWallet,
+  selectedProvider,
+  supportedChain,
+  receiver,
+  message,
+  account,
+  onSigningStart,
+  onTransactionSubmitted,
+  onTransactionConfirmed,
+  onError,
+  onComplete,
+}: UseHandleCallParams): UseHandleCallReturn {
+  const handleCall = useCallback(async () => {
+    const walletType = primaryWallet?.chain || 'EVM'; // Default to 'EVM' for EIP6963 route
+    const walletAddress = primaryWallet?.address || account;
+
+    if (!walletAddress) {
+      const error = new Error('No wallet address available');
+      onError?.(error);
+      return;
+    }
+
+    if (!supportedChain) {
+      const error = new Error('Unsupported chain');
+      onError?.(error);
+      return;
+    }
+
+    if (walletType !== supportedChain.chainType) {
+      const error = new Error('Wallet type does not match network chainType');
+      onError?.(error);
+      return;
+    }
+
+    const callParams: CallParams = {
+      receiver,
+      types: ['string'],
+      values: [message],
+      revertOptions: {
+        callOnRevert: false,
+        revertAddress: walletAddress,
+        revertMessage: '',
+        abortAddress: ZeroAddress,
+        onRevertGasLimit: 1000000,
+      },
+    };
+
+    try {
+      const callbacks = {
+        onSigningStart,
+        onTransactionSubmitted,
+        onTransactionConfirmed,
+      };
+
+      if (walletType === 'EVM') {
+        await handleEvmCall(
+          callParams,
+          primaryWallet || null,
+          selectedProvider,
+          callbacks
+        );
+      } else if (walletType === 'SOL') {
+        if (!primaryWallet) {
+          throw new Error('Solana transactions require primaryWallet');
+        }
+        await handleSolanaCall(
+          callParams,
+          primaryWallet,
+          String(supportedChain.chainId),
+          callbacks
+        );
+      } else {
+        throw new Error(`Unsupported chain: ${walletType}`);
+      }
+    } catch (error) {
+      console.error('Transaction error:', error);
+      onError?.(error instanceof Error ? error : new Error('Unknown error'));
+    } finally {
+      onComplete?.();
+    }
+  }, [
+    primaryWallet,
+    selectedProvider,
+    supportedChain,
+    receiver,
+    message,
+    account,
+    onSigningStart,
+    onTransactionSubmitted,
+    onTransactionConfirmed,
+    onError,
+    onComplete,
+  ]);
+
+  return {
+    handleCall,
+  };
+}
diff --git a/examples/hello/frontend/yarn.lock b/examples/hello/frontend/yarn.lock
index 579a896f..967707b2 100644
--- a/examples/hello/frontend/yarn.lock
+++ b/examples/hello/frontend/yarn.lock
@@ -816,6 +816,29 @@
     "@turnkey/viem" "0.6.2"
     "@turnkey/webauthn-stamper" "0.5.0"
 
+"@dynamic-labs/embedded-wallet-solana@4.29.4":
+  version "4.29.4"
+  resolved "https://registry.yarnpkg.com/@dynamic-labs/embedded-wallet-solana/-/embedded-wallet-solana-4.29.4.tgz#decf1bdd067a968dc13caec2669011a59cef92ff"
+  integrity sha512-3M9cDhzjAB76yCaHV6K9T3LNxumFl2dASaXjb5Eg4+vB7rLuK5N5UIG2oppCg/cF3SOQD1bxc4YiaiKPiK3SQg==
+  dependencies:
+    "@dynamic-labs/assert-package-version" "4.29.4"
+    "@dynamic-labs/embedded-wallet" "4.29.4"
+    "@dynamic-labs/logger" "4.29.4"
+    "@dynamic-labs/rpc-providers" "4.29.4"
+    "@dynamic-labs/sdk-api-core" "0.0.758"
+    "@dynamic-labs/solana-core" "4.29.4"
+    "@dynamic-labs/types" "4.29.4"
+    "@dynamic-labs/utils" "4.29.4"
+    "@dynamic-labs/wallet-book" "4.29.4"
+    "@dynamic-labs/wallet-connector-core" "4.29.4"
+    "@dynamic-labs/webauthn" "4.29.4"
+    "@solana/web3.js" "1.98.1"
+    "@turnkey/iframe-stamper" "2.0.0"
+    "@turnkey/solana" "1.0.1"
+    "@turnkey/webauthn-stamper" "0.5.0"
+    eventemitter3 "5.0.1"
+    viem "2.29.0"
+
 "@dynamic-labs/embedded-wallet@4.29.4":
   version "4.29.4"
   resolved "https://registry.yarnpkg.com/@dynamic-labs/embedded-wallet/-/embedded-wallet-4.29.4.tgz#7810caaa6ef731253ccd1e29fd69a696e7f5ba3a"
@@ -1033,6 +1056,30 @@
     "@solana/web3.js" "1.98.1"
     eventemitter3 "5.0.1"
 
+"@dynamic-labs/solana@4.29.4":
+  version "4.29.4"
+  resolved "https://registry.yarnpkg.com/@dynamic-labs/solana/-/solana-4.29.4.tgz#72a2f5f31f7010e3e766d1f8d44fa8c02721011c"
+  integrity sha512-zyFYpzf/3Lkt4ZFQZZjHgwx8KloukTsVn0jgpuEkJl0kiO6Xzg79YRyHgeJm2zYNs9Zi+Z6zPfSAwjWHFa3WHA==
+  dependencies:
+    "@dynamic-labs/assert-package-version" "4.29.4"
+    "@dynamic-labs/embedded-wallet-solana" "4.29.4"
+    "@dynamic-labs/logger" "4.29.4"
+    "@dynamic-labs/rpc-providers" "4.29.4"
+    "@dynamic-labs/sdk-api-core" "0.0.758"
+    "@dynamic-labs/solana-core" "4.29.4"
+    "@dynamic-labs/types" "4.29.4"
+    "@dynamic-labs/utils" "4.29.4"
+    "@dynamic-labs/waas-svm" "4.29.4"
+    "@dynamic-labs/wallet-book" "4.29.4"
+    "@dynamic-labs/wallet-connector-core" "4.29.4"
+    "@solana/web3.js" "1.98.1"
+    "@wallet-standard/app" "1.0.1"
+    "@wallet-standard/base" "1.0.1"
+    "@wallet-standard/experimental-features" "0.1.1"
+    "@wallet-standard/features" "1.0.3"
+    bs58 "5.0.0"
+    tweetnacl "1.0.3"
+
 "@dynamic-labs/store@4.15.0":
   version "4.15.0"
   resolved "https://registry.yarnpkg.com/@dynamic-labs/store/-/store-4.15.0.tgz#d29fefc8e7d60b87bb18d5d0759b0269e30829c9"
@@ -1144,6 +1191,24 @@
     "@dynamic-labs/wallet-connector-core" "4.29.4"
     viem "^2.28.4"
 
+"@dynamic-labs/waas-svm@4.29.4":
+  version "4.29.4"
+  resolved "https://registry.yarnpkg.com/@dynamic-labs/waas-svm/-/waas-svm-4.29.4.tgz#066f9c036c39faeed49bb4b790d5407c6542b06a"
+  integrity sha512-KauBHzrnDPL96iDUIOPf81jFm0dSr9zDvIO1Nn6NfGhw3S6cp/ufmfxnK0JGkuiekCP5eiImdOWfMcf8TujVog==
+  dependencies:
+    "@dynamic-labs/assert-package-version" "4.29.4"
+    "@dynamic-labs/logger" "4.29.4"
+    "@dynamic-labs/rpc-providers" "4.29.4"
+    "@dynamic-labs/sdk-api-core" "0.0.758"
+    "@dynamic-labs/solana-core" "4.29.4"
+    "@dynamic-labs/types" "4.29.4"
+    "@dynamic-labs/utils" "4.29.4"
+    "@dynamic-labs/waas" "4.29.4"
+    "@dynamic-labs/wallet-connector-core" "4.29.4"
+    "@solana/web3.js" "1.98.1"
+    bs58 "5.0.0"
+    eventemitter3 "5.0.1"
+
 "@dynamic-labs/waas@4.29.4":
   version "4.29.4"
   resolved "https://registry.yarnpkg.com/@dynamic-labs/waas/-/waas-4.29.4.tgz#8378ae37290804f5a51f934602eb932ec1c5587b"
@@ -2382,14 +2447,14 @@
   resolved "https://registry.yarnpkg.com/@noble/ciphers/-/ciphers-1.3.0.tgz#f64b8ff886c240e644e5573c097f86e5b43676dc"
   integrity sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==
 
-"@noble/curves@1.2.0", "@noble/curves@1.4.0", "@noble/curves@1.4.2", "@noble/curves@1.8.0", "@noble/curves@1.8.1", "@noble/curves@1.9.1", "@noble/curves@1.9.2", "@noble/curves@1.9.7", "@noble/curves@^1.3.0", "@noble/curves@^1.4.2", "@noble/curves@^1.6.0", "@noble/curves@^1.8.0", "@noble/curves@^1.9.1", "@noble/curves@^1.9.4", "@noble/curves@~1.4.0", "@noble/curves@~1.8.1", "@noble/curves@~1.9.0":
+"@noble/curves@1.2.0", "@noble/curves@1.4.0", "@noble/curves@1.4.2", "@noble/curves@1.8.0", "@noble/curves@1.8.1", "@noble/curves@1.8.2", "@noble/curves@1.9.1", "@noble/curves@1.9.2", "@noble/curves@1.9.7", "@noble/curves@^1.3.0", "@noble/curves@^1.4.2", "@noble/curves@^1.6.0", "@noble/curves@^1.8.0", "@noble/curves@^1.9.1", "@noble/curves@^1.9.4", "@noble/curves@~1.4.0", "@noble/curves@~1.8.1", "@noble/curves@~1.9.0":
   version "1.9.7"
   resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.7.tgz#79d04b4758a43e4bca2cbdc62e7771352fa6b951"
   integrity sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw==
   dependencies:
     "@noble/hashes" "1.8.0"
 
-"@noble/hashes@1.2.0", "@noble/hashes@1.3.2", "@noble/hashes@1.4.0", "@noble/hashes@1.7.0", "@noble/hashes@1.7.1", "@noble/hashes@1.8.0", "@noble/hashes@^1.2.0", "@noble/hashes@^1.3.1", "@noble/hashes@^1.4.0", "@noble/hashes@^1.5.0", "@noble/hashes@^1.8.0", "@noble/hashes@~1.2.0", "@noble/hashes@~1.4.0", "@noble/hashes@~1.7.1", "@noble/hashes@~1.8.0":
+"@noble/hashes@1.2.0", "@noble/hashes@1.3.2", "@noble/hashes@1.4.0", "@noble/hashes@1.7.0", "@noble/hashes@1.7.1", "@noble/hashes@1.7.2", "@noble/hashes@1.8.0", "@noble/hashes@^1.2.0", "@noble/hashes@^1.3.1", "@noble/hashes@^1.4.0", "@noble/hashes@^1.5.0", "@noble/hashes@^1.8.0", "@noble/hashes@~1.2.0", "@noble/hashes@~1.4.0", "@noble/hashes@~1.7.1", "@noble/hashes@~1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a"
   integrity sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==
@@ -3630,7 +3695,7 @@
     rpc-websockets "^9.0.2"
     superstruct "^2.0.2"
 
-"@solana/web3.js@^1.32.0", "@solana/web3.js@^1.68.0", "@solana/web3.js@^1.69.0":
+"@solana/web3.js@^1.32.0", "@solana/web3.js@^1.68.0", "@solana/web3.js@^1.69.0", "@solana/web3.js@^1.88.1":
   version "1.98.4"
   resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.98.4.tgz#df51d78be9d865181ec5138b4e699d48e6895bbe"
   integrity sha512-vv9lfnvjUsRiq//+j5pBdXig0IQdtzA0BRZ3bXEP4KaIyF1CcaydWqgyzQgfZMNIsWNWmG+AUHwPy4AHOD6gpw==
@@ -3770,6 +3835,16 @@
     cross-fetch "^3.1.5"
     elliptic "^6.5.5"
 
+"@turnkey/solana@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@turnkey/solana/-/solana-1.0.1.tgz#be2312f227b778f652f8f6040700dd9c192f7299"
+  integrity sha512-SjA908ahAYTSatTNOk97qe5fWHGLrR2siM9SxCTEH8a3pjrtTyzqVM7vcB8y+c4RDG1IjG4j8qGK467JM/Da4Q==
+  dependencies:
+    "@solana/web3.js" "^1.88.1"
+    "@turnkey/http" "2.15.0"
+    "@turnkey/sdk-browser" "1.8.0"
+    "@turnkey/sdk-server" "1.5.0"
+
 "@turnkey/viem@0.6.2":
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/@turnkey/viem/-/viem-0.6.2.tgz#c5d8d1388cce0617463cb82587de965df2c3d8ea"
@@ -4193,6 +4268,13 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.21.tgz#505edb122629d1979f70a2a65ca0bd4050dc2e54"
   integrity sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==
 
+"@wallet-standard/app@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@wallet-standard/app/-/app-1.0.1.tgz#f83c3ae887f7fb52497a7b259bba734ae10a2994"
+  integrity sha512-LnLYq2Vy2guTZ8GQKKSXQK3+FRGPil75XEdkZqE6fiLixJhZJoJa5hT7lXxwe0ykVTt9LEThdTbOpT7KadS26Q==
+  dependencies:
+    "@wallet-standard/base" "^1.0.1"
+
 "@wallet-standard/app@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@wallet-standard/app/-/app-1.1.0.tgz#2ca32e4675536224ebe55a00ad533b7923d7380a"
@@ -4200,6 +4282,11 @@
   dependencies:
     "@wallet-standard/base" "^1.1.0"
 
+"@wallet-standard/base@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@wallet-standard/base/-/base-1.0.1.tgz#860dd94d47c9e3c5c43b79d91c6afdbd7a36264e"
+  integrity sha512-1To3ekMfzhYxe0Yhkpri+Fedq0SYcfrOfJi3vbLjMwF2qiKPjTGLwZkf2C9ftdQmxES+hmxhBzTwF4KgcOwf8w==
+
 "@wallet-standard/base@^1.0.1", "@wallet-standard/base@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@wallet-standard/base/-/base-1.1.0.tgz#214093c0597a1e724ee6dbacd84191dfec62bb33"
@@ -4235,6 +4322,20 @@
     chalk "^5.4.1"
     commander "^13.1.0"
 
+"@wallet-standard/experimental-features@0.1.1":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@wallet-standard/experimental-features/-/experimental-features-0.1.1.tgz#b7a8523482e0953646af488ba8027f9cd337a8cf"
+  integrity sha512-WKtnET1okeDACTbxmePGOGaIUrGvlu/DestLZvZ/ddFpUKw7nokkbinX/gHzsuAC9WGtLyhqLSppAHzN+vAAaQ==
+  dependencies:
+    "@wallet-standard/base" "^1.0.1"
+
+"@wallet-standard/features@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@wallet-standard/features/-/features-1.0.3.tgz#c992876c5e4f7a0672f8869c4146c87e0dfe48c8"
+  integrity sha512-m8475I6W5LTatTZuUz5JJNK42wFRgkJTB0I9tkruMwfqBF2UN2eomkYNVf9RbrsROelCRzSFmugqjKZBFaubsA==
+  dependencies:
+    "@wallet-standard/base" "^1.0.1"
+
 "@wallet-standard/features@^1.0.3", "@wallet-standard/features@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@wallet-standard/features/-/features-1.1.0.tgz#f256d7b18940c8d134f66164330db358a8f5200e"
@@ -4638,10 +4739,10 @@
   resolved "https://registry.yarnpkg.com/@zetachain/standard-contracts/-/standard-contracts-2.0.1.tgz#aefd28bb81f1f05b183bd73dc62bd68e456a6ebf"
   integrity sha512-SHV9a1bSgy8litI/LRZ4VIus7Gsjy0wj3n9bZeIsEydn0C5NNZxYO4XW+P06dlEyDQjtcVJQHoQOyHkodBoVsQ==
 
-"@zetachain/toolkit@16.1.3":
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-16.1.3.tgz#8c9a5bb46fc9150a70b0cb3b02cff6d9607680aa"
-  integrity sha512-qTsISnoyroSKcFxuu32gmd7+R8lP7ueehYv5edaQMu07Cj9zsuWWj88Ntf6bkiI6VMYPMpCpYUsuY17Ie+WIyA==
+"@zetachain/toolkit@16.1.4":
+  version "16.1.4"
+  resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-16.1.4.tgz#2ab375a589ab0ff8e1d791e61de723e0355702f1"
+  integrity sha512-wR6ffBHaR9+BWA1rP/5XgswX/+NXZHZi9CM/ytct4iXj4zUGDn6SaZlSV2+rnkhX6C0ZLs9gnMfcNco2/IsKCg==
   dependencies:
     "@coral-xyz/anchor" "^0.30.1"
     "@ethersproject/units" "^5.8.0"
@@ -4687,15 +4788,16 @@
     web3 "^4.15.0"
     zod "^3.24.2"
 
-"@zetachain/wallet@1.0.12":
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/@zetachain/wallet/-/wallet-1.0.12.tgz#eb9436b412e11866001f767c3867f2b3cd94fd94"
-  integrity sha512-zR82MnnuBkCekzCdEpRkKheKkXxlSzdKiYm5pddw8mL7J+vf+41ciBK1IBhxh3BfOy+J/akx4XngP10l1eeT7A==
+"@zetachain/wallet@1.0.13":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@zetachain/wallet/-/wallet-1.0.13.tgz#2a78d23d6ac658c0a630f5f3ceb46365d808f2f2"
+  integrity sha512-ULA9ecGlbRefI4uytrkWSLOROSINwhGG151M+E7ohhp/XVI5+jwr13lmhwc6AcM9UbkBzM5F7QvlxSptpE6DOA==
   dependencies:
     "@dynamic-labs/ethereum" "4.29.4"
     "@dynamic-labs/ethers-v6" "4.29.4"
     "@dynamic-labs/global-wallet-client" "4.15.0"
     "@dynamic-labs/sdk-react-core" "4.29.4"
+    "@dynamic-labs/solana" "4.29.4"
     "@react-native-async-storage/async-storage" "^2.2.0"
     "@wallet-standard/wallet" "^1.1.0"
     react "^19.1.1"
@@ -8516,6 +8618,19 @@ ox@0.6.7:
     abitype "^1.0.6"
     eventemitter3 "5.0.1"
 
+ox@0.6.9:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/ox/-/ox-0.6.9.tgz#da1ee04fa10de30c8d04c15bfb80fe58b1f554bd"
+  integrity sha512-wi5ShvzE4eOcTwQVsIPdFr+8ycyX+5le/96iAJutaZAvCes1J0+RvpEPg5QDPDiaR0XQQAvZVl7AwqQcINuUug==
+  dependencies:
+    "@adraffy/ens-normalize" "^1.10.1"
+    "@noble/curves" "^1.6.0"
+    "@noble/hashes" "^1.5.0"
+    "@scure/bip32" "^1.5.0"
+    "@scure/bip39" "^1.4.0"
+    abitype "^1.0.6"
+    eventemitter3 "5.0.1"
+
 ox@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ox/-/ox-0.7.1.tgz#fb23a770dd966c051ad916d4e2e655a6f995e1cf"
@@ -10429,6 +10544,20 @@ viem@2.23.2:
     ox "0.6.7"
     ws "8.18.0"
 
+viem@2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-2.29.0.tgz#acaf936e534f61a2dfccd8128acce92bc724aba7"
+  integrity sha512-N6GeIuuay/spDyw+5FbSuNIkVN0da+jGOjdlC0bdatIN+N0jtOf9Zfj0pbXgpIJGwnM9ocxzTRt0HZVbHBdL2Q==
+  dependencies:
+    "@noble/curves" "1.8.2"
+    "@noble/hashes" "1.7.2"
+    "@scure/bip32" "1.6.2"
+    "@scure/bip39" "1.5.4"
+    abitype "1.0.8"
+    isows "1.0.6"
+    ox "0.6.9"
+    ws "8.18.1"
+
 viem@2.31.0:
   version "2.31.0"
   resolved "https://registry.yarnpkg.com/viem/-/viem-2.31.0.tgz#2263426cce091d440e283b88183dff6f1d8bae5c"
@@ -10860,6 +10989,11 @@ ws@8.18.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
   integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
 
+ws@8.18.1:
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb"
+  integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==
+
 ws@8.18.2:
   version "8.18.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.2.tgz#42738b2be57ced85f46154320aabb51ab003705a"