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

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

@@ -1,15 +1,10 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useRef, useState, useEffect, useMemo } from 'react';
+import { buildTokenKey } from './buildTokenKey.js';
+import { nativeTokenKey } from './nativeTokenKey.js';
+import { pollOnShielded } from './pollOnShielded.js';
 
-// Backoff schedule for the post-shield refresh. `shieldToken` resolves
-//  when the relay accepts the broadcast, not when the public→private
-//  transition confirms on-chain. Aleo block time + RecordScanner indexer
-//  lag means the immediate post-broadcast fetch usually returns the
-//  pre-confirmation balance, so we re-poll for ~45s before giving up.
-const REFRESH_DELAYS_MS = [
-    3000, 5000, 8000, 12000, 18000,
-];
 /**
  * Selects which of `tokens` should attempt an auto-shield on this cycle.
  * A token is a candidate when:
@@ -25,7 +20,6 @@ const REFRESH_DELAYS_MS = [
 const buildShieldCandidates = (args) => {
     const { tokens, accountAddress, shieldHandle, seenKeys } = args;
     return tokens.filter((token) => {
-        var _a;
         if (!token.rawBalance || token.rawBalance <= 0)
             return false;
         if (!shieldHandle.canShieldToken({
@@ -34,7 +28,7 @@ const buildShieldCandidates = (args) => {
         })) {
             return false;
         }
-        const tokenKey = (_a = token.address) !== null && _a !== void 0 ? _a : (token.isNative ? '__native__' : '');
+        const tokenKey = buildTokenKey(token);
         if (!tokenKey)
             return false;
         return !seenKeys.has(`${accountAddress}:${tokenKey}`);
@@ -48,20 +42,20 @@ const buildShieldCandidates = (args) => {
  * so the effect-cleanup `cancelled` flag stays in scope.
  */
 const tryShieldOneToken = (token, deps) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
-    const { accountAddress, shieldHandle, seenKeys, isCancelled } = deps;
-    const tokenKey = (_a = token.address) !== null && _a !== void 0 ? _a : '__native__';
+    var _a, _b, _c;
+    const { accountAddress, shieldHandle, seenKeys, isCancelled, inFlightTokenKeys, } = deps;
+    const tokenKey = buildTokenKey(token) || nativeTokenKey;
     const key = `${accountAddress}:${tokenKey}`;
     seenKeys.add(key);
     let sponsored = false;
     try {
         sponsored =
-            (_c = (yield ((_b = shieldHandle.isShieldSponsored) === null || _b === void 0 ? void 0 : _b.call(shieldHandle, {
+            (_b = (yield ((_a = shieldHandle.isShieldSponsored) === null || _a === void 0 ? void 0 : _a.call(shieldHandle, {
                 address: token.address,
                 isNative: token.isNative,
-            })))) !== null && _c !== void 0 ? _c : false;
+            })))) !== null && _b !== void 0 ? _b : false;
     }
-    catch (_e) {
+    catch (_d) {
         sponsored = false;
     }
     if (isCancelled())
@@ -70,11 +64,12 @@ const tryShieldOneToken = (token, deps) => __awaiter(void 0, void 0, void 0, fun
         seenKeys.delete(key);
         return false;
     }
-    const atomic = BigInt(Math.round((_d = token.rawBalance) !== null && _d !== void 0 ? _d : 0));
+    const atomic = BigInt(Math.round((_c = token.rawBalance) !== null && _c !== void 0 ? _c : 0));
     if (atomic <= BigInt(0)) {
         seenKeys.delete(key);
         return false;
     }
+    inFlightTokenKeys === null || inFlightTokenKeys === void 0 ? void 0 : inFlightTokenKeys.add(tokenKey);
     try {
         yield shieldHandle.shieldToken({
             amount: atomic,
@@ -83,30 +78,12 @@ const tryShieldOneToken = (token, deps) => __awaiter(void 0, void 0, void 0, fun
         });
         return true;
     }
-    catch (_f) {
+    catch (_e) {
         seenKeys.delete(key);
         return false;
     }
-});
-/**
- * After a successful shield broadcast, poll `onShielded` on a backoff
- * schedule so the consumer sees both the shielded and unshielded balances
- * update without a manual refresh click. Stops early on cancel; swallows
- * per-iteration errors (refresh is best-effort).
- */
-const pollOnShielded = (onShielded, isCancelled) => __awaiter(void 0, void 0, void 0, function* () {
-    for (const delay of REFRESH_DELAYS_MS) {
-        if (isCancelled())
-            return;
-        yield new Promise((resolve) => setTimeout(resolve, delay));
-        if (isCancelled())
-            return;
-        try {
-            yield onShielded();
-        }
-        catch (_g) {
-            /* swallow — refresh is best-effort */
-        }
+    finally {
+        inFlightTokenKeys === null || inFlightTokenKeys === void 0 ? void 0 : inFlightTokenKeys.delete(tokenKey);
     }
 });
 const useAleoAutoShieldSponsoredTokens = ({ accountAddress, unshieldedTokenBalances, shieldHandle, onShielded, }) => {
@@ -144,6 +121,35 @@ const useAleoAutoShieldSponsoredTokens = ({ accountAddress, unshieldedTokenBalan
             mountedRef.current = false;
         };
     }, []);
+    // Identity-stable set of token keys we're currently broadcasting for.
+    //  Mutated in `tryShieldOneToken` (add on entry, delete in `finally`)
+    //  via the `inFlightKeysAdapter` below. We rebuild the returned `Set`
+    //  as a new instance on every mutation so React consumers re-render;
+    //  the underlying ref-held Set is internal and never exposed.
+    const inFlightKeysRef = useRef(new Set());
+    const [currentlyShieldingTokenKeys, setCurrentlyShieldingTokenKeys] = useState(() => new Set());
+    // Stable adapter we hand to `tryShieldOneToken`. Each add/delete
+    //  mutates the ref-held set and publishes a fresh ReadonlySet snapshot
+    //  to state so subscribers re-render. We can't pass `inFlightKeysRef.current`
+    //  directly because the consumer can't subscribe to mutation — the
+    //  state copy is what makes this observable from React.
+    const inFlightKeysAdapter = useMemo(() => ({
+        add: (key) => {
+            inFlightKeysRef.current.add(key);
+            if (mountedRef.current) {
+                setCurrentlyShieldingTokenKeys(new Set(inFlightKeysRef.current));
+            }
+        },
+        delete: (key) => {
+            inFlightKeysRef.current.delete(key);
+            if (mountedRef.current) {
+                setCurrentlyShieldingTokenKeys(new Set(inFlightKeysRef.current));
+            }
+        },
+    }), 
+    // mountedRef is stable; we read its `.current` inside the closures
+    //  to avoid resubscribing consumers on every mount.
+    []);
     // Content fingerprint for the balance list. We re-run the effect only
     //  when balances *meaningfully* change (token added/removed/balance
     //  shifted), not on every render where the parent passes a new array
@@ -154,7 +160,7 @@ const useAleoAutoShieldSponsoredTokens = ({ accountAddress, unshieldedTokenBalan
     const balanceFingerprint = useMemo(() => (unshieldedTokenBalances !== null && unshieldedTokenBalances !== void 0 ? unshieldedTokenBalances : [])
         .map((t) => {
         var _a, _b;
-        return `${(_a = t.address) !== null && _a !== void 0 ? _a : '__native__'}|${t.isNative ? 1 : 0}|${(_b = t.rawBalance) !== null && _b !== void 0 ? _b : 0}`;
+        return `${(_a = t.address) !== null && _a !== void 0 ? _a : nativeTokenKey}|${t.isNative ? 1 : 0}|${(_b = t.rawBalance) !== null && _b !== void 0 ? _b : 0}`;
     })
         // Use `localeCompare` so the sort is locale-aware and stable across
         //  JS engines (default `Array.prototype.sort` on strings is
@@ -206,6 +212,7 @@ const useAleoAutoShieldSponsoredTokens = ({ accountAddress, unshieldedTokenBalan
                     return;
                 const ok = yield tryShieldOneToken(token, {
                     accountAddress,
+                    inFlightTokenKeys: inFlightKeysAdapter,
                     isCancelled,
                     seenKeys: seenKeysRef.current,
                     shieldHandle,
@@ -253,7 +260,7 @@ const useAleoAutoShieldSponsoredTokens = ({ accountAddress, unshieldedTokenBalan
         //  cancel an in-flight shield ceremony.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [accountAddress, balanceFingerprint, shieldHandle, onShielded]);
-    return { isShielding };
+    return { currentlyShieldingTokenKeys, isShielding };
 };
 
 export { useAleoAutoShieldSponsoredTokens };

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

@@ -6,110 +6,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
-require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
-require('react/jsx-runtime');
-require('../../../context/ViewContext/ViewContext.cjs');
-require('../../../shared/logger.cjs');
-require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
-require('../../constants/colors.cjs');
-require('../../constants/values.cjs');
-require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
-require('../../../store/state/nonce/nonce.cjs');
-require('@dynamic-labs-sdk/client/core');
-require('eventemitter3');
-require('@dynamic-labs-sdk/client');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/locale');
-var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
-require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
-require('../../functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
-require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../store/state/authMode/authMode.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
-require('react-dom');
-require('../../functions/compareChains/compareChains.cjs');
-require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
-require('../../../context/ThemeContext/ThemeContext.cjs');
-require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
-require('bs58');
-require('@dynamic-labs/types');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../context/LoadingContext/LoadingContext.cjs');
-require('../../../context/WalletContext/WalletContext.cjs');
-require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
-require('yup');
-require('../../../context/MockContext/MockContext.cjs');
-require('../../../views/CollectUserDataView/useFields.cjs');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('@dynamic-labs/rpc-providers');
-require('../../../store/state/walletOptions/walletOptions.cjs');
-require('react-i18next');
-require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
-require('../../../components/Alert/Alert.cjs');
-require('../../../components/ShadowDOM/ShadowDOM.cjs');
-require('../../../components/IconButton/IconButton.cjs');
-require('../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../components/Input/Input.cjs');
-require('../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../components/MenuList/Dropdown/Dropdown.cjs');
-require('../../../components/OverlayCard/OverlayCard.cjs');
-require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
-require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
-require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../components/Popper/Popper/Popper.cjs');
-require('../../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
-require('qrcode');
-require('formik');
-require('../useSubdomainCheck/useSubdomainCheck.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../useGetMfaToken/useGetMfaToken.cjs');
-require('../useWalletBackup/useWalletBackup.cjs');
-require('../useWalletBackup/types.cjs');
-require('../useWalletBackup/cloudProviders.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
-require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
-require('../../../views/ExchangeWhitelistWarning/ExchangeWhitelistWarning.cjs');
-require('../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../views/MfaChooseDeviceView/useGetMfaOptions/useGetMfaOptions.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../store/state/sendBalances.cjs');
-require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
-require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
-require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
-require('../../../widgets/DynamicWidget/views/CryptoComOnramp/CryptoComOnramp.cjs');
-require('../../../../index.cjs');
-require('../../../widgets/DynamicWidget/views/ManagePasskeysMfaWidgetView/ManagePasskeysMfaWidgetView.cjs');
-require('../../../widgets/DynamicWidget/views/ManageTotpMfaWidgetView/ManageTotpMfaWidgetView.cjs');
-require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
-require('../../../store/state/tokenBalances.cjs');
-require('../../../store/state/multichainBalances.cjs');
-require('@dynamic-labs/store');
-require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
+require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var getAleoCuratedPrices = require('../../../data/api/aleo/getAleoCuratedPrices.cjs');
+var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 
 const MICROCREDITS_PER_CREDIT = 1000000;
 const ALEO_CREDITS_LOGO = 'https://app.dynamic.xyz/assets/networks/aleo.svg';
@@ -244,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');
@@ -273,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',
     };
 };
@@ -295,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) {
@@ -308,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 */
         }
     }
@@ -318,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,
         });
     }
@@ -404,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) {