diff --git a/apps/web/src/features/earn/components/additional/additional-opportunities-tab.tsx b/apps/web/src/features/earn/components/additional/additional-opportunities-tab.tsx
index b73fdcf..019b270 100644
--- a/apps/web/src/features/earn/components/additional/additional-opportunities-tab.tsx
+++ b/apps/web/src/features/earn/components/additional/additional-opportunities-tab.tsx
@@ -68,7 +68,7 @@ export function AdditionalOpportunitiesTab() {
     setVestPending(true)
     try {
       // TODO: open vesting modal with amount input + confirmation
-      await vestEsSO4(address, so4Stats?.esSO4Balance ?? 0)
+      await vestEsSO4(address, so4Stats.esSO4Balance)
     } finally {
       setVestPending(false)
     }
@@ -84,8 +84,8 @@ export function AdditionalOpportunitiesTab() {
     }
   }
 
-  const hasEsSO4 = (so4Stats?.esSO4Balance ?? 0) > 0
-  const hasMultiplierPoints = (so4Stats?.multiplierPoints ?? 0) > 0
+  const hasEsSO4 = so4Stats.esSO4Balance > 0
+  const hasMultiplierPoints = so4Stats.multiplierPoints > 0
 
   return (
     <div className="space-y-4">
@@ -108,7 +108,7 @@ export function AdditionalOpportunitiesTab() {
         <div className="flex flex-wrap gap-x-8 gap-y-3">
           <StatRow
             label="esSO4 balance"
-            value={formatToken(so4Stats?.esSO4Balance ?? 0, "esSO4", { minDecimals: 2 })}
+            value={formatToken(so4Stats.esSO4Balance, "esSO4", { minDecimals: 2 })}
             isLoading={isLoading}
           />
           <StatRow label="Vesting duration" value="12 months" />
@@ -134,7 +134,7 @@ export function AdditionalOpportunitiesTab() {
         <div className="flex flex-wrap gap-x-8 gap-y-3">
           <StatRow
             label="Multiplier Points"
-            value={formatToken(so4Stats?.multiplierPoints ?? 0, "MP", { minDecimals: 2 })}
+            value={formatToken(so4Stats.multiplierPoints, "MP", { minDecimals: 2 })}
             isLoading={isLoading}
           />
           <StatRow label="Boost cap" value="100% of base APR" />
diff --git a/apps/web/src/features/earn/components/discover/discover-tab.tsx b/apps/web/src/features/earn/components/discover/discover-tab.tsx
index 6137194..6094e50 100644
--- a/apps/web/src/features/earn/components/discover/discover-tab.tsx
+++ b/apps/web/src/features/earn/components/discover/discover-tab.tsx
@@ -4,16 +4,16 @@ import { Button } from "@workspace/ui/components/button"
 import {
   Dialog,
   DialogContent,
+  DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogFooter,
 } from "@workspace/ui/components/dialog"
 import { Input } from "@workspace/ui/components/input"
 import { usePoolsApy } from "../../hooks/use-earn-data"
 import { depositGLV, depositGM } from "../../lib/earn"
-import { formatPct, formatUsd, formatToken } from "@/shared/lib/format"
 import { useMarketPoolAmounts } from "../../hooks/useMarketPoolAmounts"
 import { useGLVVaultData, useGMPoolData, useStakingInfo } from "../../queries"
+import { formatPct, formatToken, formatUsd } from "@/shared/lib/format"
 import { fromSorobanAmount } from "@/shared/lib/bignum"
 import { TokenIcon } from "@/shared/components/TokenIcon"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
@@ -122,7 +122,7 @@ export function DiscoverTab() {
       .sort((a, b) => (sort === "apy" ? b.apy - a.apy : b.tvlUsd - a.tvlUsd))
   }, [gmPools, glvVaults, filter, sort])
 
-  function handleEarn(id: string, kind: "gm" | "glv", name: string) {
+  async function handleEarn(id: string, kind: "gm" | "glv", name: string) {
     setDepositTarget({ id, kind, name })
     setDepositAmount("")
   }
diff --git a/apps/web/src/features/earn/components/portfolio/assets-list.tsx b/apps/web/src/features/earn/components/portfolio/assets-list.tsx
index a631fcc..c61921f 100644
--- a/apps/web/src/features/earn/components/portfolio/assets-list.tsx
+++ b/apps/web/src/features/earn/components/portfolio/assets-list.tsx
@@ -91,7 +91,7 @@ export function AssetsList() {
   const [pending, setPending] = useState<string | null>(null)
 
   const isLoading = gmLoading || glvLoading || so4Loading
-  const hasSO4 = (so4Stats?.stakedAmount ?? 0) > 0
+  const hasSO4 = so4Stats.stakedAmount > 0
   const hasAny = hasSO4 || gmPositions.length > 0 || glvPositions.length > 0
 
   async function runAction(key: string, fn: () => Promise<unknown>) {
@@ -134,7 +134,7 @@ export function AssetsList() {
                   </td>
                   <td className="px-5 py-3.5 text-right font-mono text-muted-foreground">—</td>
                   <td className="px-5 py-3.5 text-right font-mono">
-                    {formatUsd(so4Stats?.stakedValueUsd ?? 0)}
+                    {formatUsd(so4Stats.stakedValueUsd)}
                   </td>
                   <td className="px-5 py-3.5 text-right">
                     <Button
@@ -143,7 +143,7 @@ export function AssetsList() {
                       disabled={pending === "so4"}
                       onClick={() =>
                         void runAction("so4", () =>
-                          unstakeSO4("DUMMY_ACCOUNT", so4Stats?.stakedAmount ?? 0),
+                          unstakeSO4("DUMMY_ACCOUNT", so4Stats.stakedAmount),
                         )
                       }
                     >
diff --git a/apps/web/src/features/earn/components/portfolio/rewards-bar.tsx b/apps/web/src/features/earn/components/portfolio/rewards-bar.tsx
index 552c8a8..38d0167 100644
--- a/apps/web/src/features/earn/components/portfolio/rewards-bar.tsx
+++ b/apps/web/src/features/earn/components/portfolio/rewards-bar.tsx
@@ -80,7 +80,7 @@ export function RewardsBar() {
     }
   }
 
-  const hasPendingRewards = (stats?.totalPendingRewardsUsd ?? 0) > 0
+  const hasPendingRewards = stats.totalPendingRewardsUsd > 0
 
   return (
     <div className="space-y-3">
@@ -116,7 +116,7 @@ export function RewardsBar() {
       <div className="flex flex-wrap items-center gap-x-8 gap-y-4 rounded-xl border border-border bg-card px-6 py-4">
         <StatItem
           label="Total investment value"
-          value={formatUsd(stats?.totalInvestmentUsd ?? 0)}
+          value={formatUsd(stats.totalInvestmentUsd)}
           isLoading={isLoading}
         />
 
@@ -124,7 +124,7 @@ export function RewardsBar() {
 
         <StatItem
           label="Total earned"
-          value={formatUsd(stats?.totalEarnedUsd ?? 0)}
+          value={formatUsd(stats.totalEarnedUsd)}
           isLoading={isLoading}
         />
 
@@ -132,7 +132,7 @@ export function RewardsBar() {
 
         <StatItem
           label="Total pending rewards"
-          value={formatUsd(stats?.totalPendingRewardsUsd ?? 0)}
+          value={formatUsd(stats.totalPendingRewardsUsd)}
           isLoading={isLoading}
         />
 
@@ -140,7 +140,7 @@ export function RewardsBar() {
 
         <StatItem
           label="Staking Power Share"
-          value={formatPct(stats?.stakingPowerSharePct ?? 0, { sign: false })}
+          value={formatPct(stats.stakingPowerSharePct, { sign: false })}
           isLoading={isLoading}
         />
 
diff --git a/apps/web/src/features/earn/lib/earn.ts b/apps/web/src/features/earn/lib/earn.ts
index 60eb2ae..11a3a30 100644
--- a/apps/web/src/features/earn/lib/earn.ts
+++ b/apps/web/src/features/earn/lib/earn.ts
@@ -1,54 +1,35 @@
 import { toast } from "sonner"
+import { GLV_VAULTS, GM_POOLS } from "../data/pools"
 import { submitTx } from "@/shared/hooks/useTxSubmit"
 import { NETWORK } from "@/app/config/network"
 import { queryClient } from "@/app/providers/QueryProvider"
 import { prepareAndSign } from "@/lib/soroban/tx-builder"
-import { parseSorobanError } from "@/lib/contracts"
-import { walletKit } from "@/features/wallet/lib/wallet-kit"
-import { queryKeys } from "@/shared/lib/query-keys"
-import { toSorobanAmount } from "@/shared/lib/bignum"
 import {
-  buildStakeSO4Transaction,
-  buildUnstakeSO4Transaction,
   buildClaimRewardsTransaction,
   buildCompoundTransaction,
-} from "@/lib/contracts"
-import {
   buildCreateDepositTransaction,
   buildCreateWithdrawalTransaction,
+  buildDepositForVestingTransaction,
+  buildStakeSO4Transaction,
+  buildUnstakeSO4Transaction,
+  parseSorobanError,
 } from "@/lib/contracts"
-import { buildDepositForVestingTransaction } from "@/lib/contracts"
+import { walletKit } from "@/features/wallet/lib/wallet-kit"
+import { queryKeys } from "@/shared/lib/query-keys"
+import { toSorobanAmount } from "@/shared/lib/bignum"
 import {
   createDeposit as createGlvDeposit,
   createWithdrawal as createGlvWithdrawal,
 } from "@/lib/glv-router-client"
-import { GM_POOLS, GLV_VAULTS } from "../data/pools"
 
 const SO4_DECIMALS = 7
 const GM_TOKEN_DECIMALS = 7
 const GLV_TOKEN_DECIMALS = 7
 
-function fakeTxDelay(ms = 1500): Promise<void> {
-  return new Promise((res) => setTimeout(res, ms))
-}
-
 function isValidAccount(account: string): boolean {
   return /^G[A-Z2-7]{55}$/.test(account)
 }
 
-async function runMockWrite(loadingMessage: string, successMessage: string, delay = 1500): Promise<string> {
-  return submitTx(async () => "", {
-    loadingMessage,
-    successMessage,
-    successDescription: () => "Tx: DUMMY_TX_HASH",
-    execute: async () => {
-      await fakeTxDelay(delay)
-      return "DUMMY_TX_HASH"
-    },
-    onError: (error) => (error instanceof Error ? error.message : "Transaction failed"),
-  })
-}
-
 async function invalidateStakingQueries(account: string): Promise<void> {
   await Promise.all([
     queryClient.invalidateQueries({ queryKey: queryKeys.earn.stakingInfo(account) }),
diff --git a/apps/web/src/features/earn/queries/useStakingInfo.ts b/apps/web/src/features/earn/queries/useStakingInfo.ts
index 6bbe52c..56a069f 100644
--- a/apps/web/src/features/earn/queries/useStakingInfo.ts
+++ b/apps/web/src/features/earn/queries/useStakingInfo.ts
@@ -22,10 +22,10 @@ export function useStakingInfo() {
       const info = await stakingRouter.getStakerInfo(address!)
 
       return {
-        stakedSO4: info.stakedSO4 ?? info.stakedAmount,
-        stakedEsSO4: info.stakedEsSO4 ?? info.esSO4Balance,
+        stakedSO4: info.stakedSO4,
+        stakedEsSO4: info.stakedEsSO4,
         stakedMultiplierPoints: info.stakedMultiplierPoints,
-        pendingEsSO4Rewards: info.pendingEsSO4Rewards ?? info.accruedRewards,
+        pendingEsSO4Rewards: info.pendingEsSO4Rewards,
         pendingWethFees: info.pendingWethFees,
       }
     },
diff --git a/apps/web/src/features/earn/queries/useVestingSchedule.ts b/apps/web/src/features/earn/queries/useVestingSchedule.ts
index 0147831..65a811c 100644
--- a/apps/web/src/features/earn/queries/useVestingSchedule.ts
+++ b/apps/web/src/features/earn/queries/useVestingSchedule.ts
@@ -1,6 +1,7 @@
 import { useQuery } from "@tanstack/react-query"
+import type { VestingSchedule } from "@/lib/contracts"
+import { getVestingRouterClient } from "@/lib/contracts"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { getVestingRouterClient, type VestingSchedule } from "@/lib/contracts"
 import { queryKeys } from "@/shared/lib/query-keys"
 
 /**
diff --git a/apps/web/src/features/faucet/components/faucet-page.tsx b/apps/web/src/features/faucet/components/faucet-page.tsx
index 2a0a4c4..1ab2f27 100644
--- a/apps/web/src/features/faucet/components/faucet-page.tsx
+++ b/apps/web/src/features/faucet/components/faucet-page.tsx
@@ -1,5 +1,9 @@
 import { Skeleton } from "@workspace/ui/components/skeleton"
 import { Button } from "@workspace/ui/components/button"
+import { FAUCET_TOKENS, type FaucetTokenConfig } from "../data/tokens" // eslint-disable-line import/consistent-type-specifier-style
+import { FAUCET_CONTRACT_ID } from "../lib/clients"
+import { useFaucetData } from "../hooks/useFaucetData"
+import { useClaim } from "../hooks/useClaim"
 import { Navbar } from "@/ui/Navbar"
 import { TokenIcon } from "@/shared/components/TokenIcon"
 import { formatToken } from "@/shared/lib/format"
@@ -8,10 +12,6 @@ import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { useNetwork } from "@/features/wallet/hooks/useNetwork"
 import { NetworkMismatchBanner } from "@/features/wallet/components/NetworkMismatchBanner"
 import { ConnectButton } from "@/features/wallet/components/ConnectButton"
-import { FAUCET_TOKENS, type FaucetTokenConfig } from "../data/tokens"
-import { FAUCET_CONTRACT_ID } from "../lib/clients"
-import { useFaucetData } from "../hooks/useFaucetData"
-import { useClaim } from "../hooks/useClaim"
 
 // ── Token card ────────────────────────────────────────────────────────────────
 
@@ -90,7 +90,14 @@ function TokenCard({
           disabled={isDisabled || isPending}
           onClick={() => onClaim(token)}
         >
-          Claim
+          {isPending ? (
+            <span className="flex items-center gap-1.5">
+              <span className="h-3 w-3 animate-spin rounded-full border-2 border-current border-t-transparent" />
+              Claiming
+            </span>
+          ) : (
+            "Claim"
+          )}
         </Button>
       </div>
     </div>
@@ -104,10 +111,10 @@ export function FaucetPage() {
   const isConnected = useWalletStore((state) => state.status === "connected")
   const { mismatch } = useNetwork()
   const { data, isLoading } = useFaucetData(address)
-  const { claim, isPending } = useClaim()
+  const { claimOne, claimAll, pendingTokens, isBulkPending } = useClaim()
 
   const isTestnet = NETWORK.name === "testnet"
-  const claimDisabled = !isConnected || isPending || mismatch
+  const claimDisabled = !isConnected || mismatch
 
   return (
     <div className="flex min-h-svh flex-col bg-background text-foreground">
@@ -148,9 +155,9 @@ export function FaucetPage() {
                   lastClaimLedger={data?.lastClaimLedgers[token.symbol]}
                   cooldownLedgers={data?.cooldownLedgers}
                   isLoading={isLoading}
-                  isPending={isPending}
+                  isPending={pendingTokens.has(token.contractId) || isBulkPending}
                   isDisabled={claimDisabled}
-                  onClaim={(selectedToken) => claim([selectedToken.contractId])}
+                  onClaim={(selectedToken) => claimOne(selectedToken.contractId)}
                 />
               ))}
             </div>
@@ -181,10 +188,10 @@ export function FaucetPage() {
                   <Button
                     variant="default"
                     className="w-full"
-                    disabled={claimDisabled}
-                    onClick={() => claim()}
+                    disabled={claimDisabled || isBulkPending}
+                    onClick={() => claimAll()}
                   >
-                    {isPending ? (
+                    {isBulkPending ? (
                       <span className="flex items-center gap-2">
                         <span className="h-3.5 w-3.5 animate-spin rounded-full border-2 border-current border-t-transparent" />
                         Claiming…
diff --git a/apps/web/src/features/faucet/hooks/useClaim.tsx b/apps/web/src/features/faucet/hooks/useClaim.tsx
index ff46593..ab670a3 100644
--- a/apps/web/src/features/faucet/hooks/useClaim.tsx
+++ b/apps/web/src/features/faucet/hooks/useClaim.tsx
@@ -1,13 +1,13 @@
-import { useCallback, useState } from "react"
+import { useCallback, useRef, useState } from "react"
 import { toast } from "sonner"
 import { useQueryClient } from "@tanstack/react-query"
+import { FAUCET_TOKENS } from "../data/tokens"
+import { createFaucetClient } from "../lib/clients"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { walletKit } from "@/features/wallet/lib/wallet-kit"
 import { sendAndPoll } from "@/lib/tx-builder"
 import { explorerTxUrl } from "@/app/config/network"
 import { queryKeys } from "@/shared/lib/query-keys"
-import { FAUCET_TOKENS } from "../data/tokens"
-import { createFaucetClient } from "../lib/clients"
 import { parseSorobanError } from "@/lib/contracts"
 
 function isClaimTooSoonError(error: unknown): boolean {
@@ -24,53 +24,120 @@ export function useClaim() {
   const address = useWalletStore((state) => state.address)
   const isConnected = useWalletStore((state) => state.status === "connected")
   const queryClient = useQueryClient()
-  const [isPending, setIsPending] = useState(false)
-
-  const claim = useCallback(async (tokenIds = FAUCET_TOKENS.map((token) => token.contractId)) => {
-    if (!address || !isConnected) return
+  const [pendingTokens, setPendingTokens] = useState<Set<string>>(new Set())
+  const [isBulkPending, setIsBulkPending] = useState(false)
+  const isClaimingRef = useRef(false)
 
-    setIsPending(true)
-    const toastId = toast.loading(
-      tokenIds.length === 1 ? "Claiming test token…" : "Claiming test tokens…",
-    )
+  const claimOne = useCallback(
+    async (tokenId: string) => {
+      if (!address || !isConnected) return
+      if (isClaimingRef.current) return
 
-    try {
-      const faucet = createFaucetClient(address)
-      const tx = await faucet.claim_many({
-        account: address,
-        tokens: tokenIds,
+      isClaimingRef.current = true
+      setPendingTokens((prev) => {
+        const next = new Set(prev)
+        next.add(tokenId)
+        return next
       })
 
-      const unsignedXdr = tx.toXDR()
-      const { signedTxXdr } = await walletKit.signTransaction(unsignedXdr)
-      const signedXdr = signedTxXdr
-      const { hash } = await sendAndPoll(signedXdr)
-
-      // Refresh balances after a successful claim
-      await queryClient.invalidateQueries({ queryKey: queryKeys.faucet.data(address) })
-
-      toast.success("Test tokens claimed!", {
-        id: toastId,
-        description: (
-          <a
-            href={explorerTxUrl(hash)}
-            target="_blank"
-            rel="noreferrer"
-            className="text-xs text-primary hover:underline"
-          >
-            View transaction →
-          </a>
-        ),
-      })
-    } catch (error) {
-      const message = isClaimTooSoonError(error)
-        ? "Cooldown active — please wait before claiming again."
-        : parseSorobanError(error)
-      toast.error(message, { id: toastId })
-    } finally {
-      setIsPending(false)
-    }
-  }, [address, isConnected, queryClient])
-
-  return { claim, isPending }
+      const toastId = toast.loading("Claiming test token…")
+
+      try {
+        const faucet = createFaucetClient(address)
+        const tx = await faucet.claim_many({
+          account: address,
+          tokens: [tokenId],
+        })
+
+        const unsignedXdr = tx.toXDR()
+        const { signedTxXdr } = await walletKit.signTransaction(unsignedXdr)
+        const signedXdr = signedTxXdr
+        const { hash } = await sendAndPoll(signedXdr)
+
+        // Refresh balances after a successful claim
+        await queryClient.invalidateQueries({ queryKey: queryKeys.faucet.data(address) })
+
+        toast.success("Test token claimed!", {
+          id: toastId,
+          description: (
+            <a
+              href={explorerTxUrl(hash)}
+              target="_blank"
+              rel="noreferrer"
+              className="text-xs text-primary hover:underline"
+            >
+              View transaction →
+            </a>
+          ),
+        })
+      } catch (error) {
+        const message = isClaimTooSoonError(error)
+          ? "Cooldown active — please wait before claiming again."
+          : parseSorobanError(error)
+        toast.error(message, { id: toastId })
+      } finally {
+        setPendingTokens((prev) => {
+          const next = new Set(prev)
+          next.delete(tokenId)
+          return next
+        })
+        isClaimingRef.current = false
+      }
+    },
+    [address, isConnected, queryClient],
+  )
+
+  const claimAll = useCallback(
+    async () => {
+      if (!address || !isConnected) return
+      if (isClaimingRef.current) return
+
+      isClaimingRef.current = true
+      setIsBulkPending(true)
+
+      const tokenIds = FAUCET_TOKENS.map((t) => t.contractId)
+      const toastId = toast.loading("Claiming test tokens…")
+
+      try {
+        const faucet = createFaucetClient(address)
+        const tx = await faucet.claim_many({
+          account: address,
+          tokens: tokenIds,
+        })
+
+        const unsignedXdr = tx.toXDR()
+        const { signedTxXdr } = await walletKit.signTransaction(unsignedXdr)
+        const signedXdr = signedTxXdr
+        const { hash } = await sendAndPoll(signedXdr)
+
+        // Refresh balances after a successful claim
+        await queryClient.invalidateQueries({ queryKey: queryKeys.faucet.data(address) })
+
+        toast.success("Test tokens claimed!", {
+          id: toastId,
+          description: (
+            <a
+              href={explorerTxUrl(hash)}
+              target="_blank"
+              rel="noreferrer"
+              className="text-xs text-primary hover:underline"
+            >
+              View transaction →
+            </a>
+          ),
+        })
+      } catch (error) {
+        const message = isClaimTooSoonError(error)
+          ? "Cooldown active — please wait before claiming again."
+          : parseSorobanError(error)
+        toast.error(message, { id: toastId })
+      } finally {
+        setIsBulkPending(false)
+        isClaimingRef.current = false
+      }
+    },
+    [address, isConnected, queryClient],
+  )
+
+  return { claimOne, claimAll, pendingTokens, isBulkPending }
 }
diff --git a/apps/web/src/features/faucet/hooks/useFaucetData.ts b/apps/web/src/features/faucet/hooks/useFaucetData.ts
index 5a6a7d3..b1882ff 100644
--- a/apps/web/src/features/faucet/hooks/useFaucetData.ts
+++ b/apps/web/src/features/faucet/hooks/useFaucetData.ts
@@ -1,11 +1,11 @@
 import { useQuery } from "@tanstack/react-query"
-import { queryKeys } from "@/shared/lib/query-keys"
-import { FAUCET_TOKENS, type FaucetTokenSymbol } from "../data/tokens"
+import { FAUCET_TOKENS, type FaucetTokenSymbol } from "../data/tokens" // eslint-disable-line import/consistent-type-specifier-style
 import {
   createFaucetClient,
   createTokenClient,
   fromContractAmount,
 } from "../lib/clients"
+import { queryKeys } from "@/shared/lib/query-keys"
 
 export type FaucetData = {
   balances: Record<FaucetTokenSymbol, number>
@@ -44,10 +44,10 @@ async function fetchFaucetData(address: string | null): Promise<FaucetData> {
   const lastClaimLedgers = {} as Record<FaucetTokenSymbol, number | null>
 
   FAUCET_TOKENS.forEach((token, index) => {
-    const balanceTx = balanceTxs[index]
-    const lastClaimTx = lastClaimTxs[index]
-    balances[token.symbol] = fromContractAmount((balanceTx?.result as bigint | undefined) ?? 0n)
-    claimAmounts[token.symbol] = fromContractAmount(claimTxs[index]?.result as bigint)
+    const balanceTx = balanceTxs.at(index)
+    const lastClaimTx = lastClaimTxs.at(index)
+    balances[token.symbol] = fromContractAmount(balanceTx?.result ?? 0n)
+    claimAmounts[token.symbol] = fromContractAmount(claimTxs[index].result)
     lastClaimLedgers[token.symbol] = lastClaimTx ? Number(lastClaimTx.result) : null
   })
 
diff --git a/apps/web/src/features/faucet/lib/clients.ts b/apps/web/src/features/faucet/lib/clients.ts
index 096c894..21bc654 100644
--- a/apps/web/src/features/faucet/lib/clients.ts
+++ b/apps/web/src/features/faucet/lib/clients.ts
@@ -1,5 +1,4 @@
-import { FaucetContractClient as FaucetClient } from "@workspace/contracts"
-import { TestTokenContractClient as TokenClient } from "@workspace/contracts"
+import { FaucetContractClient as FaucetClient, TestTokenContractClient as TokenClient } from "@workspace/contracts"
 import { CONTRACTS } from "@/app/config/contracts"
 import { NETWORK } from "@/app/config/network"
 
diff --git a/apps/web/src/features/pools/components/pools-page.tsx b/apps/web/src/features/pools/components/pools-page.tsx
index cb7effc..f4c4171 100644
--- a/apps/web/src/features/pools/components/pools-page.tsx
+++ b/apps/web/src/features/pools/components/pools-page.tsx
@@ -1,12 +1,12 @@
 import { Link } from "@tanstack/react-router"
-import { Navbar } from "@/ui/Navbar"
-import { NetworkMismatchBanner } from "@/features/wallet/components/NetworkMismatchBanner"
-import { formatUsd } from "@/shared/lib/format"
 import { usePoolsData } from "../hooks/use-pools-data"
 import { usePoolsTimeRange } from "../hooks/use-pools-time-range"
 import { PoolsCard } from "./pools-card"
 import { PoolsTimeRangeFilter } from "./pools-time-range-filter"
 import { GmPoolsTable } from "./gm-pools-table"
+import { Navbar } from "@/ui/Navbar"
+import { NetworkMismatchBanner } from "@/features/wallet/components/NetworkMismatchBanner"
+import { formatUsd } from "@/shared/lib/format"
 
 export function PoolsPage() {
   const { timeRange, setTimeRange, options } = usePoolsTimeRange()
diff --git a/apps/web/src/features/pools/hooks/use-pool-row-data.ts b/apps/web/src/features/pools/hooks/use-pool-row-data.ts
index f9fed4e..5c635eb 100644
--- a/apps/web/src/features/pools/hooks/use-pool-row-data.ts
+++ b/apps/web/src/features/pools/hooks/use-pool-row-data.ts
@@ -1,9 +1,9 @@
 import { useQuery } from "@tanstack/react-query"
+import type { PoolMarketConfig } from "../data/markets"
 import type { FundingInfo, MarketProps, PoolValueInfo } from "@/lib/contracts"
 import { getTokenClient, syntheticsReaderClient } from "@/lib/contracts"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { queryKeys } from "@/shared/lib/query-keys"
-import type { PoolMarketConfig } from "../data/markets"
 
 export type PoolRowData = {
   market: MarketProps | null
diff --git a/apps/web/src/features/referrals/components/affiliates/affiliates-tab.tsx b/apps/web/src/features/referrals/components/affiliates/affiliates-tab.tsx
index 0f23b0b..60fee9e 100644
--- a/apps/web/src/features/referrals/components/affiliates/affiliates-tab.tsx
+++ b/apps/web/src/features/referrals/components/affiliates/affiliates-tab.tsx
@@ -1,4 +1,5 @@
 import { useState } from "react"
+import { useQueryClient } from "@tanstack/react-query"
 import { Button } from "@workspace/ui/components/button"
 import { Skeleton } from "@workspace/ui/components/skeleton"
 import { cn } from "@workspace/ui/lib/utils"
@@ -6,15 +7,14 @@ import { useAffiliateReferrals } from "../../hooks/use-referrals-data"
 import { useReferralCode } from "../../queries/useReferralCode"
 import { useReferralStats } from "../../queries/useReferralStats"
 import { useReferralTier } from "../../queries/useReferralTier"
-import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { createAffiliateCode, validateReferralCode } from "../../lib/referrals"
-import { useQueryClient } from "@tanstack/react-query"
-import { queryKeys } from "@/shared/lib/query-keys"
 import { TIERS, getNextTier, getTierByLevel } from "../../data/tiers"
 import { TimePeriodFilter } from "../shared/time-period-filter"
 import { StatChartCard } from "../shared/stat-chart-card"
-import type {TimePeriod} from "../../hooks/use-referrals-data";
+import type { TimePeriod } from "../../hooks/use-referrals-data"
 import { formatAddress, formatUsd } from "@/shared/lib/format"
+import { queryKeys } from "@/shared/lib/query-keys"
+import { useWalletStore } from "@/features/wallet/store/wallet-store"
 
 
 
@@ -252,7 +252,7 @@ export function AffiliatesTab() {
 
   function handleCodeCreated() {
     void queryClient.invalidateQueries({ queryKey: queryKeys.referrals.code(null) })
-    void queryClient.invalidateQueries({ queryKey: queryKeys.referrals.stats(code, period) })
+    void queryClient.invalidateQueries({ queryKey: queryKeys.referrals.stats(code ?? null, period) })
   }
 
   if (!hasCode && !codeLoading) {
diff --git a/apps/web/src/features/referrals/components/distributions/distributions-tab.tsx b/apps/web/src/features/referrals/components/distributions/distributions-tab.tsx
index 86b83fa..683fa67 100644
--- a/apps/web/src/features/referrals/components/distributions/distributions-tab.tsx
+++ b/apps/web/src/features/referrals/components/distributions/distributions-tab.tsx
@@ -1,9 +1,9 @@
 import { useState } from "react"
 import { Button } from "@workspace/ui/components/button"
 
-import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { useAffiliateStats, useDistributions } from "../../hooks/use-referrals-data"
 import { claimDistribution } from "../../lib/referrals"
+import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { formatToken, formatUsd } from "@/shared/lib/format"
 
 
diff --git a/apps/web/src/features/referrals/components/referrals-page.tsx b/apps/web/src/features/referrals/components/referrals-page.tsx
index 60123e8..4c2b2c3 100644
--- a/apps/web/src/features/referrals/components/referrals-page.tsx
+++ b/apps/web/src/features/referrals/components/referrals-page.tsx
@@ -5,11 +5,11 @@ import { Navbar } from "../../../ui/Navbar"
 import { useTraderStats } from "../hooks/use-referrals-data"
 import { useReferralCode } from "../queries/useReferralCode"
 import { useReferralTier } from "../queries/useReferralTier"
-import { queryKeys } from "@/shared/lib/query-keys"
 import { TradersTab } from "./traders/traders-tab"
 import { AffiliatesTab } from "./affiliates/affiliates-tab"
 import { DistributionsTab } from "./distributions/distributions-tab"
 import { ReferralsSidebar } from "./referrals-sidebar"
+import { queryKeys } from "@/shared/lib/query-keys"
 
 type ReferralsTab = "traders" | "affiliates" | "distributions"
 
diff --git a/apps/web/src/features/referrals/components/traders/traders-tab.tsx b/apps/web/src/features/referrals/components/traders/traders-tab.tsx
index 4bfedad..2a69cfb 100644
--- a/apps/web/src/features/referrals/components/traders/traders-tab.tsx
+++ b/apps/web/src/features/referrals/components/traders/traders-tab.tsx
@@ -1,8 +1,7 @@
 import { useState } from "react"
 import { Button } from "@workspace/ui/components/button"
 import { Skeleton } from "@workspace/ui/components/skeleton"
-import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { useTraderStats, useDistributions, type TimePeriod } from "../../hooks/use-referrals-data"
+import { useDistributions, useTraderStats } from "../../hooks/use-referrals-data"
 import { useReferralStats } from "../../queries/useReferralStats"
 import {
   claimRebates,
@@ -11,8 +10,11 @@ import {
 } from "../../lib/referrals"
 import { TimePeriodFilter } from "../shared/time-period-filter"
 import { StatChartCard } from "../shared/stat-chart-card"
+import type { TimePeriod } from "../../hooks/use-referrals-data"
+import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { formatUsd } from "@/shared/lib/format"
 
+
 function fmtDate(iso: string) {
   return new Intl.DateTimeFormat("en-US", {
     year: "numeric",
diff --git a/apps/web/src/features/referrals/hooks/use-referrals-data.ts b/apps/web/src/features/referrals/hooks/use-referrals-data.ts
index 659149f..7bd1052 100644
--- a/apps/web/src/features/referrals/hooks/use-referrals-data.ts
+++ b/apps/web/src/features/referrals/hooks/use-referrals-data.ts
@@ -1,7 +1,6 @@
 import { useQuery } from "@tanstack/react-query"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { referralStorageClient } from "@/lib/contracts"
-import { getAffiliateCode, getTraderDiscountBps, getTraderReferralCode } from "@/lib/contracts"
+import { getAffiliateCode, getTraderDiscountBps, getTraderReferralCode, referralStorageClient } from "@/lib/contracts"
 
 export type TimePeriod = "24h" | "7d" | "30d" | "90d" | "total"
 
diff --git a/apps/web/src/features/referrals/lib/referrals.ts b/apps/web/src/features/referrals/lib/referrals.ts
index f075be6..e2884b1 100644
--- a/apps/web/src/features/referrals/lib/referrals.ts
+++ b/apps/web/src/features/referrals/lib/referrals.ts
@@ -1,16 +1,14 @@
 import { queryClient } from "@/app/providers/QueryProvider"
 import { NETWORK } from "@/app/config/network"
 import { prepareAndSign } from "@/lib/soroban/tx-builder"
-import { parseSorobanError } from "@/lib/contracts"
 import {
   affiliateCodeStorageKey,
-  referralPromptStorageKey,
-} from "@/lib/contracts"
-import {
   buildClaimRebatesTransaction,
   buildRegisterCodeTransaction,
   buildSetTraderReferralCodeTransaction,
   mapContractError,
+  parseSorobanError,
+  referralPromptStorageKey,
 } from "@/lib/contracts"
 import { submitTx } from "@/shared/hooks/useTxSubmit"
 import { queryKeys } from "@/shared/lib/query-keys"
@@ -93,7 +91,7 @@ export async function createAffiliateCode(account: string, code: string): Promis
   )
 }
 
-export async function claimRebates(account: string, epochIds: string[]): Promise<string> {
+export async function claimRebates(account: string, epochIds: Array<string>): Promise<string> {
   if (!isValidAccount(account)) {
     throw new Error("Connect your wallet before claiming rebates.")
   }
diff --git a/apps/web/src/features/referrals/queries/useReferralCode.ts b/apps/web/src/features/referrals/queries/useReferralCode.ts
index 71a2602..962046f 100644
--- a/apps/web/src/features/referrals/queries/useReferralCode.ts
+++ b/apps/web/src/features/referrals/queries/useReferralCode.ts
@@ -1,7 +1,7 @@
 import { useQuery } from "@tanstack/react-query"
+import { readStoredAffiliateCode } from "../lib/referrals"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { referralStorageClient } from "@/lib/contracts"
-import { readStoredAffiliateCode } from "../lib/referrals"
 import { queryKeys } from "@/shared/lib/query-keys"
 
 /**
diff --git a/apps/web/src/features/referrals/queries/useReferralStats.ts b/apps/web/src/features/referrals/queries/useReferralStats.ts
index 35d2884..3321026 100644
--- a/apps/web/src/features/referrals/queries/useReferralStats.ts
+++ b/apps/web/src/features/referrals/queries/useReferralStats.ts
@@ -1,8 +1,8 @@
 import { useQuery } from "@tanstack/react-query"
-import type { TierLevel } from "@/lib/contracts"
-import { referralStorageClient } from "@/lib/contracts"
 import { getTierFromVolume } from "../data/tiers"
 import type { TimePeriod } from "../hooks/use-referrals-data"
+import type { TierLevel } from "@/lib/contracts"
+import { referralStorageClient } from "@/lib/contracts"
 import { queryKeys } from "@/shared/lib/query-keys"
 
 export type ReferralStats = {
@@ -34,7 +34,7 @@ export function useReferralStats(code: string | null, period: TimePeriod = "tota
 
       const tier =
         onChain.totalVolumeUsd > 0
-          ? (getTierFromVolume(onChain.totalVolumeUsd).level as TierLevel)
+          ? getTierFromVolume(onChain.totalVolumeUsd).level
           : onChain.tier
 
       return {
diff --git a/apps/web/src/features/referrals/queries/useReferralTier.ts b/apps/web/src/features/referrals/queries/useReferralTier.ts
index d958c79..aac57ea 100644
--- a/apps/web/src/features/referrals/queries/useReferralTier.ts
+++ b/apps/web/src/features/referrals/queries/useReferralTier.ts
@@ -1,6 +1,7 @@
 import { useQuery } from "@tanstack/react-query"
+import type { TierLevel } from "@/lib/contracts"
+import { referralStorageClient } from "@/lib/contracts"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { referralStorageClient, type TierLevel } from "@/lib/contracts"
 import { queryKeys } from "@/shared/lib/query-keys"
 
 /**
diff --git a/apps/web/src/features/trade/components/positions/BottomTabs.tsx b/apps/web/src/features/trade/components/positions/BottomTabs.tsx
index ff9dfa3..a54ef8c 100644
--- a/apps/web/src/features/trade/components/positions/BottomTabs.tsx
+++ b/apps/web/src/features/trade/components/positions/BottomTabs.tsx
@@ -3,13 +3,13 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@workspace/ui/componen
 import { Button } from "@workspace/ui/components/button"
 import { usePositions } from "../../hooks/usePositions"
 import { hasFrozenOrders, useOrders } from "../../hooks/useOrders"
+import { claimFundingFees } from "../../lib/stellar"
 import { OrderExecutionFrozenBanner } from "./OrderExecutionFrozenBanner"
 import { PositionsList } from "./PositionsList"
 import { OrdersList } from "./OrdersList"
-import { claimFundingFees } from "../../lib/stellar"
+import type { Position } from "../../hooks/usePositions"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { formatUsd } from "@/shared/lib/format"
-import type { Position } from "../../hooks/usePositions"
 
 // TODO: Add Trades and Claims tabs once tradeHistory + claimFundingFees are wired up
 
diff --git a/apps/web/src/features/trade/components/positions/CollateralDialog.tsx b/apps/web/src/features/trade/components/positions/CollateralDialog.tsx
index 1735e27..608ad63 100644
--- a/apps/web/src/features/trade/components/positions/CollateralDialog.tsx
+++ b/apps/web/src/features/trade/components/positions/CollateralDialog.tsx
@@ -9,13 +9,13 @@ import {
 } from "@workspace/ui/components/dialog"
 import { Button } from "@workspace/ui/components/button"
 import { Input } from "@workspace/ui/components/input"
-import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { useTokenBalances } from "@/features/wallet/hooks/useTokenBalances"
 import { useTokenPrices } from "../../hooks/useTokenPrices"
-import { createIncreaseOrder, createDecreaseOrder } from "../../lib/stellar"
-import { formatUsd } from "@/shared/lib/format"
+import { createDecreaseOrder, createIncreaseOrder } from "../../lib/stellar"
 import { queryKeys } from "../../lib/query-keys"
 import type { Position } from "../../hooks/usePositions"
+import { formatUsd } from "@/shared/lib/format"
+import { useTokenBalances } from "@/features/wallet/hooks/useTokenBalances"
+import { useWalletStore } from "@/features/wallet/store/wallet-store"
 
 type Props = {
   position: Position | null
@@ -54,7 +54,7 @@ export function CollateralDialog({ position, mode, open, onClose }: Props) {
   let newCollateralUsd = position.collateralUsd
   if (mode === "add") {
     newCollateralUsd = position.collateralUsd + deltaUsd
-  } else if (mode === "remove") {
+  } else {
     newCollateralUsd = Math.max(0, position.collateralUsd - deltaUsd)
   }
 
@@ -71,7 +71,7 @@ export function CollateralDialog({ position, mode, open, onClose }: Props) {
         isValid = false
         validationError = "Insufficient wallet balance"
       }
-    } else if (mode === "remove") {
+    } else {
       if (amountNum >= position.collateralAmount) {
         isValid = false
         validationError = "Cannot remove all collateral (Close position instead)"
diff --git a/apps/web/src/features/trade/components/positions/OrdersList.tsx b/apps/web/src/features/trade/components/positions/OrdersList.tsx
index 6f89a1e..bc7a223 100644
--- a/apps/web/src/features/trade/components/positions/OrdersList.tsx
+++ b/apps/web/src/features/trade/components/positions/OrdersList.tsx
@@ -2,9 +2,10 @@ import { Skeleton } from "@workspace/ui/components/skeleton"
 import { Button } from "@workspace/ui/components/button"
 import { Badge } from "@workspace/ui/components/badge"
 import { useState } from "react"
-import { useOrders, type Order } from "../../hooks/useOrders"
+import { useOrders } from "../../hooks/useOrders"
 import { cancelOrder } from "../../lib/stellar"
 import { formatUsd } from "../../lib/trade-math"
+import type { Order } from "../../hooks/useOrders"
 import type { OrderKey } from "@/lib/contracts"
 
 function toOrderKey(order: Order): OrderKey {
diff --git a/apps/web/src/features/trade/components/positions/PositionsList.tsx b/apps/web/src/features/trade/components/positions/PositionsList.tsx
index 0d32eec..356a701 100644
--- a/apps/web/src/features/trade/components/positions/PositionsList.tsx
+++ b/apps/web/src/features/trade/components/positions/PositionsList.tsx
@@ -6,12 +6,12 @@ import { Button } from "@workspace/ui/components/button"
 import { Badge } from "@workspace/ui/components/badge"
 import { usePositions } from "../../hooks/usePositions"
 import { useFundingRate } from "../../hooks/useFundingRate"
-import { createDecreaseOrder, claimFundingFees } from "../../lib/stellar"
+import { claimFundingFees, createDecreaseOrder } from "../../lib/stellar"
+import { queryKeys } from "../../lib/query-keys"
+import { CollateralDialog } from "./CollateralDialog"
 import type { Position } from "../../hooks/usePositions"
 import { formatPct, formatUsd } from "@/shared/lib/format"
-import { queryKeys } from "../../lib/query-keys"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { CollateralDialog } from "./CollateralDialog"
 import { TokenIcon } from "@/shared/components/TokenIcon"
 
 type Props = {
diff --git a/apps/web/src/features/trade/components/trade-panel/ApplyReferralCodePrompt.tsx b/apps/web/src/features/trade/components/trade-panel/ApplyReferralCodePrompt.tsx
index eeb37f6..8681e55 100644
--- a/apps/web/src/features/trade/components/trade-panel/ApplyReferralCodePrompt.tsx
+++ b/apps/web/src/features/trade/components/trade-panel/ApplyReferralCodePrompt.tsx
@@ -1,15 +1,14 @@
 import { useState } from "react"
 import { Button } from "@workspace/ui/components/button"
 import { Input } from "@workspace/ui/components/input"
+import { useQuery, useQueryClient } from "@tanstack/react-query"
 import {
   applyReferralCode,
   hasCompletedReferralPrompt,
   markReferralPromptComplete,
   validateReferralCode,
 } from "@/features/referrals/lib/referrals"
-import { getTraderReferralCode } from "@/lib/contracts"
-import { readStoredReferralCode } from "@/lib/contracts"
-import { useQuery, useQueryClient } from "@tanstack/react-query"
+import { getTraderReferralCode, readStoredReferralCode } from "@/lib/contracts"
 import { queryKeys } from "@/shared/lib/query-keys"
 
 type Props = {
diff --git a/apps/web/src/features/trade/components/trade-panel/ConfirmationDialog.tsx b/apps/web/src/features/trade/components/trade-panel/ConfirmationDialog.tsx
index 6a58397..61fc8dd 100644
--- a/apps/web/src/features/trade/components/trade-panel/ConfirmationDialog.tsx
+++ b/apps/web/src/features/trade/components/trade-panel/ConfirmationDialog.tsx
@@ -105,14 +105,14 @@ export function ConfirmationDialog({
       account,
       positionKey: `sidecar-${index}`,
       marketAddress: tradeState.marketAddress,
-      collateralToken: collateralAddress,
+      collateralToken: collateralAddress!,
       collateralDeltaAmount: Number(fromAmount || "0") * (order.sizePct / 100),
       sizeDeltaUsd: sizeUsd * (order.sizePct / 100),
       isLong: tradeFlags.isLong,
       acceptablePrice: estimatedEntryPrice,
       triggerPrice: Number(order.triggerPrice),
       orderType: order.type === "takeProfit" ? "LimitDecrease" : "StopLoss",
-      receiveToken: collateralAddress,
+      receiveToken: collateralAddress!,
     }))
   }, [
     account,
@@ -135,7 +135,7 @@ export function ConfirmationDialog({
         const parentOrder: IncreaseOrderParams = {
           account,
           marketAddress: tradeState.marketAddress,
-          collateralToken: collateralAddress,
+          collateralToken: collateralAddress!,
           collateralAmount: Number(fromAmount),
           sizeDeltaUsd: sizeUsd,
           isLong: tradeFlags.isLong,
@@ -222,7 +222,7 @@ export function ConfirmationDialog({
         const parentOrder: IncreaseOrderParams = {
           account,
           marketAddress: tradeState.marketAddress,
-          collateralToken: collateralAddress,
+          collateralToken: collateralAddress!,
           collateralAmount: Number(fromAmount),
           sizeDeltaUsd: sizeUsd,
           isLong: tradeFlags.isLong,
@@ -320,7 +320,7 @@ export function ConfirmationDialog({
           )}
           <Row
             label="Collateral"
-            value={`${fromAmount || "0"} ${formatAddress(collateralAddress)}`}
+            value={`${fromAmount || "0"} ${formatAddress(collateralAddress!)}`}
           />
           <div className="border-t border-border pt-1.5">
             <Row label="Total fees" value={formatUsd(fees.totalFeesUsd)} bold />
diff --git a/apps/web/src/features/trade/components/trade-panel/TradePanel.tsx b/apps/web/src/features/trade/components/trade-panel/TradePanel.tsx
index 83b0a1f..e8e2e8c 100644
--- a/apps/web/src/features/trade/components/trade-panel/TradePanel.tsx
+++ b/apps/web/src/features/trade/components/trade-panel/TradePanel.tsx
@@ -49,9 +49,9 @@ export function TradePanel({ trade }: TradePanelProps) {
 
   const debouncedFromAmount = useDebounce(fromAmount, 300)
   const entryPrice = getMidPrice(toTokenAddress)
-  const collateralUsd = parseFloat(debouncedFromAmount || "0") * getMidPrice(collateralAddress)
+  const collateralUsd = parseFloat(debouncedFromAmount || "0") * getMidPrice(collateralAddress!)
   const sizeUsd = tradeFlags.isSwap ? collateralUsd : sizeFromCollateralAndLeverage(collateralUsd, leverage)
-  const activeInputTokenAddress = tradeFlags.isSwap ? fromTokenAddress : collateralAddress
+  const activeInputTokenAddress = tradeFlags.isSwap ? fromTokenAddress : collateralAddress!
 
   const fees = useTradeFees({ sizeUsd, marketAddress, isIncrease: true, tradeType })
   const walletBalance = balances?.[activeInputTokenAddress]
@@ -264,7 +264,7 @@ function TradeInputs({ trade, validationError }: { trade: ReturnType<typeof useT
   const { getMidPrice } = useTokenPrices()
   const { data: balances } = useTokenBalances()
 
-  const activeInputTokenAddress = tradeFlags.isSwap ? fromTokenAddress : collateralAddress
+  const activeInputTokenAddress = tradeFlags.isSwap ? fromTokenAddress : collateralAddress!
   const fromPrice = getMidPrice(activeInputTokenAddress)
   const fromUsd = parseFloat(fromAmount || "0") * fromPrice
   const walletBalance = balances?.[activeInputTokenAddress]
diff --git a/apps/web/src/features/trade/hooks/useMarkets.ts b/apps/web/src/features/trade/hooks/useMarkets.ts
index 568c017..c6b601e 100644
--- a/apps/web/src/features/trade/hooks/useMarkets.ts
+++ b/apps/web/src/features/trade/hooks/useMarkets.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query"
 import { useMemo } from "react"
 import { MARKETS } from "../data/markets"
-import type { Market } from "../data/markets"
+import { queryKeys } from "../lib/query-keys"
 import { useTokenList } from "./useTokenList"
+import type { Market } from "../data/markets"
 import { syntheticsReaderClient } from "@/lib/contracts"
-import { queryKeys } from "../lib/query-keys"
 
 async function fetchMarkets(): Promise<Array<Market>> {
   const client = syntheticsReaderClient
@@ -16,7 +16,7 @@ async function fetchMarkets(): Promise<Array<Market>> {
   )
   // Fall back to static entry for any market whose RPC call failed.
   return results.map((result, i) =>
-    result.status === "fulfilled" ? result.value : MARKETS[i]!,
+    result.status === "fulfilled" ? result.value : MARKETS[i],
   )
 }
 
diff --git a/apps/web/src/features/trade/hooks/useMarketsInfo.ts b/apps/web/src/features/trade/hooks/useMarketsInfo.ts
index 4af09cc..c835206 100644
--- a/apps/web/src/features/trade/hooks/useMarketsInfo.ts
+++ b/apps/web/src/features/trade/hooks/useMarketsInfo.ts
@@ -62,7 +62,6 @@ async function fetchMarketsInfo(markets: Array<Market>): Promise<Array<MarketInf
         fundingRatePerHour = Number(perHourFactor) / Number(FACTOR_PRECISION)
       }
 
-      const totalOI = longOI + shortOI
       const availLong  = poolUsd - longOI  > 0 ? poolUsd - longOI  : 0
       const availShort = poolUsd - shortOI > 0 ? poolUsd - shortOI : 0
 
diff --git a/apps/web/src/features/trade/hooks/useOpenInterest.ts b/apps/web/src/features/trade/hooks/useOpenInterest.ts
index b040b14..fda92d3 100644
--- a/apps/web/src/features/trade/hooks/useOpenInterest.ts
+++ b/apps/web/src/features/trade/hooks/useOpenInterest.ts
@@ -1,7 +1,7 @@
 import { useQuery } from "@tanstack/react-query"
+import { queryKeys } from "../lib/query-keys"
 import { fromSorobanAmount } from "@/shared/lib/bignum"
 import { syntheticsReaderClient } from "@/lib/contracts"
-import { queryKeys } from "../lib/query-keys"
 
 const USD_DECIMALS = 30
 
diff --git a/apps/web/src/features/trade/hooks/useOrderEventPolling.ts b/apps/web/src/features/trade/hooks/useOrderEventPolling.ts
index 4a11599..5612c19 100644
--- a/apps/web/src/features/trade/hooks/useOrderEventPolling.ts
+++ b/apps/web/src/features/trade/hooks/useOrderEventPolling.ts
@@ -1,9 +1,9 @@
 import { useEffect, useRef } from "react"
 import { useQueryClient } from "@tanstack/react-query"
+import { queryKeys } from "../lib/query-keys"
 import { CONTRACTS } from "@/app/config/contracts"
 import { sorobanRpc } from "@/lib/soroban/client"
 import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { queryKeys } from "../lib/query-keys"
 
 const CHAIN_ID = "stellar-mainnet"
 const POLL_INTERVAL_MS = 5000
@@ -47,7 +47,7 @@ export function useOrderEventPolling() {
 
         const matching = (Array.isArray(events) ? events : []).filter((event) => {
           const text = extractEventText(event).toLowerCase()
-          const name = String((event as any)?.data?.event_name ?? (event as any)?.data?.type ?? (event as any)?.type ?? "").toLowerCase()
+          const name = String(event?.data?.event_name ?? event?.data?.type ?? event?.type ?? "").toLowerCase()
           const isOrderEvent = TARGET_EVENTS.some((target) => name.includes(target.toLowerCase()) || text.includes(target.toLowerCase()))
           const isForAccount = account ? text.includes(account.toLowerCase()) : false
           return isOrderEvent && isForAccount
diff --git a/apps/web/src/features/trade/hooks/usePositions.ts b/apps/web/src/features/trade/hooks/usePositions.ts
index 58b59d8..b6e6ea2 100644
--- a/apps/web/src/features/trade/hooks/usePositions.ts
+++ b/apps/web/src/features/trade/hooks/usePositions.ts
@@ -1,11 +1,11 @@
 import { useQuery } from "@tanstack/react-query"
 import { queryKeys } from "../lib/query-keys"
 import { MARKETS } from "../data/markets"
-import { useWalletStore } from "@/features/wallet/store/wallet-store"
-import { syntheticsReaderClient } from "@/lib/contracts"
+import { useTokenPrices } from "./useTokenPrices"
 import type { PositionInfo } from "@/lib/contracts"
+import { syntheticsReaderClient } from "@/lib/contracts"
+import { useWalletStore } from "@/features/wallet/store/wallet-store"
 import { fromSorobanAmount } from "@/shared/lib/bignum"
-import { useTokenPrices } from "./useTokenPrices"
 
 export type Position = {
   key: string
diff --git a/apps/web/src/features/trade/hooks/useTokenList.ts b/apps/web/src/features/trade/hooks/useTokenList.ts
index a1b2267..b0929d5 100644
--- a/apps/web/src/features/trade/hooks/useTokenList.ts
+++ b/apps/web/src/features/trade/hooks/useTokenList.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query"
-import { Contract, Account, TransactionBuilder, rpc, scValToNative } from "@stellar/stellar-sdk"
+import { Account, Contract, TransactionBuilder, rpc, scValToNative } from "@stellar/stellar-sdk"
 import { TOKENS } from "../data/tokens"
-import type { Token } from "../data/tokens"
 import { sorobanRpc } from "../../../lib/soroban/client"
 import { NETWORK } from "../../../app/config/network"
 import { CONTRACTS } from "../../../app/config/contracts"
+import type { Token } from "../data/tokens"
 
 const DUMMY_ACCOUNT = "GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHF"
 
diff --git a/apps/web/src/features/trade/hooks/useTokenPrices.ts b/apps/web/src/features/trade/hooks/useTokenPrices.ts
index 6f8b37f..4fed137 100644
--- a/apps/web/src/features/trade/hooks/useTokenPrices.ts
+++ b/apps/web/src/features/trade/hooks/useTokenPrices.ts
@@ -1,9 +1,10 @@
 import { useQuery } from "@tanstack/react-query"
 import { fetchTokenPrices } from "../lib/oracle"
 import { queryKeys } from "../lib/query-keys"
-import type { TokenPrice } from "../lib/oracle"
-import { getOracleStaleness, type OracleStaleness } from "../lib/pyth"
+import { getOracleStaleness } from "../lib/pyth"
 import { useTokenList } from "./useTokenList"
+import type { TokenPrice } from "../lib/oracle"
+import type { OracleStaleness } from "../lib/pyth"
 
 const CHAIN_ID = "stellar-mainnet"
 
diff --git a/apps/web/src/features/trade/hooks/useTradeState.ts b/apps/web/src/features/trade/hooks/useTradeState.ts
index 6e571d9..700f8fd 100644
--- a/apps/web/src/features/trade/hooks/useTradeState.ts
+++ b/apps/web/src/features/trade/hooks/useTradeState.ts
@@ -9,10 +9,10 @@
 //     once state complexity grows — see GMX's SyntheticsStateContext pattern
 
 import { useCallback, useEffect, useMemo, useState } from "react"
-import { CONTRACTS } from "@/app/config/contracts"
-import { POOL_MARKETS } from "@/features/pools/data/markets"
 import { useMarkets } from "./useMarkets"
 import { useTokenList } from "./useTokenList"
+import { CONTRACTS } from "@/app/config/contracts"
+import { POOL_MARKETS } from "@/features/pools/data/markets"
 
 export type TradeType = "Long" | "Short" | "Swap"
 export type TradeMode = "Market" | "Limit" | "Trigger"
@@ -59,7 +59,7 @@ export type TradeState = {
 }
 
 const STORAGE_KEY = "so4-trade-state-v2"   // bumped from v1 (collateral shape changed)
-const DEFAULT_MARKET = POOL_MARKETS[0]!
+const DEFAULT_MARKET = POOL_MARKETS[0]
 const DEFAULT_COLLATERALS = POOL_MARKETS.reduce<CollateralsByMarket>((acc, market) => {
   acc[market.marketToken] = { long: market.longToken, short: market.shortToken }
   return acc
@@ -182,8 +182,8 @@ export function useTradeState() {
   const collateralAddress = useMemo(() => {
     const marketCollaterals = state.collaterals[state.marketAddress]
     return tradeFlags.isLong
-      ? (marketCollaterals?.long ?? DEFAULT_MARKET.longToken)
-      : (marketCollaterals?.short ?? DEFAULT_MARKET.shortToken)
+      ? marketCollaterals.long
+      : marketCollaterals.short
   }, [state.collaterals, state.marketAddress, tradeFlags.isLong])
 
   // When index token changes, pick first available market and set default collaterals
@@ -191,14 +191,12 @@ export function useTradeState() {
     (address: string) => {
       const marketsList = getMarketsForIndexToken(address)
       const market = marketsList[0]
-      const marketAddress = market?.address ?? state.marketAddress
+      const marketAddress = market.address
 
       const collaterals = { ...state.collaterals }
-      if (market) {
-        collaterals[market.address] = {
-          long: market.longTokenAddress,
-          short: market.shortTokenAddress,
-        }
+      collaterals[market.address] = {
+        long: market.longTokenAddress,
+        short: market.shortTokenAddress,
       }
 
       update({ toTokenAddress: address, marketAddress, collaterals })
diff --git a/apps/web/src/features/trade/lib/data-store.ts b/apps/web/src/features/trade/lib/data-store.ts
index 863c9c0..dd7eab9 100644
--- a/apps/web/src/features/trade/lib/data-store.ts
+++ b/apps/web/src/features/trade/lib/data-store.ts
@@ -1,4 +1,4 @@
-import { Account, Contract, rpc, scValToNative, TransactionBuilder, xdr } from "@stellar/stellar-sdk"
+import { Account, Contract, TransactionBuilder, rpc, scValToNative, xdr } from "@stellar/stellar-sdk"
 import { CONTRACTS } from "@/app/config/contracts"
 import { NETWORK } from "@/app/config/network"
 import { sorobanRpc } from "@/lib/soroban/client"
@@ -61,7 +61,7 @@ async function dataStoreGetBool(key: Buffer): Promise<boolean> {
   return Boolean(scValToNative(retval))
 }
 
-export async function fetchFeeConfig(_marketAddress: string): Promise<FeeConfig> {
+export function fetchFeeConfig(_marketAddress: string): FeeConfig {
   return { ...DEFAULT_FEE_CONFIG }
 }
 
diff --git a/apps/web/src/features/trade/lib/oracle.ts b/apps/web/src/features/trade/lib/oracle.ts
index 9a68e51..fb4406c 100644
--- a/apps/web/src/features/trade/lib/oracle.ts
+++ b/apps/web/src/features/trade/lib/oracle.ts
@@ -8,8 +8,8 @@
 // All public functions accept any of the three forms and resolve internally.
 
 import { ENV } from "../../../app/config/env"
-import { formatPct } from "@/shared/lib/format"
 import { fetchPythAttestations } from "./pyth"
+import { formatPct } from "@/shared/lib/format"
 
 export type PriceSource = "so4" | "pyth" | "binance" | "gmx" | "fallback"
 
diff --git a/apps/web/src/features/trade/lib/pyth.ts b/apps/web/src/features/trade/lib/pyth.ts
index 1c4a425..925cf8f 100644
--- a/apps/web/src/features/trade/lib/pyth.ts
+++ b/apps/web/src/features/trade/lib/pyth.ts
@@ -1,6 +1,6 @@
 import { HermesClient } from "@pythnetwork/hermes-client"
-import { ENV } from "@/app/config/env"
 import { getMarket } from "../data/markets"
+import { ENV } from "@/app/config/env"
 
 /** Pyth price feed IDs (hex, with 0x prefix). */
 export const PYTH_FEED_IDS: Record<string, string> = {
@@ -97,7 +97,7 @@ export async function fetchPythAttestations(
     if (!feedId) continue
 
     const row = byFeedId.get(feedId)
-    if (!row?.entry?.price || !row.binary) continue
+    if (!row?.entry.price || !row.binary) continue
 
     const { price, conf } = row.entry.price
     const expo = row.entry.price.expo
diff --git a/apps/web/src/features/wallet/components/AccountBadge.tsx b/apps/web/src/features/wallet/components/AccountBadge.tsx
index 09ed411..e012229 100644
--- a/apps/web/src/features/wallet/components/AccountBadge.tsx
+++ b/apps/web/src/features/wallet/components/AccountBadge.tsx
@@ -1,13 +1,14 @@
-import { useEffect, useRef, useState, type ComponentProps } from "react"
+import { useEffect, useRef, useState } from "react"
 import { Button } from "@workspace/ui/components/button"
 import { toast } from "sonner"
 
-import { explorerAccountUrl } from "@/app/config/network"
+import { cn } from "@workspace/ui/lib/utils"
 import { useBalance } from "../hooks/useBalance"
 import { useNetwork } from "../hooks/useNetwork"
 import { useWallet } from "../hooks/useWallet"
+import type { ComponentProps } from "react"
+import { explorerAccountUrl } from "@/app/config/network"
 import { formatAddress } from "@/shared/lib/format"
-import { cn } from "@workspace/ui/lib/utils"
 
 type AccountBadgeProps = {
   address: string
@@ -18,7 +19,9 @@ export function AccountBadge({ address, className, ...props }: AccountBadgeProps
   const [open, setOpen] = useState(false)
   const containerRef = useRef<HTMLDivElement>(null)
   const { disconnect } = useWallet()
-  const { balance, isLoading } = useBalance()
+  const balanceData = useBalance()
+  const balance = balanceData?.xlm
+  const isLoading = balanceData?.isLoading ?? false
   const { isMainnet } = useNetwork()
 
   useEffect(() => {
diff --git a/apps/web/src/features/wallet/components/ConnectButton.tsx b/apps/web/src/features/wallet/components/ConnectButton.tsx
index b530278..a2e4032 100644
--- a/apps/web/src/features/wallet/components/ConnectButton.tsx
+++ b/apps/web/src/features/wallet/components/ConnectButton.tsx
@@ -13,12 +13,12 @@ import {
 import { cn } from "@workspace/ui/lib/utils"
 
 import { createSep7ConnectUri, createSep7TransactionUri } from "../lib/sep7"
-import { useWalletStore } from "../store/wallet-store"
 import { useBalance } from "../hooks/useBalance"
+import { useWalletStore } from "../store/wallet-store"
+import type { ComponentProps } from "react"
 import { useKeyboardShortcut } from "@/shared/hooks/useKeyboardShortcut"
 import { useWallet } from "@/app/providers"
 import { NETWORK } from "@/app/config/network"
-import type { ComponentProps } from "react"
 
 type ConnectButtonProps = Omit<
   ComponentProps<typeof Button>,
diff --git a/apps/web/src/features/wallet/components/WalletProvider.tsx b/apps/web/src/features/wallet/components/WalletProvider.tsx
index 613c7ab..41b57a0 100644
--- a/apps/web/src/features/wallet/components/WalletProvider.tsx
+++ b/apps/web/src/features/wallet/components/WalletProvider.tsx
@@ -1,5 +1,6 @@
-import { createContext, useContext, useMemo, type ReactNode } from "react"
+import { createContext, useContext, useMemo } from "react"
 import { useWalletStore } from "../store/wallet-store"
+import type { ReactNode } from "react"
 
 type WalletStatus = "disconnected" | "connecting" | "connected" | "error"
 
diff --git a/apps/web/src/features/wallet/lib/wallet-kit.ts b/apps/web/src/features/wallet/lib/wallet-kit.ts
index 6487e9d..8a2cf63 100644
--- a/apps/web/src/features/wallet/lib/wallet-kit.ts
+++ b/apps/web/src/features/wallet/lib/wallet-kit.ts
@@ -1,5 +1,5 @@
-import { NETWORK } from "@/app/config/network"
 import type { SigningWallet } from "@/lib/soroban/tx-builder"
+import { NETWORK } from "@/app/config/network"
 
 /**
  * Wallet adapter used by prepareAndSign() for Soroban write transactions.
diff --git a/apps/web/src/lib/glv-router-client.ts b/apps/web/src/lib/glv-router-client.ts
index 42a9a6c..f028e0f 100644
--- a/apps/web/src/lib/glv-router-client.ts
+++ b/apps/web/src/lib/glv-router-client.ts
@@ -1,19 +1,19 @@
+import { TransactionBuilder } from "@stellar/stellar-sdk"
+import { GlvRouterClient, parseSorobanError } from "@workspace/contracts"
+import type { Transaction } from "@stellar/stellar-sdk"
+import type {
+  GlvCreateDepositParams as GeneratedCreateDepositParams,
+  GlvCreateWithdrawalParams as GeneratedCreateWithdrawalParams,
+  GlvInfo,
+} from "@workspace/contracts"
+
 import { prepareAndSign } from "@/lib/soroban/tx-builder"
 import { queryClient } from "@/app/providers/QueryProvider"
 import { CONTRACTS } from "@/app/config/contracts"
 import { NETWORK } from "@/app/config/network"
-import { parseSorobanError } from "@workspace/contracts"
 import { queryKeys } from "@/shared/lib/query-keys"
 import { submitTx } from "@/shared/hooks/useTxSubmit"
 import { walletKit } from "@/features/wallet/lib/wallet-kit"
-import type {
-  GlvCreateDepositParams as GeneratedCreateDepositParams,
-  GlvCreateWithdrawalParams as GeneratedCreateWithdrawalParams,
-  GlvInfo,
-} from "@workspace/contracts"
-import { GlvRouterClient } from "@workspace/contracts"
-import { TransactionBuilder } from "@stellar/stellar-sdk"
-import type { Transaction } from "@stellar/stellar-sdk"
 
 const CHAIN_ID = "stellar-mainnet"
 
diff --git a/apps/web/src/shared/components/NumberInput.tsx b/apps/web/src/shared/components/NumberInput.tsx
index 9bd938e..7e786ca 100644
--- a/apps/web/src/shared/components/NumberInput.tsx
+++ b/apps/web/src/shared/components/NumberInput.tsx
@@ -1,7 +1,7 @@
 import { Button } from "@workspace/ui/components/button"
 import { Input } from "@workspace/ui/components/input"
-import { formatUsd } from "@/shared/lib/format"
 import type { ComponentPropsWithoutRef } from "react"
+import { formatUsd } from "@/shared/lib/format"
 
 type NumberInputProps = Omit<ComponentPropsWithoutRef<"input">, "onChange" | "type"> & {
   value: string
diff --git a/apps/web/src/shared/lib/bignum.test.ts b/apps/web/src/shared/lib/bignum.test.ts
index 94525fe..d0c646d 100644
--- a/apps/web/src/shared/lib/bignum.test.ts
+++ b/apps/web/src/shared/lib/bignum.test.ts
@@ -10,45 +10,45 @@ describe("Soroban amount conversions", () => {
   it("converts XLM amounts with 7 decimals", () => {
     const raw = toSorobanAmount("12.3456789", 7)
 
-    assert.equal(raw, 123456789n)
-    assert.equal(fromSorobanAmount(raw, 7), 12.3456789)
-    assert.equal(formatSorobanAmount(raw, 7), "12.3456789")
+    expect(raw).toBe(123456789n)
+    expect(fromSorobanAmount(raw, 7)).toBe(12.3456789)
+    expect(formatSorobanAmount(raw, 7)).toBe("12.3456789")
   })
 
   it("converts USDC amounts with 6 decimals", () => {
     const raw = toSorobanAmount("2500.000001", 6)
 
-    assert.equal(raw, 2500000001n)
-    assert.equal(fromSorobanAmount(raw, 6), 2500.000001)
-    assert.equal(formatSorobanAmount(raw, 6), "2500.000001")
+    expect(raw).toBe(2500000001n)
+    expect(fromSorobanAmount(raw, 6)).toBe(2500.000001)
+    expect(formatSorobanAmount(raw, 6)).toBe("2500.000001")
   })
 
   it("converts BTC amounts with 8 decimals", () => {
     const raw = toSorobanAmount("0.12345678", 8)
 
-    assert.equal(raw, 12345678n)
-    assert.equal(fromSorobanAmount(raw, 8), 0.12345678)
-    assert.equal(formatSorobanAmount(raw, 8), "0.12345678")
+    expect(raw).toBe(12345678n)
+    expect(fromSorobanAmount(raw, 8)).toBe(0.12345678)
+    expect(formatSorobanAmount(raw, 8)).toBe("0.12345678")
   })
 
   it("pads fractional digits without floating-point rounding", () => {
-    assert.equal(toSorobanAmount("0.1", 7), 1000000n)
-    assert.equal(toSorobanAmount("0.2", 7), 2000000n)
-    assert.equal(toSorobanAmount("0.3", 7), 3000000n)
-    assert.equal(toSorobanAmount(0.0000001, 7), 1n)
+    expect(toSorobanAmount("0.1", 7)).toBe(1000000n)
+    expect(toSorobanAmount("0.2", 7)).toBe(2000000n)
+    expect(toSorobanAmount("0.3", 7)).toBe(3000000n)
+    expect(toSorobanAmount(0.0000001, 7)).toBe(1n)
   })
 
   it("rejects amounts that cannot fit the requested decimal scale", () => {
-    assert.throws(() => toSorobanAmount("1.12345678", 7), /more than 7/)
+    expect(() => toSorobanAmount("1.12345678", 7)).toThrow(/more than 7/)
   })
 
   it("formats with optional bigint-based precision rounding", () => {
-    assert.equal(formatSorobanAmount(123456789n, 7, 2), "12.35")
-    assert.equal(formatSorobanAmount(123400000n, 7, 4), "12.34")
+    expect(formatSorobanAmount(123456789n, 7, 2)).toBe("12.35")
+    expect(formatSorobanAmount(123400000n, 7, 4)).toBe("12.34")
   })
 
   it("handles negative raw and display amounts", () => {
-    assert.equal(toSorobanAmount("-1.5", 7), -15000000n)
-    assert.equal(formatSorobanAmount(-15000000n, 7), "-1.5")
+    expect(toSorobanAmount("-1.5", 7)).toBe(-15000000n)
+    expect(formatSorobanAmount(-15000000n, 7)).toBe("-1.5")
   })
 })
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 6e3af63..372da83 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -9,7 +9,7 @@ export default defineConfig(({ mode }) => {
   // Determine the target network (e.g. "testnet", "mainnet") from VITE_NETWORK
   // or fall back to the Vite mode string.
   const baseEnv = loadEnv(mode, process.cwd(), "VITE_")
-  const network = baseEnv.VITE_NETWORK ?? mode
+  const network = baseEnv.VITE_NETWORK
 
   // Load network-specific env overrides from .env.{network}
   const networkEnv = loadEnv(network, process.cwd(), "VITE_")