@dynamic-labs/sdk-react-core 4.83.1 → 4.83.2-alpha.0

package/src/lib/utils/hooks/useAleoShieldedBalances/useAleoShieldedBalances.cjs

@@ -144,25 +144,29 @@ const resolveAleoNetwork = (networkKey) => {
         return { aleoNetworkParam: 'testnet', safeNetworkId };
     return { aleoNetworkParam: undefined, safeNetworkId };
 };
-/**
- * Build a `(address, isNative) → price` lookup from the curated-prices
- * endpoint response. The key shape matches the multichain balance feed
- * (native ALEO at `'0x0' + isNative=true`, every other token at its
- * program id + `isNative=false`) so the join is a straight read.
- */
-const buildPriceLookup = (priceList) => {
-    const priceByKey = new Map();
+const buildCuratedTokenLookup = (priceList) => {
+    const byKey = new Map();
     for (const entry of priceList) {
-        priceByKey.set(`${entry.address}|${entry.isNative ? 1 : 0}`, entry.price);
+        byKey.set(`${entry.address}|${entry.isNative ? 1 : 0}`, {
+            logoURI: entry.logoURI,
+            price: entry.price,
+        });
     }
-    return (address, isNative) => { var _a; return (_a = priceByKey.get(`${address}|${isNative ? 1 : 0}`)) !== null && _a !== void 0 ? _a : null; };
+    return (address, isNative) => {
+        var _a;
+        return (_a = byKey.get(`${address}|${isNative ? 1 : 0}`)) !== null && _a !== void 0 ? _a : {
+            logoURI: undefined,
+            price: null,
+        };
+    };
 };
 /**
  * Aggregate `credits.aleo / credits` records into the native ALEO
  * `TokenBalance`. Returns `undefined` when the wallet owns no credits
  * records so the caller can omit the row entirely.
  */
-const buildCreditsBalance = (records, networkId, priceFor) => {
+const buildCreditsBalance = (records, networkId, lookupCurated) => {
+    var _a;
     const creditsRecords = records.filter((r) => (r === null || r === void 0 ? void 0 : r.program_name) === 'credits.aleo' &&
         (r === null || r === void 0 ? void 0 : r.record_name) === 'credits' &&
         typeof (r === null || r === void 0 ? void 0 : r.microcredits) === 'string');
@@ -173,19 +177,25 @@ const buildCreditsBalance = (records, networkId, priceFor) => {
     // below Number.MAX_SAFE_INTEGER for a single wallet (max u64 supply is
     // 1.5B credits = 1.5e15 microcredits; Number can hold up to ~9e15).
     const rawBalance = Number(totalMicrocredits);
+    const rawBalanceString = totalMicrocredits.toString();
     const balance = rawBalance / MICROCREDITS_PER_CREDIT;
-    const price = priceFor('0x0', true);
+    const curated = lookupCurated('0x0', true);
     return {
         address: '0x0',
         balance,
         decimals: 6,
         isNative: true,
-        logoURI: ALEO_CREDITS_LOGO,
-        marketValue: price !== null ? balance * price : undefined,
+        // Prefer the server-curated logo (single source of truth for both
+        //  the unshielded multichain feed and the shielded tab); fall back
+        //  to the bundled ALEO glyph for older redcoast deployments that
+        //  don't yet send `logoURI` on the prices response.
+        logoURI: (_a = curated.logoURI) !== null && _a !== void 0 ? _a : ALEO_CREDITS_LOGO,
+        marketValue: curated.price !== null ? balance * curated.price : undefined,
         name: 'Aleo Credits',
         networkId,
-        price: price !== null ? price : undefined,
+        price: curated.price !== null ? curated.price : undefined,
         rawBalance,
+        rawBalanceString,
         symbol: 'ALEO',
     };
 };
@@ -195,8 +205,8 @@ const buildCreditsBalance = (records, networkId, priceFor) => {
  * match a curated spec, lack an `amount`, or have a malformed amount
  * string are silently skipped.
  */
-const buildTokenBalances = (records, networkId, priceFor) => {
-    var _a, _b;
+const buildTokenBalances = (records, networkId, lookupCurated) => {
+    var _a, _b, _c;
     const sumsByContract = new Map();
     const specsByContract = new Map();
     for (const r of records) {
@@ -208,7 +218,7 @@ const buildTokenBalances = (records, networkId, priceFor) => {
             sumsByContract.set(spec.contractAddress, prev + BigInt(r.amount));
             specsByContract.set(spec.contractAddress, spec);
         }
-        catch (_c) {
+        catch (_d) {
             /* ignore — malformed amount string */
         }
     }
@@ -218,22 +228,26 @@ const buildTokenBalances = (records, networkId, priceFor) => {
         if (!spec)
             continue;
         const rawBalance = Number(total);
+        const rawBalanceString = total.toString();
         const balance = rawBalance / Math.pow(10, spec.decimals);
-        const price = priceFor(spec.contractAddress, false);
+        const curated = lookupCurated(spec.contractAddress, false);
         out.push({
             address: spec.contractAddress,
             balance,
             decimals: spec.decimals,
-            // Use redcoast's `DEFAULT_TOKEN_LOGO_URI` for stablecoins + ARC-21
-            //  so they render the same dark "?" icon the Unshielded tab shows
-            //  for these tokens (the multichain endpoint applies that fallback
-            //  itself; we mirror it here for visual parity).
-            logoURI: (_b = spec.logoURI) !== null && _b !== void 0 ? _b : UNKNOWN_TOKEN_LOGO,
-            marketValue: price !== null ? balance * price : undefined,
+            // Prefer the server-curated logo so the Shielded tab renders the
+            //  same brand glyph the Unshielded tab gets from the multichain
+            //  feed. Fall back to the local spec override (kept for tests +
+            //  any future curated-but-not-yet-on-server tokens), then to the
+            //  generic dark `?` placeholder for older redcoast deployments
+            //  that haven't rolled out the logo response field yet.
+            logoURI: (_c = (_b = curated.logoURI) !== null && _b !== void 0 ? _b : spec.logoURI) !== null && _c !== void 0 ? _c : UNKNOWN_TOKEN_LOGO,
+            marketValue: curated.price !== null ? balance * curated.price : undefined,
             name: spec.name,
             networkId,
-            price: price !== null ? price : undefined,
+            price: curated.price !== null ? curated.price : undefined,
             rawBalance,
+            rawBalanceString,
             symbol: spec.symbol,
         });
     }
@@ -304,12 +318,12 @@ const useAleoShieldedBalances = () => {
                     : Promise.resolve([]),
             ]);
             const records = (_a = result === null || result === void 0 ? void 0 : result.records) !== null && _a !== void 0 ? _a : [];
-            const priceFor = buildPriceLookup(priceList);
+            const lookupCurated = buildCuratedTokenLookup(priceList);
             const balances = [];
-            const credits = buildCreditsBalance(records, safeNetworkId, priceFor);
+            const credits = buildCreditsBalance(records, safeNetworkId, lookupCurated);
             if (credits)
                 balances.push(credits);
-            balances.push(...buildTokenBalances(records, safeNetworkId, priceFor));
+            balances.push(...buildTokenBalances(records, safeNetworkId, lookupCurated));
             setTokenBalances(balances);
         }
         catch (err) {

package/src/lib/utils/hooks/useAleoShieldedBalances/useAleoShieldedBalances.js

@@ -140,25 +140,29 @@ const resolveAleoNetwork = (networkKey) => {
         return { aleoNetworkParam: 'testnet', safeNetworkId };
     return { aleoNetworkParam: undefined, safeNetworkId };
 };
-/**
- * Build a `(address, isNative) → price` lookup from the curated-prices
- * endpoint response. The key shape matches the multichain balance feed
- * (native ALEO at `'0x0' + isNative=true`, every other token at its
- * program id + `isNative=false`) so the join is a straight read.
- */
-const buildPriceLookup = (priceList) => {
-    const priceByKey = new Map();
+const buildCuratedTokenLookup = (priceList) => {
+    const byKey = new Map();
     for (const entry of priceList) {
-        priceByKey.set(`${entry.address}|${entry.isNative ? 1 : 0}`, entry.price);
+        byKey.set(`${entry.address}|${entry.isNative ? 1 : 0}`, {
+            logoURI: entry.logoURI,
+            price: entry.price,
+        });
     }
-    return (address, isNative) => { var _a; return (_a = priceByKey.get(`${address}|${isNative ? 1 : 0}`)) !== null && _a !== void 0 ? _a : null; };
+    return (address, isNative) => {
+        var _a;
+        return (_a = byKey.get(`${address}|${isNative ? 1 : 0}`)) !== null && _a !== void 0 ? _a : {
+            logoURI: undefined,
+            price: null,
+        };
+    };
 };
 /**
  * Aggregate `credits.aleo / credits` records into the native ALEO
  * `TokenBalance`. Returns `undefined` when the wallet owns no credits
  * records so the caller can omit the row entirely.
  */
-const buildCreditsBalance = (records, networkId, priceFor) => {
+const buildCreditsBalance = (records, networkId, lookupCurated) => {
+    var _a;
     const creditsRecords = records.filter((r) => (r === null || r === void 0 ? void 0 : r.program_name) === 'credits.aleo' &&
         (r === null || r === void 0 ? void 0 : r.record_name) === 'credits' &&
         typeof (r === null || r === void 0 ? void 0 : r.microcredits) === 'string');
@@ -169,19 +173,25 @@ const buildCreditsBalance = (records, networkId, priceFor) => {
     // below Number.MAX_SAFE_INTEGER for a single wallet (max u64 supply is
     // 1.5B credits = 1.5e15 microcredits; Number can hold up to ~9e15).
     const rawBalance = Number(totalMicrocredits);
+    const rawBalanceString = totalMicrocredits.toString();
     const balance = rawBalance / MICROCREDITS_PER_CREDIT;
-    const price = priceFor('0x0', true);
+    const curated = lookupCurated('0x0', true);
     return {
         address: '0x0',
         balance,
         decimals: 6,
         isNative: true,
-        logoURI: ALEO_CREDITS_LOGO,
-        marketValue: price !== null ? balance * price : undefined,
+        // Prefer the server-curated logo (single source of truth for both
+        //  the unshielded multichain feed and the shielded tab); fall back
+        //  to the bundled ALEO glyph for older redcoast deployments that
+        //  don't yet send `logoURI` on the prices response.
+        logoURI: (_a = curated.logoURI) !== null && _a !== void 0 ? _a : ALEO_CREDITS_LOGO,
+        marketValue: curated.price !== null ? balance * curated.price : undefined,
         name: 'Aleo Credits',
         networkId,
-        price: price !== null ? price : undefined,
+        price: curated.price !== null ? curated.price : undefined,
         rawBalance,
+        rawBalanceString,
         symbol: 'ALEO',
     };
 };
@@ -191,8 +201,8 @@ const buildCreditsBalance = (records, networkId, priceFor) => {
  * match a curated spec, lack an `amount`, or have a malformed amount
  * string are silently skipped.
  */
-const buildTokenBalances = (records, networkId, priceFor) => {
-    var _a, _b;
+const buildTokenBalances = (records, networkId, lookupCurated) => {
+    var _a, _b, _c;
     const sumsByContract = new Map();
     const specsByContract = new Map();
     for (const r of records) {
@@ -204,7 +214,7 @@ const buildTokenBalances = (records, networkId, priceFor) => {
             sumsByContract.set(spec.contractAddress, prev + BigInt(r.amount));
             specsByContract.set(spec.contractAddress, spec);
         }
-        catch (_c) {
+        catch (_d) {
             /* ignore — malformed amount string */
         }
     }
@@ -214,22 +224,26 @@ const buildTokenBalances = (records, networkId, priceFor) => {
         if (!spec)
             continue;
         const rawBalance = Number(total);
+        const rawBalanceString = total.toString();
         const balance = rawBalance / Math.pow(10, spec.decimals);
-        const price = priceFor(spec.contractAddress, false);
+        const curated = lookupCurated(spec.contractAddress, false);
         out.push({
             address: spec.contractAddress,
             balance,
             decimals: spec.decimals,
-            // Use redcoast's `DEFAULT_TOKEN_LOGO_URI` for stablecoins + ARC-21
-            //  so they render the same dark "?" icon the Unshielded tab shows
-            //  for these tokens (the multichain endpoint applies that fallback
-            //  itself; we mirror it here for visual parity).
-            logoURI: (_b = spec.logoURI) !== null && _b !== void 0 ? _b : UNKNOWN_TOKEN_LOGO,
-            marketValue: price !== null ? balance * price : undefined,
+            // Prefer the server-curated logo so the Shielded tab renders the
+            //  same brand glyph the Unshielded tab gets from the multichain
+            //  feed. Fall back to the local spec override (kept for tests +
+            //  any future curated-but-not-yet-on-server tokens), then to the
+            //  generic dark `?` placeholder for older redcoast deployments
+            //  that haven't rolled out the logo response field yet.
+            logoURI: (_c = (_b = curated.logoURI) !== null && _b !== void 0 ? _b : spec.logoURI) !== null && _c !== void 0 ? _c : UNKNOWN_TOKEN_LOGO,
+            marketValue: curated.price !== null ? balance * curated.price : undefined,
             name: spec.name,
             networkId,
-            price: price !== null ? price : undefined,
+            price: curated.price !== null ? curated.price : undefined,
             rawBalance,
+            rawBalanceString,
             symbol: spec.symbol,
         });
     }
@@ -300,12 +314,12 @@ const useAleoShieldedBalances = () => {
                     : Promise.resolve([]),
             ]);
             const records = (_a = result === null || result === void 0 ? void 0 : result.records) !== null && _a !== void 0 ? _a : [];
-            const priceFor = buildPriceLookup(priceList);
+            const lookupCurated = buildCuratedTokenLookup(priceList);
             const balances = [];
-            const credits = buildCreditsBalance(records, safeNetworkId, priceFor);
+            const credits = buildCreditsBalance(records, safeNetworkId, lookupCurated);
             if (credits)
                 balances.push(credits);
-            balances.push(...buildTokenBalances(records, safeNetworkId, priceFor));
+            balances.push(...buildTokenBalances(records, safeNetworkId, lookupCurated));
             setTokenBalances(balances);
         }
         catch (err) {

package/src/lib/widgets/DynamicWidget/components/ActiveWalletBalance/ActiveWalletBalance.cjs

@@ -12,7 +12,9 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 var useTokenBalances = require('../../../../utils/hooks/useTokenBalances/useTokenBalances.cjs');
 var useAleoShieldedBalances = require('../../../../utils/hooks/useAleoShieldedBalances/useAleoShieldedBalances.cjs');
 var useAleoAutoMergeRecords = require('../../../../utils/hooks/useAleoAutoMergeRecords/useAleoAutoMergeRecords.cjs');
+var buildTokenKey = require('../../../../utils/hooks/useAleoAutoShieldSponsoredTokens/buildTokenKey.cjs');
 var useAleoAutoShieldSponsoredTokens = require('../../../../utils/hooks/useAleoAutoShieldSponsoredTokens/useAleoAutoShieldSponsoredTokens.cjs');
+var pollOnShielded = require('../../../../utils/hooks/useAleoAutoShieldSponsoredTokens/pollOnShielded.cjs');
 var AccordionItem = require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -193,7 +195,7 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
     //  `shieldToken` for tokens whose `transfer_public_to_private` is
     //  Feemaster-sponsored. Unsponsored tokens stay on the manual Shield
     //  Manually CTA, which prompts the user-paid confirmation modal.
-    const { isShielding: isAutoShielding } = useAleoAutoShieldSponsoredTokens.useAleoAutoShieldSponsoredTokens({
+    const { isShielding: isAutoShielding, currentlyShieldingTokenKeys: autoShieldingTokenKeys, } = useAleoAutoShieldSponsoredTokens.useAleoAutoShieldSponsoredTokens({
         accountAddress: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
         onShielded: React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             yield fetchAccountBalances(true);
@@ -202,6 +204,16 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
         shieldHandle: aleoShieldHandle,
         unshieldedTokenBalances: unshieldedTokenBalances,
     });
+    // Liveness handle for the manual post-shield poll — set to true when
+    //  the component unmounts so `pollOnShielded` exits its backoff loop
+    //  instead of firing `fetchAccountBalances` on a torn-down tree.
+    const isUnmountedRef = React.useRef(false);
+    React.useEffect(() => {
+        isUnmountedRef.current = false;
+        return () => {
+            isUnmountedRef.current = true;
+        };
+    }, []);
     // Token currently awaiting user-paid fee confirmation. Set when
     //  Shield Manually is clicked on a token Feemaster doesn't sponsor;
     //  cleared on Cancel or after the modal's Shield button dispatches.
@@ -218,12 +230,14 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
         if (atomic <= BigInt(0))
             return;
         setShieldingAddress(token.address);
+        let didBroadcast = false;
         try {
             yield aleoShieldHandle.shieldToken({
                 amount: atomic,
                 isNative: token.isNative,
                 tokenAddress: token.address,
             });
+            didBroadcast = true;
             // Refresh the unshielded list so the just-shielded balance drops to
             // 0 in the redcoast feed. The shielded side will pick the new
             // record up on its own polling once the RecordScanner indexes.
@@ -236,6 +250,20 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
         finally {
             setShieldingAddress(undefined);
         }
+        // The relay-accepted broadcast resolves *before* the
+        //  public→private transition finalizes on-chain, so the immediate
+        //  refresh above sees the pre-confirmation balance. Re-poll on the
+        //  shared backoff so the Unshielded row visibly drops to 0 and the
+        //  Shielded row picks the new record up without a manual reload.
+        //  Polling is best-effort — errors are swallowed inside
+        //  `pollOnShielded`. Skip when the broadcast itself failed; there's
+        //  nothing new to converge on.
+        if (!didBroadcast)
+            return;
+        yield pollOnShielded.pollOnShielded(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            yield fetchAccountBalances(true);
+            yield refetchShielded();
+        }), () => isUnmountedRef.current);
     }), [aleoShieldHandle, fetchAccountBalances, refetchShielded, shieldingAddress]);
     const getSecondaryAction = React.useCallback((token) => {
         // Only on the Unshielded tab, only when the connector exposes shield
@@ -252,6 +280,15 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
             return undefined;
         if (!token.rawBalance || token.rawBalance <= 0)
             return undefined;
+        // Hide the CTA while auto-shield is mid-broadcast for this token.
+        //  The connector dedupes regardless, but suppressing the button
+        //  prevents two click-then-spinner cycles for a single underlying
+        //  shield. Once auto-shield resolves, the row re-renders with the
+        //  freshly-zero balance, the `rawBalance <= 0` guard above kicks in,
+        //  and the CTA stays hidden until a new unshielded balance arrives.
+        const tokenKey = buildTokenKey.buildTokenKey(token);
+        if (tokenKey && autoShieldingTokenKeys.has(tokenKey))
+            return undefined;
         return {
             dataTestId: `shield-manually-${token.symbol}`,
             isLoading: shieldingAddress === token.address,
@@ -282,7 +319,13 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
                 });
             },
         };
-    }, [activeShieldTab, aleoShieldHandle, handleShieldToken, shieldingAddress]);
+    }, [
+        activeShieldTab,
+        aleoShieldHandle,
+        autoShieldingTokenKeys,
+        handleShieldToken,
+        shieldingAddress,
+    ]);
     const tokenBalances = React.useMemo(() => supportsShielded && activeShieldTab === 'shielded'
         ? shieldedTokenBalances
         : unshieldedTokenBalances, [

package/src/lib/widgets/DynamicWidget/components/ActiveWalletBalance/ActiveWalletBalance.js

@@ -1,14 +1,16 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useRef, useMemo, useCallback } from 'react';
+import { useState, useRef, useMemo, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import '../../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useTokenBalances } from '../../../../utils/hooks/useTokenBalances/useTokenBalances.js';
 import { useAleoShieldedBalances } from '../../../../utils/hooks/useAleoShieldedBalances/useAleoShieldedBalances.js';
 import { useAleoAutoMergeRecords } from '../../../../utils/hooks/useAleoAutoMergeRecords/useAleoAutoMergeRecords.js';
+import { buildTokenKey } from '../../../../utils/hooks/useAleoAutoShieldSponsoredTokens/buildTokenKey.js';
 import { useAleoAutoShieldSponsoredTokens } from '../../../../utils/hooks/useAleoAutoShieldSponsoredTokens/useAleoAutoShieldSponsoredTokens.js';
+import { pollOnShielded } from '../../../../utils/hooks/useAleoAutoShieldSponsoredTokens/pollOnShielded.js';
 import { AccordionItem } from '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -189,7 +191,7 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
     //  `shieldToken` for tokens whose `transfer_public_to_private` is
     //  Feemaster-sponsored. Unsponsored tokens stay on the manual Shield
     //  Manually CTA, which prompts the user-paid confirmation modal.
-    const { isShielding: isAutoShielding } = useAleoAutoShieldSponsoredTokens({
+    const { isShielding: isAutoShielding, currentlyShieldingTokenKeys: autoShieldingTokenKeys, } = useAleoAutoShieldSponsoredTokens({
         accountAddress: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
         onShielded: useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
             yield fetchAccountBalances(true);
@@ -198,6 +200,16 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
         shieldHandle: aleoShieldHandle,
         unshieldedTokenBalances: unshieldedTokenBalances,
     });
+    // Liveness handle for the manual post-shield poll — set to true when
+    //  the component unmounts so `pollOnShielded` exits its backoff loop
+    //  instead of firing `fetchAccountBalances` on a torn-down tree.
+    const isUnmountedRef = useRef(false);
+    useEffect(() => {
+        isUnmountedRef.current = false;
+        return () => {
+            isUnmountedRef.current = true;
+        };
+    }, []);
     // Token currently awaiting user-paid fee confirmation. Set when
     //  Shield Manually is clicked on a token Feemaster doesn't sponsor;
     //  cleared on Cancel or after the modal's Shield button dispatches.
@@ -214,12 +226,14 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
         if (atomic <= BigInt(0))
             return;
         setShieldingAddress(token.address);
+        let didBroadcast = false;
         try {
             yield aleoShieldHandle.shieldToken({
                 amount: atomic,
                 isNative: token.isNative,
                 tokenAddress: token.address,
             });
+            didBroadcast = true;
             // Refresh the unshielded list so the just-shielded balance drops to
             // 0 in the redcoast feed. The shielded side will pick the new
             // record up on its own polling once the RecordScanner indexes.
@@ -232,6 +246,20 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
         finally {
             setShieldingAddress(undefined);
         }
+        // The relay-accepted broadcast resolves *before* the
+        //  public→private transition finalizes on-chain, so the immediate
+        //  refresh above sees the pre-confirmation balance. Re-poll on the
+        //  shared backoff so the Unshielded row visibly drops to 0 and the
+        //  Shielded row picks the new record up without a manual reload.
+        //  Polling is best-effort — errors are swallowed inside
+        //  `pollOnShielded`. Skip when the broadcast itself failed; there's
+        //  nothing new to converge on.
+        if (!didBroadcast)
+            return;
+        yield pollOnShielded(() => __awaiter(void 0, void 0, void 0, function* () {
+            yield fetchAccountBalances(true);
+            yield refetchShielded();
+        }), () => isUnmountedRef.current);
     }), [aleoShieldHandle, fetchAccountBalances, refetchShielded, shieldingAddress]);
     const getSecondaryAction = useCallback((token) => {
         // Only on the Unshielded tab, only when the connector exposes shield
@@ -248,6 +276,15 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
             return undefined;
         if (!token.rawBalance || token.rawBalance <= 0)
             return undefined;
+        // Hide the CTA while auto-shield is mid-broadcast for this token.
+        //  The connector dedupes regardless, but suppressing the button
+        //  prevents two click-then-spinner cycles for a single underlying
+        //  shield. Once auto-shield resolves, the row re-renders with the
+        //  freshly-zero balance, the `rawBalance <= 0` guard above kicks in,
+        //  and the CTA stays hidden until a new unshielded balance arrives.
+        const tokenKey = buildTokenKey(token);
+        if (tokenKey && autoShieldingTokenKeys.has(tokenKey))
+            return undefined;
         return {
             dataTestId: `shield-manually-${token.symbol}`,
             isLoading: shieldingAddress === token.address,
@@ -278,7 +315,13 @@ const ActiveWalletBalance = ({ isLoading = false, }) => {
                 });
             },
         };
-    }, [activeShieldTab, aleoShieldHandle, handleShieldToken, shieldingAddress]);
+    }, [
+        activeShieldTab,
+        aleoShieldHandle,
+        autoShieldingTokenKeys,
+        handleShieldToken,
+        shieldingAddress,
+    ]);
     const tokenBalances = useMemo(() => supportsShielded && activeShieldTab === 'shielded'
         ? shieldedTokenBalances
         : unshieldedTokenBalances, [