@sodax/dapp-kit 0.0.1-rc.9 → 1.0.0-rc.2

package/src/hooks/staking/useStakeApprove.ts

@@ -0,0 +1,50 @@
+// packages/dapp-kit/src/hooks/staking/useStakeApprove.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { StakeParams, TxReturnType, SpokeProvider } from '@sodax/sdk';
+import { useMutation, type UseMutationResult } from '@tanstack/react-query';
+
+/**
+ * Hook for approving SODA token spending for staking operations.
+ * Uses React Query's useMutation for better state management and caching.
+ *
+ * @param {SpokeProvider | undefined} spokeProvider - The spoke provider to use for the approval
+ * @returns {UseMutationResult<TxReturnType<SpokeProvider, false>, Error, Omit<StakeParams, 'action'>>} Mutation result object containing mutation function and state
+ *
+ * @example
+ * ```typescript
+ * const { mutateAsync: approve, isPending } = useStakeApprove(spokeProvider);
+ *
+ * const handleApprove = async () => {
+ *   const result = await approve({
+ *     amount: 1000000000000000000n, // 1 SODA
+ *     account: '0x...'
+ *   });
+ *
+ *   console.log('Approval successful:', result);
+ * };
+ * ```
+ */
+export function useStakeApprove(
+  spokeProvider: SpokeProvider | undefined,
+): UseMutationResult<TxReturnType<SpokeProvider, false>, Error, Omit<StakeParams, 'action'>> {
+  const { sodax } = useSodaxContext();
+
+  return useMutation<TxReturnType<SpokeProvider, false>, Error, Omit<StakeParams, 'action'>>({
+    mutationFn: async (params: Omit<StakeParams, 'action'>) => {
+      if (!spokeProvider) {
+        throw new Error('Spoke provider not found');
+      }
+
+      const result = await sodax.staking.approve({
+        params: { ...params, action: 'stake' },
+        spokeProvider,
+      });
+
+      if (!result.ok) {
+        throw new Error(`Stake approval failed: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+  });
+}

package/src/hooks/staking/useStakeRatio.ts

@@ -0,0 +1,53 @@
+// packages/dapp-kit/src/hooks/staking/useStakeRatio.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+
+/**
+ * Hook for fetching stake ratio estimates (xSoda amount and preview deposit).
+ * Uses React Query for efficient caching and state management.
+ *
+ * @param {bigint | undefined} amount - The amount of SODA to estimate stake for
+ * @param {number} refetchInterval - The interval in milliseconds to refetch data (default: 10000)
+ * @returns {UseQueryResult<[bigint, bigint], Error>} Query result object containing stake ratio estimates and state
+ *
+ * @example
+ * ```typescript
+ * const { data: stakeRatio, isLoading, error } = useStakeRatio(1000000000000000000n); // 1 SODA
+ *
+ * if (isLoading) return <div>Loading stake ratio...</div>;
+ * if (stakeRatio) {
+ *   const [xSodaAmount, previewDepositAmount] = stakeRatio;
+ *   console.log('xSoda amount:', xSodaAmount);
+ *   console.log('Preview deposit:', previewDepositAmount);
+ * }
+ * ```
+ */
+export function useStakeRatio(
+  amount: bigint | undefined,
+  refetchInterval = 10000,
+): UseQueryResult<[bigint, bigint], Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['soda', 'stakeRatio', amount?.toString()],
+    queryFn: async () => {
+      if (!amount || amount <= 0n) {
+        throw new Error('Amount must be greater than 0');
+      }
+
+      if (!sodax?.staking) {
+        throw new Error('Staking service not available');
+      }
+
+      const result = await sodax.staking.getStakeRatio(amount);
+
+      if (!result.ok) {
+        throw new Error(`Failed to fetch stake ratio: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+    enabled: !!amount && amount > 0n && !!sodax?.staking,
+    refetchInterval,
+  });
+}

package/src/hooks/staking/useStakingConfig.ts

@@ -0,0 +1,40 @@
+// packages/dapp-kit/src/hooks/staking/useStakingConfig.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { StakingConfig } from '@sodax/sdk';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+
+/**
+ * Hook for fetching staking configuration from the stakedSoda contract.
+ * Uses React Query for efficient caching and state management.
+ *
+ * @param {number} refetchInterval - The interval in milliseconds to refetch data (default: 30000)
+ * @returns {UseQueryResult<StakingConfig, Error>} Query result object containing staking config and state
+ *
+ * @example
+ * ```typescript
+ * const { data: stakingConfig, isLoading, error } = useStakingConfig();
+ *
+ * if (isLoading) return <div>Loading staking config...</div>;
+ * if (stakingConfig) {
+ *   console.log('Unstaking period (days):', stakingConfig.unstakingPeriod / 86400n);
+ *   console.log('Max penalty (%):', stakingConfig.maxPenalty);
+ * }
+ * ```
+ */
+export function useStakingConfig(refetchInterval = 30000): UseQueryResult<StakingConfig, Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['soda', 'stakingConfig'],
+    queryFn: async () => {
+      const result = await sodax.staking.getStakingConfig();
+
+      if (!result.ok) {
+        throw new Error(`Failed to fetch staking config: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+    refetchInterval,
+  });
+}

package/src/hooks/staking/useStakingInfo.ts

@@ -0,0 +1,50 @@
+// packages/dapp-kit/src/hooks/staking/useStakingInfo.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { StakingInfo, SpokeProvider } from '@sodax/sdk';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+
+/**
+ * Hook for fetching comprehensive staking information for a user.
+ * Uses React Query for efficient caching and state management.
+ *
+ * @param {SpokeProvider | undefined} spokeProvider - The spoke provider to use for the query
+ * @param {number} refetchInterval - The interval in milliseconds to refetch data (default: 5000)
+ * @returns {UseQueryResult<StakingInfo, Error>} Query result object containing staking info and state
+ *
+ * @example
+ * ```typescript
+ * const { data: stakingInfo, isLoading, error } = useStakingInfo(spokeProvider);
+ *
+ * if (isLoading) return <div>Loading staking info...</div>;
+ * if (stakingInfo) {
+ *   console.log('Total staked:', stakingInfo.totalStaked);
+ *   console.log('User staked:', stakingInfo.userStaked);
+ *   console.log('xSODA balance:', stakingInfo.userXSodaBalance);
+ * }
+ * ```
+ */
+export function useStakingInfo(
+  spokeProvider: SpokeProvider | undefined,
+  refetchInterval = 5000,
+): UseQueryResult<StakingInfo, Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['soda', 'stakingInfo', spokeProvider?.chainConfig.chain.id],
+    queryFn: async () => {
+      if (!spokeProvider) {
+        throw new Error('Spoke provider not found');
+      }
+
+      const result = await sodax.staking.getStakingInfoFromSpoke(spokeProvider);
+
+      if (!result.ok) {
+        throw new Error(`Failed to fetch staking info: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+    enabled: !!spokeProvider,
+    refetchInterval,
+  });
+}

package/src/hooks/staking/useUnstake.ts

@@ -0,0 +1,54 @@
+// packages/dapp-kit/src/hooks/staking/useUnstake.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { UnstakeParams, SpokeTxHash, HubTxHash, SpokeProvider } from '@sodax/sdk';
+import { useMutation, useQueryClient, type UseMutationResult } from '@tanstack/react-query';
+
+/**
+ * Hook for executing unstake transactions to unstake xSODA shares.
+ * Uses React Query's useMutation for better state management and caching.
+ *
+ * @param {SpokeProvider | undefined} spokeProvider - The spoke provider to use for the unstake
+ * @returns {UseMutationResult<[SpokeTxHash, HubTxHash], Error, Omit<UnstakeParams, 'action'>>} Mutation result object containing mutation function and state
+ *
+ * @example
+ * ```typescript
+ * const { mutateAsync: unstake, isPending } = useUnstake(spokeProvider);
+ *
+ * const handleUnstake = async () => {
+ *   const result = await unstake({
+ *     amount: 1000000000000000000n, // 1 xSODA
+ *     account: '0x...'
+ *   });
+ *
+ *   console.log('Unstake successful:', result);
+ * };
+ * ```
+ */
+export function useUnstake(
+  spokeProvider: SpokeProvider | undefined,
+): UseMutationResult<[SpokeTxHash, HubTxHash], Error, Omit<UnstakeParams, 'action'>> {
+  const { sodax } = useSodaxContext();
+  const queryClient = useQueryClient();
+
+  return useMutation<[SpokeTxHash, HubTxHash], Error, Omit<UnstakeParams, 'action'>>({
+    mutationFn: async (params: Omit<UnstakeParams, 'action'>) => {
+      if (!spokeProvider) {
+        throw new Error('Spoke provider not found');
+      }
+
+      const result = await sodax.staking.unstake({ ...params, action: 'unstake' }, spokeProvider);
+
+      if (!result.ok) {
+        throw new Error(`Unstake failed: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+    onSuccess: () => {
+      // Invalidate relevant queries to refresh data
+      queryClient.invalidateQueries({ queryKey: ['stakingInfo'] });
+      queryClient.invalidateQueries({ queryKey: ['unstakingInfo'] });
+      queryClient.invalidateQueries({ queryKey: ['unstakingInfoWithPenalty'] });
+    },
+  });
+}

package/src/hooks/staking/useUnstakeAllowance.ts

@@ -0,0 +1,58 @@
+// packages/dapp-kit/src/hooks/staking/useStakeAllowance.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { UnstakeParams, SpokeProvider } from '@sodax/sdk';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+
+/**
+ * Hook for checking xSODA token allowance for unstaking operations.
+ * Uses React Query for efficient caching and state management.
+ *
+ * @param {Omit<UnstakeParams, 'action'> | undefined} params - The unstaking parameters. If undefined, the query will be disabled.
+ * @param {SpokeProvider | undefined} spokeProvider - The spoke provider to use for the allowance check
+ * @returns {UseQueryResult<boolean, Error>} Query result object containing allowance data and state
+ *
+ * @example
+ * ```typescript
+ * const { data: hasAllowed, isLoading } = useUnstakeAllowance(
+ *   {
+ *     amount: 1000000000000000000n, // 1 xSODA
+ *     account: '0x...'
+ *   },
+ *   spokeProvider
+ * );
+ *
+ * if (isLoading) return <div>Checking allowance...</div>;
+ * if (hasAllowed) {
+ *   console.log('Sufficient allowance for unstaking');
+ * }
+ * ```
+ */
+export function useUnstakeAllowance(
+  params: Omit<UnstakeParams, 'action'> | undefined,
+  spokeProvider: SpokeProvider | undefined,
+): UseQueryResult<boolean, Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['soda', 'unstakeAllowance', params, spokeProvider?.chainConfig.chain.id],
+    queryFn: async () => {
+      if (!params || !spokeProvider) {
+        return false;
+      }
+
+      const result = await sodax.staking.isAllowanceValid({
+        params: { ...params, action: 'unstake' },
+        spokeProvider,
+      });
+
+      if (!result.ok) {
+        console.error(`Unstake allowance check failed: ${result.error.code}, error: ${result.error.error}`);
+        throw new Error(`Unstake allowance check failed: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+    enabled: !!params && !!spokeProvider,
+    refetchInterval: 5000, // Refetch every 5 seconds
+  });
+}

package/src/hooks/staking/useUnstakeApprove.ts

@@ -0,0 +1,52 @@
+// packages/dapp-kit/src/hooks/staking/useStakeApprove.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { TxReturnType, UnstakeParams } from '@sodax/sdk';
+import { useMutation, type UseMutationResult } from '@tanstack/react-query';
+import type { SpokeProvider } from '@sodax/sdk';
+
+/**
+ * Hook for approving xSODA token spending for unstaking operations.
+ * Uses React Query's useMutation for better state management and caching.
+ *
+ * @param {SpokeProvider | undefined} spokeProvider - The spoke provider to use for the approval
+ * @returns {UseMutationResult<TxReturnType<SpokeProvider, false>, Error, Omit<UnstakeParams, 'action'>>} Mutation result object containing mutation function and state
+ *
+ * @example
+ * ```typescript
+ * const { mutateAsync: approve, isPending } = useUnstakeApprove(spokeProvider);
+ *
+ * const handleApprove = async () => {
+ *   const result = await approve({
+ *     amount: 1000000000000000000n, // 1 xSODA
+ *     account: '0x...'
+ *   });
+ *
+ *   console.log('Approval successful:', result);
+ * };
+ * ```
+ */
+export function useUnstakeApprove(
+  spokeProvider: SpokeProvider | undefined,
+): UseMutationResult<TxReturnType<SpokeProvider, false>, Error, Omit<UnstakeParams, 'action'>> {
+  const { sodax } = useSodaxContext();
+
+  return useMutation<TxReturnType<SpokeProvider, false>, Error, Omit<UnstakeParams, 'action'>>({
+    mutationFn: async (params: Omit<UnstakeParams, 'action'>) => {
+      console.log('useUnstakeApprove called with params:', params);
+      if (!spokeProvider) {
+        throw new Error('Spoke provider not found');
+      }
+
+      const result = await sodax.staking.approve({
+        params: { ...params, action: 'unstake' },
+        spokeProvider,
+      });
+
+      if (!result.ok) {
+        throw new Error(`Unstake approval failed: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+  });
+}

package/src/hooks/staking/useUnstakingInfo.ts

@@ -0,0 +1,53 @@
+// packages/dapp-kit/src/hooks/staking/useUnstakingInfoWithPenalty.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { UnstakingInfo, SpokeProvider } from '@sodax/sdk';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+
+/**
+ * Hook for fetching unstaking information from the stakedSoda contract.
+ * Uses React Query for efficient caching and state management.
+ *
+ * @param {string | undefined} userAddress - The user address to fetch unstaking info for
+ * @param {SpokeProvider | undefined} spokeProvider - The spoke provider instance
+ * @param {number} refetchInterval - The interval in milliseconds to refetch data (default: 5000)
+ * @returns {UseQueryResult<UnstakingInfo, Error>} Query result object containing unstaking info and state
+ *
+ * @example
+ * ```typescript
+ * const { data: unstakingInfo, isLoading, error } = useUnstakingInfo(userAddress, spokeProvider);
+ *
+ * if (isLoading) return <div>Loading unstaking info...</div>;
+ * if (unstakingInfo) {
+ *   console.log('Total unstaking:', unstakingInfo.totalUnstaking);
+ *   unstakingInfo.userUnstakeSodaRequests.forEach(request => {
+ *     console.log('Request amount:', request.request.amount);
+ *   });
+ * }
+ * ```
+ */
+export function useUnstakingInfo(
+  userAddress: string | undefined,
+  spokeProvider: SpokeProvider | undefined,
+  refetchInterval = 5000,
+): UseQueryResult<UnstakingInfo, Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['soda', 'unstakingInfoWithPenalty', spokeProvider?.chainConfig.chain.id, userAddress],
+    queryFn: async () => {
+      if (!spokeProvider || !userAddress) {
+        throw new Error('Spoke provider or user address not found');
+      }
+
+      const result = await sodax.staking.getUnstakingInfo(spokeProvider);
+
+      if (!result.ok) {
+        throw new Error(`Failed to fetch unstaking info: ${result.error.code}`);
+      }
+
+      return result.value;
+    },
+    enabled: !!spokeProvider && !!userAddress,
+    refetchInterval,
+  });
+}

package/src/hooks/staking/useUnstakingInfoWithPenalty.ts

@@ -0,0 +1,59 @@
+// packages/dapp-kit/src/hooks/staking/useUnstakingInfoWithPenalty.ts
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { UnstakingInfo, UnstakeRequestWithPenalty, SpokeProvider } from '@sodax/sdk';
+import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+
+export type UnstakingInfoWithPenalty = UnstakingInfo & {
+  requestsWithPenalty: UnstakeRequestWithPenalty[];
+};
+
+/**
+ * Hook for fetching unstaking information with penalty calculations from the stakedSoda contract.
+ * Uses React Query for efficient caching and state management.
+ *
+ * @param {string | undefined} userAddress - The user address to fetch unstaking info for
+ * @param {SpokeProvider | undefined} spokeProvider - The spoke provider instance
+ * @param {number} refetchInterval - The interval in milliseconds to refetch data (default: 5000)
+ * @returns {UseQueryResult<UnstakingInfoWithPenalty, Error>} Query result object containing unstaking info with penalties and state
+ *
+ * @example
+ * ```typescript
+ * const { data: unstakingInfo, isLoading, error } = useUnstakingInfoWithPenalty(userAddress, spokeProvider);
+ *
+ * if (isLoading) return <div>Loading unstaking info...</div>;
+ * if (unstakingInfo) {
+ *   console.log('Total unstaking:', unstakingInfo.totalUnstaking);
+ *   unstakingInfo.requestsWithPenalty.forEach(request => {
+ *     console.log('Penalty:', request.penaltyPercentage + '%');
+ *     console.log('Claimable amount:', request.claimableAmount);
+ *   });
+ * }
+ * ```
+ */
+export function useUnstakingInfoWithPenalty(
+  userAddress: string | undefined,
+  spokeProvider: SpokeProvider | undefined,
+  refetchInterval = 5000,
+): UseQueryResult<UnstakingInfoWithPenalty, Error> {
+  const { sodax } = useSodaxContext();
+
+  return useQuery({
+    queryKey: ['soda', 'unstakingInfoWithPenalty', spokeProvider?.chainConfig.chain.id, userAddress],
+    queryFn: async () => {
+      if (!spokeProvider) {
+        throw new Error('Spoke provider not found');
+      }
+
+      // Get unstaking info with penalty calculations
+      const penaltyResult = await sodax.staking.getUnstakingInfoWithPenalty(spokeProvider);
+
+      if (!penaltyResult.ok) {
+        throw new Error(`Failed to fetch unstaking info with penalty: ${penaltyResult.error.code}`);
+      }
+
+      return penaltyResult.value;
+    },
+    enabled: !!spokeProvider && !!userAddress,
+    refetchInterval,
+  });
+}

package/src/hooks/swap/index.ts

@@ -1,5 +1,6 @@
 export * from './useQuote';
-export * from './useCreateIntentOrder';
+export * from './useSwap';
 export * from './useStatus';
 export * from './useSwapAllowance';
 export * from './useSwapApprove';
+export * from './useCancelSwap';

package/src/hooks/swap/useCancelSwap.ts

@@ -0,0 +1,44 @@
+import { useSodaxContext } from '../shared/useSodaxContext';
+import type { Intent, Result, SpokeProvider, TxReturnType } from '@sodax/sdk';
+import { useMutation, type UseMutationResult } from '@tanstack/react-query';
+
+type CancelIntentParams = {
+  intent: Intent;
+  raw?: boolean;
+};
+
+type CancelIntentResult = Result<TxReturnType<SpokeProvider, boolean>>;
+
+/**
+ * Hook for canceling a swap intent order.
+ * Uses React Query's useMutation for better state management and caching.
+ *
+ * @param {SpokeProvider} spokeProvider - The spoke provider to use for canceling the intent
+ * @returns {UseMutationResult} Mutation result object containing mutation function and state
+ *
+ * @example
+ * ```typescript
+ * const { mutateAsync: cancelSwap, isPending } = useCancelSwap(spokeProvider);
+ *
+ * const handleCancelSwap = async () => {
+ *   const result = await cancelSwap({
+ *     intent: intentObject,
+ *     raw: false // optional, defaults to false
+ *   });
+ * };
+ * ```
+ */
+export function useCancelSwap(
+  spokeProvider: SpokeProvider | undefined,
+): UseMutationResult<CancelIntentResult, Error, CancelIntentParams> {
+  const { sodax } = useSodaxContext();
+
+  return useMutation<CancelIntentResult, Error, CancelIntentParams>({
+    mutationFn: async ({ intent, raw = false }: CancelIntentParams) => {
+      if (!spokeProvider) {
+        throw new Error('Spoke provider not found');
+      }
+      return sodax.swap.cancelIntent(intent, spokeProvider, raw);
+    },
+  });
+}

package/src/hooks/swap/useQuote.ts

@@ -1,6 +1,7 @@
 import type { SolverErrorResponse, SolverIntentQuoteRequest, SolverIntentQuoteResponse, Result } from '@sodax/sdk';
 import { useSodaxContext } from '../shared/useSodaxContext';
 import { useQuery, type UseQueryResult } from '@tanstack/react-query';
+import { useMemo } from 'react';
 
 /**
  * Hook for fetching a quote for an intent-based swap.
@@ -41,13 +42,26 @@ export const useQuote = (
   payload: SolverIntentQuoteRequest | undefined,
 ): UseQueryResult<Result<SolverIntentQuoteResponse, SolverErrorResponse> | undefined> => {
   const { sodax } = useSodaxContext();
+  
+  // Create a serializable query key by converting BigInt to string
+  const queryKey = useMemo(() => {
+    if (!payload) return ['quote', undefined];
+    return [
+      'quote',
+      {
+        ...payload,
+        amount: payload.amount.toString(),
+      },
+    ];
+  }, [payload]);
+
   return useQuery({
-    queryKey: [payload],
+    queryKey,
     queryFn: async () => {
       if (!payload) {
         return undefined;
       }
-      return sodax.solver.getQuote(payload);
+      return sodax.swap.getQuote(payload);
     },
     enabled: !!payload,
     refetchInterval: 3000,

package/src/hooks/swap/useStatus.ts

@@ -37,7 +37,7 @@ export const useStatus = (
   return useQuery({
     queryKey: [intent_tx_hash],
     queryFn: async () => {
-      return sodax.solver.getStatus({ intent_tx_hash });
+      return sodax.swap.getStatus({ intent_tx_hash });
     },
     refetchInterval: 3000, // 3s
   });

package/src/hooks/swap/{useCreateIntentOrder.ts → useSwap.ts}

@@ -5,19 +5,16 @@ import type {
   Result,
   IntentErrorCode,
   Intent,
-  PacketData,
   IntentError,
   SpokeProvider,
+  IntentDeliveryInfo,
 } from '@sodax/sdk';
-import { useMutation, type UseMutationResult } from '@tanstack/react-query';
+import { useMutation, type UseMutationResult, useQueryClient } from '@tanstack/react-query';
 
-type CreateIntentResult = Result<
-  [SolverExecutionResponse, Intent, PacketData],
-  IntentError<IntentErrorCode>
->;
+type CreateIntentResult = Result<[SolverExecutionResponse, Intent, IntentDeliveryInfo], IntentError<IntentErrorCode>>;
 
 /**
- * Hook for creating and submitting an intent order for cross-chain swaps.
+ * Hook for creating and submitting an swap intent order for cross-chain swaps.
  * Uses React Query's useMutation for better state management and caching.
  *
  * @param {SpokeProvider} spokeProvider - The spoke provider to use for the swap
@@ -25,10 +22,10 @@ type CreateIntentResult = Result<
  *
  * @example
  * ```typescript
- * const { mutateAsync: createIntent, isPending } = useCreateIntentOrder(spokeProvider);
+ * const { mutateAsync: swap, isPending } = useSwap(spokeProvider);
  *
  * const handleSwap = async () => {
- *   const result = await createIntent({
+ *   const result = await swap({
  *     token_src: '0x...',
  *     token_src_blockchain_id: 'arbitrum',
  *     token_dst: '0x...',
@@ -39,17 +36,25 @@ type CreateIntentResult = Result<
  * };
  * ```
  */
-export function useCreateIntentOrder(
+export function useSwap(
   spokeProvider: SpokeProvider | undefined,
 ): UseMutationResult<CreateIntentResult, Error, CreateIntentParams> {
   const { sodax } = useSodaxContext();
+  const queryClient = useQueryClient();
 
   return useMutation<CreateIntentResult, Error, CreateIntentParams>({
     mutationFn: async (params: CreateIntentParams) => {
       if (!spokeProvider) {
         throw new Error('Spoke provider not found');
       }
-      return sodax.solver.createAndSubmitIntent(params, spokeProvider);
+      return sodax.swap.swap({
+        intentParams: params,
+        spokeProvider,
+      });
+    },
+    onSuccess: () => {
+      // Invalidate balance queries to refresh both source and destination token balances
+      queryClient.invalidateQueries({ queryKey: ['xBalances'] });
     },
   });
 }

package/src/hooks/swap/useSwapAllowance.ts

@@ -33,12 +33,16 @@ export function useSwapAllowance(
       if (!spokeProvider || !params) {
         return false;
       }
-      const allowance = await sodax.solver.isAllowanceValid(params, spokeProvider);
+      const allowance = await sodax.swap.isAllowanceValid({
+        intentParams: params,
+        spokeProvider,
+      });
       if (allowance.ok) {
         return allowance.value;
       }
       return false;
     },
     enabled: !!spokeProvider && !!params,
+    refetchInterval: 2000,
   });
 }