September 11, 2026 Production Release

src/components/BitcoinDetails.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import { QrCodeIcon, SendIcon } from "lucide-react";
+import { QrCodeIcon, RefreshCwIcon, SendIcon } from "lucide-react";
 import { useShallow } from "zustand/react/shallow";
 import {
   BITCOIN_MAINNET_CHAIN_ID,
@@ -70,10 +70,14 @@ export function BitcoinDetails() {
     makeBitcoinSatoshiDelta(0n),
   );
   const [loading, setLoading] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [receiveOpen, setReceiveOpen] = useState(false);
   const [sendOpen, setSendOpen] = useState(false);
   const addressRefreshAttemptedRef = useRef(false);
+  const requestIdRef = useRef(0);
+  const inFlightLoadRef = useRef(0);
+  const inFlightQuietRef = useRef(0);
 
   // Returning sessions may lack BTC addresses until secp cache / unlock fills them.
   useEffect(() => {
@@ -85,28 +89,47 @@ export function BitcoinDetails() {
     });
   }, [address, unlocked, refreshAddresses, getSigner]);
 
-  const refresh = useCallback(async () => {
-    if (!address) {
-      setConfirmedSats(null);
-      setUnconfirmedSats(makeBitcoinSatoshiDelta(0n));
-      return;
-    }
-    setLoading(true);
-    setError(null);
-    try {
-      const balance = await bitcoinService.getBalance(btcChainId, address);
-      setConfirmedSats(balance.confirmed);
-      setUnconfirmedSats(balance.unconfirmed);
-    } catch (err: unknown) {
-      setError(
-        err instanceof Error ? err.message : bitcoinCopy.loadFailedError,
-      );
-      setConfirmedSats(null);
-      setUnconfirmedSats(makeBitcoinSatoshiDelta(0n));
-    } finally {
-      setLoading(false);
-    }
-  }, [address, bitcoinCopy.loadFailedError, bitcoinService, btcChainId]);
+  const refresh = useCallback(
+    async (opts?: { quiet?: boolean }) => {
+      if (!address) {
+        setConfirmedSats(null);
+        setUnconfirmedSats(makeBitcoinSatoshiDelta(0n));
+        return;
+      }
+      const quiet = opts?.quiet === true;
+      const requestId = ++requestIdRef.current;
+      if (quiet) {
+        inFlightQuietRef.current += 1;
+        setRefreshing(true);
+      } else {
+        inFlightLoadRef.current += 1;
+        setLoading(true);
+      }
+      setError(null);
+      try {
+        const balance = await bitcoinService.getBalance(btcChainId, address);
+        if (requestId !== requestIdRef.current) return;
+        setConfirmedSats(balance.confirmed);
+        setUnconfirmedSats(balance.unconfirmed);
+      } catch (err: unknown) {
+        if (requestId !== requestIdRef.current) return;
+        setError(
+          err instanceof Error ? err.message : bitcoinCopy.loadFailedError,
+        );
+        setConfirmedSats(null);
+        setUnconfirmedSats(makeBitcoinSatoshiDelta(0n));
+      } finally {
+        if (quiet) {
+          inFlightQuietRef.current = Math.max(0, inFlightQuietRef.current - 1);
+          if (inFlightQuietRef.current === 0) setRefreshing(false);
+        } else {
+          inFlightLoadRef.current = Math.max(0, inFlightLoadRef.current - 1);
+          if (inFlightLoadRef.current === 0) setLoading(false);
+        }
+      }
+    },
+    [address, bitcoinCopy.loadFailedError, bitcoinService, btcChainId],
+  );
 
   useEffect(() => {
     void refresh();
@@ -125,6 +148,23 @@ export function BitcoinDetails() {
 
   return (
     <div className="flex flex-col gap-4">
+      <div className="flex items-center justify-end">
+        <Button
+          type="button"
+          size="icon-sm"
+          variant="outline"
+          aria-label={balances.refreshLabel}
+          disabled={!address || refreshing || loading}
+          onClick={() => {
+            void refresh({ quiet: true });
+          }}
+        >
+          <RefreshCwIcon
+            className={`size-3.5 ${refreshing ? "animate-spin" : ""}`}
+          />
+        </Button>
+      </div>
+
       <div className="flex flex-col items-center gap-3 py-4">
         <img
           src={logoUrl}
@@ -166,7 +206,7 @@ export function BitcoinDetails() {
           type="button"
           disabled={!canAct}
           onClick={() => {
-            void refresh();
+            void refresh({ quiet: true });
             setSendOpen(true);
           }}
         >
@@ -190,7 +230,7 @@ export function BitcoinDetails() {
           balanceSats={spendableSats}
           onClose={() => setSendOpen(false)}
           onSuccess={() => {
-            void refresh();
+            void refresh({ quiet: true });
           }}
         />
       ) : null}

src/components/balances/AssetList.tsx

@@ -25,6 +25,7 @@ import {
 } from "@/components/ui/table";
 import { TrackedAsset } from "../../lib/types/domain";
 import { EAssetType } from "../../lib/types/enum/EAssetType";
+import { ChainUtils } from "@1shotapi/ows-types";
 import { useStyle } from "../../style/StyleProvider";
 import { useWallet } from "../../wallet/WalletProvider";
 import { useWalletSessionStore } from "../../wallet/sessionStore";
@@ -56,16 +57,28 @@ export function AssetList({
     setLoading(true);
     setError(null);
     try {
-      const tracked = (await listTrackedAssets()).filter(
-        (asset) => asset.chainId === chainId,
-      );
+      // Metadata + cache only (no RPC) so the list can paint immediately.
+      const tracked = ChainUtils.isEVMChainId(chainId)
+        ? await listTrackedAssets(chainId)
+        : [];
       setRows(tracked);
     } catch (err: unknown) {
       setError(err instanceof Error ? err.message : copy.loadFailedError);
     } finally {
       setLoading(false);
     }
-  }, [listTrackedAssets, chainId, copy.loadFailedError]);
+    // Active-chain balances in the background; BalanceDisplay stays live via events.
+    if (ChainUtils.isEVMChainId(chainId)) {
+      void requestBalanceRefresh(undefined, chainId).catch(() => {
+        /* list already painted; refresh errors stay in console */
+      });
+    }
+  }, [
+    listTrackedAssets,
+    chainId,
+    copy.loadFailedError,
+    requestBalanceRefresh,
+  ]);
 
   useEffect(() => {
     void reload();
@@ -75,8 +88,12 @@ export function AssetList({
     setRefreshing(true);
     setError(null);
     try {
-      await requestBalanceRefresh();
-      await reload();
+      if (!ChainUtils.isEVMChainId(chainId)) {
+        setRows([]);
+        return;
+      }
+      await requestBalanceRefresh(undefined, chainId);
+      setRows(await listTrackedAssets(chainId));
     } catch (err: unknown) {
       setError(
         err instanceof Error ? err.message : copy.refreshFailedError,

src/components/modals/CCTPBridge.tsx

@@ -319,7 +319,8 @@ export function CCTPBridge({
         if (cancelled) return;
         setForwardTxHash(hash);
         setPhase("success");
-        void requestBalanceRefresh();
+        // Scope to the bridge source chain — session may be on Bitcoin/etc.
+        void requestBalanceRefresh(undefined, request.sourceChainId);
       })
       .catch((err: unknown) => {
         if (cancelled) return;
@@ -488,13 +489,12 @@ export function CCTPBridge({
       });
       setForwardTxHash(hash);
       setPhase("success");
-      if (sourceUsdc) {
-        void requestBalanceRefresh(
-          makeTrackedAssetId(request.sourceChainId, sourceUsdc.address),
-        );
-      } else {
-        void requestBalanceRefresh();
-      }
+      void requestBalanceRefresh(
+        sourceUsdc
+          ? makeTrackedAssetId(request.sourceChainId, sourceUsdc.address)
+          : undefined,
+        request.sourceChainId,
+      );
     } catch (err: unknown) {
       setError(err instanceof Error ? err.message : copy.timeoutError);
       setPhase("timeout");
@@ -525,13 +525,12 @@ export function CCTPBridge({
       if (result.forwardTxHash) {
         setForwardTxHash(result.forwardTxHash);
         setPhase("success");
-        if (sourceUsdc) {
-          void requestBalanceRefresh(
-            makeTrackedAssetId(request.sourceChainId, sourceUsdc.address),
-          );
-        } else {
-          void requestBalanceRefresh();
-        }
+        void requestBalanceRefresh(
+          sourceUsdc
+            ? makeTrackedAssetId(request.sourceChainId, sourceUsdc.address)
+            : undefined,
+          request.sourceChainId,
+        );
         return;
       }
       const stored = await bridgeService.resume(request.ownerAddress);