fix(generic-delegator): correct gas estimation for smart-account txs

cross-app-connect/src/app/cross-app/_lib/decoder.ts

@@ -113,6 +113,12 @@ export async function decodeClause(
     thor: ThorClient | null,
     network: NETWORK_TYPE,
     self?: string,
+    /** Lowercased address of the generic delegator's deposit account. When
+     *  set, clauses transferring VET / VTHO / B3TR / VOT3 to this address
+     *  are re-labelled as "Pay transaction fee" instead of an opaque
+     *  "Send X VET to 0x86…fa" — the user understands the clause exists
+     *  to fund the gas payer, not as a separate transfer. */
+    feeDepositAccount?: string,
 ): Promise<DecodedClause> {
     const data = (clause.data ?? '0x').toLowerCase();
     const value = (() => {
@@ -123,9 +129,25 @@ export async function decodeClause(
         }
     })();
 
+    const isFeeDeposit = (recipient: string): boolean =>
+        !!feeDepositAccount &&
+        recipient.toLowerCase() === feeDepositAccount;
+
     // 1. Native VET transfer
     if ((data === '0x' || data === '') && value > ZERO) {
         const amount = formatUnits(value, 18);
+        if (isFeeDeposit(clause.to)) {
+            return {
+                kind: 'known_action',
+                category: 'fee',
+                recipient: clause.to,
+                summary: t('action.fee.payTransactionFee'),
+                detail: t('action.fee.amount', {
+                    amount: trimAmount(amount),
+                    symbol: 'VET',
+                }),
+            };
+        }
         return {
             kind: 'native_transfer',
             recipient: clause.to,
@@ -157,6 +179,18 @@ export async function decodeClause(
                         bigint,
                     ];
                     const amount = formatUnits(raw, token.decimals);
+                    if (isFeeDeposit(recipient)) {
+                        return {
+                            kind: 'known_action',
+                            category: 'fee',
+                            recipient,
+                            summary: t('action.fee.payTransactionFee'),
+                            detail: t('action.fee.amount', {
+                                amount: trimAmount(amount),
+                                symbol: token.symbol,
+                            }),
+                        };
+                    }
                     return {
                         kind: 'token_transfer',
                         recipient,

cross-app-connect/src/app/cross-app/_lib/knownActions.ts

@@ -29,7 +29,8 @@ export type KnownActionCategory =
     | 'nft'
     | 'token'
     | 'staking'
-    | 'swap';
+    | 'swap'
+    | 'fee';
 
 /**
  * Structured side-channel that travels alongside the localized summary so

cross-app-connect/src/app/cross-app/_lib/thor.ts

@@ -22,17 +22,48 @@ const NETWORK = {
     main: {
         nodeUrl: 'https://mainnet.vechain.org',
         accountFactoryAddress: '0xC06Ad8573022e2BE416CA89DA47E8c592971679A',
+        genericDelegatorUrl: 'https://mainnet.delegator.vechain.org/api/v1/',
     },
     test: {
         nodeUrl: 'https://testnet.vechain.org',
         accountFactoryAddress: '0x713b908Bcf77f3E00EFEf328E50b657a1A23AeaF',
+        genericDelegatorUrl: 'https://testnet.delegator.vechain.org/api/v1/',
     },
 } as const;
 
 export const networkType = NETWORK_TYPE;
 export const networkConfig = NETWORK[NETWORK_TYPE];
 export const thor = ThorClient.at(networkConfig.nodeUrl);
 
+// Fetch the generic delegator's current deposit account once per page load.
+// The recogniser in decoder.ts uses the result to re-label clauses sending
+// gas tokens to that address as "Pay transaction fee" instead of an opaque
+// "Send X VET to 0x86…fa", so the user understands what they're paying.
+let depositAccountPromise: Promise<string | null> | null = null;
+export async function fetchGenericDelegatorDepositAccount(): Promise<
+    string | null
+> {
+    if (!depositAccountPromise) {
+        depositAccountPromise = (async () => {
+            try {
+                const res = await fetch(
+                    new URL(
+                        'deposit/account',
+                        networkConfig.genericDelegatorUrl,
+                    ),
+                    { method: 'GET', headers: { 'Content-Type': 'application/json' } },
+                );
+                if (!res.ok) return null;
+                const data = (await res.json()) as { depositAccount?: string };
+                return data.depositAccount?.toLowerCase() ?? null;
+            } catch {
+                return null;
+            }
+        })();
+    }
+    return depositAccountPromise;
+}
+
 // Minimal ABI for SocialLoginSmartAccountFactory.getAccountAddress. Inlined
 // to avoid pulling the full `@vechain/vechain-contract-types` package; this
 // single read is all the host needs.

cross-app-connect/src/app/cross-app/transact/TransactClient.tsx

@@ -28,6 +28,7 @@ import {
     type Risk,
 } from '../_lib/labels';
 import {
+    fetchGenericDelegatorDepositAccount,
     getChainId,
     getSmartAccountAddress,
     networkType,
@@ -387,9 +388,21 @@ export function TransactClient() {
         const selfAddress = smartAccount?.address;
         let cancelled = false;
         (async () => {
+            // Resolve the generic delegator's deposit account so transfers
+            // funding the gas payer get re-labelled as "Pay transaction fee".
+            // Cached after the first call; null if the delegator is
+            // unreachable (decoder gracefully falls back to the raw label).
+            const feeDepositAccount =
+                (await fetchGenericDelegatorDepositAccount()) ?? undefined;
             const results = await Promise.all(
                 parsed.clauses.map((c) =>
-                    decodeClause(c, thor, networkType, selfAddress),
+                    decodeClause(
+                        c,
+                        thor,
+                        networkType,
+                        selfAddress,
+                        feeDepositAccount,
+                    ),
                 ),
             );
             if (!cancelled) setDecoded(results);

cross-app-connect/src/app/i18n/locales/en.json

@@ -53,6 +53,10 @@
             "native": "Send {{amount}} VET",
             "token": "Send {{amount}} {{symbol}}"
         },
+        "fee": {
+            "payTransactionFee": "Pay transaction fee",
+            "amount": "{{amount}} {{symbol}} to the gas payer"
+        },
         "approve": {
             "unlimited": "Allow unlimited {{symbol}} spending",
             "upTo": "Allow spending up to {{amount}} {{symbol}}"

cross-app-connect/src/app/i18n/locales/it.json

@@ -53,6 +53,10 @@
             "native": "Invia {{amount}} VET",
             "token": "Invia {{amount}} {{symbol}}"
         },
+        "fee": {
+            "payTransactionFee": "Paga fee per transazione",
+            "amount": "{{amount}} {{symbol}} al pagatore del gas"
+        },
         "approve": {
             "unlimited": "Consenti spesa illimitata di {{symbol}}",
             "upTo": "Consenti spesa fino a {{amount}} {{symbol}}"

packages/vechain-kit/src/components/AccountModal/Contents/ChooseName/ChooseNameSummaryContent.tsx

@@ -163,7 +163,16 @@ export const ChooseNameSummaryContent = ({
     const [userSelectedGasToken, setUserSelectedGasToken] =
         React.useState<GasTokenType | null>(null);
 
+    // VeChain pays gas for domain CLAIMS via the kit-sponsored delegator
+    // (see useClaimVetDomain / useClaimVeWorldSubdomain). The unset path
+    // (useUnsetDomain) is NOT sponsored — the user pays — so we still
+    // need the gas-token UI and balance check for that case. Drives:
+    // skip estimation, hide GasFeeSummary, force hasEnoughGasBalance,
+    // and suppress gas-estimation errors.
+    const KIT_PAYS_GAS = !isUnsetting;
+
     const shouldEstimateGas =
+        !KIT_PAYS_GAS &&
         preferences.availableGasTokens.length > 0 &&
         (connection.isConnectedWithPrivy ||
             connection.isConnectedWithVeChain) &&
@@ -182,6 +191,7 @@ export const ChooseNameSummaryContent = ({
     });
     const usedGasToken = gasEstimation?.usedToken;
     const disableConfirmButtonDuringEstimation =
+        !KIT_PAYS_GAS &&
         (gasEstimationLoading || !gasEstimation) &&
         connection.isConnectedWithPrivy &&
         !feeDelegation?.delegatorUrl;
@@ -196,7 +206,8 @@ export const ChooseNameSummaryContent = ({
     );
 
     // hasEnoughBalance is now determined by the hook itself
-    const hasEnoughBalance = !!usedGasToken && !gasEstimationError;
+    const hasEnoughBalance =
+        KIT_PAYS_GAS || (!!usedGasToken && !gasEstimationError);
 
     // Auto-fallback: if the selected token cannot cover fees (estimation error),
     // clear selection to re-estimate across all available tokens
@@ -256,7 +267,7 @@ export const ChooseNameSummaryContent = ({
                         </Text>
                     </VStack>
                 )}
-                {connection.isConnectedWithPrivy && (
+                {!KIT_PAYS_GAS && connection.isConnectedWithPrivy && (
                     <GasFeeSummary
                         estimation={gasEstimation}
                         isLoading={gasEstimationLoading}
@@ -291,6 +302,7 @@ export const ChooseNameSummaryContent = ({
                     hasEnoughGasBalance={hasEnoughBalance}
                     isLoadingGasEstimation={gasEstimationLoading}
                     showGasEstimationError={
+                        !KIT_PAYS_GAS &&
                         !feeDelegation?.delegatorUrl &&
                         connection.isConnectedWithPrivy
                     }

packages/vechain-kit/src/components/AccountModal/Contents/Profile/Customization/CustomizationSummaryContent.tsx

@@ -207,7 +207,13 @@ export const CustomizationSummaryContent = ({
     const [userSelectedGasToken, setUserSelectedGasToken] =
         React.useState<GasTokenType | null>(null);
 
+    // VeChain pays gas for profile updates via the kit-sponsored delegator
+    // (see useUpdateTextRecord). Skip the gas-token UI and "do you have
+    // enough VTHO" check so users with no gas tokens can still proceed.
+    const KIT_PAYS_GAS = true;
+
     const shouldEstimateGas =
+        !KIT_PAYS_GAS &&
         preferences.availableGasTokens.length > 0 &&
         (connection.isConnectedWithPrivy ||
             connection.isConnectedWithVeChain) &&
@@ -226,6 +232,7 @@ export const CustomizationSummaryContent = ({
     });
     const usedGasToken = gasEstimation?.usedToken;
     const disableConfirmButtonDuringEstimation =
+        !KIT_PAYS_GAS &&
         (gasEstimationLoading || !gasEstimation) &&
         connection.isConnectedWithPrivy &&
         !feeDelegation?.delegatorUrl;
@@ -240,7 +247,8 @@ export const CustomizationSummaryContent = ({
     );
 
     // hasEnoughBalance is now determined by the hook itself
-    const hasEnoughBalance = !!usedGasToken && !gasEstimationError;
+    const hasEnoughBalance =
+        KIT_PAYS_GAS || (!!usedGasToken && !gasEstimationError);
 
     // Auto-fallback: if the selected token cannot cover fees (estimation error),
     // clear selection to re-estimate across all available tokens
@@ -377,7 +385,7 @@ export const CustomizationSummaryContent = ({
                         renderField(t('Website'), changes.website)}
                     {changes.email && renderField(t('Email'), changes.email)}
                 </VStack>
-                {connection.isConnectedWithPrivy && (
+                {!KIT_PAYS_GAS && connection.isConnectedWithPrivy && (
                     <GasFeeSummary
                         estimation={gasEstimation}
                         isLoading={gasEstimationLoading}
@@ -407,6 +415,7 @@ export const CustomizationSummaryContent = ({
                     hasEnoughGasBalance={hasEnoughBalance}
                     isLoadingGasEstimation={gasEstimationLoading}
                     showGasEstimationError={
+                        !KIT_PAYS_GAS &&
                         !feeDelegation?.delegatorUrl &&
                         connection.isConnectedWithPrivy
                     }