From 02536c0d1dfeb73bf22d73b593cdf3e4360cbd22 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 20 Apr 2026 16:09:59 +0400
Subject: [PATCH 01/46] feat(appkit): add sign message

---
 .../actions/transaction/sign-message.ts       | 27 ++++++++
 .../actions/transaction/transaction.test.ts   | 16 +++++
 .../hooks/transaction/transaction.test.tsx    | 63 ++++++++++++++++++
 .../hooks/transaction/use-sign-message.tsx    | 42 ++++++++++++
 packages/appkit-react/docs/hooks.md           | 35 ++++++++++
 .../transaction/hooks/use-sign-message.ts     | 50 ++++++++++++++
 .../src/features/transaction/index.ts         |  1 +
 packages/appkit/docs/actions.md               | 19 ++++++
 packages/appkit/src/actions/index.ts          |  6 ++
 .../src/actions/transaction/sign-message.ts   | 40 +++++++++++
 .../adapters/ton-connect-wallet-adapter.ts    | 42 ++++++++----
 packages/appkit/src/queries/index.ts          | 12 ++++
 .../src/queries/transaction/sign-message.ts   | 66 +++++++++++++++++++
 packages/appkit/src/types/signing.ts          | 12 ++++
 packages/appkit/src/types/wallet.ts           | 20 +++++-
 template/packages/appkit-react/docs/hooks.md  |  6 ++
 template/packages/appkit/docs/actions.md      |  6 ++
 17 files changed, 449 insertions(+), 14 deletions(-)
 create mode 100644 demo/examples/src/appkit/actions/transaction/sign-message.ts
 create mode 100644 demo/examples/src/appkit/hooks/transaction/use-sign-message.tsx
 create mode 100644 packages/appkit-react/src/features/transaction/hooks/use-sign-message.ts
 create mode 100644 packages/appkit/src/actions/transaction/sign-message.ts
 create mode 100644 packages/appkit/src/queries/transaction/sign-message.ts

diff --git a/demo/examples/src/appkit/actions/transaction/sign-message.ts b/demo/examples/src/appkit/actions/transaction/sign-message.ts
new file mode 100644
index 000000000..cb60b48c0
--- /dev/null
+++ b/demo/examples/src/appkit/actions/transaction/sign-message.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '@ton/appkit';
+import { signMessage } from '@ton/appkit';
+
+export const signMessageExample = async (appKit: AppKit) => {
+    // SAMPLE_START: SIGN_MESSAGE
+    const result = await signMessage(appKit, {
+        messages: [
+            {
+                address: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+                amount: '100000000', // 0.1 TON in nanotons
+            },
+        ],
+    });
+
+    // result.internalBoc is a signed internal message BoC (base64)
+    // that can be relayed on-chain by a third party (e.g. a gasless relayer).
+    console.log('Signed Message:', result);
+    // SAMPLE_END: SIGN_MESSAGE
+};
diff --git a/demo/examples/src/appkit/actions/transaction/transaction.test.ts b/demo/examples/src/appkit/actions/transaction/transaction.test.ts
index 482dd02a3..d5b24a0f7 100644
--- a/demo/examples/src/appkit/actions/transaction/transaction.test.ts
+++ b/demo/examples/src/appkit/actions/transaction/transaction.test.ts
@@ -12,6 +12,7 @@ import { Network } from '@ton/walletkit';
 import type { WalletInterface } from '@ton/appkit';
 
 import { sendTransactionExample } from './send-transaction';
+import { signMessageExample } from './sign-message';
 import { transferTonExample } from './transfer-ton';
 import { createTransferTonTransactionExample } from './create-transfer-ton-transaction';
 
@@ -19,6 +20,7 @@ describe('Transaction Actions Examples', () => {
     let appKit: AppKit;
     let consoleSpy: ReturnType<typeof vi.spyOn>;
     let mockSendTransaction: ReturnType<typeof vi.fn>;
+    let mockSignMessage: ReturnType<typeof vi.fn>;
 
     beforeEach(() => {
         vi.clearAllMocks();
@@ -31,6 +33,7 @@ describe('Transaction Actions Examples', () => {
         });
 
         mockSendTransaction = vi.fn();
+        mockSignMessage = vi.fn();
     });
 
     afterEach(() => {
@@ -43,6 +46,7 @@ describe('Transaction Actions Examples', () => {
             getWalletId: () => 'mock-wallet-id',
             getNetwork: () => Network.mainnet(),
             sendTransaction: mockSendTransaction,
+            signMessage: mockSignMessage,
         } as unknown as WalletInterface;
 
         appKit.walletsManager.setWallets([mockWallet]);
@@ -61,6 +65,18 @@ describe('Transaction Actions Examples', () => {
         });
     });
 
+    describe('signMessageExample', () => {
+        it('should log signed message result', async () => {
+            setupMockWallet();
+            mockSignMessage.mockResolvedValue({ internalBoc: 'mock-internal-boc' });
+
+            await signMessageExample(appKit);
+
+            expect(mockSignMessage).toHaveBeenCalled();
+            expect(consoleSpy).toHaveBeenCalledWith('Signed Message:', { internalBoc: 'mock-internal-boc' });
+        });
+    });
+
     describe('transferTonExample', () => {
         it('should log transfer result', async () => {
             setupMockWallet();
diff --git a/demo/examples/src/appkit/hooks/transaction/transaction.test.tsx b/demo/examples/src/appkit/hooks/transaction/transaction.test.tsx
index 277ab008e..7d6aee5ef 100644
--- a/demo/examples/src/appkit/hooks/transaction/transaction.test.tsx
+++ b/demo/examples/src/appkit/hooks/transaction/transaction.test.tsx
@@ -14,6 +14,7 @@ import { Network } from '@ton/walletkit';
 
 import { createWrapper } from '../../../__tests__/test-utils';
 import { UseSendTransactionExample } from './use-send-transaction';
+import { UseSignMessageExample } from './use-sign-message';
 import { UseTransferTonExample } from './use-transfer-ton';
 import { UseWatchTransactionsByAddressExample } from './use-watch-transactions-by-address';
 import { UseWatchTransactionsExample } from './use-watch-transactions';
@@ -21,14 +22,17 @@ import { UseWatchTransactionsExample } from './use-watch-transactions';
 describe('Transaction Hooks Examples', () => {
     let mockAppKit: any;
     let mockSendTransaction: any;
+    let mockSignMessage: any;
 
     const mockBoc = 'te6cckEBAQEAAgAAAEysuc0=';
+    const mockInternalBoc = 'te6cckEBAQEAAgAAAEysuc1=';
     const mockNetwork = Network.mainnet();
 
     const mockWallet = {
         getAddress: () => 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
         getNetwork: () => mockNetwork,
         sendTransaction: vi.fn(),
+        signMessage: vi.fn(),
     };
 
     beforeEach(() => {
@@ -38,6 +42,9 @@ describe('Transaction Hooks Examples', () => {
         mockSendTransaction = vi.fn().mockResolvedValue({ boc: mockBoc });
         mockWallet.sendTransaction = mockSendTransaction;
 
+        mockSignMessage = vi.fn().mockResolvedValue({ internalBoc: mockInternalBoc });
+        mockWallet.signMessage = mockSignMessage;
+
         mockAppKit = {
             getDefaultNetwork: vi.fn(),
             connectors: [],
@@ -116,6 +123,62 @@ describe('Transaction Hooks Examples', () => {
         });
     });
 
+    describe('UseSignMessageExample', () => {
+        it('should render sign button initially', () => {
+            render(<UseSignMessageExample />, { wrapper: createWrapper(mockAppKit) });
+            expect(screen.getByText('Sign Message')).toBeDefined();
+        });
+
+        it('should call signMessage on button click', async () => {
+            render(<UseSignMessageExample />, { wrapper: createWrapper(mockAppKit) });
+
+            const button = screen.getByText('Sign Message');
+            act(() => {
+                button.click();
+            });
+
+            await waitFor(() => {
+                expect(mockSignMessage).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        messages: expect.arrayContaining([
+                            expect.objectContaining({
+                                amount: '100000000',
+                                address: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+                            }),
+                        ]),
+                    }),
+                );
+            });
+        });
+
+        it('should display internal BOC on success', async () => {
+            render(<UseSignMessageExample />, { wrapper: createWrapper(mockAppKit) });
+
+            const button = screen.getByText('Sign Message');
+            act(() => {
+                button.click();
+            });
+
+            await waitFor(() => {
+                expect(screen.getByText(`Internal BOC: ${mockInternalBoc}`)).toBeDefined();
+            });
+        });
+
+        it('should display error on failure', async () => {
+            mockSignMessage.mockRejectedValue(new Error('User rejected'));
+            render(<UseSignMessageExample />, { wrapper: createWrapper(mockAppKit) });
+
+            const button = screen.getByText('Sign Message');
+            act(() => {
+                button.click();
+            });
+
+            await waitFor(() => {
+                expect(screen.getByText('Error: User rejected')).toBeDefined();
+            });
+        });
+    });
+
     describe('UseTransferTonExample', () => {
         it('should render transfer button initially', () => {
             render(<UseTransferTonExample />, { wrapper: createWrapper(mockAppKit) });
diff --git a/demo/examples/src/appkit/hooks/transaction/use-sign-message.tsx b/demo/examples/src/appkit/hooks/transaction/use-sign-message.tsx
new file mode 100644
index 000000000..7f1448428
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/transaction/use-sign-message.tsx
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useSignMessage } from '@ton/appkit-react';
+
+export const UseSignMessageExample = () => {
+    // SAMPLE_START: USE_SIGN_MESSAGE
+    const { mutate: signMessage, isPending, error, data } = useSignMessage();
+
+    const handleSign = () => {
+        signMessage({
+            validUntil: Math.floor(Date.now() / 1000) + 600, // 10 minutes
+            messages: [
+                {
+                    address: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+                    amount: '100000000', // 0.1 TON in nanotons
+                },
+            ],
+        });
+    };
+
+    return (
+        <div>
+            <button onClick={handleSign} disabled={isPending}>
+                {isPending ? 'Signing...' : 'Sign Message'}
+            </button>
+            {error && <div>Error: {error.message}</div>}
+            {data && (
+                <div>
+                    <h4>Message Signed!</h4>
+                    <p>Internal BOC: {data.internalBoc}</p>
+                </div>
+            )}
+        </div>
+    );
+    // SAMPLE_END: USE_SIGN_MESSAGE
+};
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index 06fa62048..d7bd4ebcd 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -876,6 +876,41 @@ return (
 );
 ```
 
+### `useSignMessage`
+
+Hook to sign a transaction-shaped request without broadcasting it. Returns a signed internal-message BoC that can be relayed on-chain by a third party (e.g. a gasless relayer). Requires wallet support for the `SignMessage` feature.
+
+```tsx
+const { mutate: signMessage, isPending, error, data } = useSignMessage();
+
+const handleSign = () => {
+    signMessage({
+        validUntil: Math.floor(Date.now() / 1000) + 600, // 10 minutes
+        messages: [
+            {
+                address: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+                amount: '100000000', // 0.1 TON in nanotons
+            },
+        ],
+    });
+};
+
+return (
+    <div>
+        <button onClick={handleSign} disabled={isPending}>
+            {isPending ? 'Signing...' : 'Sign Message'}
+        </button>
+        {error && <div>Error: {error.message}</div>}
+        {data && (
+            <div>
+                <h4>Message Signed!</h4>
+                <p>Internal BOC: {data.internalBoc}</p>
+            </div>
+        )}
+    </div>
+);
+```
+
 ### `useTransferTon`
 
 Hook to simplify transferring TON to another address.
diff --git a/packages/appkit-react/src/features/transaction/hooks/use-sign-message.ts b/packages/appkit-react/src/features/transaction/hooks/use-sign-message.ts
new file mode 100644
index 000000000..70d44d72b
--- /dev/null
+++ b/packages/appkit-react/src/features/transaction/hooks/use-sign-message.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import type { MutateFunction, MutateOptions } from '@tanstack/react-query';
+import type {
+    SignMessageData,
+    SignMessageErrorType,
+    SignMessageOptions,
+    SignMessageVariables,
+} from '@ton/appkit/queries';
+import { signMessageMutationOptions } from '@ton/appkit/queries';
+
+import { useMutation } from '../../../libs/query';
+import type { UseMutationReturnType } from '../../../libs/query';
+import { useAppKit } from '../../settings';
+
+export type UseSignMessageParameters<context = unknown> = SignMessageOptions<context>;
+
+export type UseSignMessageReturnType<context = unknown> = UseMutationReturnType<
+    SignMessageData,
+    SignMessageErrorType,
+    SignMessageVariables,
+    context,
+    (
+        variables: SignMessageVariables,
+        options?: MutateOptions<SignMessageData, SignMessageErrorType, SignMessageVariables, context>,
+    ) => void,
+    MutateFunction<SignMessageData, SignMessageErrorType, SignMessageVariables, context>
+>;
+
+/**
+ * Hook to sign a transaction-shaped request without broadcasting it.
+ *
+ * Returns a signed internal-message BoC that a third party can relay on-chain
+ * (e.g. a gasless relayer).
+ */
+export const useSignMessage = <context = unknown>(
+    parameters: UseSignMessageParameters<context> = {},
+): UseSignMessageReturnType<context> => {
+    const appKit = useAppKit();
+
+    return useMutation(signMessageMutationOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/transaction/index.ts b/packages/appkit-react/src/features/transaction/index.ts
index 5b49ca36b..d5415eca8 100644
--- a/packages/appkit-react/src/features/transaction/index.ts
+++ b/packages/appkit-react/src/features/transaction/index.ts
@@ -7,6 +7,7 @@
  */
 
 export * from './hooks/use-send-transaction';
+export * from './hooks/use-sign-message';
 export * from './hooks/use-transfer-ton';
 export * from './hooks/use-transaction-status';
 export * from './hooks/use-watch-transactions-by-address';
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 949067e83..26aa13cd5 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -664,6 +664,25 @@ const result = await sendTransaction(appKit, {
 
 console.log('Transaction Result:', result);
 ```
+
+### `signMessage`
+
+Ask the connected wallet to sign a transaction-shaped request without broadcasting it. Returns a signed internal-message BoC that can be relayed on-chain by a third party (e.g. a gasless relayer). Requires wallet support for the `SignMessage` feature.
+
+```ts
+const result = await signMessage(appKit, {
+    messages: [
+        {
+            address: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+            amount: '100000000', // 0.1 TON in nanotons
+        },
+    ],
+});
+
+// result.internalBoc is a signed internal message BoC (base64)
+// that can be relayed on-chain by a third party (e.g. a gasless relayer).
+console.log('Signed Message:', result);
+```
  
 ### `transferTon`
  
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index e9c38eb36..e090f69d8 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -184,6 +184,12 @@ export {
     type SendTransactionParameters,
     type SendTransactionReturnType,
 } from './transaction/send-transaction';
+export {
+    signMessage,
+    type SignMessageParameters,
+    type SignMessageReturnType,
+    type SignMessageErrorType,
+} from './transaction/sign-message';
 export { transferTon, type TransferTonParameters, type TransferTonReturnType } from './transaction/transfer-ton';
 export {
     getTransactionStatus,
diff --git a/packages/appkit/src/actions/transaction/sign-message.ts b/packages/appkit/src/actions/transaction/sign-message.ts
new file mode 100644
index 000000000..57aac6b7b
--- /dev/null
+++ b/packages/appkit/src/actions/transaction/sign-message.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { TransactionRequest } from '../../types/transaction';
+import type { SignMessageResponse } from '../../types/signing';
+import type { AppKit } from '../../core/app-kit';
+import { getSelectedWallet } from '../wallets/get-selected-wallet';
+
+export type SignMessageParameters = TransactionRequest;
+
+export type SignMessageReturnType = SignMessageResponse;
+
+export type SignMessageErrorType = Error;
+
+/**
+ * Ask the connected wallet to sign a transaction-shaped request without broadcasting it.
+ *
+ * Returns a signed internal-message BoC that can be relayed on-chain by a third party
+ * (e.g. a gasless relayer). Unlike sendTransaction, the message is NOT submitted to the
+ * network by the wallet.
+ *
+ * Requires the wallet to support the SignMessage feature.
+ */
+export const signMessage = async (
+    appKit: AppKit,
+    parameters: SignMessageParameters,
+): Promise<SignMessageReturnType> => {
+    const wallet = getSelectedWallet(appKit);
+
+    if (!wallet) {
+        throw new Error('Wallet not connected');
+    }
+
+    return wallet.signMessage(parameters);
+};
diff --git a/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts b/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts
index d7db5c564..3f748cdc9 100644
--- a/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts
+++ b/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts
@@ -9,7 +9,7 @@
 import { Address } from '@ton/core';
 import type { Wallet as TonConnectWallet } from '@tonconnect/sdk';
 import type { SignDataPayload as TonConnectSignDataPayload } from '@tonconnect/sdk';
-import type { SendTransactionResponse, UserFriendlyAddress, Hex } from '@ton/walletkit';
+import type { Feature, SendTransactionResponse, UserFriendlyAddress, Hex } from '@ton/walletkit';
 import { asHex, createWalletId, getNormalizedExtMessageHash } from '@ton/walletkit';
 import type { TonConnectUI } from '@tonconnect/ui';
 
@@ -17,7 +17,7 @@ import type { TransactionRequest } from '../../../types/transaction';
 import type { Base64String } from '../../../types/primitives';
 import { getValidUntil } from '../utils/transaction';
 import type { WalletInterface } from '../../../types/wallet';
-import type { SignDataRequest, SignDataResponse } from '../../../types/signing';
+import type { SignDataRequest, SignDataResponse, SignMessageResponse } from '../../../types/signing';
 import { Network } from '../../../types/network';
 
 /**
@@ -73,21 +73,16 @@ export class TonConnectWalletAdapter implements WalletInterface {
         return createWalletId(this.getNetwork(), this.getAddress());
     }
 
+    getSupportedFeatures(): Feature[] | undefined {
+        return this.tonConnectWallet.device?.features;
+    }
+
     // ==========================================
     // Signing / Transactions
     // ==========================================
 
     async sendTransaction(request: TransactionRequest): Promise<SendTransactionResponse> {
-        const transaction = {
-            validUntil: request.validUntil || getValidUntil(),
-            messages: request.messages.map((msg) => ({
-                address: msg.address,
-                amount: String(msg.amount),
-                payload: msg.payload,
-                stateInit: msg.stateInit,
-            })),
-            network: request.network?.chainId ?? this.tonConnectWallet.account?.chain,
-        };
+        const transaction = this.mapTransactionRequest(request);
 
         const result = await this.tonConnectUI.sendTransaction(transaction);
         const { hash, boc: normalizedBoc } = getNormalizedExtMessageHash(result.boc);
@@ -99,6 +94,16 @@ export class TonConnectWalletAdapter implements WalletInterface {
         };
     }
 
+    async signMessage(request: TransactionRequest): Promise<SignMessageResponse> {
+        const message = this.mapTransactionRequest(request);
+
+        const result = await this.tonConnectUI.signMessage(message);
+
+        return {
+            internalBoc: result.internalBoc as Base64String,
+        };
+    }
+
     async signData(payload: SignDataRequest): Promise<SignDataResponse> {
         const result = await this.tonConnectUI.signData(this.mapSignDataRequest(payload));
 
@@ -115,6 +120,19 @@ export class TonConnectWalletAdapter implements WalletInterface {
     // Private helpers
     // ==========================================
 
+    private mapTransactionRequest(request: TransactionRequest) {
+        return {
+            validUntil: request.validUntil || getValidUntil(),
+            messages: request.messages.map((msg) => ({
+                address: msg.address,
+                amount: String(msg.amount),
+                payload: msg.payload,
+                stateInit: msg.stateInit,
+            })),
+            network: request.network?.chainId ?? this.tonConnectWallet.account?.chain,
+        };
+    }
+
     private mapSignDataRequest(request: SignDataRequest): TonConnectSignDataPayload {
         const chainId = request.network?.chainId ?? this.getNetwork().chainId;
 
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index da7e6f0b9..90e3d77fe 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -220,6 +220,18 @@ export {
     type SendTransactionParameters,
     type SendTransactionReturnType,
 } from './transaction/send-transaction';
+export {
+    signMessageMutationOptions,
+    type SignMessageData,
+    type SignMessageErrorType,
+    type SignMessageMutate,
+    type SignMessageMutateAsync,
+    type SignMessageMutationOptions,
+    type SignMessageOptions,
+    type SignMessageVariables,
+    type SignMessageParameters,
+    type SignMessageReturnType,
+} from './transaction/sign-message';
 export {
     getTransactionStatusQueryOptions,
     type GetTransactionStatusData,
diff --git a/packages/appkit/src/queries/transaction/sign-message.ts b/packages/appkit/src/queries/transaction/sign-message.ts
new file mode 100644
index 000000000..f8bb8cf87
--- /dev/null
+++ b/packages/appkit/src/queries/transaction/sign-message.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { MutateOptions, MutationOptions } from '@tanstack/query-core';
+
+import { signMessage } from '../../actions/transaction/sign-message';
+import type {
+    SignMessageErrorType,
+    SignMessageParameters,
+    SignMessageReturnType,
+} from '../../actions/transaction/sign-message';
+import type { AppKit } from '../../core/app-kit';
+import type { MutationParameter } from '../../types/query';
+import type { Compute } from '../../types/utils';
+
+export type { SignMessageErrorType, SignMessageParameters, SignMessageReturnType };
+
+export type SignMessageOptions<context = unknown> = MutationParameter<
+    SignMessageData,
+    SignMessageErrorType,
+    SignMessageVariables,
+    context
+>;
+
+export const signMessageMutationOptions = <context = unknown>(
+    appKit: AppKit,
+    options: SignMessageOptions<context> = {},
+): SignMessageMutationOptions<context> => {
+    return {
+        ...options.mutation,
+        mutationFn(variables) {
+            return signMessage(appKit, variables);
+        },
+        mutationKey: ['signMessage'],
+    };
+};
+
+export type SignMessageMutationOptions<context = unknown> = MutationOptions<
+    SignMessageData,
+    SignMessageErrorType,
+    SignMessageVariables,
+    context
+>;
+
+export type SignMessageData = Compute<SignMessageReturnType>;
+
+export type SignMessageVariables = SignMessageParameters;
+
+export type SignMessageMutate<context = unknown> = (
+    variables: SignMessageVariables,
+    options?:
+        | Compute<MutateOptions<SignMessageData, SignMessageErrorType, Compute<SignMessageVariables>, context>>
+        | undefined,
+) => void;
+
+export type SignMessageMutateAsync<context = unknown> = (
+    variables: SignMessageVariables,
+    options?:
+        | Compute<MutateOptions<SignMessageData, SignMessageErrorType, Compute<SignMessageVariables>, context>>
+        | undefined,
+) => Promise<SignMessageData>;
diff --git a/packages/appkit/src/types/signing.ts b/packages/appkit/src/types/signing.ts
index c97fc2403..e0d43fc79 100644
--- a/packages/appkit/src/types/signing.ts
+++ b/packages/appkit/src/types/signing.ts
@@ -76,3 +76,15 @@ export interface SignDataResponse {
     /** Original payload that was signed */
     payload: SignDataRequest;
 }
+
+/**
+ * SignMessage Response - returned from wallet.
+ *
+ * Wallet signs a transaction-shaped request with the internal message opcode
+ * (instead of external), so the resulting BoC can be relayed on-chain by a
+ * third party (e.g. a gasless relayer) rather than broadcast directly.
+ */
+export interface SignMessageResponse {
+    /** Signed internal message BoC (base64) ready to be relayed */
+    internalBoc: Base64String;
+}
diff --git a/packages/appkit/src/types/wallet.ts b/packages/appkit/src/types/wallet.ts
index 81f42030f..b6255415a 100644
--- a/packages/appkit/src/types/wallet.ts
+++ b/packages/appkit/src/types/wallet.ts
@@ -6,10 +6,10 @@
  *
  */
 
-import type { SendTransactionResponse, Hex, UserFriendlyAddress } from '@ton/walletkit';
+import type { Feature, SendTransactionResponse, Hex, UserFriendlyAddress } from '@ton/walletkit';
 
 import type { TransactionRequest } from './transaction';
-import type { SignDataRequest, SignDataResponse } from './signing';
+import type { SignDataRequest, SignDataResponse, SignMessageResponse } from './signing';
 import type { Network } from './network';
 
 /**
@@ -37,6 +37,13 @@ export interface WalletInterface {
     /** Get unique wallet identifier */
     getWalletId(): string;
 
+    /**
+     * Features supported by the underlying wallet (e.g. SendTransaction, SignData, SignMessage).
+     * Returns undefined when the connector cannot report capabilities.
+     * Callers should gracefully degrade when a feature is missing.
+     */
+    getSupportedFeatures(): Feature[] | undefined;
+
     // ==========================================
     // Actions requiring wallet signature
     // ==========================================
@@ -46,4 +53,13 @@ export interface WalletInterface {
 
     /** Sign arbitrary data using TonConnect signData */
     signData(payload: SignDataRequest): Promise<SignDataResponse>;
+
+    /**
+     * Sign a transaction-shaped request without broadcasting it.
+     * The wallet returns a signed internal-message BoC that a third party can relay
+     * on-chain (e.g. a gasless relayer).
+     *
+     * Requires the wallet to support the SignMessage feature (see getSupportedFeatures).
+     */
+    signMessage(request: TransactionRequest): Promise<SignMessageResponse>;
 }
diff --git a/template/packages/appkit-react/docs/hooks.md b/template/packages/appkit-react/docs/hooks.md
index 4699b2361..8f07ba845 100644
--- a/template/packages/appkit-react/docs/hooks.md
+++ b/template/packages/appkit-react/docs/hooks.md
@@ -246,6 +246,12 @@ Hook to send a transaction to the blockchain.
 
 %%demo/examples/src/appkit/hooks/transaction#USE_SEND_TRANSACTION%%
 
+### `useSignMessage`
+
+Hook to sign a transaction-shaped request without broadcasting it. Returns a signed internal-message BoC that can be relayed on-chain by a third party (e.g. a gasless relayer). Requires wallet support for the `SignMessage` feature.
+
+%%demo/examples/src/appkit/hooks/transaction#USE_SIGN_MESSAGE%%
+
 ### `useTransferTon`
 
 Hook to simplify transferring TON to another address.
diff --git a/template/packages/appkit/docs/actions.md b/template/packages/appkit/docs/actions.md
index 78fa64331..abdd49261 100644
--- a/template/packages/appkit/docs/actions.md
+++ b/template/packages/appkit/docs/actions.md
@@ -331,6 +331,12 @@ Create a TON transfer transaction request without sending it.
 Send a transaction to the blockchain.
  
 %%demo/examples/src/appkit/actions/transaction#SEND_TRANSACTION%%
+
+### `signMessage`
+
+Ask the connected wallet to sign a transaction-shaped request without broadcasting it. Returns a signed internal-message BoC that can be relayed on-chain by a third party (e.g. a gasless relayer). Requires wallet support for the `SignMessage` feature.
+
+%%demo/examples/src/appkit/actions/transaction#SIGN_MESSAGE%%
  
 ### `transferTon`
  

From fd0e7405745d64ec4fbe993ecb247b71f944e6de Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 20 Apr 2026 18:01:47 +0400
Subject: [PATCH 02/46] feat(appkit): draft gasless

---
 .../layout/app-router/app-router.tsx          |   4 +-
 .../core/components/layout/layout/layout.tsx  |  20 +-
 .../appkit-minter/src/core/configs/app-kit.ts |   7 +
 apps/appkit-minter/src/pages/gasless-page.tsx | 153 ++++++++++++
 apps/appkit-minter/src/pages/index.ts         |   2 +
 .../src/pages/sign-message-page.tsx           |  20 ++
 .../gasless/hooks/use-estimate-gasless.ts     |  45 ++++
 .../gasless/hooks/use-gasless-config.ts       |  31 +++
 .../hooks/use-send-gasless-transaction.ts     |  55 ++++
 .../src/features/gasless/index.ts             |  23 ++
 packages/appkit-react/src/index.ts            |   1 +
 packages/appkit/package.json                  |  16 ++
 .../src/actions/gasless/estimate-gasless.ts   |  53 ++++
 .../src/actions/gasless/get-gasless-config.ts |  32 +++
 .../gasless/send-gasless-transaction.ts       |  84 +++++++
 packages/appkit/src/actions/index.ts          |  20 ++
 .../create-transfer-ton-transaction.ts        |   7 +-
 .../src/core/app-kit/services/app-kit.ts      |   7 +
 packages/appkit/src/gasless/index.ts          |  20 ++
 packages/appkit/src/gasless/tonapi/index.ts   |   9 +
 packages/appkit/src/index.ts                  |   1 +
 .../src/queries/gasless/estimate-gasless.ts   |  60 +++++
 .../src/queries/gasless/get-gasless-config.ts |  58 +++++
 .../gasless/send-gasless-transaction.ts       |  70 ++++++
 packages/appkit/src/queries/index.ts          |  26 ++
 packages/appkit/src/types/transaction.ts      |   5 +-
 packages/appkit/src/utils/index.ts            |   2 +-
 packages/walletkit/package.json               |  19 +-
 .../src/api/interfaces/DefiProvider.ts        |   2 +-
 .../src/api/interfaces/GaslessAPI.ts          |  77 ++++++
 .../walletkit/src/api/interfaces/index.ts     |   3 +-
 .../src/defi/gasless/GaslessManager.ts        |  85 +++++++
 .../src/defi/gasless/GaslessProvider.ts       |  42 ++++
 packages/walletkit/src/defi/gasless/errors.ts |  21 ++
 packages/walletkit/src/defi/gasless/index.ts  |  19 ++
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 234 ++++++++++++++++++
 .../src/defi/gasless/tonapi/index.ts          |  10 +
 packages/walletkit/src/defi/gasless/types.ts  |  85 +++++++
 packages/walletkit/src/index.ts               |   9 +
 pnpm-lock.yaml                                |  20 ++
 40 files changed, 1446 insertions(+), 11 deletions(-)
 create mode 100644 apps/appkit-minter/src/pages/gasless-page.tsx
 create mode 100644 apps/appkit-minter/src/pages/sign-message-page.tsx
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts
 create mode 100644 packages/appkit-react/src/features/gasless/index.ts
 create mode 100644 packages/appkit/src/actions/gasless/estimate-gasless.ts
 create mode 100644 packages/appkit/src/actions/gasless/get-gasless-config.ts
 create mode 100644 packages/appkit/src/actions/gasless/send-gasless-transaction.ts
 create mode 100644 packages/appkit/src/gasless/index.ts
 create mode 100644 packages/appkit/src/gasless/tonapi/index.ts
 create mode 100644 packages/appkit/src/queries/gasless/estimate-gasless.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-config.ts
 create mode 100644 packages/appkit/src/queries/gasless/send-gasless-transaction.ts
 create mode 100644 packages/walletkit/src/api/interfaces/GaslessAPI.ts
 create mode 100644 packages/walletkit/src/defi/gasless/GaslessManager.ts
 create mode 100644 packages/walletkit/src/defi/gasless/GaslessProvider.ts
 create mode 100644 packages/walletkit/src/defi/gasless/errors.ts
 create mode 100644 packages/walletkit/src/defi/gasless/index.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/index.ts
 create mode 100644 packages/walletkit/src/defi/gasless/types.ts

diff --git a/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx b/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
index a10a7b60e..0046c7fd7 100644
--- a/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
+++ b/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
@@ -11,7 +11,7 @@ import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
 import { useWatchBalance, useWatchTransactions, useWatchJettons, useBalance } from '@ton/appkit-react';
 import { toast } from 'sonner';
 
-import { JettonsPage, MinterPage, NftsPage, StakingPage, SwapPage } from '@/pages';
+import { GaslessPage, JettonsPage, MinterPage, NftsPage, SignMessagePage, StakingPage, SwapPage } from '@/pages';
 
 export const AppRouter: React.FC = () => {
     // Set balance refetch interval to 20 seconds
@@ -57,6 +57,8 @@ export const AppRouter: React.FC = () => {
                 <Route path="/nfts" element={<NftsPage />} />
                 <Route path="/swap" element={<SwapPage />} />
                 <Route path="/staking" element={<StakingPage />} />
+                <Route path="/sign" element={<SignMessagePage />} />
+                <Route path="/gasless" element={<GaslessPage />} />
                 <Route path="*" element={<Navigate to="/" replace />} />
             </Routes>
         </BrowserRouter>
diff --git a/apps/appkit-minter/src/core/components/layout/layout/layout.tsx b/apps/appkit-minter/src/core/components/layout/layout/layout.tsx
index 7bfb7c0f4..fc2c314d6 100644
--- a/apps/appkit-minter/src/core/components/layout/layout/layout.tsx
+++ b/apps/appkit-minter/src/core/components/layout/layout/layout.tsx
@@ -7,7 +7,18 @@
  */
 
 import { TonConnectButton, useAddress } from '@ton/appkit-react';
-import { ArrowLeftRight, BookOpen, Coins, ExternalLink, Github, ImageIcon, Sparkles, Wallet } from 'lucide-react';
+import {
+    ArrowLeftRight,
+    BookOpen,
+    Coins,
+    ExternalLink,
+    Github,
+    ImageIcon,
+    PenLine,
+    Sparkles,
+    Wallet,
+    Zap,
+} from 'lucide-react';
 import { Link, NavLink } from 'react-router-dom';
 import type { ComponentType, FC, ReactNode } from 'react';
 
@@ -58,6 +69,13 @@ const NAV_GROUPS: readonly { label?: string; links: readonly NavGroupLink[] }[]
             { to: '/staking', label: 'Staking', icon: Coins },
         ],
     },
+    {
+        label: 'Wallet',
+        links: [
+            { to: '/sign', label: 'Sign Message', icon: PenLine },
+            { to: '/gasless', label: 'Gasless', icon: Zap },
+        ],
+    },
 ];
 
 const EXTERNAL_LINKS: readonly { href: string; label: string; icon: ComponentType<{ className?: string }> }[] = [
diff --git a/apps/appkit-minter/src/core/configs/app-kit.ts b/apps/appkit-minter/src/core/configs/app-kit.ts
index 6a5eb67c5..cd5903d2a 100644
--- a/apps/appkit-minter/src/core/configs/app-kit.ts
+++ b/apps/appkit-minter/src/core/configs/app-kit.ts
@@ -17,6 +17,8 @@ import {
 import { createDeDustProvider } from '@ton/appkit/swap/dedust';
 import { createOmnistonProvider } from '@ton/appkit/swap/omniston';
 import { createTonstakersProvider } from '@ton/appkit/staking/tonstakers';
+import { TonApiGaslessProvider } from '@ton/appkit/gasless/tonapi';
+import { TonApiClient } from '@ton-api/client';
 
 import { ENV_TON_API_KEY_TESTNET, ENV_TON_API_KEY_MAINNET } from '@/core/configs/env';
 
@@ -35,6 +37,10 @@ const tetraApiClient = new ApiClientTonApi({
     endpoint: 'https://tetra.tonapi.io',
 });
 
+const mainnetTonApi = new TonApiClient({
+    baseUrl: 'https://tonapi.io',
+});
+
 export const appKit = new AppKit({
     networks: {
         [Network.mainnet().chainId]: { apiClient: mainnetApiClient },
@@ -54,5 +60,6 @@ export const appKit = new AppKit({
         createTonstakersProvider(),
         createTonCenterStreamingProvider({ network: Network.mainnet(), apiKey: ENV_TON_API_KEY_MAINNET }),
         createTonCenterStreamingProvider({ network: Network.testnet(), apiKey: ENV_TON_API_KEY_TESTNET }),
+        new TonApiGaslessProvider({ client: mainnetTonApi }),
     ],
 });
diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
new file mode 100644
index 000000000..be2093b4d
--- /dev/null
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useState, useMemo, useEffect } from 'react';
+import type { FC } from 'react';
+import {
+    useGaslessConfig,
+    useSendGaslessTransaction,
+    useAddress,
+    useJettonBalanceByAddress,
+    useJettonWalletAddress,
+} from '@ton/appkit-react';
+import type { Base64String } from '@ton/appkit-react';
+import { parseUnits, createJettonTransferPayload } from '@ton/appkit';
+import { toast } from 'sonner';
+
+import { Card, Layout } from '@/core/components';
+
+const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+
+export const GaslessPage: FC = () => {
+    const address = useAddress();
+    const { data: gaslessConfig, isLoading: isConfigLoading } = useGaslessConfig();
+    const { mutateAsync: sendGasless, isPending: isSending } = useSendGaslessTransaction();
+
+    const [amount, setAmount] = useState('0.1');
+    const [recipient, setRecipient] = useState('');
+
+    const { data: usdtBalance } = useJettonBalanceByAddress({
+        jettonAddress: USDT_MASTER_MAINNET,
+        ownerAddress: address,
+        jettonDecimals: 6,
+    });
+
+    const { data: usdtWalletAddress } = useJettonWalletAddress({
+        jettonAddress: USDT_MASTER_MAINNET,
+        ownerAddress: address,
+    });
+
+    // Set own address as default recipient
+    useEffect(() => {
+        if (address && !recipient) {
+            setRecipient(address);
+        }
+    }, [address, recipient]);
+
+    const isUsdtSupported = useMemo(() => {
+        return gaslessConfig?.gasJettons.some((j) => j.masterId === USDT_MASTER_MAINNET);
+    }, [gaslessConfig]);
+
+    const handleSend = async () => {
+        if (!address || !usdtWalletAddress) {
+            toast.error(!address ? 'Wallet not connected' : 'Could not resolve USDT wallet address');
+            return;
+        }
+
+        try {
+            const payload = createJettonTransferPayload({
+                amount: parseUnits(amount, 6), // USDT has 6 decimals
+                destination: recipient,
+                responseDestination: address,
+            });
+
+            await sendGasless({
+                feeJettonMaster: USDT_MASTER_MAINNET,
+                messages: [
+                    {
+                        address: usdtWalletAddress,
+                        amount: parseUnits('0.06', 9).toString(),
+                        payload: payload.toBoc().toString('base64') as Base64String,
+                    },
+                ],
+            });
+
+            toast.success('Gasless transaction submitted!');
+        } catch (error) {
+            // eslint-disable-next-line no-console
+            console.error('Gasless error:', error);
+            toast.error(error instanceof Error ? error.message : 'Failed to send gasless transaction');
+        }
+    };
+
+    return (
+        <Layout title="Gasless Transfer">
+            <Card className="w-full max-w-[434px] mx-auto p-6 space-y-6">
+                <div className="space-y-2">
+                    <h2 className="text-xl font-semibold">Send USDT (Gasless)</h2>
+                    <p className="text-sm text-muted-foreground">
+                        Send USDT without having TON for gas. The fee will be paid in USDT.
+                    </p>
+                </div>
+
+                {!address && (
+                    <div className="p-4 bg-yellow-500/10 border border-yellow-500/20 rounded-lg text-yellow-600 text-sm">
+                        Please connect your wallet first.
+                    </div>
+                )}
+
+                {address && (
+                    <div className="space-y-4">
+                        <div className="space-y-1">
+                            <label className="text-xs font-medium uppercase text-muted-foreground">
+                                Your USDT Balance
+                            </label>
+                            <div className="text-lg font-mono">
+                                {usdtBalance ? Number(usdtBalance).toFixed(2) : '0.00'} USDT
+                            </div>
+                        </div>
+
+                        <div className="space-y-2">
+                            <label className="text-sm font-medium">Recipient Address</label>
+                            <input
+                                className="w-full p-2 bg-secondary rounded-md border border-border"
+                                value={recipient}
+                                onChange={(e) => setRecipient(e.target.value)}
+                                placeholder="Address"
+                            />
+                        </div>
+
+                        <div className="space-y-2">
+                            <label className="text-sm font-medium">Amount (USDT)</label>
+                            <input
+                                className="w-full p-2 bg-secondary rounded-md border border-border"
+                                type="number"
+                                value={amount}
+                                onChange={(e) => setAmount(e.target.value)}
+                            />
+                        </div>
+
+                        <button
+                            className="w-full py-3 bg-primary text-primary-foreground rounded-xl font-semibold disabled:opacity-50"
+                            onClick={handleSend}
+                            disabled={isSending || isConfigLoading || !isUsdtSupported}
+                        >
+                            {isSending ? 'Sending...' : isUsdtSupported ? 'Send Gasless' : 'USDT Not Supported'}
+                        </button>
+
+                        {!isConfigLoading && !isUsdtSupported && (
+                            <p className="text-xs text-red-500 text-center">
+                                Relayer does not support USDT for gas fees on this network.
+                            </p>
+                        )}
+                    </div>
+                )}
+            </Card>
+        </Layout>
+    );
+};
diff --git a/apps/appkit-minter/src/pages/index.ts b/apps/appkit-minter/src/pages/index.ts
index 09a13a93d..ad60f596a 100644
--- a/apps/appkit-minter/src/pages/index.ts
+++ b/apps/appkit-minter/src/pages/index.ts
@@ -11,3 +11,5 @@ export { JettonsPage } from './jettons-page';
 export { NftsPage } from './nfts-page';
 export { SwapPage } from './swap-page';
 export { StakingPage } from './staking-page';
+export { SignMessagePage } from './sign-message-page';
+export { GaslessPage } from './gasless-page';
diff --git a/apps/appkit-minter/src/pages/sign-message-page.tsx b/apps/appkit-minter/src/pages/sign-message-page.tsx
new file mode 100644
index 000000000..fef84a09a
--- /dev/null
+++ b/apps/appkit-minter/src/pages/sign-message-page.tsx
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type React from 'react';
+
+import { Layout } from '@/core/components';
+import { SignMessageCard } from '@/features/signing';
+
+export const SignMessagePage: React.FC = () => {
+    return (
+        <Layout title="Sign Message">
+            <SignMessageCard className="w-full max-w-[488px] mx-auto" />
+        </Layout>
+    );
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts b/packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts
new file mode 100644
index 000000000..649bac03e
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { MutateFunction, MutateOptions } from '@tanstack/react-query';
+import { estimateGaslessMutationOptions } from '@ton/appkit/queries';
+import type {
+    EstimateGaslessData,
+    EstimateGaslessErrorType,
+    EstimateGaslessMutationConfig,
+    EstimateGaslessVariables,
+} from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useMutation } from '../../../libs/query';
+import type { UseMutationReturnType } from '../../../libs/query';
+
+export type UseEstimateGaslessParameters<context = unknown> = EstimateGaslessMutationConfig<context>;
+
+export type UseEstimateGaslessReturnType<context = unknown> = UseMutationReturnType<
+    EstimateGaslessData,
+    EstimateGaslessErrorType,
+    EstimateGaslessVariables,
+    context,
+    (
+        variables: EstimateGaslessVariables,
+        options?: MutateOptions<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>,
+    ) => void,
+    MutateFunction<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>
+>;
+
+/**
+ * Hook to estimate gasless transaction.
+ */
+export const useEstimateGasless = <context = unknown>(
+    parameters: UseEstimateGaslessParameters<context> = {},
+): UseEstimateGaslessReturnType<context> => {
+    const appKit = useAppKit();
+
+    return useMutation(estimateGaslessMutationOptions<context>(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
new file mode 100644
index 000000000..d62731e16
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessConfigQueryOptions } from '@ton/appkit/queries';
+import type { GetGaslessConfigData, GetGaslessConfigErrorType, GetGaslessConfigQueryConfig } from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+
+export type UseGaslessConfigParameters<selectData = GetGaslessConfigData> = GetGaslessConfigQueryConfig<selectData>;
+export type UseGaslessConfigReturnType<selectData = GetGaslessConfigData> = UseQueryReturnType<
+    selectData,
+    GetGaslessConfigErrorType
+>;
+
+/**
+ * Hook to get gasless relayer configuration.
+ */
+export const useGaslessConfig = <selectData = GetGaslessConfigData>(
+    parameters: UseGaslessConfigParameters<selectData> = {},
+): UseGaslessConfigReturnType<selectData> => {
+    const appKit = useAppKit();
+
+    return useQuery(getGaslessConfigQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts b/packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts
new file mode 100644
index 000000000..53f0dd5eb
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { MutateFunction, MutateOptions } from '@tanstack/react-query';
+import { sendGaslessTransactionMutationOptions } from '@ton/appkit/queries';
+import type {
+    SendGaslessTransactionData,
+    SendGaslessTransactionErrorType,
+    SendGaslessTransactionMutationConfig,
+    SendGaslessTransactionVariables,
+} from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useMutation } from '../../../libs/query';
+import type { UseMutationReturnType } from '../../../libs/query';
+
+export type UseSendGaslessTransactionParameters<context = unknown> = SendGaslessTransactionMutationConfig<context>;
+
+export type UseSendGaslessTransactionReturnType<context = unknown> = UseMutationReturnType<
+    SendGaslessTransactionData,
+    SendGaslessTransactionErrorType,
+    SendGaslessTransactionVariables,
+    context,
+    (
+        variables: SendGaslessTransactionVariables,
+        options?: MutateOptions<
+            SendGaslessTransactionData,
+            SendGaslessTransactionErrorType,
+            SendGaslessTransactionVariables,
+            context
+        >,
+    ) => void,
+    MutateFunction<
+        SendGaslessTransactionData,
+        SendGaslessTransactionErrorType,
+        SendGaslessTransactionVariables,
+        context
+    >
+>;
+
+/**
+ * Hook to send gasless transaction.
+ */
+export const useSendGaslessTransaction = <context = unknown>(
+    parameters: UseSendGaslessTransactionParameters<context> = {},
+): UseSendGaslessTransactionReturnType<context> => {
+    const appKit = useAppKit();
+
+    return useMutation(sendGaslessTransactionMutationOptions<context>(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/index.ts b/packages/appkit-react/src/features/gasless/index.ts
new file mode 100644
index 000000000..4ffc4f984
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/index.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export {
+    useGaslessConfig,
+    type UseGaslessConfigParameters,
+    type UseGaslessConfigReturnType,
+} from './hooks/use-gasless-config';
+export {
+    useEstimateGasless,
+    type UseEstimateGaslessParameters,
+    type UseEstimateGaslessReturnType,
+} from './hooks/use-estimate-gasless';
+export {
+    useSendGaslessTransaction,
+    type UseSendGaslessTransactionParameters,
+    type UseSendGaslessTransactionReturnType,
+} from './hooks/use-send-gasless-transaction';
diff --git a/packages/appkit-react/src/index.ts b/packages/appkit-react/src/index.ts
index 2ae249e19..a82b9c3ef 100644
--- a/packages/appkit-react/src/index.ts
+++ b/packages/appkit-react/src/index.ts
@@ -39,5 +39,6 @@ export * from './features/settings';
 export * from './features/swap';
 export * from './features/signing';
 export * from './features/staking';
+export * from './features/gasless';
 
 export * from './types/appkit-ui-token';
diff --git a/packages/appkit/package.json b/packages/appkit/package.json
index a797c1150..c8af9fe5b 100644
--- a/packages/appkit/package.json
+++ b/packages/appkit/package.json
@@ -60,6 +60,16 @@
         "types": "./dist/cjs/staking/tonstakers/index.d.ts",
         "default": "./dist/cjs/staking/tonstakers/index.js"
       }
+    },
+    "./gasless/tonapi": {
+      "import": {
+        "types": "./dist/esm/gasless/tonapi/index.d.ts",
+        "default": "./dist/esm/gasless/tonapi/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/gasless/tonapi/index.d.ts",
+        "default": "./dist/cjs/gasless/tonapi/index.js"
+      }
     }
   },
   "typesVersions": {
@@ -75,6 +85,9 @@
       ],
       "staking/tonstakers": [
         "./dist/esm/staking/tonstakers/index.d.ts"
+      ],
+      "gasless/tonapi": [
+        "./dist/esm/gasless/tonapi/index.d.ts"
       ]
     }
   },
@@ -106,6 +119,9 @@
     "@ston-fi/omniston-sdk": {
       "optional": true
     },
+    "@ton-api/client": {
+      "optional": true
+    },
     "@tanstack/query-core": {
       "optional": true
     }
diff --git a/packages/appkit/src/actions/gasless/estimate-gasless.ts b/packages/appkit/src/actions/gasless/estimate-gasless.ts
new file mode 100644
index 000000000..9a4afb297
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/estimate-gasless.ts
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessEstimateResult } from '@ton/walletkit';
+
+import type { TransactionRequestMessage } from '../../types/transaction';
+import type { AppKit } from '../../core/app-kit';
+import { getSelectedWallet } from '../wallets/get-selected-wallet';
+
+export interface EstimateGaslessParameters {
+    /** Master address of the jetton used to pay the relayer's fee */
+    feeJettonMaster: string;
+    /** User's messages to include in the gasless transaction */
+    messages: TransactionRequestMessage[];
+    /** Gasless provider id. Uses the default provider when omitted. */
+    providerId?: string;
+}
+
+export type EstimateGaslessReturnType = Promise<GaslessEstimateResult>;
+
+export type EstimateGaslessErrorType = Error;
+
+/**
+ * Ask the relayer to estimate a gasless transaction.
+ *
+ * Returns relayer-wrapped messages (ready to be signed via `signMessage`), the
+ * commission charged in the fee jetton, and the bundle validity window.
+ */
+export const estimateGasless = async (
+    appKit: AppKit,
+    parameters: EstimateGaslessParameters,
+): EstimateGaslessReturnType => {
+    const wallet = getSelectedWallet(appKit);
+
+    if (!wallet) {
+        throw new Error('Wallet not connected');
+    }
+
+    return appKit.gaslessManager.estimate(
+        {
+            feeJettonMaster: parameters.feeJettonMaster,
+            walletAddress: wallet.getAddress(),
+            walletPublicKey: wallet.getPublicKey(),
+            messages: parameters.messages,
+        },
+        parameters.providerId,
+    );
+};
diff --git a/packages/appkit/src/actions/gasless/get-gasless-config.ts b/packages/appkit/src/actions/gasless/get-gasless-config.ts
new file mode 100644
index 000000000..89053c162
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/get-gasless-config.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessConfig } from '@ton/walletkit';
+
+import type { AppKit } from '../../core/app-kit';
+
+export interface GetGaslessConfigOptions {
+    /** Gasless provider id. Uses the default provider when omitted. */
+    providerId?: string;
+}
+
+export type GetGaslessConfigReturnType = Promise<GaslessConfig>;
+
+export type GetGaslessConfigErrorType = Error;
+
+/**
+ * Fetch gasless relayer configuration.
+ *
+ * Returns the relay address and jettons accepted by the relayer as fee payment.
+ */
+export const getGaslessConfig = async (
+    appKit: AppKit,
+    options: GetGaslessConfigOptions = {},
+): GetGaslessConfigReturnType => {
+    return appKit.gaslessManager.getConfig(options.providerId);
+};
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
new file mode 100644
index 000000000..0e20b478f
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessSendResult } from '@ton/walletkit';
+
+import type { Base64String } from '../../types/primitives';
+import type { TransactionRequestMessage } from '../../types/transaction';
+import type { AppKit } from '../../core/app-kit';
+import { getSelectedWallet } from '../wallets/get-selected-wallet';
+
+export interface SendGaslessTransactionParameters {
+    /** Master address of the jetton used to pay the relayer's fee */
+    feeJettonMaster: string;
+    /** User's messages to include in the gasless transaction */
+    messages: TransactionRequestMessage[];
+    /** Gasless provider id. Uses the default provider when omitted. */
+    providerId?: string;
+}
+
+export interface SendGaslessTransactionReturnType {
+    /** Signed internal BoC that was submitted to the relayer */
+    internalBoc: Base64String;
+    /** Relayer commission in fee-jetton nanounits */
+    commission: bigint;
+    /** Provider-specific relayer response */
+    relayerResponse: GaslessSendResult;
+}
+
+export type SendGaslessTransactionErrorType = Error;
+
+/**
+ * Execute a full gasless transaction flow:
+ *   1. estimate (with the relayer)
+ *   2. sign the relayer-wrapped messages via the wallet's `signMessage`
+ *   3. submit the signed BoC to the relayer
+ *
+ * Requires the wallet to support the SignMessage feature.
+ */
+export const sendGaslessTransaction = async (
+    appKit: AppKit,
+    parameters: SendGaslessTransactionParameters,
+): Promise<SendGaslessTransactionReturnType> => {
+    const wallet = getSelectedWallet(appKit);
+
+    if (!wallet) {
+        throw new Error('Wallet not connected');
+    }
+
+    const walletPublicKey = wallet.getPublicKey();
+
+    const estimate = await appKit.gaslessManager.estimate(
+        {
+            feeJettonMaster: parameters.feeJettonMaster,
+            walletAddress: wallet.getAddress(),
+            walletPublicKey,
+            messages: parameters.messages,
+        },
+        parameters.providerId,
+    );
+
+    const { internalBoc } = await wallet.signMessage({
+        messages: estimate.messages,
+        validUntil: estimate.validUntil,
+    });
+
+    const relayerResponse = await appKit.gaslessManager.send(
+        {
+            walletPublicKey,
+            internalBoc,
+        },
+        parameters.providerId,
+    );
+
+    return {
+        internalBoc,
+        commission: estimate.commission,
+        relayerResponse,
+    };
+};
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index e090f69d8..7d2368841 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -108,6 +108,26 @@ export { transferNft, type TransferNftParameters, type TransferNftReturnType } f
 // Providers
 export { registerProvider, type RegisterProviderOptions } from './providers/register-provider';
 
+// Gasless
+export {
+    getGaslessConfig,
+    type GetGaslessConfigOptions,
+    type GetGaslessConfigReturnType,
+    type GetGaslessConfigErrorType,
+} from './gasless/get-gasless-config';
+export {
+    estimateGasless,
+    type EstimateGaslessParameters,
+    type EstimateGaslessReturnType,
+    type EstimateGaslessErrorType,
+} from './gasless/estimate-gasless';
+export {
+    sendGaslessTransaction,
+    type SendGaslessTransactionParameters,
+    type SendGaslessTransactionReturnType,
+    type SendGaslessTransactionErrorType,
+} from './gasless/send-gasless-transaction';
+
 // Signing
 export { signText, type SignTextParameters, type SignTextReturnType } from './signing/sign-text';
 export { signBinary, type SignBinaryParameters, type SignBinaryReturnType } from './signing/sign-binary';
diff --git a/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts b/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts
index bf84ad836..b27d2b882 100644
--- a/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts
+++ b/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts
@@ -9,6 +9,7 @@
 import { createCommentPayloadBase64, parseUnits } from '@ton/walletkit';
 
 import type { TransactionRequest, TransactionRequestMessage } from '../../types/transaction';
+import type { Base64String } from '../../types/primitives';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
@@ -45,14 +46,14 @@ export const createTransferTonTransaction = (
     const message: TransactionRequestMessage = {
         address: recipientAddress,
         amount: parseUnits(amount, 9).toString(),
-        stateInit,
+        stateInit: stateInit as Base64String,
     };
 
     // Payload takes priority, otherwise use comment
     if (payload) {
-        message.payload = payload;
+        message.payload = payload as Base64String;
     } else if (comment) {
-        message.payload = createCommentPayloadBase64(comment);
+        message.payload = createCommentPayloadBase64(comment) as Base64String;
     }
 
     return {
diff --git a/packages/appkit/src/core/app-kit/services/app-kit.ts b/packages/appkit/src/core/app-kit/services/app-kit.ts
index fcb685a37..8c0048ee0 100644
--- a/packages/appkit/src/core/app-kit/services/app-kit.ts
+++ b/packages/appkit/src/core/app-kit/services/app-kit.ts
@@ -12,6 +12,8 @@ import type { ProviderInput, SwapProviderInterface, StakingProviderInterface, St
 import type { AppKitConfig } from '../types/config';
 import { CONNECTOR_EVENTS, WALLETS_EVENTS } from '../constants/events';
 import { StakingManager } from '../../../staking';
+import { GaslessManager } from '../../../gasless';
+import type { GaslessProviderInterface } from '../../../gasless';
 import type { Connector, ConnectorFactoryContext, ConnectorInput } from '../../../types/connector';
 import { EventEmitter } from '../../emitter';
 import type { AppKitEmitter, AppKitEvents } from '../types/events';
@@ -33,6 +35,7 @@ export class AppKit {
     readonly walletsManager: WalletsManager;
     readonly swapManager: SwapManager;
     readonly stakingManager: StakingManager;
+    readonly gaslessManager: GaslessManager;
 
     readonly networkManager: AppKitNetworkManager;
     readonly streamingManager: StreamingManager;
@@ -56,6 +59,7 @@ export class AppKit {
 
         this.swapManager = new SwapManager(() => this.createFactoryContext());
         this.stakingManager = new StakingManager(() => this.createFactoryContext());
+        this.gaslessManager = new GaslessManager(() => this.createFactoryContext());
         this.streamingManager = new StreamingManager(() => this.createFactoryContext());
 
         if (config.connectors) {
@@ -126,6 +130,9 @@ export class AppKit {
             case 'streaming':
                 this.streamingManager.registerProvider(provider as StreamingProvider);
                 break;
+            case 'gasless':
+                this.gaslessManager.registerProvider(provider as GaslessProviderInterface);
+                break;
             default:
                 throw new Error('Unknown provider type');
         }
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
new file mode 100644
index 000000000..7c771ffb3
--- /dev/null
+++ b/packages/appkit/src/gasless/index.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export { GaslessProvider, GaslessError, GaslessManager } from '@ton/walletkit';
+
+export type {
+    GaslessAPI,
+    GaslessProviderInterface,
+    GaslessConfig,
+    GaslessGasJetton,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    GaslessSendResult,
+} from '@ton/walletkit';
diff --git a/packages/appkit/src/gasless/tonapi/index.ts b/packages/appkit/src/gasless/tonapi/index.ts
new file mode 100644
index 000000000..29bf67892
--- /dev/null
+++ b/packages/appkit/src/gasless/tonapi/index.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export * from '@ton/walletkit/gasless/tonapi';
diff --git a/packages/appkit/src/index.ts b/packages/appkit/src/index.ts
index b851df432..855cc962d 100644
--- a/packages/appkit/src/index.ts
+++ b/packages/appkit/src/index.ts
@@ -35,6 +35,7 @@ export * from './connectors/tonconnect';
 
 export * from './swap';
 export * from './staking';
+export * from './gasless';
 
 // Actions
 export * from './actions';
diff --git a/packages/appkit/src/queries/gasless/estimate-gasless.ts b/packages/appkit/src/queries/gasless/estimate-gasless.ts
new file mode 100644
index 000000000..2ba317097
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/estimate-gasless.ts
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { MutationOptions } from '@tanstack/query-core';
+
+import { estimateGasless } from '../../actions/gasless/estimate-gasless';
+import type {
+    EstimateGaslessErrorType,
+    EstimateGaslessParameters,
+    EstimateGaslessReturnType,
+} from '../../actions/gasless/estimate-gasless';
+import type { AppKit } from '../../core/app-kit';
+import type { MutationParameter } from '../../types/query';
+import type { Compute } from '../../types/utils';
+
+export type { EstimateGaslessErrorType };
+
+export type EstimateGaslessMutationConfig<context = unknown> = MutationParameter<
+    EstimateGaslessData,
+    EstimateGaslessErrorType,
+    EstimateGaslessVariables,
+    context
+>;
+
+export const estimateGaslessMutationOptions = <context = unknown>(
+    appKit: AppKit,
+    config: EstimateGaslessMutationConfig<context> = {},
+): EstimateGaslessMutationOptions<context> => {
+    return {
+        ...config.mutation,
+        mutationFn: (variables: EstimateGaslessVariables) => estimateGasless(appKit, variables),
+        mutationKey: ['estimateGasless'],
+    };
+};
+
+export type EstimateGaslessVariables = Compute<EstimateGaslessParameters>;
+
+export type EstimateGaslessData = Compute<Awaited<EstimateGaslessReturnType>>;
+
+export type EstimateGaslessMutate<context = unknown> = (
+    variables: EstimateGaslessVariables,
+    options?: MutationOptions<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>,
+) => void;
+
+export type EstimateGaslessMutateAsync<context = unknown> = (
+    variables: EstimateGaslessVariables,
+    options?: MutationOptions<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>,
+) => Promise<EstimateGaslessData>;
+
+export type EstimateGaslessMutationOptions<context = unknown> = MutationOptions<
+    EstimateGaslessData,
+    EstimateGaslessErrorType,
+    EstimateGaslessVariables,
+    context
+>;
diff --git a/packages/appkit/src/queries/gasless/get-gasless-config.ts b/packages/appkit/src/queries/gasless/get-gasless-config.ts
new file mode 100644
index 000000000..815d4af38
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-config.ts
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessConfig } from '../../actions/gasless/get-gasless-config';
+import type {
+    GetGaslessConfigErrorType,
+    GetGaslessConfigOptions,
+    GetGaslessConfigReturnType,
+} from '../../actions/gasless/get-gasless-config';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+
+export type { GetGaslessConfigErrorType };
+
+export type GetGaslessConfigQueryConfig<selectData = GetGaslessConfigData> = Compute<
+    ExactPartial<GetGaslessConfigOptions>
+> &
+    QueryParameter<GetGaslessConfigQueryFnData, GetGaslessConfigErrorType, selectData, GetGaslessConfigQueryKey>;
+
+export const getGaslessConfigQueryOptions = <selectData = GetGaslessConfigData>(
+    appKit: AppKit,
+    options: GetGaslessConfigQueryConfig<selectData> = {},
+): GetGaslessConfigQueryOptions<selectData> => {
+    return {
+        ...options.query,
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [string, GetGaslessConfigOptions];
+            return getGaslessConfig(appKit, parameters);
+        },
+        queryKey: getGaslessConfigQueryKey(options),
+    };
+};
+
+export type GetGaslessConfigQueryFnData = Compute<Awaited<GetGaslessConfigReturnType>>;
+
+export type GetGaslessConfigData = GetGaslessConfigQueryFnData;
+
+export const getGaslessConfigQueryKey = (
+    options: Compute<ExactPartial<GetGaslessConfigOptions>> = {},
+): GetGaslessConfigQueryKey => {
+    return ['gaslessConfig', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
+};
+
+export type GetGaslessConfigQueryKey = readonly ['gaslessConfig', Compute<ExactPartial<GetGaslessConfigOptions>>];
+
+export type GetGaslessConfigQueryOptions<selectData = GetGaslessConfigData> = QueryOptions<
+    GetGaslessConfigQueryFnData,
+    GetGaslessConfigErrorType,
+    selectData,
+    GetGaslessConfigQueryKey
+>;
diff --git a/packages/appkit/src/queries/gasless/send-gasless-transaction.ts b/packages/appkit/src/queries/gasless/send-gasless-transaction.ts
new file mode 100644
index 000000000..01832bf1d
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/send-gasless-transaction.ts
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { MutationOptions } from '@tanstack/query-core';
+
+import { sendGaslessTransaction } from '../../actions/gasless/send-gasless-transaction';
+import type {
+    SendGaslessTransactionErrorType,
+    SendGaslessTransactionParameters,
+    SendGaslessTransactionReturnType,
+} from '../../actions/gasless/send-gasless-transaction';
+import type { AppKit } from '../../core/app-kit';
+import type { MutationParameter } from '../../types/query';
+import type { Compute } from '../../types/utils';
+
+export type { SendGaslessTransactionErrorType };
+
+export type SendGaslessTransactionMutationConfig<context = unknown> = MutationParameter<
+    SendGaslessTransactionData,
+    SendGaslessTransactionErrorType,
+    SendGaslessTransactionVariables,
+    context
+>;
+
+export const sendGaslessTransactionMutationOptions = <context = unknown>(
+    appKit: AppKit,
+    config: SendGaslessTransactionMutationConfig<context> = {},
+): SendGaslessTransactionMutationOptions<context> => {
+    return {
+        ...config.mutation,
+        mutationFn: (variables: SendGaslessTransactionVariables) => sendGaslessTransaction(appKit, variables),
+        mutationKey: ['sendGaslessTransaction'],
+    };
+};
+
+export type SendGaslessTransactionVariables = Compute<SendGaslessTransactionParameters>;
+
+export type SendGaslessTransactionData = Compute<Awaited<SendGaslessTransactionReturnType>>;
+
+export type SendGaslessTransactionMutate<context = unknown> = (
+    variables: SendGaslessTransactionVariables,
+    options?: MutationOptions<
+        SendGaslessTransactionData,
+        SendGaslessTransactionErrorType,
+        SendGaslessTransactionVariables,
+        context
+    >,
+) => void;
+
+export type SendGaslessTransactionMutateAsync<context = unknown> = (
+    variables: SendGaslessTransactionVariables,
+    options?: MutationOptions<
+        SendGaslessTransactionData,
+        SendGaslessTransactionErrorType,
+        SendGaslessTransactionVariables,
+        context
+    >,
+) => Promise<SendGaslessTransactionData>;
+
+export type SendGaslessTransactionMutationOptions<context = unknown> = MutationOptions<
+    SendGaslessTransactionData,
+    SendGaslessTransactionErrorType,
+    SendGaslessTransactionVariables,
+    context
+>;
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index 90e3d77fe..0468f2c6d 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -165,6 +165,32 @@ export {
     type BuildSwapTransactionVariables,
 } from './swap/build-swap-transaction';
 
+// Gasless
+export {
+    getGaslessConfigQueryOptions,
+    type GetGaslessConfigQueryConfig,
+    type GetGaslessConfigData,
+    type GetGaslessConfigErrorType,
+} from './gasless/get-gasless-config';
+export {
+    estimateGaslessMutationOptions,
+    type EstimateGaslessMutationConfig,
+    type EstimateGaslessData,
+    type EstimateGaslessErrorType,
+    type EstimateGaslessMutate,
+    type EstimateGaslessMutateAsync,
+    type EstimateGaslessVariables,
+} from './gasless/estimate-gasless';
+export {
+    sendGaslessTransactionMutationOptions,
+    type SendGaslessTransactionMutationConfig,
+    type SendGaslessTransactionData,
+    type SendGaslessTransactionErrorType,
+    type SendGaslessTransactionMutate,
+    type SendGaslessTransactionMutateAsync,
+    type SendGaslessTransactionVariables,
+} from './gasless/send-gasless-transaction';
+
 // Staking
 export {
     getStakingQuoteQueryOptions,
diff --git a/packages/appkit/src/types/transaction.ts b/packages/appkit/src/types/transaction.ts
index 0255b717b..d5bab0f82 100644
--- a/packages/appkit/src/types/transaction.ts
+++ b/packages/appkit/src/types/transaction.ts
@@ -9,6 +9,7 @@
 import type { ExtraCurrencies, TokenAmount } from '@ton/walletkit';
 
 import type { Network } from './network';
+import type { Base64String } from './primitives';
 
 export type { TransactionStatus } from '@ton/walletkit';
 
@@ -56,10 +57,10 @@ export interface TransactionRequestMessage {
     /**
      * Initial state for deploying a new contract, encoded in Base64
      */
-    stateInit?: string;
+    stateInit?: Base64String;
 
     /**
      * Message payload data encoded in Base64
      */
-    payload?: string;
+    payload?: Base64String;
 }
diff --git a/packages/appkit/src/utils/index.ts b/packages/appkit/src/utils/index.ts
index 369be1302..97cf50e67 100644
--- a/packages/appkit/src/utils/index.ts
+++ b/packages/appkit/src/utils/index.ts
@@ -6,7 +6,7 @@
  *
  */
 
-export { formatUnits, parseUnits, compareAddress } from '@ton/walletkit';
+export { formatUnits, parseUnits, compareAddress, createJettonTransferPayload } from '@ton/walletkit';
 
 export * from './address/is-valid-address';
 export * from './address/to-bounceble-address';
diff --git a/packages/walletkit/package.json b/packages/walletkit/package.json
index a3b513474..49fa6ef5e 100644
--- a/packages/walletkit/package.json
+++ b/packages/walletkit/package.json
@@ -60,6 +60,16 @@
         "types": "./dist/cjs/defi/staking/tonstakers/index.d.ts",
         "default": "./dist/cjs/defi/staking/tonstakers/index.js"
       }
+    },
+    "./gasless/tonapi": {
+      "import": {
+        "types": "./dist/esm/defi/gasless/tonapi/index.d.ts",
+        "default": "./dist/esm/defi/gasless/tonapi/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/defi/gasless/tonapi/index.d.ts",
+        "default": "./dist/cjs/defi/gasless/tonapi/index.js"
+      }
     }
   },
   "typesVersions": {
@@ -75,6 +85,9 @@
       ],
       "staking/tonstakers": [
         "./dist/cjs/defi/staking/tonstakers/index.d.ts"
+      ],
+      "gasless/tonapi": [
+        "./dist/cjs/defi/gasless/tonapi/index.d.ts"
       ]
     }
   },
@@ -123,10 +136,14 @@
   "peerDependenciesMeta": {
     "@ston-fi/omniston-sdk": {
       "optional": true
+    },
+    "@ton-api/client": {
+      "optional": true
     }
   },
   "optionalDependencies": {
-    "@ston-fi/omniston-sdk": "^0.7.9"
+    "@ston-fi/omniston-sdk": "^0.7.9",
+    "@ton-api/client": "^0.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.2.0",
diff --git a/packages/walletkit/src/api/interfaces/DefiProvider.ts b/packages/walletkit/src/api/interfaces/DefiProvider.ts
index 33661ca41..a3eb7ec49 100644
--- a/packages/walletkit/src/api/interfaces/DefiProvider.ts
+++ b/packages/walletkit/src/api/interfaces/DefiProvider.ts
@@ -11,7 +11,7 @@ import type { Network, BaseProvider } from '../models';
 /**
  * Type of provider
  */
-export type DefiProviderType = 'swap' | 'staking';
+export type DefiProviderType = 'swap' | 'staking' | 'gasless';
 
 /**
  * Base interface for all DeFi providers
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
new file mode 100644
index 000000000..3e59b0890
--- /dev/null
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type {
+    GaslessConfig,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    GaslessSendResult,
+} from '../../defi/gasless/types';
+import type { DefiManagerAPI } from './DefiManagerAPI';
+import type { DefiProvider } from './DefiProvider';
+
+/**
+ * Gasless API interface exposed by GaslessManager.
+ *
+ * Gasless lets a dApp submit on-chain transactions without the user paying TON
+ * for gas: a relayer co-signs and covers the gas, taking a jetton fee in return.
+ */
+export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
+    /**
+     * Fetch relayer configuration (supported jettons and relay address).
+     * @param providerId Provider identifier (optional, uses default if not specified)
+     */
+    getConfig(providerId?: string): Promise<GaslessConfig>;
+
+    /**
+     * Estimate fees and obtain relayer-wrapped messages for signing.
+     *
+     * Pass the returned `messages` to `wallet.signMessage` to obtain a signed
+     * internal-message BoC, then submit it via `send`.
+     *
+     * @param params Estimation parameters (wallet identity, fee jetton, messages)
+     * @param providerId Provider identifier (optional, uses default if not specified)
+     */
+    estimate(params: GaslessEstimateParams, providerId?: string): Promise<GaslessEstimateResult>;
+
+    /**
+     * Submit a signed transaction BoC to the relayer for on-chain execution.
+     *
+     * @param params Signed message and wallet public key
+     * @param providerId Provider identifier (optional, uses default if not specified)
+     */
+    send(params: GaslessSendParams, providerId?: string): Promise<GaslessSendResult>;
+}
+
+/**
+ * Interface that all gasless providers must implement.
+ */
+export interface GaslessProviderInterface extends DefiProvider {
+    readonly type: 'gasless';
+
+    /**
+     * Unique identifier for the provider
+     */
+    readonly providerId: string;
+
+    /**
+     * Fetch relayer configuration (supported jettons and relay address).
+     */
+    getConfig(): Promise<GaslessConfig>;
+
+    /**
+     * Estimate fees and return relayer-wrapped messages for signing.
+     */
+    estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult>;
+
+    /**
+     * Submit a signed transaction BoC to the relayer.
+     */
+    send(params: GaslessSendParams): Promise<GaslessSendResult>;
+}
diff --git a/packages/walletkit/src/api/interfaces/index.ts b/packages/walletkit/src/api/interfaces/index.ts
index cdaca3627..aee441303 100644
--- a/packages/walletkit/src/api/interfaces/index.ts
+++ b/packages/walletkit/src/api/interfaces/index.ts
@@ -12,9 +12,10 @@ export type { WalletSigner, ISigner } from './WalletSigner';
 
 // Defi interfaces
 export type { DefiManagerAPI } from './DefiManagerAPI';
-export type { DefiProvider } from './DefiProvider';
+export type { DefiProvider, DefiProviderType } from './DefiProvider';
 export type { SwapAPI, SwapProviderInterface } from './SwapAPI';
 export type { StakingAPI, StakingProviderInterface } from './StakingAPI';
+export type { GaslessAPI, GaslessProviderInterface } from './GaslessAPI';
 
 export type { TONConnectSessionManager } from './TONConnectSessionManager';
 
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
new file mode 100644
index 000000000..e57838838
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
+import { globalLogger } from '../../core/Logger';
+import type { ProviderFactoryContext } from '../../types/factory';
+import { DefiManager } from '../DefiManager';
+import { GaslessError } from './errors';
+import type {
+    GaslessConfig,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    GaslessSendResult,
+} from './types';
+
+const log = globalLogger.createChild('GaslessManager');
+
+/**
+ * GaslessManager — manages gasless relay providers and delegates gasless operations.
+ *
+ * Allows registration of multiple gasless providers and provides a unified API.
+ * Providers can be switched dynamically.
+ */
+export class GaslessManager extends DefiManager<GaslessProviderInterface> implements GaslessAPI {
+    constructor(createFactoryContext: () => ProviderFactoryContext) {
+        super(createFactoryContext);
+    }
+
+    /**
+     * Fetch relayer configuration (supported jettons and relay address).
+     */
+    async getConfig(providerId?: string): Promise<GaslessConfig> {
+        log.debug('Getting gasless config', { providerId: providerId ?? this.defaultProviderId });
+
+        try {
+            return await this.getProvider(providerId ?? this.defaultProviderId).getConfig();
+        } catch (error) {
+            log.error('Failed to get gasless config', { error });
+            throw error;
+        }
+    }
+
+    /**
+     * Estimate fees and obtain relayer-wrapped messages for signing.
+     */
+    async estimate(params: GaslessEstimateParams, providerId?: string): Promise<GaslessEstimateResult> {
+        log.debug('Estimating gasless transaction', {
+            walletAddress: params.walletAddress,
+            feeJettonMaster: params.feeJettonMaster,
+            messagesCount: params.messages.length,
+            providerId: providerId ?? this.defaultProviderId,
+        });
+
+        try {
+            return await this.getProvider(providerId ?? this.defaultProviderId).estimate(params);
+        } catch (error) {
+            log.error('Failed to estimate gasless transaction', { error, params });
+            throw error;
+        }
+    }
+
+    /**
+     * Submit a signed transaction BoC to the relayer.
+     */
+    async send(params: GaslessSendParams, providerId?: string): Promise<GaslessSendResult> {
+        log.debug('Sending gasless transaction', { providerId: providerId ?? this.defaultProviderId });
+
+        try {
+            return await this.getProvider(providerId ?? this.defaultProviderId).send(params);
+        } catch (error) {
+            log.error('Failed to send gasless transaction', { error });
+            throw error;
+        }
+    }
+
+    protected createError(message: string, code: string, details?: unknown): GaslessError {
+        return new GaslessError(message, code, details);
+    }
+}
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
new file mode 100644
index 000000000..0d0f3071b
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessProviderInterface } from '../../api/interfaces';
+import type {
+    GaslessConfig,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    GaslessSendResult,
+} from './types';
+
+/**
+ * Abstract base class for gasless relay providers.
+ *
+ * Concrete providers (e.g. TonApiGaslessProvider) implement the three methods
+ * below against a specific relayer backend.
+ *
+ * @example
+ * ```typescript
+ * class MyGaslessProvider extends GaslessProvider {
+ *   readonly providerId = 'my-relayer';
+ *
+ *   async getConfig(): Promise<GaslessConfig> { ... }
+ *   async estimate(params): Promise<GaslessEstimateResult> { ... }
+ *   async send(params): Promise<GaslessSendResult> { ... }
+ * }
+ * ```
+ */
+export abstract class GaslessProvider implements GaslessProviderInterface {
+    readonly type = 'gasless';
+    abstract readonly providerId: string;
+
+    abstract getConfig(): Promise<GaslessConfig>;
+    abstract estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult>;
+    abstract send(params: GaslessSendParams): Promise<GaslessSendResult>;
+}
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
new file mode 100644
index 000000000..a0374cb5c
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { DefiManagerError } from '../errors';
+
+export class GaslessError extends DefiManagerError {
+    static readonly UNSUPPORTED_FEE_JETTON = 'UNSUPPORTED_FEE_JETTON';
+    static readonly ESTIMATE_FAILED = 'ESTIMATE_FAILED';
+    static readonly SEND_FAILED = 'SEND_FAILED';
+    static readonly CONFIG_FAILED = 'CONFIG_FAILED';
+
+    constructor(message: string, code: string, details?: unknown) {
+        super(message, code, details);
+        this.name = 'GaslessError';
+    }
+}
diff --git a/packages/walletkit/src/defi/gasless/index.ts b/packages/walletkit/src/defi/gasless/index.ts
new file mode 100644
index 000000000..ef5702477
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/index.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export { GaslessProvider } from './GaslessProvider';
+export { GaslessManager } from './GaslessManager';
+export { GaslessError } from './errors';
+export type {
+    GaslessConfig,
+    GaslessGasJetton,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    GaslessSendResult,
+} from './types';
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
new file mode 100644
index 000000000..8cbc4283c
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -0,0 +1,234 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+    Address,
+    beginCell,
+    Cell,
+    external,
+    internal,
+    loadMessageRelaxed,
+    storeMessage,
+    storeMessageRelaxed,
+} from '@ton/core';
+import type { TonApiClient } from '@ton-api/client';
+
+import type { Base64String } from '../../../api/models/core/Primitives';
+import { globalLogger } from '../../../core/Logger';
+import { CallForSuccess } from '../../../utils/retry';
+import { GaslessError } from '../errors';
+import { GaslessProvider } from '../GaslessProvider';
+import type {
+    GaslessConfig,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    GaslessSendResult,
+} from '../types';
+
+const log = globalLogger.createChild('TonApiGaslessProvider');
+
+/**
+ * Configuration for TonApiGaslessProvider.
+ */
+export interface TonApiGaslessProviderConfig {
+    /** Pre-configured TonApi client (brings its own baseUrl / API key). */
+    client: TonApiClient;
+    /** Optional provider id override. Defaults to 'tonapi'. */
+    providerId?: string;
+    /** Number of send retries on transient errors. Defaults to 5. */
+    sendRetries?: number;
+    /** Delay between send retries in ms. Defaults to 2000. */
+    sendRetryDelayMs?: number;
+}
+
+/**
+ * Gasless provider implementation backed by TonApi (@ton-api/client).
+ *
+ * Follows the public gasless flow documented at
+ * https://docs.tonapi.io/tonapi/rest-api/gasless.
+ *
+ * @example
+ * ```typescript
+ * import { TonApiClient } from '@ton-api/client';
+ * import { TonApiGaslessProvider } from '@ton/walletkit/gasless/tonapi';
+ *
+ * const provider = new TonApiGaslessProvider({
+ *     client: new TonApiClient({ baseUrl: 'https://tonapi.io' }),
+ * });
+ *
+ * kit.registerProvider(provider);
+ * ```
+ */
+export class TonApiGaslessProvider extends GaslessProvider {
+    readonly providerId: string;
+
+    private readonly client: TonApiClient;
+    private readonly sendRetries: number;
+    private readonly sendRetryDelayMs: number;
+
+    constructor(config: TonApiGaslessProviderConfig) {
+        super();
+        this.client = config.client;
+        this.providerId = config.providerId ?? 'tonapi';
+        this.sendRetries = config.sendRetries ?? 5;
+        this.sendRetryDelayMs = config.sendRetryDelayMs ?? 2000;
+    }
+
+    async getConfig(): Promise<GaslessConfig> {
+        try {
+            const cfg = await this.client.gasless.gaslessConfig();
+            return {
+                relayAddress: cfg.relayAddress.toString({ bounceable: true }),
+                gasJettons: cfg.gasJettons.map((jetton) => ({
+                    masterId: jetton.masterId.toString({ bounceable: true }),
+                })),
+            };
+        } catch (error) {
+            log.error('Failed to fetch gasless config', { error });
+            throw new GaslessError(
+                error instanceof Error ? error.message : 'Failed to fetch gasless config',
+                GaslessError.CONFIG_FAILED,
+                error,
+            );
+        }
+    }
+
+    async estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult> {
+        const feeJettonMaster = Address.parse(params.feeJettonMaster);
+        const walletAddress = Address.parse(params.walletAddress);
+        const walletPublicKey = stripHexPrefix(params.walletPublicKey);
+
+        const messagesBoc = params.messages.map((message) => ({
+            boc: buildInternalMessageCell(message),
+        }));
+
+        try {
+            const result = await this.client.gasless.gaslessEstimate(feeJettonMaster, {
+                walletAddress,
+                walletPublicKey,
+                messages: messagesBoc,
+            });
+
+            return {
+                messages: result.messages.map((message) => ({
+                    address: message.address.toString({ bounceable: true }),
+                    amount: message.amount,
+                    payload: message.payload ? cellToBase64(message.payload) : undefined,
+                    stateInit: message.stateInit ? cellToBase64(message.stateInit) : undefined,
+                })),
+                commission: result.commission,
+                validUntil: result.validUntil,
+                relayAddress: result.relayAddress.toString({ bounceable: true }),
+                from: result.from.toString({ bounceable: true }),
+            };
+        } catch (error) {
+            log.error('Failed to estimate gasless transaction', { error, params });
+            throw new GaslessError(
+                error instanceof Error ? error.message : 'Failed to estimate gasless transaction',
+                GaslessError.ESTIMATE_FAILED,
+                error,
+            );
+        }
+    }
+
+    async send(params: GaslessSendParams): Promise<GaslessSendResult> {
+        const walletPublicKey = stripHexPrefix(params.walletPublicKey);
+        const externalBoc = internalBocToExternalMessageBoc(params.internalBoc);
+
+        try {
+            const result = await CallForSuccess(
+                () =>
+                    this.client.gasless.gaslessSend({
+                        walletPublicKey,
+                        boc: externalBoc,
+                    }),
+                this.sendRetries,
+                this.sendRetryDelayMs,
+            );
+
+            return (result ?? {}) as GaslessSendResult;
+        } catch (error) {
+            log.error('Failed to send gasless transaction', { error });
+            throw new GaslessError(
+                error instanceof Error ? error.message : 'Failed to send gasless transaction',
+                GaslessError.SEND_FAILED,
+                error,
+            );
+        }
+    }
+}
+
+function stripHexPrefix(value: string): string {
+    return value.startsWith('0x') ? value.slice(2) : value;
+}
+
+function cellToBase64(cell: Cell): Base64String {
+    return cell.toBoc().toString('base64') as Base64String;
+}
+
+function buildInternalMessageCell(message: {
+    address: string;
+    amount: string | bigint;
+    payload?: string;
+    stateInit?: string;
+}): Cell {
+    const to = Address.parse(message.address);
+    const value = BigInt(message.amount);
+    const body = message.payload ? Cell.fromBase64(message.payload) : beginCell().endCell();
+    const init = message.stateInit ? parseStateInit(message.stateInit) : undefined;
+
+    return beginCell()
+        .storeWritable(
+            storeMessageRelaxed(
+                internal({
+                    to,
+                    value,
+                    bounce: true,
+                    body,
+                    init,
+                }),
+            ),
+        )
+        .endCell();
+}
+
+function parseStateInit(base64: string) {
+    const cell = Cell.fromBase64(base64);
+    const slice = cell.beginParse();
+    const maybeCodeBit = slice.loadBit();
+    const code = maybeCodeBit ? slice.loadRef() : undefined;
+    const maybeDataBit = slice.loadBit();
+    const data = maybeDataBit ? slice.loadRef() : undefined;
+    return { code, data };
+}
+
+/**
+ * Convert an internal-message BoC (what `wallet.signMessage` returns) into an
+ * external message BoC that the relayer accepts for broadcast.
+ */
+function internalBocToExternalMessageBoc(internalBoc: Base64String): Cell {
+    const parsed = Cell.fromBase64(internalBoc);
+    const { info, body, init } = loadMessageRelaxed(parsed.beginParse());
+
+    if (info.type !== 'internal') {
+        throw new GaslessError('Signed message must be an internal message', GaslessError.SEND_FAILED);
+    }
+
+    return beginCell()
+        .storeWritable(
+            storeMessage(
+                external({
+                    to: info.dest,
+                    init: init ?? undefined,
+                    body,
+                }),
+            ),
+        )
+        .endCell();
+}
diff --git a/packages/walletkit/src/defi/gasless/tonapi/index.ts b/packages/walletkit/src/defi/gasless/tonapi/index.ts
new file mode 100644
index 000000000..5b50dd0c6
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/index.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export { TonApiGaslessProvider } from './TonApiGaslessProvider';
+export type { TonApiGaslessProviderConfig } from './TonApiGaslessProvider';
diff --git a/packages/walletkit/src/defi/gasless/types.ts b/packages/walletkit/src/defi/gasless/types.ts
new file mode 100644
index 000000000..de7c956fd
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/types.ts
@@ -0,0 +1,85 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Base64String, Hex, UserFriendlyAddress } from '../../api/models/core/Primitives';
+import type { TransactionRequestMessage } from '../../api/models/transactions/TransactionRequest';
+
+/**
+ * Relayer configuration for gasless transactions.
+ *
+ * Reports which jettons the relayer accepts as fee payment and the address
+ * where relayer commission is routed.
+ */
+export interface GaslessConfig {
+    /** Address where the relayer expects to receive the commission */
+    relayAddress: UserFriendlyAddress;
+    /** Jettons supported by the relayer for paying the fee */
+    gasJettons: GaslessGasJetton[];
+}
+
+/**
+ * A jetton accepted by the relayer as a fee payment option.
+ */
+export interface GaslessGasJetton {
+    /** Jetton master address */
+    masterId: UserFriendlyAddress;
+}
+
+/**
+ * Parameters to estimate a gasless transaction.
+ *
+ * The relayer wraps the caller's messages with commission-collection logic and
+ * returns a new set of messages that the wallet should sign via `signMessage`.
+ */
+export interface GaslessEstimateParams {
+    /** Master address of the jetton used to pay the relayer's fee */
+    feeJettonMaster: UserFriendlyAddress;
+    /** Sender wallet address */
+    walletAddress: UserFriendlyAddress;
+    /** Sender wallet public key */
+    walletPublicKey: Hex;
+    /** Messages that the caller wants to include in the transaction */
+    messages: TransactionRequestMessage[];
+}
+
+/**
+ * Result of gasless estimation.
+ *
+ * Contains relayer-wrapped messages that should be passed to `wallet.signMessage`
+ * in place of the caller's original messages, together with the commission the
+ * relayer will deduct and the timestamp after which the estimate expires.
+ */
+export interface GaslessEstimateResult {
+    /** Relayer-wrapped messages ready to be signed */
+    messages: TransactionRequestMessage[];
+    /** Relayer commission in fee-jetton nanounits */
+    commission: bigint;
+    /** Unix timestamp after which the bundle becomes invalid for relay */
+    validUntil: number;
+    /** Address of the relayer that produced this estimate */
+    relayAddress: UserFriendlyAddress;
+    /** Sender wallet address echoed by the relayer */
+    from: UserFriendlyAddress;
+}
+
+/**
+ * Parameters to submit a signed gasless transaction to the relayer.
+ */
+export interface GaslessSendParams {
+    /** Sender wallet public key */
+    walletPublicKey: Hex;
+    /** Signed internal-message BoC obtained from `wallet.signMessage` */
+    internalBoc: Base64String;
+}
+
+/**
+ * Result of submitting a signed gasless transaction to the relayer.
+ *
+ * Fields are provider-specific; callers should not rely on a particular shape.
+ */
+export type GaslessSendResult = Record<string, unknown>;
diff --git a/packages/walletkit/src/index.ts b/packages/walletkit/src/index.ts
index f9c899ef3..0f79ad429 100644
--- a/packages/walletkit/src/index.ts
+++ b/packages/walletkit/src/index.ts
@@ -22,6 +22,15 @@ export { JettonsManager } from './core/JettonsManager';
 export { DefiError, DefiErrorCode } from './defi/errors';
 export { SwapManager, SwapProvider, SwapError, SwapErrorCode } from './defi/swap';
 export { StakingManager, StakingProvider, StakingError, StakingErrorCode } from './defi/staking';
+export { GaslessManager, GaslessProvider, GaslessError } from './defi/gasless';
+export type {
+    GaslessConfig,
+    GaslessGasJetton,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    GaslessSendResult,
+} from './defi/gasless';
 export { EventEmitter } from './core/EventEmitter';
 export type { EventListener, EventPayload, KitEvent } from './core/EventEmitter';
 export type { SharedKitEvents } from './types/emitter';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d6a1e1be..9e5c9292f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -878,6 +878,9 @@ importers:
       '@ston-fi/omniston-sdk':
         specifier: ^0.7.9
         version: 0.7.9(bufferutil@4.1.0)(utf-8-validate@5.0.10)
+      '@ton-api/client':
+        specifier: ^0.4.0
+        version: 0.4.0(@ton/core@0.63.1(@ton/crypto@3.3.0))
 
   packages/walletkit-android-bridge:
     dependencies:
@@ -4030,6 +4033,11 @@ packages:
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
 
+  '@ton-api/client@0.4.0':
+    resolution: {integrity: sha512-k3d6RzNWRDEZpVa9Gig2kHqp74tGvaK/imkjb08RIGxn+wKC7Yv5g98GnXEHf3srRkjtRCG0Nnjx8EsasOMJkw==}
+    peerDependencies:
+      '@ton/core': '>=0.59.0'
+
   '@ton-community/ton-ledger@7.3.0':
     resolution: {integrity: sha512-eG4KqQaQoUgdVzedUlt8ZkwHDw7JiXnPqZOO+1fUKISwjU2OdiRIeo+TB0yKK3X3fm/0hgQbFBEZAbGSCKvzTw==}
     peerDependencies:
@@ -5345,6 +5353,9 @@ packages:
   core-js-compat@3.48.0:
     resolution: {integrity: sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==}
 
+  core-js-pure@3.49.0:
+    resolution: {integrity: sha512-XM4RFka59xATyJv/cS3O3Kml72hQXUeGRuuTmMYFxwzc9/7C8OYTaIR/Ji+Yt8DXzsFLNhat15cE/JP15HrCgw==}
+
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
@@ -13991,6 +14002,12 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.4.1
 
+  '@ton-api/client@0.4.0(@ton/core@0.63.1(@ton/crypto@3.3.0))':
+    dependencies:
+      '@ton/core': 0.63.1(@ton/crypto@3.3.0)
+      core-js-pure: 3.49.0
+    optional: true
+
   '@ton-community/ton-ledger@7.3.0(@ton/core@0.63.1(@ton/crypto@3.3.0))':
     dependencies:
       '@ledgerhq/hw-transport': 6.35.0
@@ -15619,6 +15636,9 @@ snapshots:
     dependencies:
       browserslist: 4.28.1
 
+  core-js-pure@3.49.0:
+    optional: true
+
   core-util-is@1.0.3: {}
 
   cors@2.8.6:

From 7df94cd7daa744671f49935b72b646ff4416d6af Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 20 Apr 2026 21:20:43 +0400
Subject: [PATCH 03/46] feat(appkit): use loadStateInit

---
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 8cbc4283c..525c2d42a 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -13,12 +13,13 @@ import {
     external,
     internal,
     loadMessageRelaxed,
+    loadStateInit,
     storeMessage,
     storeMessageRelaxed,
 } from '@ton/core';
 import type { TonApiClient } from '@ton-api/client';
 
-import type { Base64String } from '../../../api/models/core/Primitives';
+import type { Base64String, TransactionRequestMessage } from '../../../api/models';
 import { globalLogger } from '../../../core/Logger';
 import { CallForSuccess } from '../../../utils/retry';
 import { GaslessError } from '../errors';
@@ -172,16 +173,11 @@ function cellToBase64(cell: Cell): Base64String {
     return cell.toBoc().toString('base64') as Base64String;
 }
 
-function buildInternalMessageCell(message: {
-    address: string;
-    amount: string | bigint;
-    payload?: string;
-    stateInit?: string;
-}): Cell {
+function buildInternalMessageCell(message: TransactionRequestMessage): Cell {
     const to = Address.parse(message.address);
     const value = BigInt(message.amount);
     const body = message.payload ? Cell.fromBase64(message.payload) : beginCell().endCell();
-    const init = message.stateInit ? parseStateInit(message.stateInit) : undefined;
+    const init = message.stateInit ? loadStateInit(Cell.fromBase64(message.stateInit).beginParse()) : undefined;
 
     return beginCell()
         .storeWritable(
@@ -189,6 +185,10 @@ function buildInternalMessageCell(message: {
                 internal({
                     to,
                     value,
+                    // Jetton transfers (the primary gasless use case) require bounce=true;
+                    // TransactionRequestMessage does not carry a bounce flag, so we default
+                    // to true. Callers needing non-bounceable messages should handle that
+                    // outside the gasless flow.
                     bounce: true,
                     body,
                     init,
@@ -198,16 +198,6 @@ function buildInternalMessageCell(message: {
         .endCell();
 }
 
-function parseStateInit(base64: string) {
-    const cell = Cell.fromBase64(base64);
-    const slice = cell.beginParse();
-    const maybeCodeBit = slice.loadBit();
-    const code = maybeCodeBit ? slice.loadRef() : undefined;
-    const maybeDataBit = slice.loadBit();
-    const data = maybeDataBit ? slice.loadRef() : undefined;
-    return { code, data };
-}
-
 /**
  * Convert an internal-message BoC (what `wallet.signMessage` returns) into an
  * external message BoC that the relayer accepts for broadcast.

From 960555a6dca28b8aca0685e781ed663119f73c3b Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 20 Apr 2026 22:20:41 +0400
Subject: [PATCH 04/46] feat(gasless): move types to models

---
 apps/appkit-minter/src/pages/gasless-page.tsx |  4 +-
 .../src/actions/gasless/estimate-gasless.ts   |  2 +-
 .../gasless/send-gasless-transaction.ts       | 13 +--
 packages/appkit/src/gasless/index.ts          |  1 -
 .../src/api/interfaces/GaslessAPI.ts          | 12 +--
 .../src/api/models/gasless/GaslessConfig.ts   | 23 +++++
 .../models/gasless/GaslessEstimateParams.ts   | 27 ++++++
 .../models/gasless/GaslessEstimateResult.ts   | 31 ++++++
 .../api/models/gasless/GaslessGasJetton.ts    | 17 ++++
 .../api/models/gasless/GaslessSendParams.ts   | 19 ++++
 packages/walletkit/src/api/models/index.ts    |  7 ++
 .../src/defi/gasless/GaslessManager.ts        | 12 +--
 .../src/defi/gasless/GaslessProvider.ts       | 12 +--
 packages/walletkit/src/defi/gasless/index.ts  |  8 --
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 95 +++----------------
 .../src/defi/gasless/tonapi/utils.ts          | 80 ++++++++++++++++
 packages/walletkit/src/defi/gasless/types.ts  | 85 -----------------
 packages/walletkit/src/index.ts               |  8 --
 18 files changed, 233 insertions(+), 223 deletions(-)
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessConfig.ts
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessEstimateParams.ts
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessEstimateResult.ts
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessSendParams.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/utils.ts
 delete mode 100644 packages/walletkit/src/defi/gasless/types.ts

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index be2093b4d..26d33a95c 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -16,7 +16,7 @@ import {
     useJettonWalletAddress,
 } from '@ton/appkit-react';
 import type { Base64String } from '@ton/appkit-react';
-import { parseUnits, createJettonTransferPayload } from '@ton/appkit';
+import { parseUnits, createJettonTransferPayload, compareAddress } from '@ton/appkit';
 import { toast } from 'sonner';
 
 import { Card, Layout } from '@/core/components';
@@ -50,7 +50,7 @@ export const GaslessPage: FC = () => {
     }, [address, recipient]);
 
     const isUsdtSupported = useMemo(() => {
-        return gaslessConfig?.gasJettons.some((j) => j.masterId === USDT_MASTER_MAINNET);
+        return gaslessConfig?.supportedGasJettons.some((j) => compareAddress(j.jettonMaster, USDT_MASTER_MAINNET));
     }, [gaslessConfig]);
 
     const handleSend = async () => {
diff --git a/packages/appkit/src/actions/gasless/estimate-gasless.ts b/packages/appkit/src/actions/gasless/estimate-gasless.ts
index 9a4afb297..114b4000b 100644
--- a/packages/appkit/src/actions/gasless/estimate-gasless.ts
+++ b/packages/appkit/src/actions/gasless/estimate-gasless.ts
@@ -29,7 +29,7 @@ export type EstimateGaslessErrorType = Error;
  * Ask the relayer to estimate a gasless transaction.
  *
  * Returns relayer-wrapped messages (ready to be signed via `signMessage`), the
- * commission charged in the fee jetton, and the bundle validity window.
+ * fee charged in the fee jetton, and the bundle validity window.
  */
 export const estimateGasless = async (
     appKit: AppKit,
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index 0e20b478f..3a82dcf9f 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import type { GaslessSendResult } from '@ton/walletkit';
+import type { TokenAmount } from '@ton/walletkit';
 
 import type { Base64String } from '../../types/primitives';
 import type { TransactionRequestMessage } from '../../types/transaction';
@@ -25,10 +25,8 @@ export interface SendGaslessTransactionParameters {
 export interface SendGaslessTransactionReturnType {
     /** Signed internal BoC that was submitted to the relayer */
     internalBoc: Base64String;
-    /** Relayer commission in fee-jetton nanounits */
-    commission: bigint;
-    /** Provider-specific relayer response */
-    relayerResponse: GaslessSendResult;
+    /** Relayer fee in fee-jetton nanounits */
+    fee: TokenAmount;
 }
 
 export type SendGaslessTransactionErrorType = Error;
@@ -68,7 +66,7 @@ export const sendGaslessTransaction = async (
         validUntil: estimate.validUntil,
     });
 
-    const relayerResponse = await appKit.gaslessManager.send(
+    await appKit.gaslessManager.send(
         {
             walletPublicKey,
             internalBoc,
@@ -78,7 +76,6 @@ export const sendGaslessTransaction = async (
 
     return {
         internalBoc,
-        commission: estimate.commission,
-        relayerResponse,
+        fee: estimate.fee,
     };
 };
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index 7c771ffb3..5aa5053dc 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -16,5 +16,4 @@ export type {
     GaslessEstimateParams,
     GaslessEstimateResult,
     GaslessSendParams,
-    GaslessSendResult,
 } from '@ton/walletkit';
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
index 3e59b0890..1b2f027e5 100644
--- a/packages/walletkit/src/api/interfaces/GaslessAPI.ts
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -6,13 +6,7 @@
  *
  */
 
-import type {
-    GaslessConfig,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
-    GaslessSendParams,
-    GaslessSendResult,
-} from '../../defi/gasless/types';
+import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../models';
 import type { DefiManagerAPI } from './DefiManagerAPI';
 import type { DefiProvider } from './DefiProvider';
 
@@ -46,7 +40,7 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
      * @param params Signed message and wallet public key
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
-    send(params: GaslessSendParams, providerId?: string): Promise<GaslessSendResult>;
+    send(params: GaslessSendParams, providerId?: string): Promise<void>;
 }
 
 /**
@@ -73,5 +67,5 @@ export interface GaslessProviderInterface extends DefiProvider {
     /**
      * Submit a signed transaction BoC to the relayer.
      */
-    send(params: GaslessSendParams): Promise<GaslessSendResult>;
+    send(params: GaslessSendParams): Promise<void>;
 }
diff --git a/packages/walletkit/src/api/models/gasless/GaslessConfig.ts b/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
new file mode 100644
index 000000000..c61be999a
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { UserFriendlyAddress } from '../core/Primitives';
+import type { GaslessGasJetton } from './GaslessGasJetton';
+
+/**
+ * Relayer configuration for gasless transactions.
+ *
+ * Reports which jettons the relayer accepts as fee payment and the address
+ * where the relayer fee is routed.
+ */
+export interface GaslessConfig {
+    /** Address where the relayer expects to receive the fee */
+    relayAddress: UserFriendlyAddress;
+    /** Jettons supported by the relayer for paying the fee */
+    supportedGasJettons: GaslessGasJetton[];
+}
diff --git a/packages/walletkit/src/api/models/gasless/GaslessEstimateParams.ts b/packages/walletkit/src/api/models/gasless/GaslessEstimateParams.ts
new file mode 100644
index 000000000..de1298172
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessEstimateParams.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Hex, UserFriendlyAddress } from '../core/Primitives';
+import type { TransactionRequestMessage } from '../transactions/TransactionRequest';
+
+/**
+ * Parameters to estimate a gasless transaction.
+ *
+ * The relayer wraps the caller's messages with fee-collection logic and
+ * returns a new set of messages that the wallet should sign via `signMessage`.
+ */
+export interface GaslessEstimateParams {
+    /** Master address of the jetton used to pay the relayer's fee */
+    feeJettonMaster: UserFriendlyAddress;
+    /** Sender wallet address */
+    walletAddress: UserFriendlyAddress;
+    /** Sender wallet public key */
+    walletPublicKey: Hex;
+    /** Messages that the caller wants to include in the transaction */
+    messages: TransactionRequestMessage[];
+}
diff --git a/packages/walletkit/src/api/models/gasless/GaslessEstimateResult.ts b/packages/walletkit/src/api/models/gasless/GaslessEstimateResult.ts
new file mode 100644
index 000000000..2ac48d670
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessEstimateResult.ts
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { UserFriendlyAddress } from '../core/Primitives';
+import type { TokenAmount } from '../core/TokenAmount';
+import type { TransactionRequestMessage } from '../transactions/TransactionRequest';
+
+/**
+ * Result of gasless estimation.
+ *
+ * Contains relayer-wrapped messages that should be passed to `wallet.signMessage`
+ * in place of the caller's original messages, together with the fee the relayer
+ * will deduct and the timestamp after which the estimate expires.
+ */
+export interface GaslessEstimateResult {
+    /** Relayer-wrapped messages ready to be signed */
+    messages: TransactionRequestMessage[];
+    /** Relayer fee in fee-jetton nanounits */
+    fee: TokenAmount;
+    /** Unix timestamp after which the bundle becomes invalid for relay */
+    validUntil: number;
+    /** Address of the relayer that produced this estimate */
+    relayAddress: UserFriendlyAddress;
+    /** Sender wallet address echoed by the relayer */
+    from: UserFriendlyAddress;
+}
diff --git a/packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts b/packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts
new file mode 100644
index 000000000..d8cb80417
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { UserFriendlyAddress } from '../core/Primitives';
+
+/**
+ * A jetton accepted by the relayer as a fee payment option.
+ */
+export interface GaslessGasJetton {
+    /** Jetton master address */
+    jettonMaster: UserFriendlyAddress;
+}
diff --git a/packages/walletkit/src/api/models/gasless/GaslessSendParams.ts b/packages/walletkit/src/api/models/gasless/GaslessSendParams.ts
new file mode 100644
index 000000000..829a2ef90
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessSendParams.ts
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Base64String, Hex } from '../core/Primitives';
+
+/**
+ * Parameters to submit a signed gasless transaction to the relayer.
+ */
+export interface GaslessSendParams {
+    /** Sender wallet public key */
+    walletPublicKey: Hex;
+    /** Signed internal-message BoC obtained from `wallet.signMessage` */
+    internalBoc: Base64String;
+}
diff --git a/packages/walletkit/src/api/models/index.ts b/packages/walletkit/src/api/models/index.ts
index f6e946734..fbc6750a0 100644
--- a/packages/walletkit/src/api/models/index.ts
+++ b/packages/walletkit/src/api/models/index.ts
@@ -137,6 +137,13 @@ export type { StakingQuoteParams } from './staking/StakingQuoteParams';
 export type { UnstakeModes } from './staking/UnstakeMode';
 export { UnstakeMode } from './staking/UnstakeMode';
 
+// Gasless models
+export type { GaslessConfig } from './gasless/GaslessConfig';
+export type { GaslessGasJetton } from './gasless/GaslessGasJetton';
+export type { GaslessEstimateParams } from './gasless/GaslessEstimateParams';
+export type { GaslessEstimateResult } from './gasless/GaslessEstimateResult';
+export type { GaslessSendParams } from './gasless/GaslessSendParams';
+
 // Transaction models
 export * from './transactions/Transaction';
 export type { TransactionAddressMetadata, TransactionAddressMetadataEntry } from './transactions/TransactionMetadata';
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index e57838838..1ffc7e1c8 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -7,17 +7,11 @@
  */
 
 import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
+import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../../api/models';
 import { globalLogger } from '../../core/Logger';
 import type { ProviderFactoryContext } from '../../types/factory';
 import { DefiManager } from '../DefiManager';
 import { GaslessError } from './errors';
-import type {
-    GaslessConfig,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
-    GaslessSendParams,
-    GaslessSendResult,
-} from './types';
 
 const log = globalLogger.createChild('GaslessManager');
 
@@ -68,11 +62,11 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
     /**
      * Submit a signed transaction BoC to the relayer.
      */
-    async send(params: GaslessSendParams, providerId?: string): Promise<GaslessSendResult> {
+    async send(params: GaslessSendParams, providerId?: string): Promise<void> {
         log.debug('Sending gasless transaction', { providerId: providerId ?? this.defaultProviderId });
 
         try {
-            return await this.getProvider(providerId ?? this.defaultProviderId).send(params);
+            await this.getProvider(providerId ?? this.defaultProviderId).send(params);
         } catch (error) {
             log.error('Failed to send gasless transaction', { error });
             throw error;
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index 0d0f3071b..74ea8056a 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -7,13 +7,7 @@
  */
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
-import type {
-    GaslessConfig,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
-    GaslessSendParams,
-    GaslessSendResult,
-} from './types';
+import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../../api/models';
 
 /**
  * Abstract base class for gasless relay providers.
@@ -28,7 +22,7 @@ import type {
  *
  *   async getConfig(): Promise<GaslessConfig> { ... }
  *   async estimate(params): Promise<GaslessEstimateResult> { ... }
- *   async send(params): Promise<GaslessSendResult> { ... }
+ *   async send(params): Promise<void> { ... }
  * }
  * ```
  */
@@ -38,5 +32,5 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
 
     abstract getConfig(): Promise<GaslessConfig>;
     abstract estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult>;
-    abstract send(params: GaslessSendParams): Promise<GaslessSendResult>;
+    abstract send(params: GaslessSendParams): Promise<void>;
 }
diff --git a/packages/walletkit/src/defi/gasless/index.ts b/packages/walletkit/src/defi/gasless/index.ts
index ef5702477..00e27cc3c 100644
--- a/packages/walletkit/src/defi/gasless/index.ts
+++ b/packages/walletkit/src/defi/gasless/index.ts
@@ -9,11 +9,3 @@
 export { GaslessProvider } from './GaslessProvider';
 export { GaslessManager } from './GaslessManager';
 export { GaslessError } from './errors';
-export type {
-    GaslessConfig,
-    GaslessGasJetton,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
-    GaslessSendParams,
-    GaslessSendResult,
-} from './types';
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 525c2d42a..705208ee4 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -6,31 +6,20 @@
  *
  */
 
-import {
-    Address,
-    beginCell,
-    Cell,
-    external,
-    internal,
-    loadMessageRelaxed,
-    loadStateInit,
-    storeMessage,
-    storeMessageRelaxed,
-} from '@ton/core';
+import { Address } from '@ton/core';
 import type { TonApiClient } from '@ton-api/client';
 
-import type { Base64String, TransactionRequestMessage } from '../../../api/models';
-import { globalLogger } from '../../../core/Logger';
-import { CallForSuccess } from '../../../utils/retry';
-import { GaslessError } from '../errors';
-import { GaslessProvider } from '../GaslessProvider';
 import type {
     GaslessConfig,
     GaslessEstimateParams,
     GaslessEstimateResult,
     GaslessSendParams,
-    GaslessSendResult,
-} from '../types';
+} from '../../../api/models';
+import { globalLogger } from '../../../core/Logger';
+import { CallForSuccess } from '../../../utils/retry';
+import { GaslessError } from '../errors';
+import { GaslessProvider } from '../GaslessProvider';
+import { buildInternalMessageCell, cellToBase64, internalBocToExternalMessageBoc, stripHexPrefix } from './utils';
 
 const log = globalLogger.createChild('TonApiGaslessProvider');
 
@@ -86,8 +75,8 @@ export class TonApiGaslessProvider extends GaslessProvider {
             const cfg = await this.client.gasless.gaslessConfig();
             return {
                 relayAddress: cfg.relayAddress.toString({ bounceable: true }),
-                gasJettons: cfg.gasJettons.map((jetton) => ({
-                    masterId: jetton.masterId.toString({ bounceable: true }),
+                supportedGasJettons: cfg.gasJettons.map((jetton) => ({
+                    jettonMaster: jetton.masterId.toString({ bounceable: true }),
                 })),
             };
         } catch (error) {
@@ -123,7 +112,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
                     payload: message.payload ? cellToBase64(message.payload) : undefined,
                     stateInit: message.stateInit ? cellToBase64(message.stateInit) : undefined,
                 })),
-                commission: result.commission,
+                fee: result.commission.toString(),
                 validUntil: result.validUntil,
                 relayAddress: result.relayAddress.toString({ bounceable: true }),
                 from: result.from.toString({ bounceable: true }),
@@ -138,12 +127,12 @@ export class TonApiGaslessProvider extends GaslessProvider {
         }
     }
 
-    async send(params: GaslessSendParams): Promise<GaslessSendResult> {
+    async send(params: GaslessSendParams): Promise<void> {
         const walletPublicKey = stripHexPrefix(params.walletPublicKey);
         const externalBoc = internalBocToExternalMessageBoc(params.internalBoc);
 
         try {
-            const result = await CallForSuccess(
+            await CallForSuccess(
                 () =>
                     this.client.gasless.gaslessSend({
                         walletPublicKey,
@@ -152,8 +141,6 @@ export class TonApiGaslessProvider extends GaslessProvider {
                 this.sendRetries,
                 this.sendRetryDelayMs,
             );
-
-            return (result ?? {}) as GaslessSendResult;
         } catch (error) {
             log.error('Failed to send gasless transaction', { error });
             throw new GaslessError(
@@ -164,61 +151,3 @@ export class TonApiGaslessProvider extends GaslessProvider {
         }
     }
 }
-
-function stripHexPrefix(value: string): string {
-    return value.startsWith('0x') ? value.slice(2) : value;
-}
-
-function cellToBase64(cell: Cell): Base64String {
-    return cell.toBoc().toString('base64') as Base64String;
-}
-
-function buildInternalMessageCell(message: TransactionRequestMessage): Cell {
-    const to = Address.parse(message.address);
-    const value = BigInt(message.amount);
-    const body = message.payload ? Cell.fromBase64(message.payload) : beginCell().endCell();
-    const init = message.stateInit ? loadStateInit(Cell.fromBase64(message.stateInit).beginParse()) : undefined;
-
-    return beginCell()
-        .storeWritable(
-            storeMessageRelaxed(
-                internal({
-                    to,
-                    value,
-                    // Jetton transfers (the primary gasless use case) require bounce=true;
-                    // TransactionRequestMessage does not carry a bounce flag, so we default
-                    // to true. Callers needing non-bounceable messages should handle that
-                    // outside the gasless flow.
-                    bounce: true,
-                    body,
-                    init,
-                }),
-            ),
-        )
-        .endCell();
-}
-
-/**
- * Convert an internal-message BoC (what `wallet.signMessage` returns) into an
- * external message BoC that the relayer accepts for broadcast.
- */
-function internalBocToExternalMessageBoc(internalBoc: Base64String): Cell {
-    const parsed = Cell.fromBase64(internalBoc);
-    const { info, body, init } = loadMessageRelaxed(parsed.beginParse());
-
-    if (info.type !== 'internal') {
-        throw new GaslessError('Signed message must be an internal message', GaslessError.SEND_FAILED);
-    }
-
-    return beginCell()
-        .storeWritable(
-            storeMessage(
-                external({
-                    to: info.dest,
-                    init: init ?? undefined,
-                    body,
-                }),
-            ),
-        )
-        .endCell();
-}
diff --git a/packages/walletkit/src/defi/gasless/tonapi/utils.ts b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
new file mode 100644
index 000000000..1f389cfe7
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+    Address,
+    beginCell,
+    Cell,
+    external,
+    internal,
+    loadMessageRelaxed,
+    loadStateInit,
+    storeMessage,
+    storeMessageRelaxed,
+} from '@ton/core';
+
+import type { Base64String, TransactionRequestMessage } from '../../../api/models';
+import { GaslessError } from '../errors';
+
+export const stripHexPrefix = (value: string): string => {
+    return value.startsWith('0x') ? value.slice(2) : value;
+};
+
+export const cellToBase64 = (cell: Cell): Base64String => {
+    return cell.toBoc().toString('base64') as Base64String;
+};
+
+export const buildInternalMessageCell = (message: TransactionRequestMessage): Cell => {
+    const to = Address.parse(message.address);
+    const value = BigInt(message.amount);
+    const body = message.payload ? Cell.fromBase64(message.payload) : beginCell().endCell();
+    const init = message.stateInit ? loadStateInit(Cell.fromBase64(message.stateInit).beginParse()) : undefined;
+
+    return beginCell()
+        .storeWritable(
+            storeMessageRelaxed(
+                internal({
+                    to,
+                    value,
+                    // Jetton transfers (the primary gasless use case) require bounce=true;
+                    // TransactionRequestMessage does not carry a bounce flag, so we default
+                    // to true. Callers needing non-bounceable messages should handle that
+                    // outside the gasless flow.
+                    bounce: true,
+                    body,
+                    init,
+                }),
+            ),
+        )
+        .endCell();
+};
+
+/**
+ * Convert an internal-message BoC (what `wallet.signMessage` returns) into an
+ * external message BoC that the relayer accepts for broadcast.
+ */
+export const internalBocToExternalMessageBoc = (internalBoc: Base64String): Cell => {
+    const parsed = Cell.fromBase64(internalBoc);
+    const { info, body, init } = loadMessageRelaxed(parsed.beginParse());
+
+    if (info.type !== 'internal') {
+        throw new GaslessError('Signed message must be an internal message', GaslessError.SEND_FAILED);
+    }
+
+    return beginCell()
+        .storeWritable(
+            storeMessage(
+                external({
+                    to: info.dest,
+                    init: init ?? undefined,
+                    body,
+                }),
+            ),
+        )
+        .endCell();
+};
diff --git a/packages/walletkit/src/defi/gasless/types.ts b/packages/walletkit/src/defi/gasless/types.ts
deleted file mode 100644
index de7c956fd..000000000
--- a/packages/walletkit/src/defi/gasless/types.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import type { Base64String, Hex, UserFriendlyAddress } from '../../api/models/core/Primitives';
-import type { TransactionRequestMessage } from '../../api/models/transactions/TransactionRequest';
-
-/**
- * Relayer configuration for gasless transactions.
- *
- * Reports which jettons the relayer accepts as fee payment and the address
- * where relayer commission is routed.
- */
-export interface GaslessConfig {
-    /** Address where the relayer expects to receive the commission */
-    relayAddress: UserFriendlyAddress;
-    /** Jettons supported by the relayer for paying the fee */
-    gasJettons: GaslessGasJetton[];
-}
-
-/**
- * A jetton accepted by the relayer as a fee payment option.
- */
-export interface GaslessGasJetton {
-    /** Jetton master address */
-    masterId: UserFriendlyAddress;
-}
-
-/**
- * Parameters to estimate a gasless transaction.
- *
- * The relayer wraps the caller's messages with commission-collection logic and
- * returns a new set of messages that the wallet should sign via `signMessage`.
- */
-export interface GaslessEstimateParams {
-    /** Master address of the jetton used to pay the relayer's fee */
-    feeJettonMaster: UserFriendlyAddress;
-    /** Sender wallet address */
-    walletAddress: UserFriendlyAddress;
-    /** Sender wallet public key */
-    walletPublicKey: Hex;
-    /** Messages that the caller wants to include in the transaction */
-    messages: TransactionRequestMessage[];
-}
-
-/**
- * Result of gasless estimation.
- *
- * Contains relayer-wrapped messages that should be passed to `wallet.signMessage`
- * in place of the caller's original messages, together with the commission the
- * relayer will deduct and the timestamp after which the estimate expires.
- */
-export interface GaslessEstimateResult {
-    /** Relayer-wrapped messages ready to be signed */
-    messages: TransactionRequestMessage[];
-    /** Relayer commission in fee-jetton nanounits */
-    commission: bigint;
-    /** Unix timestamp after which the bundle becomes invalid for relay */
-    validUntil: number;
-    /** Address of the relayer that produced this estimate */
-    relayAddress: UserFriendlyAddress;
-    /** Sender wallet address echoed by the relayer */
-    from: UserFriendlyAddress;
-}
-
-/**
- * Parameters to submit a signed gasless transaction to the relayer.
- */
-export interface GaslessSendParams {
-    /** Sender wallet public key */
-    walletPublicKey: Hex;
-    /** Signed internal-message BoC obtained from `wallet.signMessage` */
-    internalBoc: Base64String;
-}
-
-/**
- * Result of submitting a signed gasless transaction to the relayer.
- *
- * Fields are provider-specific; callers should not rely on a particular shape.
- */
-export type GaslessSendResult = Record<string, unknown>;
diff --git a/packages/walletkit/src/index.ts b/packages/walletkit/src/index.ts
index 0f79ad429..963a8c7db 100644
--- a/packages/walletkit/src/index.ts
+++ b/packages/walletkit/src/index.ts
@@ -23,14 +23,6 @@ export { DefiError, DefiErrorCode } from './defi/errors';
 export { SwapManager, SwapProvider, SwapError, SwapErrorCode } from './defi/swap';
 export { StakingManager, StakingProvider, StakingError, StakingErrorCode } from './defi/staking';
 export { GaslessManager, GaslessProvider, GaslessError } from './defi/gasless';
-export type {
-    GaslessConfig,
-    GaslessGasJetton,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
-    GaslessSendParams,
-    GaslessSendResult,
-} from './defi/gasless';
 export { EventEmitter } from './core/EventEmitter';
 export type { EventListener, EventPayload, KitEvent } from './core/EventEmitter';
 export type { SharedKitEvents } from './types/emitter';

From 6f873388dcbbaface3cd85de42b369b40946bb63 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Sun, 24 May 2026 22:40:28 +0400
Subject: [PATCH 05/46] feat(gasless): fixes after merge

---
 apps/appkit-minter/src/pages/gasless-page.tsx |  6 +-
 .../src/pages/sign-message-page.tsx           | 79 ++++++++++++++++++-
 packages/appkit/src/types/provider.ts         | 13 ++-
 .../src/defi/gasless/GaslessProvider.ts       |  9 ++-
 packages/walletkit/src/defi/gasless/errors.ts | 19 +++--
 .../gasless/tonapi/TonApiGaslessProvider.ts   |  5 ++
 6 files changed, 115 insertions(+), 16 deletions(-)

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index 26d33a95c..daa4a7b54 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -19,7 +19,7 @@ import type { Base64String } from '@ton/appkit-react';
 import { parseUnits, createJettonTransferPayload, compareAddress } from '@ton/appkit';
 import { toast } from 'sonner';
 
-import { Card, Layout } from '@/core/components';
+import { Layout } from '@/core/components';
 
 const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 
@@ -87,7 +87,7 @@ export const GaslessPage: FC = () => {
 
     return (
         <Layout title="Gasless Transfer">
-            <Card className="w-full max-w-[434px] mx-auto p-6 space-y-6">
+            <div className="w-full max-w-[434px] mx-auto p-6 space-y-6 rounded-2xl border border-border bg-card">
                 <div className="space-y-2">
                     <h2 className="text-xl font-semibold">Send USDT (Gasless)</h2>
                     <p className="text-sm text-muted-foreground">
@@ -147,7 +147,7 @@ export const GaslessPage: FC = () => {
                         )}
                     </div>
                 )}
-            </Card>
+            </div>
         </Layout>
     );
 };
diff --git a/apps/appkit-minter/src/pages/sign-message-page.tsx b/apps/appkit-minter/src/pages/sign-message-page.tsx
index fef84a09a..c019853ee 100644
--- a/apps/appkit-minter/src/pages/sign-message-page.tsx
+++ b/apps/appkit-minter/src/pages/sign-message-page.tsx
@@ -6,15 +6,86 @@
  *
  */
 
-import type React from 'react';
+import { useState } from 'react';
+import type { FC } from 'react';
+import { useSignText, useSelectedWallet } from '@ton/appkit-react';
+import { toast } from 'sonner';
 
 import { Layout } from '@/core/components';
-import { SignMessageCard } from '@/features/signing';
 
-export const SignMessagePage: React.FC = () => {
+export const SignMessagePage: FC = () => {
+    const [message, setMessage] = useState('');
+    const [signature, setSignature] = useState<string | null>(null);
+
+    const [wallet] = useSelectedWallet();
+    const { mutate: signText, isPending } = useSignText({
+        mutation: {
+            onSuccess: (result) => {
+                setSignature(result.signature);
+                toast.success('Message signed successfully!');
+            },
+            onError: (error) => {
+                toast.error(`Signing failed: ${error.message}`);
+            },
+        },
+    });
+
+    const handleSign = () => {
+        if (!wallet || !message.trim()) {
+            toast.error('Please enter a message to sign');
+            return;
+        }
+
+        signText({ text: message });
+    };
+
+    const handleCopySignature = () => {
+        if (signature) {
+            navigator.clipboard.writeText(signature);
+            toast.success('Signature copied to clipboard!');
+        }
+    };
+
     return (
         <Layout title="Sign Message">
-            <SignMessageCard className="w-full max-w-[488px] mx-auto" />
+            <div className="w-full max-w-[488px] mx-auto p-6 space-y-4 rounded-2xl border border-border bg-card">
+                <h2 className="text-xl font-semibold">Sign Message</h2>
+
+                <div>
+                    <label className="block text-sm font-medium text-foreground mb-2">Message to sign</label>
+                    <textarea
+                        className="w-full p-3 bg-muted border border-border rounded-lg text-foreground placeholder:text-muted-foreground resize-none focus:outline-none focus:ring-2 focus:ring-primary"
+                        rows={3}
+                        placeholder="Enter your message here..."
+                        value={message}
+                        onChange={(e) => setMessage(e.target.value)}
+                        disabled={isPending}
+                    />
+                </div>
+
+                <button
+                    className="w-full py-3 bg-primary text-primary-foreground rounded-xl font-semibold disabled:opacity-50"
+                    onClick={handleSign}
+                    disabled={!wallet || !message.trim() || isPending}
+                >
+                    {isPending ? 'Signing...' : 'Sign Message'}
+                </button>
+
+                {signature && (
+                    <div className="space-y-2">
+                        <label className="block text-sm font-medium text-foreground">Signature</label>
+                        <div className="p-3 bg-muted border border-border rounded-lg break-all text-xs font-mono">
+                            {signature}
+                        </div>
+                        <button
+                            className="w-full py-2 bg-secondary text-secondary-foreground rounded-lg text-sm"
+                            onClick={handleCopySignature}
+                        >
+                            Copy Signature
+                        </button>
+                    </div>
+                )}
+            </div>
         </Layout>
     );
 };
diff --git a/packages/appkit/src/types/provider.ts b/packages/appkit/src/types/provider.ts
index d83d060d0..50ba16ea5 100644
--- a/packages/appkit/src/types/provider.ts
+++ b/packages/appkit/src/types/provider.ts
@@ -6,9 +6,18 @@
  *
  */
 
-import type { SwapProviderInterface, StakingProviderInterface, StreamingProvider } from '@ton/walletkit';
+import type {
+    SwapProviderInterface,
+    StakingProviderInterface,
+    StreamingProvider,
+    GaslessProviderInterface,
+} from '@ton/walletkit';
 
 /**
  * Available provider types in AppKit.
  */
-export type AppKitProvider = SwapProviderInterface | StakingProviderInterface | StreamingProvider;
+export type AppKitProvider =
+    | SwapProviderInterface
+    | StakingProviderInterface
+    | StreamingProvider
+    | GaslessProviderInterface;
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index 74ea8056a..6750771ae 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -7,7 +7,13 @@
  */
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
-import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../../api/models';
+import type {
+    GaslessConfig,
+    GaslessEstimateParams,
+    GaslessEstimateResult,
+    GaslessSendParams,
+    Network,
+} from '../../api/models';
 
 /**
  * Abstract base class for gasless relay providers.
@@ -30,6 +36,7 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
     readonly type = 'gasless';
     abstract readonly providerId: string;
 
+    abstract getSupportedNetworks(): Network[];
     abstract getConfig(): Promise<GaslessConfig>;
     abstract estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult>;
     abstract send(params: GaslessSendParams): Promise<void>;
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index a0374cb5c..b868bdc75 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -6,13 +6,20 @@
  *
  */
 
-import { DefiManagerError } from '../errors';
+import { DefiError } from '../errors';
 
-export class GaslessError extends DefiManagerError {
-    static readonly UNSUPPORTED_FEE_JETTON = 'UNSUPPORTED_FEE_JETTON';
-    static readonly ESTIMATE_FAILED = 'ESTIMATE_FAILED';
-    static readonly SEND_FAILED = 'SEND_FAILED';
-    static readonly CONFIG_FAILED = 'CONFIG_FAILED';
+export enum GaslessErrorCode {
+    UnsupportedFeeJetton = 'UNSUPPORTED_FEE_JETTON',
+    EstimateFailed = 'ESTIMATE_FAILED',
+    SendFailed = 'SEND_FAILED',
+    ConfigFailed = 'CONFIG_FAILED',
+}
+
+export class GaslessError extends DefiError {
+    static readonly UNSUPPORTED_FEE_JETTON = GaslessErrorCode.UnsupportedFeeJetton;
+    static readonly ESTIMATE_FAILED = GaslessErrorCode.EstimateFailed;
+    static readonly SEND_FAILED = GaslessErrorCode.SendFailed;
+    static readonly CONFIG_FAILED = GaslessErrorCode.ConfigFailed;
 
     constructor(message: string, code: string, details?: unknown) {
         super(message, code, details);
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 705208ee4..9f0c989cb 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -15,6 +15,7 @@ import type {
     GaslessEstimateResult,
     GaslessSendParams,
 } from '../../../api/models';
+import { Network } from '../../../api/models';
 import { globalLogger } from '../../../core/Logger';
 import { CallForSuccess } from '../../../utils/retry';
 import { GaslessError } from '../errors';
@@ -70,6 +71,10 @@ export class TonApiGaslessProvider extends GaslessProvider {
         this.sendRetryDelayMs = config.sendRetryDelayMs ?? 2000;
     }
 
+    getSupportedNetworks(): Network[] {
+        return [Network.mainnet()];
+    }
+
     async getConfig(): Promise<GaslessConfig> {
         try {
             const cfg = await this.client.gasless.gaslessConfig();

From a8edbf856754c31e58ccdb71aa4e74feb22efa8f Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 12:33:27 +0400
Subject: [PATCH 06/46] feat(gasless): polishing

---
 .../appkit-minter/src/core/configs/app-kit.ts |   4 +-
 apps/appkit-minter/src/pages/gasless-page.tsx | 204 ++++++++++----
 .../appkit/actions/gasless/gasless-actions.ts |  75 ++++++
 .../appkit/actions/gasless/gasless.test.ts    |  96 +++++++
 .../hooks/gasless/use-gasless-config.tsx      |  27 ++
 .../hooks/gasless/use-gasless-estimate.tsx    |  37 +++
 .../hooks/gasless/use-gasless-provider.tsx    |  21 ++
 .../hooks/gasless/use-gasless-providers.tsx   |  22 ++
 .../gasless/use-send-gasless-transaction.tsx  |  44 +++
 packages/appkit-react/docs/hooks.md           | 104 ++++++++
 .../gasless/hooks/use-estimate-gasless.ts     |  45 ----
 .../gasless/hooks/use-gasless-estimate.ts     |  42 +++
 .../gasless/hooks/use-gasless-provider.ts     |  54 ++++
 .../gasless/hooks/use-gasless-providers.ts    |  37 +++
 .../hooks/use-send-gasless-transaction.ts     |   2 +
 .../src/features/gasless/index.ts             |  10 +-
 packages/appkit/docs/actions.md               | 101 +++++++
 ...ate-gasless.ts => get-gasless-estimate.ts} |  23 +-
 .../actions/gasless/get-gasless-manager.ts    |  20 ++
 .../actions/gasless/get-gasless-provider.ts   |  24 ++
 .../actions/gasless/get-gasless-providers.ts  |  20 ++
 .../gasless/send-gasless-transaction.test.ts  | 144 ++++++++++
 .../gasless/send-gasless-transaction.ts       |  63 +++--
 .../gasless/set-default-gasless-provider.ts   |  26 ++
 .../gasless/watch-gasless-providers.ts        |  38 +++
 packages/appkit/src/actions/index.ts          |  27 +-
 packages/appkit/src/gasless/index.ts          |   2 +-
 .../src/queries/gasless/estimate-gasless.ts   |  60 -----
 .../queries/gasless/get-gasless-estimate.ts   |  80 ++++++
 .../gasless/send-gasless-transaction.ts       |  38 ++-
 packages/appkit/src/queries/index.ts          |  17 +-
 packages/appkit/src/utils/index.ts            |   2 +-
 .../src/defi/gasless/GaslessManager.spec.ts   | 200 ++++++++++++++
 .../src/defi/gasless/GaslessManager.ts        |   3 +-
 packages/walletkit/src/defi/gasless/README.md | 137 ++++++++++
 packages/walletkit/src/defi/gasless/errors.ts |  10 +-
 packages/walletkit/src/defi/gasless/index.ts  |   2 +-
 .../tonapi/TonApiGaslessProvider.spec.ts      | 250 ++++++++++++++++++
 .../gasless/tonapi/TonApiGaslessProvider.ts   |  25 +-
 .../src/defi/gasless/tonapi/index.ts          |   2 +-
 .../src/defi/gasless/tonapi/utils.spec.ts     | 127 +++++++++
 .../src/defi/gasless/tonapi/utils.ts          |   4 +-
 packages/walletkit/src/index.ts               |   3 +-
 43 files changed, 2031 insertions(+), 241 deletions(-)
 create mode 100644 demo/examples/src/appkit/actions/gasless/gasless-actions.ts
 create mode 100644 demo/examples/src/appkit/actions/gasless/gasless.test.ts
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-estimate.tsx
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-provider.tsx
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-providers.tsx
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
 delete mode 100644 packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-provider.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-providers.ts
 rename packages/appkit/src/actions/gasless/{estimate-gasless.ts => get-gasless-estimate.ts} (68%)
 create mode 100644 packages/appkit/src/actions/gasless/get-gasless-manager.ts
 create mode 100644 packages/appkit/src/actions/gasless/get-gasless-provider.ts
 create mode 100644 packages/appkit/src/actions/gasless/get-gasless-providers.ts
 create mode 100644 packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
 create mode 100644 packages/appkit/src/actions/gasless/set-default-gasless-provider.ts
 create mode 100644 packages/appkit/src/actions/gasless/watch-gasless-providers.ts
 delete mode 100644 packages/appkit/src/queries/gasless/estimate-gasless.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-estimate.ts
 create mode 100644 packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
 create mode 100644 packages/walletkit/src/defi/gasless/README.md
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/utils.spec.ts

diff --git a/apps/appkit-minter/src/core/configs/app-kit.ts b/apps/appkit-minter/src/core/configs/app-kit.ts
index cd5903d2a..bdf838705 100644
--- a/apps/appkit-minter/src/core/configs/app-kit.ts
+++ b/apps/appkit-minter/src/core/configs/app-kit.ts
@@ -17,7 +17,7 @@ import {
 import { createDeDustProvider } from '@ton/appkit/swap/dedust';
 import { createOmnistonProvider } from '@ton/appkit/swap/omniston';
 import { createTonstakersProvider } from '@ton/appkit/staking/tonstakers';
-import { TonApiGaslessProvider } from '@ton/appkit/gasless/tonapi';
+import { createTonApiGaslessProvider } from '@ton/appkit/gasless/tonapi';
 import { TonApiClient } from '@ton-api/client';
 
 import { ENV_TON_API_KEY_TESTNET, ENV_TON_API_KEY_MAINNET } from '@/core/configs/env';
@@ -60,6 +60,6 @@ export const appKit = new AppKit({
         createTonstakersProvider(),
         createTonCenterStreamingProvider({ network: Network.mainnet(), apiKey: ENV_TON_API_KEY_MAINNET }),
         createTonCenterStreamingProvider({ network: Network.testnet(), apiKey: ENV_TON_API_KEY_TESTNET }),
-        new TonApiGaslessProvider({ client: mainnetTonApi }),
+        createTonApiGaslessProvider({ client: mainnetTonApi }),
     ],
 });
diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index daa4a7b54..b68cd9393 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -6,35 +6,74 @@
  *
  */
 
-import { useState, useMemo, useEffect } from 'react';
+import { useState, useEffect, useMemo } from 'react';
 import type { FC } from 'react';
 import {
-    useGaslessConfig,
-    useSendGaslessTransaction,
     useAddress,
+    useGaslessConfig,
+    useGaslessEstimate,
     useJettonBalanceByAddress,
     useJettonWalletAddress,
+    useSelectedWallet,
+    useSendGaslessTransaction,
 } from '@ton/appkit-react';
-import type { Base64String } from '@ton/appkit-react';
-import { parseUnits, createJettonTransferPayload, compareAddress } from '@ton/appkit';
+import { asBase64, compareAddress, createJettonTransferPayload, GaslessError, parseUnits } from '@ton/appkit';
+import type { GaslessGasJetton, TransactionRequestMessage } from '@ton/appkit';
 import { toast } from 'sonner';
 
 import { Layout } from '@/core/components';
 
 const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+const USDT_DECIMALS = 6;
+const JETTON_FORWARD_TON = parseUnits('0.06', 9).toString();
+
+const formatRelativeTimeFromNow = (timestampSec: number): string => {
+    const diffSec = timestampSec - Math.floor(Date.now() / 1000);
+    if (diffSec <= 0) return 'expired';
+    const min = Math.floor(diffSec / 60);
+    const sec = diffSec % 60;
+    return min > 0 ? `${min}m ${sec}s` : `${sec}s`;
+};
+
+const useNow = (intervalMs = 1000): number => {
+    const [now, setNow] = useState(() => Date.now());
+
+    useEffect(() => {
+        const id = window.setInterval(() => setNow(Date.now()), intervalMs);
+        return () => window.clearInterval(id);
+    }, [intervalMs]);
+
+    return now;
+};
 
 export const GaslessPage: FC = () => {
     const address = useAddress();
+    const [selectedWallet] = useSelectedWallet();
+
     const { data: gaslessConfig, isLoading: isConfigLoading } = useGaslessConfig();
     const { mutateAsync: sendGasless, isPending: isSending } = useSendGaslessTransaction();
 
-    const [amount, setAmount] = useState('0.1');
     const [recipient, setRecipient] = useState('');
+    const [amount, setAmount] = useState('0.1');
+    const [feeJettonMaster, setFeeJettonMaster] = useState<string | null>(null);
+
+    useEffect(() => {
+        if (address && !recipient) setRecipient(address);
+    }, [address, recipient]);
+
+    useEffect(() => {
+        if (!feeJettonMaster && gaslessConfig?.supportedGasJettons.length) {
+            const preferred = gaslessConfig.supportedGasJettons.find((j: GaslessGasJetton) =>
+                compareAddress(j.jettonMaster, USDT_MASTER_MAINNET),
+            );
+            setFeeJettonMaster(preferred?.jettonMaster ?? gaslessConfig.supportedGasJettons[0].jettonMaster);
+        }
+    }, [feeJettonMaster, gaslessConfig]);
 
     const { data: usdtBalance } = useJettonBalanceByAddress({
         jettonAddress: USDT_MASTER_MAINNET,
         ownerAddress: address,
-        jettonDecimals: 6,
+        jettonDecimals: USDT_DECIMALS,
     });
 
     const { data: usdtWalletAddress } = useJettonWalletAddress({
@@ -42,56 +81,88 @@ export const GaslessPage: FC = () => {
         ownerAddress: address,
     });
 
-    // Set own address as default recipient
-    useEffect(() => {
-        if (address && !recipient) {
-            setRecipient(address);
+    const supportsSignMessage = useMemo(() => {
+        const features = selectedWallet?.getSupportedFeatures();
+        if (features === undefined) return true;
+        return features.some((f) => typeof f === 'object' && f.name === 'SignMessage');
+    }, [selectedWallet]);
+
+    const messages = useMemo<TransactionRequestMessage[] | null>(() => {
+        if (!address || !usdtWalletAddress || !recipient || !amount) return null;
+        try {
+            const payload = createJettonTransferPayload({
+                amount: parseUnits(amount, USDT_DECIMALS),
+                destination: recipient,
+                responseDestination: address,
+            });
+            return [
+                {
+                    address: usdtWalletAddress,
+                    amount: JETTON_FORWARD_TON,
+                    payload: asBase64(payload.toBoc().toString('base64')),
+                },
+            ];
+        } catch {
+            return null;
         }
-    }, [address, recipient]);
+    }, [address, amount, recipient, usdtWalletAddress]);
+
+    const {
+        data: estimate,
+        isFetching: isEstimating,
+        error: estimateError,
+    } = useGaslessEstimate({
+        feeJettonMaster: feeJettonMaster ?? undefined,
+        messages: messages ?? undefined,
+        query: { enabled: Boolean(address && feeJettonMaster && messages) },
+    });
 
-    const isUsdtSupported = useMemo(() => {
-        return gaslessConfig?.supportedGasJettons.some((j) => compareAddress(j.jettonMaster, USDT_MASTER_MAINNET));
-    }, [gaslessConfig]);
+    const now = useNow();
+    const validUntilText = useMemo(() => {
+        if (!estimate) return null;
+        // `now` is in the dep array so the countdown ticks every second.
+        void now;
+        return formatRelativeTimeFromNow(estimate.validUntil);
+    }, [estimate, now]);
+
+    const formattedFee = useMemo(() => {
+        if (!estimate) return null;
+        const feeWhole = Number(estimate.fee) / 10 ** USDT_DECIMALS;
+        return feeWhole.toFixed(USDT_DECIMALS);
+    }, [estimate]);
 
     const handleSend = async () => {
-        if (!address || !usdtWalletAddress) {
-            toast.error(!address ? 'Wallet not connected' : 'Could not resolve USDT wallet address');
+        if (!estimate) {
+            toast.error('No estimate available yet');
             return;
         }
 
         try {
-            const payload = createJettonTransferPayload({
-                amount: parseUnits(amount, 6), // USDT has 6 decimals
-                destination: recipient,
-                responseDestination: address,
-            });
-
-            await sendGasless({
-                feeJettonMaster: USDT_MASTER_MAINNET,
-                messages: [
-                    {
-                        address: usdtWalletAddress,
-                        amount: parseUnits('0.06', 9).toString(),
-                        payload: payload.toBoc().toString('base64') as Base64String,
-                    },
-                ],
+            const result = await sendGasless({ estimate });
+            const explorerUrl = `https://tonviewer.com/transaction/${result.internalBoc}`;
+            toast.success('Gasless transaction submitted!', {
+                description: 'View internal BoC on explorer',
+                action: {
+                    label: 'Open',
+                    onClick: () => window.open(explorerUrl, '_blank'),
+                },
             });
-
-            toast.success('Gasless transaction submitted!');
         } catch (error) {
-            // eslint-disable-next-line no-console
-            console.error('Gasless error:', error);
-            toast.error(error instanceof Error ? error.message : 'Failed to send gasless transaction');
+            if (error instanceof GaslessError) {
+                toast.error(`${error.code}: ${error.message}`);
+            } else {
+                toast.error(error instanceof Error ? error.message : 'Failed to send gasless transaction');
+            }
         }
     };
 
     return (
         <Layout title="Gasless Transfer">
-            <div className="w-full max-w-[434px] mx-auto p-6 space-y-6 rounded-2xl border border-border bg-card">
+            <div className="w-full max-w-[488px] mx-auto p-6 space-y-6 rounded-2xl border border-border bg-card">
                 <div className="space-y-2">
                     <h2 className="text-xl font-semibold">Send USDT (Gasless)</h2>
                     <p className="text-sm text-muted-foreground">
-                        Send USDT without having TON for gas. The fee will be paid in USDT.
+                        Send USDT without having TON for gas. The fee is paid in the selected jetton.
                     </p>
                 </div>
 
@@ -101,17 +172,37 @@ export const GaslessPage: FC = () => {
                     </div>
                 )}
 
+                {address && !supportsSignMessage && (
+                    <div className="p-4 bg-red-500/10 border border-red-500/20 rounded-lg text-red-600 text-sm">
+                        Your wallet does not support SignMessage, which is required for gasless transactions.
+                    </div>
+                )}
+
                 {address && (
                     <div className="space-y-4">
                         <div className="space-y-1">
-                            <label className="text-xs font-medium uppercase text-muted-foreground">
-                                Your USDT Balance
-                            </label>
+                            <label className="text-xs font-medium uppercase text-muted-foreground">USDT Balance</label>
                             <div className="text-lg font-mono">
                                 {usdtBalance ? Number(usdtBalance).toFixed(2) : '0.00'} USDT
                             </div>
                         </div>
 
+                        <div className="space-y-2">
+                            <label className="text-sm font-medium">Fee jetton</label>
+                            <select
+                                className="w-full p-2 bg-secondary rounded-md border border-border"
+                                value={feeJettonMaster ?? ''}
+                                onChange={(e) => setFeeJettonMaster(e.target.value)}
+                                disabled={isConfigLoading || !gaslessConfig?.supportedGasJettons.length}
+                            >
+                                {gaslessConfig?.supportedGasJettons.map((j) => (
+                                    <option key={j.jettonMaster} value={j.jettonMaster}>
+                                        {j.jettonMaster.slice(0, 6)}…{j.jettonMaster.slice(-4)}
+                                    </option>
+                                ))}
+                            </select>
+                        </div>
+
                         <div className="space-y-2">
                             <label className="text-sm font-medium">Recipient Address</label>
                             <input
@@ -132,19 +223,32 @@ export const GaslessPage: FC = () => {
                             />
                         </div>
 
+                        {estimateError && (
+                            <div className="text-xs text-red-500">Estimate failed: {estimateError.message}</div>
+                        )}
+
+                        {estimate && (
+                            <div className="grid grid-cols-2 gap-2 text-xs">
+                                <div className="text-muted-foreground">Relayer fee</div>
+                                <div className="text-right font-mono">{formattedFee} USDT</div>
+                                <div className="text-muted-foreground">Valid for</div>
+                                <div className="text-right font-mono">{validUntilText}</div>
+                            </div>
+                        )}
+
                         <button
                             className="w-full py-3 bg-primary text-primary-foreground rounded-xl font-semibold disabled:opacity-50"
                             onClick={handleSend}
-                            disabled={isSending || isConfigLoading || !isUsdtSupported}
+                            disabled={isSending || isEstimating || !estimate || !supportsSignMessage}
                         >
-                            {isSending ? 'Sending...' : isUsdtSupported ? 'Send Gasless' : 'USDT Not Supported'}
+                            {isSending
+                                ? 'Sending…'
+                                : isEstimating
+                                  ? 'Estimating…'
+                                  : !supportsSignMessage
+                                    ? 'SignMessage not supported'
+                                    : 'Send Gasless'}
                         </button>
-
-                        {!isConfigLoading && !isUsdtSupported && (
-                            <p className="text-xs text-red-500 text-center">
-                                Relayer does not support USDT for gas fees on this network.
-                            </p>
-                        )}
                     </div>
                 )}
             </div>
diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
new file mode 100644
index 000000000..6bb4147cd
--- /dev/null
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '@ton/appkit';
+import {
+    getGaslessConfig,
+    getGaslessEstimate,
+    getGaslessManager,
+    getGaslessProvider,
+    getGaslessProviders,
+    sendGaslessTransaction,
+    setDefaultGaslessProvider,
+    watchGaslessProviders,
+} from '@ton/appkit';
+
+export const gaslessExample = async (appKit: AppKit) => {
+    // SAMPLE_START: GET_GASLESS_MANAGER
+    const gaslessManager = getGaslessManager(appKit);
+    // SAMPLE_END: GET_GASLESS_MANAGER
+
+    // SAMPLE_START: GET_GASLESS_PROVIDER
+    const provider = getGaslessProvider(appKit, { id: 'tonapi' });
+    // SAMPLE_END: GET_GASLESS_PROVIDER
+
+    // SAMPLE_START: GET_GASLESS_PROVIDERS
+    const providers = getGaslessProviders(appKit);
+    console.log(
+        'Registered gasless providers:',
+        providers.map((p) => p.providerId),
+    );
+    // SAMPLE_END: GET_GASLESS_PROVIDERS
+
+    // SAMPLE_START: SET_DEFAULT_GASLESS_PROVIDER
+    setDefaultGaslessProvider(appKit, { providerId: 'tonapi' });
+    // SAMPLE_END: SET_DEFAULT_GASLESS_PROVIDER
+
+    // SAMPLE_START: WATCH_GASLESS_PROVIDERS
+    const unsubscribe = watchGaslessProviders(appKit, {
+        onChange: () => console.log('Gasless providers updated'),
+    });
+    unsubscribe();
+    // SAMPLE_END: WATCH_GASLESS_PROVIDERS
+
+    // SAMPLE_START: GET_GASLESS_CONFIG
+    const config = await getGaslessConfig(appKit);
+    const feeJetton = config.supportedGasJettons[0].jettonMaster;
+    console.log('Relay address:', config.relayAddress);
+    // SAMPLE_END: GET_GASLESS_CONFIG
+
+    // SAMPLE_START: GET_GASLESS_ESTIMATE
+    const estimate = await getGaslessEstimate(appKit, {
+        feeJettonMaster: feeJetton,
+        messages: [
+            {
+                address: 'EQ...jetton_wallet_address',
+                amount: '60000000', // 0.06 TON gas budget
+                payload: 'te6cckEBAQEAAgAAAA==' as never,
+            },
+        ],
+    });
+    console.log('Relayer fee:', estimate.fee, 'valid until:', estimate.validUntil);
+    // SAMPLE_END: GET_GASLESS_ESTIMATE
+
+    // SAMPLE_START: SEND_GASLESS_TRANSACTION
+    const { internalBoc, fee } = await sendGaslessTransaction(appKit, { estimate });
+    console.log('Submitted gasless transaction. Fee:', fee, 'BoC:', internalBoc);
+    // SAMPLE_END: SEND_GASLESS_TRANSACTION
+
+    return { gaslessManager, provider, config, estimate };
+};
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
new file mode 100644
index 000000000..925103b0b
--- /dev/null
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { AppKit } from '@ton/appkit';
+import type { WalletInterface } from '@ton/appkit';
+import { Network } from '@ton/walletkit';
+
+import { gaslessExample } from './gasless-actions';
+
+const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+const SIGN_MESSAGE_FEATURE = { name: 'SignMessage', maxMessages: 4 } as const;
+
+describe('Gasless Actions Examples', () => {
+    let appKit: AppKit;
+    let consoleSpy: ReturnType<typeof vi.spyOn>;
+    let mockGetConfig: ReturnType<typeof vi.fn>;
+    let mockEstimate: ReturnType<typeof vi.fn>;
+    let mockSend: ReturnType<typeof vi.fn>;
+    let mockSignMessage: ReturnType<typeof vi.fn>;
+
+    beforeEach(() => {
+        vi.clearAllMocks();
+        consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+
+        appKit = new AppKit({
+            networks: {
+                [Network.mainnet().chainId]: {},
+            },
+        });
+
+        mockGetConfig = vi.fn().mockResolvedValue({
+            relayAddress: TEST_ADDRESS,
+            supportedGasJettons: [{ jettonMaster: TEST_ADDRESS }],
+        });
+        mockEstimate = vi.fn().mockResolvedValue({
+            messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
+            fee: '1234',
+            validUntil: Math.floor(Date.now() / 1000) + 120,
+            relayAddress: TEST_ADDRESS,
+            from: TEST_ADDRESS,
+        });
+        mockSend = vi.fn().mockResolvedValue(undefined);
+        mockSignMessage = vi.fn().mockResolvedValue({ internalBoc: 'AAAA' });
+
+        // @ts-expect-error - internal mock access
+        vi.spyOn(appKit.gaslessManager, 'getProvider').mockImplementation((id) => ({
+            providerId: id || 'default',
+        }));
+        vi.spyOn(appKit.gaslessManager, 'getProviders').mockReturnValue([]);
+        // @ts-expect-error - internal mock access
+        vi.spyOn(appKit.gaslessManager, 'getConfig').mockImplementation(mockGetConfig);
+        // @ts-expect-error - internal mock access
+        vi.spyOn(appKit.gaslessManager, 'estimate').mockImplementation(mockEstimate);
+        // @ts-expect-error - internal mock access
+        vi.spyOn(appKit.gaslessManager, 'send').mockImplementation(mockSend);
+        vi.spyOn(appKit.gaslessManager, 'setDefaultProvider').mockImplementation(() => {});
+    });
+
+    afterEach(() => {
+        consoleSpy.mockRestore();
+    });
+
+    const setupMockWallet = () => {
+        const wallet = {
+            connectorId: 'mock',
+            getAddress: () => TEST_ADDRESS,
+            getPublicKey: () => '0xabc',
+            getNetwork: () => Network.mainnet(),
+            getWalletId: () => 'mock-wallet-id',
+            getSupportedFeatures: () => [SIGN_MESSAGE_FEATURE],
+            sendTransaction: vi.fn(),
+            signData: vi.fn(),
+            signMessage: mockSignMessage,
+        } as unknown as WalletInterface;
+
+        appKit.walletsManager.setWallets([wallet]);
+        return wallet;
+    };
+
+    it('runs the full gasless example flow', async () => {
+        setupMockWallet();
+
+        await gaslessExample(appKit);
+
+        expect(mockGetConfig).toHaveBeenCalled();
+        expect(mockEstimate).toHaveBeenCalled();
+        expect(mockSignMessage).toHaveBeenCalled();
+        expect(mockSend).toHaveBeenCalled();
+    });
+});
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
new file mode 100644
index 000000000..3fb9edf34
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useGaslessConfig } from '@ton/appkit-react';
+
+export const UseGaslessConfigExample = () => {
+    // SAMPLE_START: USE_GASLESS_CONFIG
+    const { data: config, isLoading } = useGaslessConfig();
+
+    if (isLoading) return <div>Loading relayer config...</div>;
+
+    return (
+        <select>
+            {config?.supportedGasJettons.map((j) => (
+                <option key={j.jettonMaster} value={j.jettonMaster}>
+                    {j.jettonMaster}
+                </option>
+            ))}
+        </select>
+    );
+    // SAMPLE_END: USE_GASLESS_CONFIG
+};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-estimate.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-estimate.tsx
new file mode 100644
index 000000000..53a04eeb8
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-estimate.tsx
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Base64String } from '@ton/appkit';
+import { useGaslessEstimate } from '@ton/appkit-react';
+
+export const UseGaslessEstimateExample = () => {
+    // SAMPLE_START: USE_GASLESS_ESTIMATE
+    const { data: estimate, isFetching } = useGaslessEstimate({
+        feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
+        messages: [
+            {
+                address: 'EQ...jetton_wallet_address',
+                amount: '60000000', // 0.06 TON gas budget
+                payload: 'te6cckEBAQEAAgAAAA==' as Base64String,
+            },
+        ],
+    });
+
+    return (
+        <div>
+            {isFetching && <span>Estimating...</span>}
+            {estimate && (
+                <>
+                    <div>Fee: {estimate.fee}</div>
+                    <div>Valid until: {new Date(estimate.validUntil * 1000).toISOString()}</div>
+                </>
+            )}
+        </div>
+    );
+    // SAMPLE_END: USE_GASLESS_ESTIMATE
+};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-provider.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-provider.tsx
new file mode 100644
index 000000000..259f3f40f
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-provider.tsx
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useGaslessProvider } from '@ton/appkit-react';
+
+export const UseGaslessProviderExample = () => {
+    // SAMPLE_START: USE_GASLESS_PROVIDER
+    const [provider, setProviderId] = useGaslessProvider();
+    return (
+        <div>
+            <div>Current: {provider?.providerId ?? 'none'}</div>
+            <button onClick={() => setProviderId('tonapi')}>Use TonApi</button>
+        </div>
+    );
+    // SAMPLE_END: USE_GASLESS_PROVIDER
+};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-providers.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-providers.tsx
new file mode 100644
index 000000000..1824ccdfb
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-providers.tsx
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useGaslessProviders } from '@ton/appkit-react';
+
+export const UseGaslessProvidersExample = () => {
+    // SAMPLE_START: USE_GASLESS_PROVIDERS
+    const providers = useGaslessProviders();
+    return (
+        <ul>
+            {providers.map((p) => (
+                <li key={p.providerId}>{p.providerId}</li>
+            ))}
+        </ul>
+    );
+    // SAMPLE_END: USE_GASLESS_PROVIDERS
+};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
new file mode 100644
index 000000000..ed0589ccb
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Base64String } from '@ton/appkit';
+import { useGaslessEstimate, useSendGaslessTransaction } from '@ton/appkit-react';
+
+/* eslint-disable no-console */
+
+export const UseSendGaslessTransactionExample = () => {
+    // SAMPLE_START: USE_SEND_GASLESS_TRANSACTION
+    const { data: estimate } = useGaslessEstimate({
+        feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
+        messages: [
+            {
+                address: 'EQ...jetton_wallet_address',
+                amount: '60000000',
+                payload: 'te6cckEBAQEAAgAAAA==' as Base64String,
+            },
+        ],
+    });
+    const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
+
+    const handleSend = async () => {
+        if (!estimate) return;
+        try {
+            const { internalBoc, fee } = await sendGasless({ estimate });
+            console.log('Submitted. Fee:', fee, 'BoC:', internalBoc);
+        } catch (e) {
+            console.error(e);
+        }
+    };
+
+    return (
+        <button onClick={handleSend} disabled={!estimate || isPending}>
+            {isPending ? 'Sending...' : 'Send Gasless'}
+        </button>
+    );
+    // SAMPLE_END: USE_SEND_GASLESS_TRANSACTION
+};
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index d7bd4ebcd..3e1818196 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -837,6 +837,110 @@ return (
 );
 ```
 
+## Gasless
+
+Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return. The connected wallet must support the `SignMessage` TonConnect feature.
+
+### `useGaslessConfig`
+
+Hook to fetch the relayer config (supported jettons + relay address).
+
+```tsx
+const { data: config, isLoading } = useGaslessConfig();
+return (
+    <select>
+        {config?.supportedGasJettons.map((j) => (
+            <option key={j.jettonMaster} value={j.jettonMaster}>
+                {j.jettonMaster}
+            </option>
+        ))}
+    </select>
+);
+```
+
+### `useGaslessEstimate`
+
+Hook to fetch a gasless estimate. Auto-refetches as inputs change; cached results become stale after ~2 minutes (matches the relayer `validUntil` window).
+
+```tsx
+const { data: estimate, isFetching } = useGaslessEstimate({
+    feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
+    messages: [
+        {
+            address: 'EQ...jetton_wallet_address',
+            amount: '60000000', // 0.06 TON gas budget
+            payload: jettonTransferPayloadBase64,
+        },
+    ],
+});
+
+return (
+    <div>
+        {isFetching && <span>Estimating...</span>}
+        {estimate && (
+            <>
+                <div>Fee: {estimate.fee}</div>
+                <div>Valid until: {new Date(estimate.validUntil * 1000).toISOString()}</div>
+            </>
+        )}
+    </div>
+);
+```
+
+### `useSendGaslessTransaction`
+
+Hook to sign a previously computed estimate and submit the resulting BoC to the relayer.
+
+Throws:
+- `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the wallet does not advertise `SignMessage`.
+- `GaslessError(TOO_MANY_MESSAGES)` if the estimate carries more messages than the wallet's `maxMessages` cap.
+
+```tsx
+const { data: estimate } = useGaslessEstimate({ feeJettonMaster, messages });
+const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
+
+const handleSend = async () => {
+    if (!estimate) return;
+    const { internalBoc, fee } = await sendGasless({ estimate });
+    console.log('Submitted. Fee:', fee, 'BoC:', internalBoc);
+};
+
+return (
+    <button onClick={handleSend} disabled={!estimate || isPending}>
+        {isPending ? 'Sending...' : 'Send Gasless'}
+    </button>
+);
+```
+
+### `useGaslessProvider`
+
+Hook to read and change the currently selected gasless provider. Returns a tuple `[provider, setProviderId]` — mirrors `useSwapProvider`.
+
+```tsx
+const [provider, setProviderId] = useGaslessProvider();
+return (
+    <div>
+        <div>Current: {provider?.providerId ?? 'none'}</div>
+        <button onClick={() => setProviderId('tonapi')}>Use TonApi</button>
+    </div>
+);
+```
+
+### `useGaslessProviders`
+
+Hook to get all registered gasless providers. The returned array keeps a stable reference until the provider list changes.
+
+```tsx
+const providers = useGaslessProviders();
+return (
+    <ul>
+        {providers.map((p) => (
+            <li key={p.providerId}>{p.providerId}</li>
+        ))}
+    </ul>
+);
+```
+
 ## Transaction
 
 ### `useSendTransaction`
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts b/packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts
deleted file mode 100644
index 649bac03e..000000000
--- a/packages/appkit-react/src/features/gasless/hooks/use-estimate-gasless.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import type { MutateFunction, MutateOptions } from '@tanstack/react-query';
-import { estimateGaslessMutationOptions } from '@ton/appkit/queries';
-import type {
-    EstimateGaslessData,
-    EstimateGaslessErrorType,
-    EstimateGaslessMutationConfig,
-    EstimateGaslessVariables,
-} from '@ton/appkit/queries';
-
-import { useAppKit } from '../../settings';
-import { useMutation } from '../../../libs/query';
-import type { UseMutationReturnType } from '../../../libs/query';
-
-export type UseEstimateGaslessParameters<context = unknown> = EstimateGaslessMutationConfig<context>;
-
-export type UseEstimateGaslessReturnType<context = unknown> = UseMutationReturnType<
-    EstimateGaslessData,
-    EstimateGaslessErrorType,
-    EstimateGaslessVariables,
-    context,
-    (
-        variables: EstimateGaslessVariables,
-        options?: MutateOptions<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>,
-    ) => void,
-    MutateFunction<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>
->;
-
-/**
- * Hook to estimate gasless transaction.
- */
-export const useEstimateGasless = <context = unknown>(
-    parameters: UseEstimateGaslessParameters<context> = {},
-): UseEstimateGaslessReturnType<context> => {
-    const appKit = useAppKit();
-
-    return useMutation(estimateGaslessMutationOptions<context>(appKit, parameters));
-};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts
new file mode 100644
index 000000000..ba7bdb685
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { getGaslessEstimateQueryOptions } from '@ton/appkit/queries';
+import type {
+    GetGaslessEstimateData,
+    GetGaslessEstimateErrorType,
+    GetGaslessEstimateQueryConfig,
+} from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+
+export type UseGaslessEstimateParameters<selectData = GetGaslessEstimateData> =
+    GetGaslessEstimateQueryConfig<selectData>;
+
+export type UseGaslessEstimateReturnType<selectData = GetGaslessEstimateData> = UseQueryReturnType<
+    selectData,
+    GetGaslessEstimateErrorType
+>;
+
+/**
+ * Hook to fetch a gasless estimate. Auto-refetches as inputs change.
+ *
+ * The estimate carries a relayer-provided `validUntil` window; cached results
+ * become stale after `GASLESS_ESTIMATE_STALE_TIME_MS` (2 minutes).
+ */
+export const useGaslessEstimate = <selectData = GetGaslessEstimateData>(
+    parameters: UseGaslessEstimateParameters<selectData> = {},
+): UseGaslessEstimateReturnType<selectData> => {
+    const appKit = useAppKit();
+
+    return useQuery(getGaslessEstimateQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-provider.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-provider.ts
new file mode 100644
index 000000000..76c8aabf2
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-provider.ts
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { useSyncExternalStore, useCallback } from 'react';
+import { getGaslessProvider, setDefaultGaslessProvider, watchGaslessProviders } from '@ton/appkit';
+import type { GetGaslessProviderReturnType } from '@ton/appkit';
+
+import { useAppKit } from '../../settings/hooks/use-app-kit';
+
+export type UseGaslessProviderReturnType = readonly [
+    GetGaslessProviderReturnType | undefined,
+    (providerId: string) => void,
+];
+
+/**
+ * Hook to get and set the currently selected gasless provider.
+ * Mirrors the tuple shape of `useSwapProvider`.
+ */
+export const useGaslessProvider = (): UseGaslessProviderReturnType => {
+    const appKit = useAppKit();
+
+    const subscribe = useCallback(
+        (onChange: () => void) => {
+            return watchGaslessProviders(appKit, { onChange });
+        },
+        [appKit],
+    );
+
+    const getSnapshot = useCallback(() => {
+        try {
+            return getGaslessProvider(appKit);
+        } catch {
+            return undefined;
+        }
+    }, [appKit]);
+
+    const provider = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+
+    const setProviderId = useCallback(
+        (providerId: string) => {
+            setDefaultGaslessProvider(appKit, { providerId });
+        },
+        [appKit],
+    );
+
+    return [provider, setProviderId] as const;
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-providers.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-providers.ts
new file mode 100644
index 000000000..cbdba3463
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-providers.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { useSyncExternalStore, useCallback } from 'react';
+import { getGaslessProviders, watchGaslessProviders } from '@ton/appkit';
+import type { GetGaslessProvidersReturnType } from '@ton/appkit';
+
+import { useAppKit } from '../../settings/hooks/use-app-kit';
+
+export type UseGaslessProvidersReturnType = GetGaslessProvidersReturnType;
+
+/**
+ * Hook to get all registered gasless providers.
+ */
+export const useGaslessProviders = (): UseGaslessProvidersReturnType => {
+    const appKit = useAppKit();
+
+    const subscribe = useCallback(
+        (onChange: () => void) => {
+            return watchGaslessProviders(appKit, { onChange });
+        },
+        [appKit],
+    );
+
+    const getSnapshot = useCallback(() => {
+        return getGaslessProviders(appKit);
+    }, [appKit]);
+
+    return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts b/packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts
index 53f0dd5eb..016a2fcf4 100644
--- a/packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts
+++ b/packages/appkit-react/src/features/gasless/hooks/use-send-gasless-transaction.ts
@@ -6,6 +6,8 @@
  *
  */
 
+'use client';
+
 import type { MutateFunction, MutateOptions } from '@tanstack/react-query';
 import { sendGaslessTransactionMutationOptions } from '@ton/appkit/queries';
 import type {
diff --git a/packages/appkit-react/src/features/gasless/index.ts b/packages/appkit-react/src/features/gasless/index.ts
index 4ffc4f984..bd35f9294 100644
--- a/packages/appkit-react/src/features/gasless/index.ts
+++ b/packages/appkit-react/src/features/gasless/index.ts
@@ -12,10 +12,12 @@ export {
     type UseGaslessConfigReturnType,
 } from './hooks/use-gasless-config';
 export {
-    useEstimateGasless,
-    type UseEstimateGaslessParameters,
-    type UseEstimateGaslessReturnType,
-} from './hooks/use-estimate-gasless';
+    useGaslessEstimate,
+    type UseGaslessEstimateParameters,
+    type UseGaslessEstimateReturnType,
+} from './hooks/use-gasless-estimate';
+export { useGaslessProvider, type UseGaslessProviderReturnType } from './hooks/use-gasless-provider';
+export { useGaslessProviders, type UseGaslessProvidersReturnType } from './hooks/use-gasless-providers';
 export {
     useSendGaslessTransaction,
     type UseSendGaslessTransactionParameters,
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 26aa13cd5..e10e9506f 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -632,6 +632,107 @@ const balance = await getStakedBalance(appKit, {
 console.log('Staked Balance:', balance);
 ```
 
+## Gasless
+
+Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return. The connected wallet must support the `SignMessage` TonConnect feature.
+
+The high-level flow is:
+1. `getGaslessConfig` – discover which jettons the relayer accepts as fee payment.
+2. `getGaslessEstimate` – ask the relayer for fee + wrapped messages (with a `validUntil`).
+3. `sendGaslessTransaction` – sign the wrapped messages via the wallet and submit the signed BoC.
+
+### `getGaslessManager`
+
+Get the `GaslessManager` instance to interact with gasless providers directly.
+
+```ts
+const gaslessManager = getGaslessManager(appKit);
+```
+
+### `getGaslessProvider`
+
+Get a specific gasless provider by its ID. Uses the default provider when no `id` is supplied.
+
+```ts
+const provider = getGaslessProvider(appKit, { id: 'tonapi' });
+```
+
+### `getGaslessProviders`
+
+Get all registered gasless providers. The returned array keeps a stable reference until the provider list changes.
+
+```ts
+const providers = getGaslessProviders(appKit);
+console.log(
+    'Registered gasless providers:',
+    providers.map((p) => p.providerId),
+);
+```
+
+### `setDefaultGaslessProvider`
+
+Set the default gasless provider. Subsequent estimate and send calls will use this provider when none is specified.
+
+```ts
+setDefaultGaslessProvider(appKit, { providerId: 'tonapi' });
+```
+
+### `watchGaslessProviders`
+
+Watch for new gasless provider registrations and default-provider changes.
+
+```ts
+const unsubscribe = watchGaslessProviders(appKit, {
+    onChange: () => console.log('Gasless providers updated'),
+});
+unsubscribe();
+```
+
+### `getGaslessConfig`
+
+Fetch relayer configuration (supported jettons + relay address).
+
+```ts
+const config = await getGaslessConfig(appKit);
+const feeJetton = config.supportedGasJettons[0].jettonMaster;
+```
+
+### `getGaslessEstimate`
+
+Ask the relayer to estimate a gasless transaction. Returns relayer-wrapped messages, the fee charged in the fee jetton, and the bundle validity window (`validUntil`).
+
+The estimate is intended to be passed verbatim to `sendGaslessTransaction`, which validates `validUntil` before signing. Estimates are typically valid for ~2 minutes.
+
+```ts
+const estimate = await getGaslessEstimate(appKit, {
+    feeJettonMaster: feeJetton,
+    messages: [
+        {
+            address: 'EQ...jetton_wallet_address',
+            amount: '60000000', // 0.06 TON gas budget
+            payload: jettonTransferPayloadBase64,
+        },
+    ],
+});
+console.log('Relayer fee:', estimate.fee);
+console.log('Valid until:', new Date(estimate.validUntil * 1000));
+```
+
+### `sendGaslessTransaction`
+
+Sign a previously computed gasless estimate and submit the resulting BoC to the relayer.
+
+Estimate freshness is owned by the query layer: `useGaslessEstimate` uses a 2-minute `staleTime` matching the relayer `validUntil` window. If you submit a stale estimate anyway, the relayer rejects it and the error surfaces through `gaslessManager.send`.
+
+Throws:
+- `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the connected wallet does not advertise the `SignMessage` feature.
+- `GaslessError(TOO_MANY_MESSAGES)` if the estimate carries more messages than the wallet's `maxMessages` cap.
+
+```ts
+const { internalBoc, fee } = await sendGaslessTransaction(appKit, { estimate });
+console.log('Submitted gasless transaction. Fee:', fee);
+```
+
 ## Transaction
 
 ### `createTransferTonTransaction`
diff --git a/packages/appkit/src/actions/gasless/estimate-gasless.ts b/packages/appkit/src/actions/gasless/get-gasless-estimate.ts
similarity index 68%
rename from packages/appkit/src/actions/gasless/estimate-gasless.ts
rename to packages/appkit/src/actions/gasless/get-gasless-estimate.ts
index 114b4000b..e32f41186 100644
--- a/packages/appkit/src/actions/gasless/estimate-gasless.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-estimate.ts
@@ -12,7 +12,7 @@ import type { TransactionRequestMessage } from '../../types/transaction';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
-export interface EstimateGaslessParameters {
+export interface GetGaslessEstimateOptions {
     /** Master address of the jetton used to pay the relayer's fee */
     feeJettonMaster: string;
     /** User's messages to include in the gasless transaction */
@@ -21,20 +21,23 @@ export interface EstimateGaslessParameters {
     providerId?: string;
 }
 
-export type EstimateGaslessReturnType = Promise<GaslessEstimateResult>;
+export type GetGaslessEstimateReturnType = Promise<GaslessEstimateResult>;
 
-export type EstimateGaslessErrorType = Error;
+export type GetGaslessEstimateErrorType = Error;
 
 /**
  * Ask the relayer to estimate a gasless transaction.
  *
  * Returns relayer-wrapped messages (ready to be signed via `signMessage`), the
- * fee charged in the fee jetton, and the bundle validity window.
+ * fee charged in the fee jetton, and the bundle validity window (`validUntil`).
+ *
+ * The result is intended to be passed verbatim to `sendGaslessTransaction`,
+ * which validates `validUntil` and forwards the signed BoC to the relayer.
  */
-export const estimateGasless = async (
+export const getGaslessEstimate = async (
     appKit: AppKit,
-    parameters: EstimateGaslessParameters,
-): EstimateGaslessReturnType => {
+    options: GetGaslessEstimateOptions,
+): GetGaslessEstimateReturnType => {
     const wallet = getSelectedWallet(appKit);
 
     if (!wallet) {
@@ -43,11 +46,11 @@ export const estimateGasless = async (
 
     return appKit.gaslessManager.estimate(
         {
-            feeJettonMaster: parameters.feeJettonMaster,
+            feeJettonMaster: options.feeJettonMaster,
             walletAddress: wallet.getAddress(),
             walletPublicKey: wallet.getPublicKey(),
-            messages: parameters.messages,
+            messages: options.messages,
         },
-        parameters.providerId,
+        options.providerId,
     );
 };
diff --git a/packages/appkit/src/actions/gasless/get-gasless-manager.ts b/packages/appkit/src/actions/gasless/get-gasless-manager.ts
new file mode 100644
index 000000000..a298092d2
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/get-gasless-manager.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessManager } from '@ton/walletkit';
+
+import type { AppKit } from '../../core/app-kit';
+
+export type GetGaslessManagerReturnType = GaslessManager;
+
+/**
+ * Get gasless manager instance
+ */
+export const getGaslessManager = (appKit: AppKit): GetGaslessManagerReturnType => {
+    return appKit.gaslessManager;
+};
diff --git a/packages/appkit/src/actions/gasless/get-gasless-provider.ts b/packages/appkit/src/actions/gasless/get-gasless-provider.ts
new file mode 100644
index 000000000..c493ac35e
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/get-gasless-provider.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessProviderInterface } from '@ton/walletkit';
+
+import type { AppKit } from '../../core/app-kit';
+
+export interface GetGaslessProviderOptions {
+    id?: string;
+}
+
+export type GetGaslessProviderReturnType = GaslessProviderInterface;
+
+export const getGaslessProvider = (
+    appKit: AppKit,
+    options: GetGaslessProviderOptions = {},
+): GetGaslessProviderReturnType => {
+    return appKit.gaslessManager.getProvider(options.id);
+};
diff --git a/packages/appkit/src/actions/gasless/get-gasless-providers.ts b/packages/appkit/src/actions/gasless/get-gasless-providers.ts
new file mode 100644
index 000000000..4cd0656ba
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/get-gasless-providers.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessProviderInterface } from '@ton/walletkit';
+
+import type { AppKit } from '../../core/app-kit';
+
+export type GetGaslessProvidersReturnType = GaslessProviderInterface[];
+
+/**
+ * Get all registered gasless providers.
+ */
+export const getGaslessProviders = (appKit: AppKit): GetGaslessProvidersReturnType => {
+    return appKit.gaslessManager.getProviders();
+};
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
new file mode 100644
index 000000000..b66dc8ae4
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -0,0 +1,144 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { GaslessErrorCode } from '@ton/walletkit';
+import type { Feature, GaslessEstimateResult } from '@ton/walletkit';
+
+import type { AppKit } from '../../core/app-kit';
+import type { Base64String } from '../../types/primitives';
+import type { WalletInterface } from '../../types/wallet';
+import { sendGaslessTransaction } from './send-gasless-transaction';
+
+const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+const FAKE_INTERNAL_BOC = 'te6cckEBAQEAAgAAAA==' as Base64String;
+
+const makeEstimate = (overrides: Partial<GaslessEstimateResult> = {}): GaslessEstimateResult => ({
+    messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
+    fee: '1234',
+    validUntil: Math.floor(Date.now() / 1000) + 60,
+    relayAddress: TEST_ADDRESS,
+    from: TEST_ADDRESS,
+    ...overrides,
+});
+
+const SIGN_MESSAGE_FEATURE: Feature = { name: 'SignMessage', maxMessages: 4 };
+
+const makeWallet = (overrides: Partial<WalletInterface> = {}): WalletInterface => {
+    return {
+        connectorId: 'tonconnect',
+        getAddress: () => TEST_ADDRESS,
+        getPublicKey: () => '0xabc' as never,
+        getNetwork: () => ({ chainId: '-239' }) as never,
+        getWalletId: () => 'wallet-1',
+        getSupportedFeatures: () => [SIGN_MESSAGE_FEATURE],
+        sendTransaction: vi.fn(),
+        signData: vi.fn(),
+        signMessage: vi.fn().mockResolvedValue({ internalBoc: FAKE_INTERNAL_BOC }),
+        ...overrides,
+    } as WalletInterface;
+};
+
+const makeAppKit = (wallet: WalletInterface | null) => {
+    const send = vi.fn<() => Promise<void>>().mockResolvedValue(undefined);
+
+    const appKit = {
+        walletsManager: { selectedWallet: wallet },
+        gaslessManager: { send },
+    } as unknown as AppKit;
+
+    return { appKit, send };
+};
+
+describe('sendGaslessTransaction', () => {
+    let wallet: WalletInterface;
+
+    beforeEach(() => {
+        wallet = makeWallet();
+    });
+
+    it('signs the estimate and submits the resulting BoC to the relayer', async () => {
+        const { appKit, send } = makeAppKit(wallet);
+        const estimate = makeEstimate();
+
+        const result = await sendGaslessTransaction(appKit, { estimate });
+
+        expect(wallet.signMessage).toHaveBeenCalledWith({
+            messages: estimate.messages,
+            validUntil: estimate.validUntil,
+        });
+        expect(send).toHaveBeenCalledWith({ walletPublicKey: '0xabc', internalBoc: FAKE_INTERNAL_BOC }, undefined);
+        expect(result.internalBoc).toBe(FAKE_INTERNAL_BOC);
+        expect(result.fee).toBe(estimate.fee);
+    });
+
+    it('forwards providerId to gaslessManager.send', async () => {
+        const { appKit, send } = makeAppKit(wallet);
+
+        await sendGaslessTransaction(appKit, { estimate: makeEstimate(), providerId: 'custom' });
+
+        expect(send).toHaveBeenCalledWith(expect.anything(), 'custom');
+    });
+
+    it('throws plain Error when no wallet is connected', async () => {
+        const { appKit } = makeAppKit(null);
+
+        await expect(sendGaslessTransaction(appKit, { estimate: makeEstimate() })).rejects.toThrow(
+            'Wallet not connected',
+        );
+    });
+
+    it('throws GaslessError(SIGN_MESSAGE_NOT_SUPPORTED) when wallet lacks SignMessage feature', async () => {
+        const walletWithoutFeature = makeWallet({
+            getSupportedFeatures: () => [{ name: 'SignData' } as never],
+        });
+        const { appKit } = makeAppKit(walletWithoutFeature);
+
+        await expect(sendGaslessTransaction(appKit, { estimate: makeEstimate() })).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.SignMessageNotSupported,
+        });
+        expect(walletWithoutFeature.signMessage).not.toHaveBeenCalled();
+    });
+
+    it('throws GaslessError(TOO_MANY_MESSAGES) when estimate exceeds wallet maxMessages', async () => {
+        const walletWithCap = makeWallet({
+            getSupportedFeatures: () => [{ name: 'SignMessage', maxMessages: 1 }],
+        });
+        const { appKit } = makeAppKit(walletWithCap);
+        const estimate = makeEstimate({
+            messages: [
+                { address: TEST_ADDRESS, amount: '1' },
+                { address: TEST_ADDRESS, amount: '2' },
+            ],
+        });
+
+        await expect(sendGaslessTransaction(appKit, { estimate })).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.TooManyMessages,
+        });
+        expect(walletWithCap.signMessage).not.toHaveBeenCalled();
+    });
+
+    it('proceeds when wallet returns undefined features (unknown capabilities)', async () => {
+        const walletWithUnknown = makeWallet({ getSupportedFeatures: () => undefined });
+        const { appKit, send } = makeAppKit(walletWithUnknown);
+
+        await sendGaslessTransaction(appKit, { estimate: makeEstimate() });
+
+        expect(walletWithUnknown.signMessage).toHaveBeenCalled();
+        expect(send).toHaveBeenCalled();
+    });
+
+    it('propagates errors from gaslessManager.send', async () => {
+        const { appKit, send } = makeAppKit(wallet);
+        send.mockRejectedValueOnce(new Error('relayer offline'));
+
+        await expect(sendGaslessTransaction(appKit, { estimate: makeEstimate() })).rejects.toThrow('relayer offline');
+    });
+});
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index 3a82dcf9f..925221271 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -6,18 +6,16 @@
  *
  */
 
-import type { TokenAmount } from '@ton/walletkit';
+import type { GaslessEstimateResult, TokenAmount } from '@ton/walletkit';
 
+import { GaslessError, GaslessErrorCode } from '../../gasless';
 import type { Base64String } from '../../types/primitives';
-import type { TransactionRequestMessage } from '../../types/transaction';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
 export interface SendGaslessTransactionParameters {
-    /** Master address of the jetton used to pay the relayer's fee */
-    feeJettonMaster: string;
-    /** User's messages to include in the gasless transaction */
-    messages: TransactionRequestMessage[];
+    /** Pre-computed estimate obtained via `getGaslessEstimate` */
+    estimate: GaslessEstimateResult;
     /** Gasless provider id. Uses the default provider when omitted. */
     providerId?: string;
 }
@@ -25,41 +23,56 @@ export interface SendGaslessTransactionParameters {
 export interface SendGaslessTransactionReturnType {
     /** Signed internal BoC that was submitted to the relayer */
     internalBoc: Base64String;
-    /** Relayer fee in fee-jetton nanounits */
+    /** Relayer fee in fee-jetton nanounits (mirrors the estimate) */
     fee: TokenAmount;
 }
 
 export type SendGaslessTransactionErrorType = Error;
 
 /**
- * Execute a full gasless transaction flow:
- *   1. estimate (with the relayer)
- *   2. sign the relayer-wrapped messages via the wallet's `signMessage`
- *   3. submit the signed BoC to the relayer
+ * Sign a previously computed gasless estimate and submit the resulting BoC
+ * to the relayer.
  *
- * Requires the wallet to support the SignMessage feature.
+ * Estimate freshness is owned by the query layer (`getGaslessEstimateQueryOptions`
+ * sets a 2-minute `staleTime` matching the relayer `validUntil` window). If a
+ * stale estimate is submitted anyway, the relayer rejects it and the error
+ * surfaces through `gaslessManager.send`.
+ *
+ * @throws GaslessError(SIGN_MESSAGE_NOT_SUPPORTED) when the wallet does not
+ *         advertise the `SignMessage` feature.
+ * @throws GaslessError(TOO_MANY_MESSAGES) when the estimate carries more
+ *         messages than the wallet's advertised `maxMessages` cap.
  */
 export const sendGaslessTransaction = async (
     appKit: AppKit,
     parameters: SendGaslessTransactionParameters,
 ): Promise<SendGaslessTransactionReturnType> => {
+    const { estimate, providerId } = parameters;
+
     const wallet = getSelectedWallet(appKit);
 
     if (!wallet) {
         throw new Error('Wallet not connected');
     }
 
-    const walletPublicKey = wallet.getPublicKey();
-
-    const estimate = await appKit.gaslessManager.estimate(
-        {
-            feeJettonMaster: parameters.feeJettonMaster,
-            walletAddress: wallet.getAddress(),
-            walletPublicKey,
-            messages: parameters.messages,
-        },
-        parameters.providerId,
-    );
+    const features = wallet.getSupportedFeatures();
+    if (features !== undefined) {
+        const signMessageFeature = features.find((f) => typeof f === 'object' && f.name === 'SignMessage');
+        if (!signMessageFeature) {
+            throw new GaslessError(
+                'Connected wallet does not support the SignMessage feature required for gasless transactions.',
+                GaslessErrorCode.SignMessageNotSupported,
+            );
+        }
+        const { maxMessages } = signMessageFeature as { maxMessages: number };
+        if (estimate.messages.length > maxMessages) {
+            throw new GaslessError(
+                `Estimate has ${estimate.messages.length} messages but the wallet only supports up to ${maxMessages}.`,
+                GaslessErrorCode.TooManyMessages,
+                { messages: estimate.messages.length, maxMessages },
+            );
+        }
+    }
 
     const { internalBoc } = await wallet.signMessage({
         messages: estimate.messages,
@@ -68,10 +81,10 @@ export const sendGaslessTransaction = async (
 
     await appKit.gaslessManager.send(
         {
-            walletPublicKey,
+            walletPublicKey: wallet.getPublicKey(),
             internalBoc,
         },
-        parameters.providerId,
+        providerId,
     );
 
     return {
diff --git a/packages/appkit/src/actions/gasless/set-default-gasless-provider.ts b/packages/appkit/src/actions/gasless/set-default-gasless-provider.ts
new file mode 100644
index 000000000..379cb68cd
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/set-default-gasless-provider.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '../../core/app-kit';
+
+export interface SetDefaultGaslessProviderParameters {
+    providerId: string;
+}
+
+export type SetDefaultGaslessProviderReturnType = void;
+
+/**
+ * Set the default gasless provider.
+ * Subsequent estimate and send calls will use this provider when none is specified.
+ */
+export const setDefaultGaslessProvider = (
+    appKit: AppKit,
+    parameters: SetDefaultGaslessProviderParameters,
+): SetDefaultGaslessProviderReturnType => {
+    appKit.gaslessManager.setDefaultProvider(parameters.providerId);
+};
diff --git a/packages/appkit/src/actions/gasless/watch-gasless-providers.ts b/packages/appkit/src/actions/gasless/watch-gasless-providers.ts
new file mode 100644
index 000000000..19ce57d34
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/watch-gasless-providers.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '../../core/app-kit';
+
+export interface WatchGaslessProvidersParameters {
+    onChange: () => void;
+}
+
+export type WatchGaslessProvidersReturnType = () => void;
+
+/**
+ * Watch for new gasless providers registration and default-provider changes.
+ */
+export const watchGaslessProviders = (
+    appKit: AppKit,
+    parameters: WatchGaslessProvidersParameters,
+): WatchGaslessProvidersReturnType => {
+    const { onChange } = parameters;
+
+    const unsubscribeRegistered = appKit.emitter.on('provider:registered', (event) => {
+        if (event.payload.type === 'gasless') onChange();
+    });
+
+    const unsubscribeDefaultChanged = appKit.emitter.on('provider:default-changed', (event) => {
+        if (event.payload.type === 'gasless') onChange();
+    });
+
+    return () => {
+        unsubscribeRegistered();
+        unsubscribeDefaultChanged();
+    };
+};
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index 7d2368841..06bc9f5d6 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -109,6 +109,23 @@ export { transferNft, type TransferNftParameters, type TransferNftReturnType } f
 export { registerProvider, type RegisterProviderOptions } from './providers/register-provider';
 
 // Gasless
+export { getGaslessManager, type GetGaslessManagerReturnType } from './gasless/get-gasless-manager';
+export {
+    getGaslessProvider,
+    type GetGaslessProviderOptions,
+    type GetGaslessProviderReturnType,
+} from './gasless/get-gasless-provider';
+export { getGaslessProviders, type GetGaslessProvidersReturnType } from './gasless/get-gasless-providers';
+export {
+    setDefaultGaslessProvider,
+    type SetDefaultGaslessProviderParameters,
+    type SetDefaultGaslessProviderReturnType,
+} from './gasless/set-default-gasless-provider';
+export {
+    watchGaslessProviders,
+    type WatchGaslessProvidersParameters,
+    type WatchGaslessProvidersReturnType,
+} from './gasless/watch-gasless-providers';
 export {
     getGaslessConfig,
     type GetGaslessConfigOptions,
@@ -116,11 +133,11 @@ export {
     type GetGaslessConfigErrorType,
 } from './gasless/get-gasless-config';
 export {
-    estimateGasless,
-    type EstimateGaslessParameters,
-    type EstimateGaslessReturnType,
-    type EstimateGaslessErrorType,
-} from './gasless/estimate-gasless';
+    getGaslessEstimate,
+    type GetGaslessEstimateOptions,
+    type GetGaslessEstimateReturnType,
+    type GetGaslessEstimateErrorType,
+} from './gasless/get-gasless-estimate';
 export {
     sendGaslessTransaction,
     type SendGaslessTransactionParameters,
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index 5aa5053dc..f5f709e0e 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -6,7 +6,7 @@
  *
  */
 
-export { GaslessProvider, GaslessError, GaslessManager } from '@ton/walletkit';
+export { GaslessProvider, GaslessError, GaslessErrorCode, GaslessManager } from '@ton/walletkit';
 
 export type {
     GaslessAPI,
diff --git a/packages/appkit/src/queries/gasless/estimate-gasless.ts b/packages/appkit/src/queries/gasless/estimate-gasless.ts
deleted file mode 100644
index 2ba317097..000000000
--- a/packages/appkit/src/queries/gasless/estimate-gasless.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import type { MutationOptions } from '@tanstack/query-core';
-
-import { estimateGasless } from '../../actions/gasless/estimate-gasless';
-import type {
-    EstimateGaslessErrorType,
-    EstimateGaslessParameters,
-    EstimateGaslessReturnType,
-} from '../../actions/gasless/estimate-gasless';
-import type { AppKit } from '../../core/app-kit';
-import type { MutationParameter } from '../../types/query';
-import type { Compute } from '../../types/utils';
-
-export type { EstimateGaslessErrorType };
-
-export type EstimateGaslessMutationConfig<context = unknown> = MutationParameter<
-    EstimateGaslessData,
-    EstimateGaslessErrorType,
-    EstimateGaslessVariables,
-    context
->;
-
-export const estimateGaslessMutationOptions = <context = unknown>(
-    appKit: AppKit,
-    config: EstimateGaslessMutationConfig<context> = {},
-): EstimateGaslessMutationOptions<context> => {
-    return {
-        ...config.mutation,
-        mutationFn: (variables: EstimateGaslessVariables) => estimateGasless(appKit, variables),
-        mutationKey: ['estimateGasless'],
-    };
-};
-
-export type EstimateGaslessVariables = Compute<EstimateGaslessParameters>;
-
-export type EstimateGaslessData = Compute<Awaited<EstimateGaslessReturnType>>;
-
-export type EstimateGaslessMutate<context = unknown> = (
-    variables: EstimateGaslessVariables,
-    options?: MutationOptions<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>,
-) => void;
-
-export type EstimateGaslessMutateAsync<context = unknown> = (
-    variables: EstimateGaslessVariables,
-    options?: MutationOptions<EstimateGaslessData, EstimateGaslessErrorType, EstimateGaslessVariables, context>,
-) => Promise<EstimateGaslessData>;
-
-export type EstimateGaslessMutationOptions<context = unknown> = MutationOptions<
-    EstimateGaslessData,
-    EstimateGaslessErrorType,
-    EstimateGaslessVariables,
-    context
->;
diff --git a/packages/appkit/src/queries/gasless/get-gasless-estimate.ts b/packages/appkit/src/queries/gasless/get-gasless-estimate.ts
new file mode 100644
index 000000000..d03e4601f
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-estimate.ts
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessEstimate } from '../../actions/gasless/get-gasless-estimate';
+import type {
+    GetGaslessEstimateErrorType,
+    GetGaslessEstimateOptions,
+    GetGaslessEstimateReturnType,
+} from '../../actions/gasless/get-gasless-estimate';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+
+export type { GetGaslessEstimateErrorType };
+
+/**
+ * Default time-to-live for a gasless estimate. The relayer returns its own
+ * `validUntil`; this is the upper bound used by react-query to refresh the
+ * estimate before it expires.
+ */
+export const GASLESS_ESTIMATE_STALE_TIME_MS = 2 * 60 * 1000;
+
+export type GetGaslessEstimateQueryConfig<selectData = GetGaslessEstimateData> = Compute<
+    ExactPartial<GetGaslessEstimateOptions>
+> &
+    QueryParameter<GetGaslessEstimateQueryFnData, GetGaslessEstimateErrorType, selectData, GetGaslessEstimateQueryKey>;
+
+export const getGaslessEstimateQueryOptions = <selectData = GetGaslessEstimateData>(
+    appKit: AppKit,
+    options: GetGaslessEstimateQueryConfig<selectData> = {},
+): GetGaslessEstimateQueryOptions<selectData> => {
+    return {
+        staleTime: GASLESS_ESTIMATE_STALE_TIME_MS,
+        ...options.query,
+        enabled: Boolean(
+            options.feeJettonMaster &&
+            options.messages &&
+            options.messages.length > 0 &&
+            (options.query?.enabled ?? true),
+        ),
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [string, GetGaslessEstimateOptions];
+
+            if (!parameters.feeJettonMaster) {
+                throw new Error('feeJettonMaster is required');
+            }
+            if (!parameters.messages || parameters.messages.length === 0) {
+                throw new Error('messages is required');
+            }
+
+            return getGaslessEstimate(appKit, parameters);
+        },
+        queryKey: getGaslessEstimateQueryKey(options),
+    };
+};
+
+export type GetGaslessEstimateQueryFnData = Compute<Awaited<GetGaslessEstimateReturnType>>;
+
+export type GetGaslessEstimateData = GetGaslessEstimateQueryFnData;
+
+export const getGaslessEstimateQueryKey = (
+    options: Compute<ExactPartial<GetGaslessEstimateOptions>> = {},
+): GetGaslessEstimateQueryKey => {
+    return ['gaslessEstimate', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
+};
+
+export type GetGaslessEstimateQueryKey = readonly ['gaslessEstimate', Compute<ExactPartial<GetGaslessEstimateOptions>>];
+
+export type GetGaslessEstimateQueryOptions<selectData = GetGaslessEstimateData> = QueryOptions<
+    GetGaslessEstimateQueryFnData,
+    GetGaslessEstimateErrorType,
+    selectData,
+    GetGaslessEstimateQueryKey
+>;
diff --git a/packages/appkit/src/queries/gasless/send-gasless-transaction.ts b/packages/appkit/src/queries/gasless/send-gasless-transaction.ts
index 01832bf1d..aede6295b 100644
--- a/packages/appkit/src/queries/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/queries/gasless/send-gasless-transaction.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import type { MutationOptions } from '@tanstack/query-core';
+import type { MutateOptions, MutationOptions } from '@tanstack/query-core';
 
 import { sendGaslessTransaction } from '../../actions/gasless/send-gasless-transaction';
 import type {
@@ -33,7 +33,9 @@ export const sendGaslessTransactionMutationOptions = <context = unknown>(
 ): SendGaslessTransactionMutationOptions<context> => {
     return {
         ...config.mutation,
-        mutationFn: (variables: SendGaslessTransactionVariables) => sendGaslessTransaction(appKit, variables),
+        mutationFn(variables) {
+            return sendGaslessTransaction(appKit, variables);
+        },
         mutationKey: ['sendGaslessTransaction'],
     };
 };
@@ -44,22 +46,30 @@ export type SendGaslessTransactionData = Compute<Awaited<SendGaslessTransactionR
 
 export type SendGaslessTransactionMutate<context = unknown> = (
     variables: SendGaslessTransactionVariables,
-    options?: MutationOptions<
-        SendGaslessTransactionData,
-        SendGaslessTransactionErrorType,
-        SendGaslessTransactionVariables,
-        context
-    >,
+    options?:
+        | Compute<
+              MutateOptions<
+                  SendGaslessTransactionData,
+                  SendGaslessTransactionErrorType,
+                  SendGaslessTransactionVariables,
+                  context
+              >
+          >
+        | undefined,
 ) => void;
 
 export type SendGaslessTransactionMutateAsync<context = unknown> = (
     variables: SendGaslessTransactionVariables,
-    options?: MutationOptions<
-        SendGaslessTransactionData,
-        SendGaslessTransactionErrorType,
-        SendGaslessTransactionVariables,
-        context
-    >,
+    options?:
+        | Compute<
+              MutateOptions<
+                  SendGaslessTransactionData,
+                  SendGaslessTransactionErrorType,
+                  SendGaslessTransactionVariables,
+                  context
+              >
+          >
+        | undefined,
 ) => Promise<SendGaslessTransactionData>;
 
 export type SendGaslessTransactionMutationOptions<context = unknown> = MutationOptions<
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index 0468f2c6d..7b3c15198 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -173,14 +173,15 @@ export {
     type GetGaslessConfigErrorType,
 } from './gasless/get-gasless-config';
 export {
-    estimateGaslessMutationOptions,
-    type EstimateGaslessMutationConfig,
-    type EstimateGaslessData,
-    type EstimateGaslessErrorType,
-    type EstimateGaslessMutate,
-    type EstimateGaslessMutateAsync,
-    type EstimateGaslessVariables,
-} from './gasless/estimate-gasless';
+    getGaslessEstimateQueryOptions,
+    getGaslessEstimateQueryKey,
+    GASLESS_ESTIMATE_STALE_TIME_MS,
+    type GetGaslessEstimateQueryConfig,
+    type GetGaslessEstimateData,
+    type GetGaslessEstimateErrorType,
+    type GetGaslessEstimateQueryKey,
+    type GetGaslessEstimateQueryOptions,
+} from './gasless/get-gasless-estimate';
 export {
     sendGaslessTransactionMutationOptions,
     type SendGaslessTransactionMutationConfig,
diff --git a/packages/appkit/src/utils/index.ts b/packages/appkit/src/utils/index.ts
index 97cf50e67..bdf904c8a 100644
--- a/packages/appkit/src/utils/index.ts
+++ b/packages/appkit/src/utils/index.ts
@@ -6,7 +6,7 @@
  *
  */
 
-export { formatUnits, parseUnits, compareAddress, createJettonTransferPayload } from '@ton/walletkit';
+export { formatUnits, parseUnits, compareAddress, createJettonTransferPayload, asBase64, asHex } from '@ton/walletkit';
 
 export * from './address/is-valid-address';
 export * from './address/to-bounceble-address';
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
new file mode 100644
index 000000000..52563a6b8
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -0,0 +1,200 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+
+import type { GaslessProviderInterface } from '../../api/interfaces';
+import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../../api/models';
+import { Network } from '../../api/models';
+import { EventEmitter } from '../../core/EventEmitter';
+import type { ProviderFactoryContext } from '../../types/factory';
+import { GaslessError, GaslessErrorCode } from './errors';
+import { GaslessManager } from './GaslessManager';
+
+const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+
+const makeProvider = (providerId: string): GaslessProviderInterface => ({
+    type: 'gasless',
+    providerId,
+    getSupportedNetworks: () => [Network.mainnet()],
+    getConfig: vi.fn<() => Promise<GaslessConfig>>().mockResolvedValue({
+        relayAddress: TEST_ADDRESS,
+        supportedGasJettons: [{ jettonMaster: TEST_ADDRESS }],
+    }),
+    estimate: vi.fn<(p: GaslessEstimateParams) => Promise<GaslessEstimateResult>>().mockResolvedValue({
+        messages: [],
+        fee: '0',
+        validUntil: 0,
+        relayAddress: TEST_ADDRESS,
+        from: TEST_ADDRESS,
+    }),
+    send: vi.fn<(p: GaslessSendParams) => Promise<void>>().mockResolvedValue(undefined),
+});
+
+const makeManager = (): { manager: GaslessManager; emitter: EventEmitter<never> } => {
+    const emitter = new EventEmitter();
+    const ctx: ProviderFactoryContext = {
+        eventEmitter: emitter,
+        networkManager: undefined as never,
+    };
+    const manager = new GaslessManager(() => ctx);
+    return { manager, emitter: emitter as never };
+};
+
+describe('GaslessManager.registerProvider', () => {
+    let manager: GaslessManager;
+
+    beforeEach(() => {
+        manager = makeManager().manager;
+    });
+
+    it('makes the first registered provider the default', () => {
+        const provider = makeProvider('one');
+        manager.registerProvider(provider);
+
+        expect(manager.getProvider()).toBe(provider);
+        expect(manager.getProviders()).toEqual([provider]);
+    });
+
+    it('keeps the first default when a second provider registers', () => {
+        const first = makeProvider('first');
+        const second = makeProvider('second');
+        manager.registerProvider(first);
+        manager.registerProvider(second);
+
+        expect(manager.getProvider()).toBe(first);
+        expect(manager.getProviders()).toEqual([first, second]);
+    });
+
+    it('replaces an existing provider with the same providerId', () => {
+        const original = makeProvider('shared');
+        const replacement = makeProvider('shared');
+        manager.registerProvider(original);
+        manager.registerProvider(replacement);
+
+        expect(manager.getProvider()).toBe(replacement);
+        expect(manager.getProviders()).toEqual([replacement]);
+    });
+});
+
+describe('GaslessManager.setDefaultProvider', () => {
+    it('switches the default to the requested providerId', () => {
+        const { manager } = makeManager();
+        const first = makeProvider('first');
+        const second = makeProvider('second');
+        manager.registerProvider(first);
+        manager.registerProvider(second);
+
+        manager.setDefaultProvider('second');
+
+        expect(manager.getProvider()).toBe(second);
+        expect(manager.getProvider('first')).toBe(first);
+    });
+
+    it('throws GaslessError when the providerId is not registered', () => {
+        const { manager } = makeManager();
+        manager.registerProvider(makeProvider('first'));
+
+        expect(() => manager.setDefaultProvider('missing')).toThrow(GaslessError);
+    });
+});
+
+describe('GaslessManager delegation', () => {
+    it('forwards getConfig to the default provider', async () => {
+        const { manager } = makeManager();
+        const provider = makeProvider('one');
+        manager.registerProvider(provider);
+
+        await manager.getConfig();
+
+        expect(provider.getConfig).toHaveBeenCalledTimes(1);
+    });
+
+    it('forwards estimate to the named provider', async () => {
+        const { manager } = makeManager();
+        const a = makeProvider('a');
+        const b = makeProvider('b');
+        manager.registerProvider(a);
+        manager.registerProvider(b);
+
+        await manager.estimate(
+            {
+                feeJettonMaster: TEST_ADDRESS,
+                walletAddress: TEST_ADDRESS,
+                walletPublicKey: '0xabc',
+                messages: [{ address: TEST_ADDRESS, amount: '0' }],
+            },
+            'b',
+        );
+
+        expect(a.estimate).not.toHaveBeenCalled();
+        expect(b.estimate).toHaveBeenCalledTimes(1);
+    });
+
+    it('forwards send to the default provider', async () => {
+        const { manager } = makeManager();
+        const provider = makeProvider('one');
+        manager.registerProvider(provider);
+
+        await manager.send({ walletPublicKey: '0xabc', internalBoc: 'AAA=' as never });
+
+        expect(provider.send).toHaveBeenCalledTimes(1);
+    });
+
+    it('rethrows provider errors from estimate without wrapping', async () => {
+        const { manager } = makeManager();
+        const provider = makeProvider('one');
+        const error = new GaslessError('relayer down', GaslessErrorCode.EstimateFailed);
+        (provider.estimate as ReturnType<typeof vi.fn>).mockRejectedValueOnce(error);
+        manager.registerProvider(provider);
+
+        await expect(
+            manager.estimate({
+                feeJettonMaster: TEST_ADDRESS,
+                walletAddress: TEST_ADDRESS,
+                walletPublicKey: '0xabc',
+                messages: [{ address: TEST_ADDRESS, amount: '0' }],
+            }),
+        ).rejects.toBe(error);
+    });
+});
+
+describe('GaslessManager events', () => {
+    it('emits provider:registered when a new provider is added', () => {
+        const { manager, emitter } = makeManager();
+        const handler = vi.fn();
+        (emitter as unknown as EventEmitter<{ 'provider:registered': { providerId: string; type: string } }>).on(
+            'provider:registered',
+            handler,
+        );
+
+        manager.registerProvider(makeProvider('one'));
+
+        expect(handler).toHaveBeenCalledWith(
+            expect.objectContaining({
+                payload: expect.objectContaining({ providerId: 'one', type: 'gasless' }),
+            }),
+        );
+    });
+
+    it('emits provider:default-changed when the default switches', () => {
+        const { manager, emitter } = makeManager();
+        manager.registerProvider(makeProvider('first'));
+        manager.registerProvider(makeProvider('second'));
+
+        const handler = vi.fn();
+        (emitter as unknown as EventEmitter<{ 'provider:default-changed': { providerId: string; type: string } }>).on(
+            'provider:default-changed',
+            handler,
+        );
+
+        manager.setDefaultProvider('second');
+
+        expect(handler).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index 1ffc7e1c8..d3a3f0de2 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -11,6 +11,7 @@ import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, Gasle
 import { globalLogger } from '../../core/Logger';
 import type { ProviderFactoryContext } from '../../types/factory';
 import { DefiManager } from '../DefiManager';
+import type { GaslessErrorCode } from './errors';
 import { GaslessError } from './errors';
 
 const log = globalLogger.createChild('GaslessManager');
@@ -74,6 +75,6 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
     }
 
     protected createError(message: string, code: string, details?: unknown): GaslessError {
-        return new GaslessError(message, code, details);
+        return new GaslessError(message, code as GaslessErrorCode, details);
     }
 }
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
new file mode 100644
index 000000000..182617557
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -0,0 +1,137 @@
+# Gasless Manager
+
+`GaslessManager` lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return.
+
+## Flow
+
+1. **Configure** – fetch the relayer config (`getConfig`) to learn which jettons it accepts as fee payment and its relay address.
+2. **Estimate** – call `estimate` with your messages and chosen fee jetton. The relayer returns *wrapped* messages, a fee, and a `validUntil` window.
+3. **Sign** – pass the wrapped messages to `wallet.signMessage` (TonConnect `SignMessage` feature). The wallet returns a signed *internal-message* BoC.
+4. **Send** – submit the signed BoC via `send`; the relayer converts it to an external message, pays the gas, and broadcasts.
+
+## Quick Start
+
+```typescript
+import { TonWalletKit, Network } from '@ton/walletkit';
+import { createTonApiGaslessProvider } from '@ton/walletkit/gasless/tonapi';
+import { TonApiClient } from '@ton-api/client';
+
+const kit = new TonWalletKit({
+    networks: {
+        [Network.mainnet().chainId]: { apiClient: { url: 'https://toncenter.com' } },
+    },
+});
+
+kit.gasless.registerProvider(
+    createTonApiGaslessProvider({
+        client: new TonApiClient({ baseUrl: 'https://tonapi.io' }),
+    }),
+);
+```
+
+## Wallet Requirements
+
+The connected wallet must expose the `SignMessage` feature (advertised via TonConnect device info). Wallets that only support `SendTransaction` cannot be used for gasless flows — check `wallet.getSupportedFeatures()` before invoking `send`.
+
+## Sending a Gasless Transaction
+
+```typescript
+import { Address } from '@ton/core';
+import { Network } from '@ton/walletkit';
+
+const config = await kit.gasless.getConfig();
+const feeJetton = config.supportedGasJettons[0].jettonMaster;
+
+const estimate = await kit.gasless.estimate({
+    feeJettonMaster: feeJetton,
+    walletAddress: wallet.getAddress(),
+    walletPublicKey: wallet.getPublicKey(),
+    messages: [
+        {
+            address: 'EQ...jetton_wallet_address',
+            amount: '60000000', // 0.06 TON gas
+            payload: jettonTransferPayloadBase64,
+        },
+    ],
+});
+
+const { internalBoc } = await wallet.signMessage({
+    messages: estimate.messages,
+    validUntil: estimate.validUntil,
+});
+
+await kit.gasless.send({
+    walletPublicKey: wallet.getPublicKey(),
+    internalBoc,
+});
+```
+
+The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@ton/appkit-react`, `useGaslessEstimate` already refreshes estimates automatically via a 2-minute `staleTime`; if you wire `estimate` manually, re-call it for long-running UIs before signing.
+
+## Error Codes
+
+`GaslessError` extends `DefiError`. The codes are exposed as both static constants on `GaslessError` and a `GaslessErrorCode` enum:
+
+| Code | Meaning |
+|---|---|
+| `UNSUPPORTED_FEE_JETTON` | The relayer does not accept the chosen jetton as fee payment. |
+| `ESTIMATE_FAILED` | Relayer rejected the estimate (insufficient liquidity, malformed messages, …). |
+| `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
+| `CONFIG_FAILED` | Relayer config endpoint failed. |
+| `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not implement the `SignMessage` feature. Surfaced by the higher-level `sendGaslessTransaction` action in `@ton/appkit`. |
+| `TOO_MANY_MESSAGES` | The estimate carries more messages than the wallet's advertised `SignMessage.maxMessages` cap. Surfaced by `sendGaslessTransaction` in `@ton/appkit`. |
+
+## Creating a Custom Gasless Provider
+
+To target a different relayer, extend `GaslessProvider`:
+
+```typescript
+import {
+    GaslessProvider,
+    type GaslessConfig,
+    type GaslessEstimateParams,
+    type GaslessEstimateResult,
+    type GaslessSendParams,
+    type Network,
+} from '@ton/walletkit';
+
+export class MyGaslessProvider extends GaslessProvider {
+    readonly providerId = 'my-relayer';
+
+    getSupportedNetworks(): Network[] {
+        return [Network.mainnet()];
+    }
+
+    async getConfig(): Promise<GaslessConfig> {
+        // …
+    }
+
+    async estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult> {
+        // …
+    }
+
+    async send(params: GaslessSendParams): Promise<void> {
+        // …
+    }
+}
+```
+
+## Available Providers
+
+- **TonApi** (`@ton/walletkit/gasless/tonapi`) – uses the public TonApi gasless API at `https://docs.tonapi.io/tonapi/rest-api/gasless`. Mainnet by default; pass `networks` in the config to enable other chains.
+
+## API Reference
+
+### GaslessManager
+
+#### `getConfig(providerId?)`
+Fetch the relayer config (supported jettons, relay address).
+
+#### `estimate(params, providerId?)`
+Wrap caller's messages with relayer fee-collection logic. Returns wrapped messages, fee, and `validUntil`.
+
+#### `send(params, providerId?)`
+Submit a signed internal-message BoC to the relayer.
+
+#### `registerProvider(provider)` / `setDefaultProvider(providerId)`
+Standard `DefiManager` lifecycle methods.
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index b868bdc75..412cbbbf0 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -13,16 +13,16 @@ export enum GaslessErrorCode {
     EstimateFailed = 'ESTIMATE_FAILED',
     SendFailed = 'SEND_FAILED',
     ConfigFailed = 'CONFIG_FAILED',
+    SignMessageNotSupported = 'SIGN_MESSAGE_NOT_SUPPORTED',
+    TooManyMessages = 'TOO_MANY_MESSAGES',
 }
 
 export class GaslessError extends DefiError {
-    static readonly UNSUPPORTED_FEE_JETTON = GaslessErrorCode.UnsupportedFeeJetton;
-    static readonly ESTIMATE_FAILED = GaslessErrorCode.EstimateFailed;
-    static readonly SEND_FAILED = GaslessErrorCode.SendFailed;
-    static readonly CONFIG_FAILED = GaslessErrorCode.ConfigFailed;
+    public readonly code: GaslessErrorCode;
 
-    constructor(message: string, code: string, details?: unknown) {
+    constructor(message: string, code: GaslessErrorCode, details?: unknown) {
         super(message, code, details);
         this.name = 'GaslessError';
+        this.code = code;
     }
 }
diff --git a/packages/walletkit/src/defi/gasless/index.ts b/packages/walletkit/src/defi/gasless/index.ts
index 00e27cc3c..5616d2d74 100644
--- a/packages/walletkit/src/defi/gasless/index.ts
+++ b/packages/walletkit/src/defi/gasless/index.ts
@@ -8,4 +8,4 @@
 
 export { GaslessProvider } from './GaslessProvider';
 export { GaslessManager } from './GaslessManager';
-export { GaslessError } from './errors';
+export { GaslessError, GaslessErrorCode } from './errors';
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
new file mode 100644
index 000000000..7e9eae29a
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -0,0 +1,250 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { Address, beginCell, internal, storeMessageRelaxed } from '@ton/core';
+import type { TonApiClient } from '@ton-api/client';
+
+import type { Base64String } from '../../../api/models';
+import { Network } from '../../../api/models';
+import { GaslessError, GaslessErrorCode } from '../errors';
+import { TonApiGaslessProvider, createTonApiGaslessProvider } from './TonApiGaslessProvider';
+
+const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+const TEST_PUBKEY = '0x' + 'a'.repeat(64);
+
+const buildSignedInternalBoc = (): Base64String => {
+    const msg = internal({
+        to: Address.parse(TEST_ADDRESS),
+        value: 0n,
+        body: beginCell().storeUint(1, 32).endCell(),
+        bounce: false,
+    });
+    const cell = beginCell().store(storeMessageRelaxed(msg)).endCell();
+    return cell.toBoc().toString('base64') as Base64String;
+};
+
+const makeClient = (
+    overrides: Partial<TonApiClient['gasless']> = {},
+): {
+    client: TonApiClient;
+    gasless: {
+        gaslessConfig: ReturnType<typeof vi.fn>;
+        gaslessEstimate: ReturnType<typeof vi.fn>;
+        gaslessSend: ReturnType<typeof vi.fn>;
+    };
+} => {
+    const gasless = {
+        gaslessConfig: vi.fn(),
+        gaslessEstimate: vi.fn(),
+        gaslessSend: vi.fn(),
+        ...overrides,
+    } as unknown as TonApiClient['gasless'];
+    const client = { gasless } as unknown as TonApiClient;
+    return { client, gasless: gasless as never };
+};
+
+describe('TonApiGaslessProvider configuration', () => {
+    it('defaults providerId to "tonapi"', () => {
+        const { client } = makeClient();
+        const provider = new TonApiGaslessProvider({ client });
+        expect(provider.providerId).toBe('tonapi');
+    });
+
+    it('respects providerId override', () => {
+        const { client } = makeClient();
+        const provider = new TonApiGaslessProvider({ client, providerId: 'custom' });
+        expect(provider.providerId).toBe('custom');
+    });
+
+    it('defaults supported networks to [mainnet]', () => {
+        const { client } = makeClient();
+        const provider = new TonApiGaslessProvider({ client });
+        expect(provider.getSupportedNetworks()).toEqual([Network.mainnet()]);
+    });
+
+    it('accepts custom networks list', () => {
+        const { client } = makeClient();
+        const provider = new TonApiGaslessProvider({
+            client,
+            networks: [Network.mainnet(), Network.testnet()],
+        });
+        expect(provider.getSupportedNetworks()).toEqual([Network.mainnet(), Network.testnet()]);
+    });
+
+    it('exposes "gasless" provider type', () => {
+        const { client } = makeClient();
+        const provider = new TonApiGaslessProvider({ client });
+        expect(provider.type).toBe('gasless');
+    });
+});
+
+describe('createTonApiGaslessProvider', () => {
+    it('returns a factory producing a TonApiGaslessProvider', () => {
+        const { client } = makeClient();
+        const factory = createTonApiGaslessProvider({ client });
+        const provider = factory({} as never);
+        expect(provider).toBeInstanceOf(TonApiGaslessProvider);
+    });
+});
+
+describe('TonApiGaslessProvider.getConfig', () => {
+    let provider: TonApiGaslessProvider;
+    let gasless: ReturnType<typeof makeClient>['gasless'];
+
+    beforeEach(() => {
+        const c = makeClient();
+        provider = new TonApiGaslessProvider({ client: c.client });
+        gasless = c.gasless;
+    });
+
+    it('maps the TonApi response to GaslessConfig', async () => {
+        const relayAddress = Address.parse(TEST_ADDRESS);
+        const masterAddress = Address.parse(TEST_ADDRESS);
+        gasless.gaslessConfig.mockResolvedValueOnce({
+            relayAddress,
+            gasJettons: [{ masterId: masterAddress }],
+        });
+
+        const cfg = await provider.getConfig();
+
+        expect(cfg.relayAddress).toBe(relayAddress.toString({ bounceable: true }));
+        expect(cfg.supportedGasJettons).toHaveLength(1);
+        expect(cfg.supportedGasJettons[0].jettonMaster).toBe(masterAddress.toString({ bounceable: true }));
+    });
+
+    it('wraps client errors in GaslessError(CONFIG_FAILED)', async () => {
+        gasless.gaslessConfig.mockRejectedValueOnce(new Error('boom'));
+
+        await expect(provider.getConfig()).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.ConfigFailed,
+        });
+    });
+});
+
+describe('TonApiGaslessProvider.estimate', () => {
+    let provider: TonApiGaslessProvider;
+    let gasless: ReturnType<typeof makeClient>['gasless'];
+
+    beforeEach(() => {
+        const c = makeClient();
+        provider = new TonApiGaslessProvider({ client: c.client });
+        gasless = c.gasless;
+    });
+
+    it('maps relayer response to GaslessEstimateResult', async () => {
+        const relayAddress = Address.parse(TEST_ADDRESS);
+        const fromAddress = Address.parse(TEST_ADDRESS);
+        const msgAddress = Address.parse(TEST_ADDRESS);
+        const payloadCell = beginCell().storeUint(99, 32).endCell();
+
+        gasless.gaslessEstimate.mockResolvedValueOnce({
+            messages: [{ address: msgAddress, amount: '60000000', payload: payloadCell }],
+            commission: 1234n,
+            validUntil: 999999,
+            relayAddress,
+            from: fromAddress,
+        });
+
+        const result = await provider.estimate({
+            feeJettonMaster: TEST_ADDRESS,
+            walletAddress: TEST_ADDRESS,
+            walletPublicKey: TEST_PUBKEY,
+            messages: [{ address: TEST_ADDRESS, amount: '0' }],
+        });
+
+        expect(result.fee).toBe('1234');
+        expect(result.validUntil).toBe(999999);
+        expect(result.messages).toHaveLength(1);
+        expect(result.messages[0].payload).toBeDefined();
+    });
+
+    it('strips 0x prefix from walletPublicKey before calling the relayer', async () => {
+        const relayAddress = Address.parse(TEST_ADDRESS);
+        gasless.gaslessEstimate.mockResolvedValueOnce({
+            messages: [],
+            commission: 0n,
+            validUntil: 0,
+            relayAddress,
+            from: relayAddress,
+        });
+
+        await provider.estimate({
+            feeJettonMaster: TEST_ADDRESS,
+            walletAddress: TEST_ADDRESS,
+            walletPublicKey: TEST_PUBKEY,
+            messages: [{ address: TEST_ADDRESS, amount: '0' }],
+        });
+
+        const callArg = gasless.gaslessEstimate.mock.calls[0][1] as { walletPublicKey: string };
+        expect(callArg.walletPublicKey).not.toMatch(/^0x/);
+        expect(callArg.walletPublicKey).toBe('a'.repeat(64));
+    });
+
+    it('wraps client errors in GaslessError(ESTIMATE_FAILED)', async () => {
+        gasless.gaslessEstimate.mockRejectedValueOnce(new Error('relayer down'));
+
+        await expect(
+            provider.estimate({
+                feeJettonMaster: TEST_ADDRESS,
+                walletAddress: TEST_ADDRESS,
+                walletPublicKey: TEST_PUBKEY,
+                messages: [{ address: TEST_ADDRESS, amount: '0' }],
+            }),
+        ).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.EstimateFailed,
+        });
+    });
+});
+
+describe('TonApiGaslessProvider.send', () => {
+    it('forwards a parsed external BoC to the relayer', async () => {
+        const { client, gasless } = makeClient();
+        const provider = new TonApiGaslessProvider({ client, sendRetries: 1, sendRetryDelayMs: 0 });
+        gasless.gaslessSend.mockResolvedValueOnce(undefined);
+
+        await provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
+
+        expect(gasless.gaslessSend).toHaveBeenCalledTimes(1);
+        const args = gasless.gaslessSend.mock.calls[0][0];
+        expect(args.walletPublicKey).toBe('a'.repeat(64));
+        expect(args.boc).toBeDefined();
+    });
+
+    it('retries on transient failure up to sendRetries', async () => {
+        const { client, gasless } = makeClient();
+        const provider = new TonApiGaslessProvider({ client, sendRetries: 3, sendRetryDelayMs: 0 });
+
+        gasless.gaslessSend
+            .mockRejectedValueOnce(new Error('transient'))
+            .mockRejectedValueOnce(new Error('transient'))
+            .mockResolvedValueOnce(undefined);
+
+        await provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
+
+        expect(gasless.gaslessSend).toHaveBeenCalledTimes(3);
+    });
+
+    it('wraps persistent send errors in GaslessError(SEND_FAILED)', async () => {
+        const { client, gasless } = makeClient();
+        const provider = new TonApiGaslessProvider({ client, sendRetries: 1, sendRetryDelayMs: 0 });
+        gasless.gaslessSend.mockRejectedValue(new Error('boom'));
+
+        await expect(
+            provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() }),
+        ).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.SendFailed,
+        });
+    });
+});
+
+// Reference: imported for assertions
+void GaslessError;
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 9f0c989cb..3cf563817 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -17,8 +17,9 @@ import type {
 } from '../../../api/models';
 import { Network } from '../../../api/models';
 import { globalLogger } from '../../../core/Logger';
+import type { ProviderFactoryContext } from '../../../types/factory';
 import { CallForSuccess } from '../../../utils/retry';
-import { GaslessError } from '../errors';
+import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
 import { buildInternalMessageCell, cellToBase64, internalBocToExternalMessageBoc, stripHexPrefix } from './utils';
 
@@ -32,6 +33,8 @@ export interface TonApiGaslessProviderConfig {
     client: TonApiClient;
     /** Optional provider id override. Defaults to 'tonapi'. */
     providerId?: string;
+    /** Networks on which this provider can operate. Defaults to `[Network.mainnet()]`. */
+    networks?: Network[];
     /** Number of send retries on transient errors. Defaults to 5. */
     sendRetries?: number;
     /** Delay between send retries in ms. Defaults to 2000. */
@@ -60,6 +63,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
     readonly providerId: string;
 
     private readonly client: TonApiClient;
+    private readonly networks: Network[];
     private readonly sendRetries: number;
     private readonly sendRetryDelayMs: number;
 
@@ -67,12 +71,13 @@ export class TonApiGaslessProvider extends GaslessProvider {
         super();
         this.client = config.client;
         this.providerId = config.providerId ?? 'tonapi';
+        this.networks = config.networks ?? [Network.mainnet()];
         this.sendRetries = config.sendRetries ?? 5;
         this.sendRetryDelayMs = config.sendRetryDelayMs ?? 2000;
     }
 
     getSupportedNetworks(): Network[] {
-        return [Network.mainnet()];
+        return this.networks;
     }
 
     async getConfig(): Promise<GaslessConfig> {
@@ -88,7 +93,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
             log.error('Failed to fetch gasless config', { error });
             throw new GaslessError(
                 error instanceof Error ? error.message : 'Failed to fetch gasless config',
-                GaslessError.CONFIG_FAILED,
+                GaslessErrorCode.ConfigFailed,
                 error,
             );
         }
@@ -126,7 +131,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
             log.error('Failed to estimate gasless transaction', { error, params });
             throw new GaslessError(
                 error instanceof Error ? error.message : 'Failed to estimate gasless transaction',
-                GaslessError.ESTIMATE_FAILED,
+                GaslessErrorCode.EstimateFailed,
                 error,
             );
         }
@@ -150,9 +155,19 @@ export class TonApiGaslessProvider extends GaslessProvider {
             log.error('Failed to send gasless transaction', { error });
             throw new GaslessError(
                 error instanceof Error ? error.message : 'Failed to send gasless transaction',
-                GaslessError.SEND_FAILED,
+                GaslessErrorCode.SendFailed,
                 error,
             );
         }
     }
 }
+
+/**
+ * Factory for `TonApiGaslessProvider` matching the `(ctx) => Provider` shape
+ * expected by `AppKit.registerProvider`.
+ */
+export const createTonApiGaslessProvider = (
+    config: TonApiGaslessProviderConfig,
+): ((ctx: ProviderFactoryContext) => TonApiGaslessProvider) => {
+    return () => new TonApiGaslessProvider(config);
+};
diff --git a/packages/walletkit/src/defi/gasless/tonapi/index.ts b/packages/walletkit/src/defi/gasless/tonapi/index.ts
index 5b50dd0c6..c5928cac7 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/index.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/index.ts
@@ -6,5 +6,5 @@
  *
  */
 
-export { TonApiGaslessProvider } from './TonApiGaslessProvider';
+export { TonApiGaslessProvider, createTonApiGaslessProvider } from './TonApiGaslessProvider';
 export type { TonApiGaslessProviderConfig } from './TonApiGaslessProvider';
diff --git a/packages/walletkit/src/defi/gasless/tonapi/utils.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/utils.spec.ts
new file mode 100644
index 000000000..57035f852
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/utils.spec.ts
@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, it, expect } from 'vitest';
+import { Address, beginCell, Cell, internal, storeMessageRelaxed, storeStateInit } from '@ton/core';
+
+import type { Base64String, TransactionRequestMessage } from '../../../api/models';
+import { GaslessError } from '../errors';
+import { buildInternalMessageCell, cellToBase64, internalBocToExternalMessageBoc, stripHexPrefix } from './utils';
+
+const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+
+const cellToBase64String = (cell: Cell): Base64String => cell.toBoc().toString('base64') as Base64String;
+
+describe('stripHexPrefix', () => {
+    it('removes 0x prefix when present', () => {
+        expect(stripHexPrefix('0xabc')).toBe('abc');
+    });
+
+    it('returns input unchanged when no prefix', () => {
+        expect(stripHexPrefix('abc')).toBe('abc');
+    });
+
+    it('handles empty string', () => {
+        expect(stripHexPrefix('')).toBe('');
+    });
+});
+
+describe('cellToBase64', () => {
+    it('encodes an empty cell to base64 BoC', () => {
+        const cell = beginCell().endCell();
+        const encoded = cellToBase64(cell);
+        const decoded = Cell.fromBase64(encoded);
+        expect(decoded.equals(cell)).toBe(true);
+    });
+});
+
+describe('buildInternalMessageCell', () => {
+    it('builds a bounce=true internal message with payload', () => {
+        const payload = beginCell().storeUint(42, 32).endCell();
+        const message: TransactionRequestMessage = {
+            address: TEST_ADDRESS,
+            amount: '1000000000',
+            payload: cellToBase64String(payload),
+        };
+
+        const cell = buildInternalMessageCell(message);
+        const slice = cell.beginParse();
+
+        // tag: 0 (internal message)
+        expect(slice.loadBit()).toBe(false);
+        // ihrDisabled
+        expect(slice.loadBit()).toBe(true);
+        // bounce flag should be true (gasless default for jetton transfers)
+        expect(slice.loadBit()).toBe(true);
+    });
+
+    it('builds an internal message without payload (empty body)', () => {
+        const message: TransactionRequestMessage = {
+            address: TEST_ADDRESS,
+            amount: '0',
+        };
+
+        const cell = buildInternalMessageCell(message);
+        expect(cell.bits.length).toBeGreaterThan(0);
+    });
+
+    it('attaches stateInit when provided', () => {
+        const code = beginCell().endCell();
+        const data = beginCell().endCell();
+        const stateInit = beginCell().store(storeStateInit({ code, data })).endCell();
+
+        const message: TransactionRequestMessage = {
+            address: TEST_ADDRESS,
+            amount: '500000000',
+            stateInit: cellToBase64String(stateInit),
+        };
+
+        const cell = buildInternalMessageCell(message);
+        // sanity: should produce a valid cell
+        expect(cell.bits.length).toBeGreaterThan(0);
+    });
+});
+
+describe('internalBocToExternalMessageBoc', () => {
+    const buildSignedInternalBoc = (): Base64String => {
+        const body = beginCell().storeUint(1, 32).endCell();
+        const msg = internal({
+            to: Address.parse(TEST_ADDRESS),
+            value: 0n,
+            body,
+            bounce: false,
+        });
+        const cell = beginCell().store(storeMessageRelaxed(msg)).endCell();
+        return cellToBase64String(cell);
+    };
+
+    it('converts an internal-message BoC into an external-message BoC', () => {
+        const internalBoc = buildSignedInternalBoc();
+        const externalCell = internalBocToExternalMessageBoc(internalBoc);
+
+        // The result should be parseable as an external message structure
+        const slice = externalCell.beginParse();
+        // external-in-msg tag (10 = 2 bits, '01')
+        expect(slice.loadBit()).toBe(true);
+        expect(slice.loadBit()).toBe(false);
+    });
+
+    it('throws when input cannot be parsed as a relaxed message', () => {
+        const garbage = cellToBase64String(beginCell().storeUint(0xdead, 16).endCell());
+
+        // The parse layer throws before we reach the GaslessError branch;
+        // either way the conversion must not silently succeed.
+        expect(() => internalBocToExternalMessageBoc(garbage)).toThrow();
+    });
+});
+
+// Reference: GaslessError is exported but its instance is only thrown on the
+// `info.type !== 'internal'` branch, which is unreachable without crafting a
+// relaxed externalOut message (no builder for that in @ton/core). The branch
+// is exercised indirectly via integration in TonApiGaslessProvider.spec.ts.
+void GaslessError;
diff --git a/packages/walletkit/src/defi/gasless/tonapi/utils.ts b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
index 1f389cfe7..a1a26aed4 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/utils.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
@@ -19,7 +19,7 @@ import {
 } from '@ton/core';
 
 import type { Base64String, TransactionRequestMessage } from '../../../api/models';
-import { GaslessError } from '../errors';
+import { GaslessError, GaslessErrorCode } from '../errors';
 
 export const stripHexPrefix = (value: string): string => {
     return value.startsWith('0x') ? value.slice(2) : value;
@@ -63,7 +63,7 @@ export const internalBocToExternalMessageBoc = (internalBoc: Base64String): Cell
     const { info, body, init } = loadMessageRelaxed(parsed.beginParse());
 
     if (info.type !== 'internal') {
-        throw new GaslessError('Signed message must be an internal message', GaslessError.SEND_FAILED);
+        throw new GaslessError('Signed message must be an internal message', GaslessErrorCode.SendFailed);
     }
 
     return beginCell()
diff --git a/packages/walletkit/src/index.ts b/packages/walletkit/src/index.ts
index 963a8c7db..6f7cd8c5c 100644
--- a/packages/walletkit/src/index.ts
+++ b/packages/walletkit/src/index.ts
@@ -22,7 +22,7 @@ export { JettonsManager } from './core/JettonsManager';
 export { DefiError, DefiErrorCode } from './defi/errors';
 export { SwapManager, SwapProvider, SwapError, SwapErrorCode } from './defi/swap';
 export { StakingManager, StakingProvider, StakingError, StakingErrorCode } from './defi/staking';
-export { GaslessManager, GaslessProvider, GaslessError } from './defi/gasless';
+export { GaslessManager, GaslessProvider, GaslessError, GaslessErrorCode } from './defi/gasless';
 export { EventEmitter } from './core/EventEmitter';
 export type { EventListener, EventPayload, KitEvent } from './core/EventEmitter';
 export type { SharedKitEvents } from './types/emitter';
@@ -114,6 +114,7 @@ export type { AnalyticsAppInfo, AnalyticsManagerOptions } from './analytics';
 export type { AccountState, AccountStates, TransactionId } from './api/models';
 export type { ToncenterResponseJettonMasters } from './types/toncenter/emulation';
 export { asHex } from './utils/hex';
+export { asBase64 } from './utils/base64';
 export {
     // Message builders
     storeJettonTransferMessage,

From 72ecb8c9f378e1b7ad36b00d4b9da58becfe0ff1 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 13:30:50 +0400
Subject: [PATCH 07/46] feat(gasless): delete ton-api dependency

---
 .../appkit-minter/src/core/configs/app-kit.ts |  11 +-
 packages/appkit/package.json                  |   3 -
 packages/walletkit/package.json               |   6 +-
 packages/walletkit/src/defi/gasless/README.md |   6 +-
 .../tonapi/TonApiGaslessProvider.spec.ts      | 249 ++++++++++--------
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 139 +++++-----
 .../tonapi/mappers/map-gasless-config.ts      |  18 ++
 .../tonapi/mappers/map-gasless-estimate.ts    |  56 ++++
 .../tonapi/mappers/map-gasless-send.ts        |  22 ++
 .../src/defi/gasless/tonapi/types/config.ts   |  20 ++
 .../src/defi/gasless/tonapi/types/estimate.ts |  35 +++
 .../src/defi/gasless/tonapi/types/send.ts     |  16 ++
 packages/walletkit/src/utils/base64.ts        |   8 +-
 pnpm-lock.yaml                                |  20 --
 14 files changed, 399 insertions(+), 210 deletions(-)
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-estimate.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/types/config.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/types/estimate.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/types/send.ts

diff --git a/apps/appkit-minter/src/core/configs/app-kit.ts b/apps/appkit-minter/src/core/configs/app-kit.ts
index bdf838705..57593832d 100644
--- a/apps/appkit-minter/src/core/configs/app-kit.ts
+++ b/apps/appkit-minter/src/core/configs/app-kit.ts
@@ -18,7 +18,6 @@ import { createDeDustProvider } from '@ton/appkit/swap/dedust';
 import { createOmnistonProvider } from '@ton/appkit/swap/omniston';
 import { createTonstakersProvider } from '@ton/appkit/staking/tonstakers';
 import { createTonApiGaslessProvider } from '@ton/appkit/gasless/tonapi';
-import { TonApiClient } from '@ton-api/client';
 
 import { ENV_TON_API_KEY_TESTNET, ENV_TON_API_KEY_MAINNET } from '@/core/configs/env';
 
@@ -37,10 +36,6 @@ const tetraApiClient = new ApiClientTonApi({
     endpoint: 'https://tetra.tonapi.io',
 });
 
-const mainnetTonApi = new TonApiClient({
-    baseUrl: 'https://tonapi.io',
-});
-
 export const appKit = new AppKit({
     networks: {
         [Network.mainnet().chainId]: { apiClient: mainnetApiClient },
@@ -60,6 +55,10 @@ export const appKit = new AppKit({
         createTonstakersProvider(),
         createTonCenterStreamingProvider({ network: Network.mainnet(), apiKey: ENV_TON_API_KEY_MAINNET }),
         createTonCenterStreamingProvider({ network: Network.testnet(), apiKey: ENV_TON_API_KEY_TESTNET }),
-        createTonApiGaslessProvider({ client: mainnetTonApi }),
+        // Note: `apiKey` is intentionally omitted. ENV_TON_API_KEY_MAINNET is a Toncenter v3 key
+        // (hex format) — TonAPI uses a different base32 token format, so passing the Toncenter
+        // key as Bearer here triggers a 401 "illegal base32 data" from TonAPI. The gasless
+        // config endpoint is public; supply a real TonAPI key here if you need higher rate limits.
+        createTonApiGaslessProvider({ network: Network.mainnet() }),
     ],
 });
diff --git a/packages/appkit/package.json b/packages/appkit/package.json
index c8af9fe5b..e6bea8d09 100644
--- a/packages/appkit/package.json
+++ b/packages/appkit/package.json
@@ -119,9 +119,6 @@
     "@ston-fi/omniston-sdk": {
       "optional": true
     },
-    "@ton-api/client": {
-      "optional": true
-    },
     "@tanstack/query-core": {
       "optional": true
     }
diff --git a/packages/walletkit/package.json b/packages/walletkit/package.json
index 49fa6ef5e..a576ec70c 100644
--- a/packages/walletkit/package.json
+++ b/packages/walletkit/package.json
@@ -136,14 +136,10 @@
   "peerDependenciesMeta": {
     "@ston-fi/omniston-sdk": {
       "optional": true
-    },
-    "@ton-api/client": {
-      "optional": true
     }
   },
   "optionalDependencies": {
-    "@ston-fi/omniston-sdk": "^0.7.9",
-    "@ton-api/client": "^0.4.0"
+    "@ston-fi/omniston-sdk": "^0.7.9"
   },
   "devDependencies": {
     "@jest/globals": "^30.2.0",
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index 182617557..aec569c0e 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -14,7 +14,6 @@
 ```typescript
 import { TonWalletKit, Network } from '@ton/walletkit';
 import { createTonApiGaslessProvider } from '@ton/walletkit/gasless/tonapi';
-import { TonApiClient } from '@ton-api/client';
 
 const kit = new TonWalletKit({
     networks: {
@@ -24,7 +23,8 @@ const kit = new TonWalletKit({
 
 kit.gasless.registerProvider(
     createTonApiGaslessProvider({
-        client: new TonApiClient({ baseUrl: 'https://tonapi.io' }),
+        network: Network.mainnet(),
+        apiKey: process.env.TON_API_KEY,
     }),
 );
 ```
@@ -118,7 +118,7 @@ export class MyGaslessProvider extends GaslessProvider {
 
 ## Available Providers
 
-- **TonApi** (`@ton/walletkit/gasless/tonapi`) – uses the public TonApi gasless API at `https://docs.tonapi.io/tonapi/rest-api/gasless`. Mainnet by default; pass `networks` in the config to enable other chains.
+- **TonApi** (`@ton/walletkit/gasless/tonapi`) – uses the public TonApi gasless REST API documented at `https://docs.tonapi.io/tonapi/rest-api/gasless`. One provider instance per network: pass `network: Network.mainnet()` (default endpoint `https://tonapi.io`) or `network: Network.testnet()` (`https://testnet.tonapi.io`). No external SDK dependency — talks to TonAPI directly via `fetch`.
 
 ## API Reference
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 7e9eae29a..1025d0711 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -7,12 +7,11 @@
  */
 
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { Address, beginCell, internal, storeMessageRelaxed } from '@ton/core';
-import type { TonApiClient } from '@ton-api/client';
+import { Address, beginCell, Cell, internal, storeMessageRelaxed } from '@ton/core';
 
 import type { Base64String } from '../../../api/models';
 import { Network } from '../../../api/models';
-import { GaslessError, GaslessErrorCode } from '../errors';
+import { GaslessErrorCode } from '../errors';
 import { TonApiGaslessProvider, createTonApiGaslessProvider } from './TonApiGaslessProvider';
 
 const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
@@ -29,97 +28,116 @@ const buildSignedInternalBoc = (): Base64String => {
     return cell.toBoc().toString('base64') as Base64String;
 };
 
-const makeClient = (
-    overrides: Partial<TonApiClient['gasless']> = {},
-): {
-    client: TonApiClient;
-    gasless: {
-        gaslessConfig: ReturnType<typeof vi.fn>;
-        gaslessEstimate: ReturnType<typeof vi.fn>;
-        gaslessSend: ReturnType<typeof vi.fn>;
-    };
-} => {
-    const gasless = {
-        gaslessConfig: vi.fn(),
-        gaslessEstimate: vi.fn(),
-        gaslessSend: vi.fn(),
+const jsonResponse = (body: unknown, init: { status?: number } = {}): Response => {
+    return new Response(JSON.stringify(body), {
+        status: init.status ?? 200,
+        headers: { 'content-type': 'application/json' },
+    });
+};
+
+const makeFetch = () => vi.fn<typeof fetch>();
+
+const makeProvider = (
+    fetchApi: ReturnType<typeof makeFetch>,
+    overrides: Partial<Parameters<typeof createTonApiGaslessProvider>[0]> = {},
+): TonApiGaslessProvider => {
+    return new TonApiGaslessProvider({
+        network: Network.mainnet(),
+        fetchApi,
+        sendRetries: 1,
+        sendRetryDelayMs: 0,
         ...overrides,
-    } as unknown as TonApiClient['gasless'];
-    const client = { gasless } as unknown as TonApiClient;
-    return { client, gasless: gasless as never };
+    });
 };
 
 describe('TonApiGaslessProvider configuration', () => {
-    it('defaults providerId to "tonapi"', () => {
-        const { client } = makeClient();
-        const provider = new TonApiGaslessProvider({ client });
-        expect(provider.providerId).toBe('tonapi');
+    it('defaults providerId to tonapi-${network.chainId}', () => {
+        const provider = makeProvider(makeFetch());
+        expect(provider.providerId).toBe(`tonapi-${Network.mainnet().chainId}`);
     });
 
     it('respects providerId override', () => {
-        const { client } = makeClient();
-        const provider = new TonApiGaslessProvider({ client, providerId: 'custom' });
+        const provider = makeProvider(makeFetch(), { providerId: 'custom' });
         expect(provider.providerId).toBe('custom');
     });
 
-    it('defaults supported networks to [mainnet]', () => {
-        const { client } = makeClient();
-        const provider = new TonApiGaslessProvider({ client });
-        expect(provider.getSupportedNetworks()).toEqual([Network.mainnet()]);
-    });
-
-    it('accepts custom networks list', () => {
-        const { client } = makeClient();
-        const provider = new TonApiGaslessProvider({
-            client,
-            networks: [Network.mainnet(), Network.testnet()],
-        });
-        expect(provider.getSupportedNetworks()).toEqual([Network.mainnet(), Network.testnet()]);
+    it('reports the configured network in getSupportedNetworks', () => {
+        const provider = makeProvider(makeFetch(), { network: Network.testnet() });
+        expect(provider.getSupportedNetworks()).toEqual([Network.testnet()]);
     });
 
     it('exposes "gasless" provider type', () => {
-        const { client } = makeClient();
-        const provider = new TonApiGaslessProvider({ client });
+        const provider = makeProvider(makeFetch());
         expect(provider.type).toBe('gasless');
     });
 });
 
 describe('createTonApiGaslessProvider', () => {
     it('returns a factory producing a TonApiGaslessProvider', () => {
-        const { client } = makeClient();
-        const factory = createTonApiGaslessProvider({ client });
+        const factory = createTonApiGaslessProvider({ network: Network.mainnet() });
         const provider = factory({} as never);
         expect(provider).toBeInstanceOf(TonApiGaslessProvider);
     });
 });
 
 describe('TonApiGaslessProvider.getConfig', () => {
+    let fetchApi: ReturnType<typeof makeFetch>;
     let provider: TonApiGaslessProvider;
-    let gasless: ReturnType<typeof makeClient>['gasless'];
 
     beforeEach(() => {
-        const c = makeClient();
-        provider = new TonApiGaslessProvider({ client: c.client });
-        gasless = c.gasless;
+        fetchApi = makeFetch();
+        provider = makeProvider(fetchApi);
+    });
+
+    const rawConfig = (overrides: Record<string, unknown> = {}) => ({
+        relay_address: Address.parse(TEST_ADDRESS).toRawString(),
+        gas_jettons: [{ master_id: Address.parse(TEST_ADDRESS).toRawString() }],
+        ...overrides,
     });
 
     it('maps the TonApi response to GaslessConfig', async () => {
-        const relayAddress = Address.parse(TEST_ADDRESS);
-        const masterAddress = Address.parse(TEST_ADDRESS);
-        gasless.gaslessConfig.mockResolvedValueOnce({
-            relayAddress,
-            gasJettons: [{ masterId: masterAddress }],
-        });
+        fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig()));
 
         const cfg = await provider.getConfig();
 
-        expect(cfg.relayAddress).toBe(relayAddress.toString({ bounceable: true }));
+        expect(cfg.relayAddress).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
         expect(cfg.supportedGasJettons).toHaveLength(1);
-        expect(cfg.supportedGasJettons[0].jettonMaster).toBe(masterAddress.toString({ bounceable: true }));
+        expect(cfg.supportedGasJettons[0].jettonMaster).toBe(
+            Address.parse(TEST_ADDRESS).toString({ bounceable: true }),
+        );
+    });
+
+    it('hits /v2/gasless/config on the network endpoint', async () => {
+        fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
+
+        await provider.getConfig();
+
+        const url = (fetchApi.mock.calls[0][0] as URL).toString();
+        expect(url).toBe('https://tonapi.io/v2/gasless/config');
+    });
+
+    it('uses the testnet endpoint for testnet provider', async () => {
+        const testnetProvider = makeProvider(fetchApi, { network: Network.testnet() });
+        fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
+
+        await testnetProvider.getConfig();
+
+        expect((fetchApi.mock.calls[0][0] as URL).origin).toBe('https://testnet.tonapi.io');
     });
 
-    it('wraps client errors in GaslessError(CONFIG_FAILED)', async () => {
-        gasless.gaslessConfig.mockRejectedValueOnce(new Error('boom'));
+    it('sends Bearer authorization when apiKey is provided', async () => {
+        const authedProvider = makeProvider(fetchApi, { apiKey: 'sk_test_123' });
+        fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
+
+        await authedProvider.getConfig();
+
+        const init = fetchApi.mock.calls[0][1] as RequestInit;
+        const headers = init.headers as Headers;
+        expect(headers.get('Authorization')).toBe('Bearer sk_test_123');
+    });
+
+    it('wraps fetch errors in GaslessError(CONFIG_FAILED)', async () => {
+        fetchApi.mockResolvedValueOnce(new Response('boom', { status: 500 }));
 
         await expect(provider.getConfig()).rejects.toMatchObject({
             name: 'GaslessError',
@@ -129,28 +147,31 @@ describe('TonApiGaslessProvider.getConfig', () => {
 });
 
 describe('TonApiGaslessProvider.estimate', () => {
+    let fetchApi: ReturnType<typeof makeFetch>;
     let provider: TonApiGaslessProvider;
-    let gasless: ReturnType<typeof makeClient>['gasless'];
 
     beforeEach(() => {
-        const c = makeClient();
-        provider = new TonApiGaslessProvider({ client: c.client });
-        gasless = c.gasless;
+        fetchApi = makeFetch();
+        provider = makeProvider(fetchApi);
+    });
+
+    const makeRawEstimate = (overrides: Record<string, unknown> = {}) => ({
+        messages: [
+            {
+                address: Address.parse(TEST_ADDRESS).toRawString(),
+                amount: '60000000',
+                payload: beginCell().storeUint(99, 32).endCell().toBoc().toString('hex'),
+            },
+        ],
+        commission: '1234',
+        valid_until: 999999,
+        relay_address: Address.parse(TEST_ADDRESS).toRawString(),
+        from: Address.parse(TEST_ADDRESS).toRawString(),
+        ...overrides,
     });
 
     it('maps relayer response to GaslessEstimateResult', async () => {
-        const relayAddress = Address.parse(TEST_ADDRESS);
-        const fromAddress = Address.parse(TEST_ADDRESS);
-        const msgAddress = Address.parse(TEST_ADDRESS);
-        const payloadCell = beginCell().storeUint(99, 32).endCell();
-
-        gasless.gaslessEstimate.mockResolvedValueOnce({
-            messages: [{ address: msgAddress, amount: '60000000', payload: payloadCell }],
-            commission: 1234n,
-            validUntil: 999999,
-            relayAddress,
-            from: fromAddress,
-        });
+        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawEstimate()));
 
         const result = await provider.estimate({
             feeJettonMaster: TEST_ADDRESS,
@@ -163,18 +184,33 @@ describe('TonApiGaslessProvider.estimate', () => {
         expect(result.validUntil).toBe(999999);
         expect(result.messages).toHaveLength(1);
         expect(result.messages[0].payload).toBeDefined();
+        // Returned payload must be a valid base64 BoC
+        expect(() => Cell.fromBase64(result.messages[0].payload as string)).not.toThrow();
     });
 
-    it('strips 0x prefix from walletPublicKey before calling the relayer', async () => {
-        const relayAddress = Address.parse(TEST_ADDRESS);
-        gasless.gaslessEstimate.mockResolvedValueOnce({
-            messages: [],
-            commission: 0n,
-            validUntil: 0,
-            relayAddress,
-            from: relayAddress,
+    it('strips 0x prefix from walletPublicKey and serializes BoCs as hex', async () => {
+        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawEstimate({ messages: [], commission: '0', validUntil: 0 })));
+
+        await provider.estimate({
+            feeJettonMaster: TEST_ADDRESS,
+            walletAddress: TEST_ADDRESS,
+            walletPublicKey: TEST_PUBKEY,
+            messages: [{ address: TEST_ADDRESS, amount: '0' }],
         });
 
+        const init = fetchApi.mock.calls[0][1] as RequestInit;
+        const body = JSON.parse(init.body as string);
+        expect(body.wallet_public_key).not.toMatch(/^0x/);
+        expect(body.wallet_public_key).toBe('a'.repeat(64));
+        expect(body.wallet_address).toBeDefined();
+        expect(body.messages[0].boc).toMatch(/^[0-9a-f]+$/);
+    });
+
+    it('posts to /v2/gasless/estimate/{master_id}', async () => {
+        fetchApi.mockResolvedValueOnce(
+            jsonResponse(makeRawEstimate({ messages: [], commission: '0', valid_until: 0 })),
+        );
+
         await provider.estimate({
             feeJettonMaster: TEST_ADDRESS,
             walletAddress: TEST_ADDRESS,
@@ -182,13 +218,14 @@ describe('TonApiGaslessProvider.estimate', () => {
             messages: [{ address: TEST_ADDRESS, amount: '0' }],
         });
 
-        const callArg = gasless.gaslessEstimate.mock.calls[0][1] as { walletPublicKey: string };
-        expect(callArg.walletPublicKey).not.toMatch(/^0x/);
-        expect(callArg.walletPublicKey).toBe('a'.repeat(64));
+        const url = (fetchApi.mock.calls[0][0] as URL).toString();
+        expect(url).toContain('/v2/gasless/estimate/');
+        const init = fetchApi.mock.calls[0][1] as RequestInit;
+        expect(init.method).toBe('POST');
     });
 
-    it('wraps client errors in GaslessError(ESTIMATE_FAILED)', async () => {
-        gasless.gaslessEstimate.mockRejectedValueOnce(new Error('relayer down'));
+    it('wraps fetch errors in GaslessError(ESTIMATE_FAILED)', async () => {
+        fetchApi.mockResolvedValueOnce(new Response('relayer down', { status: 502 }));
 
         await expect(
             provider.estimate({
@@ -205,37 +242,38 @@ describe('TonApiGaslessProvider.estimate', () => {
 });
 
 describe('TonApiGaslessProvider.send', () => {
-    it('forwards a parsed external BoC to the relayer', async () => {
-        const { client, gasless } = makeClient();
-        const provider = new TonApiGaslessProvider({ client, sendRetries: 1, sendRetryDelayMs: 0 });
-        gasless.gaslessSend.mockResolvedValueOnce(undefined);
+    it('forwards a parsed external BoC (hex) to the relayer', async () => {
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi);
+        fetchApi.mockResolvedValueOnce(jsonResponse({}));
 
         await provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
 
-        expect(gasless.gaslessSend).toHaveBeenCalledTimes(1);
-        const args = gasless.gaslessSend.mock.calls[0][0];
-        expect(args.walletPublicKey).toBe('a'.repeat(64));
-        expect(args.boc).toBeDefined();
+        expect(fetchApi).toHaveBeenCalledTimes(1);
+        const init = fetchApi.mock.calls[0][1] as RequestInit;
+        const body = JSON.parse(init.body as string);
+        expect(body.wallet_public_key).toBe('a'.repeat(64));
+        expect(body.boc).toMatch(/^[0-9a-f]+$/);
     });
 
     it('retries on transient failure up to sendRetries', async () => {
-        const { client, gasless } = makeClient();
-        const provider = new TonApiGaslessProvider({ client, sendRetries: 3, sendRetryDelayMs: 0 });
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi, { sendRetries: 3 });
 
-        gasless.gaslessSend
-            .mockRejectedValueOnce(new Error('transient'))
-            .mockRejectedValueOnce(new Error('transient'))
-            .mockResolvedValueOnce(undefined);
+        fetchApi
+            .mockResolvedValueOnce(new Response('transient', { status: 500 }))
+            .mockResolvedValueOnce(new Response('transient', { status: 500 }))
+            .mockResolvedValueOnce(jsonResponse({}));
 
         await provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
 
-        expect(gasless.gaslessSend).toHaveBeenCalledTimes(3);
+        expect(fetchApi).toHaveBeenCalledTimes(3);
     });
 
     it('wraps persistent send errors in GaslessError(SEND_FAILED)', async () => {
-        const { client, gasless } = makeClient();
-        const provider = new TonApiGaslessProvider({ client, sendRetries: 1, sendRetryDelayMs: 0 });
-        gasless.gaslessSend.mockRejectedValue(new Error('boom'));
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi);
+        fetchApi.mockResolvedValue(new Response('boom', { status: 500 }));
 
         await expect(
             provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() }),
@@ -245,6 +283,3 @@ describe('TonApiGaslessProvider.send', () => {
         });
     });
 });
-
-// Reference: imported for assertions
-void GaslessError;
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 3cf563817..2ae9f3471 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -7,7 +7,6 @@
  */
 
 import { Address } from '@ton/core';
-import type { TonApiClient } from '@ton-api/client';
 
 import type {
     GaslessConfig,
@@ -16,25 +15,59 @@ import type {
     GaslessSendParams,
 } from '../../../api/models';
 import { Network } from '../../../api/models';
+import { BaseApiClient } from '../../../clients/BaseApiClient';
 import { globalLogger } from '../../../core/Logger';
 import type { ProviderFactoryContext } from '../../../types/factory';
 import { CallForSuccess } from '../../../utils/retry';
 import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
-import { buildInternalMessageCell, cellToBase64, internalBocToExternalMessageBoc, stripHexPrefix } from './utils';
+import { mapGaslessConfig } from './mappers/map-gasless-config';
+import { buildGaslessEstimateRequest, mapGaslessEstimate } from './mappers/map-gasless-estimate';
+import { buildGaslessSendRequest } from './mappers/map-gasless-send';
+import type { TonApiGaslessConfig } from './types/config';
+import type { TonApiGaslessEstimateResponse } from './types/estimate';
 
 const log = globalLogger.createChild('TonApiGaslessProvider');
 
+const DEFAULT_SEND_RETRIES = 5;
+const DEFAULT_SEND_RETRY_DELAY_MS = 2000;
+
+const defaultEndpoint = (network: Network): string => {
+    switch (network.chainId) {
+        case Network.mainnet().chainId:
+            return 'https://tonapi.io';
+        case Network.tetra().chainId:
+            return 'https://tetra.tonapi.io';
+        default:
+            return 'https://testnet.tonapi.io';
+    }
+};
+
+class TonApiHttpClient extends BaseApiClient {
+    protected appendAuthHeaders(headers: Headers): void {
+        if (this.apiKey) {
+            headers.set('Authorization', `Bearer ${this.apiKey}`);
+        }
+    }
+}
+
 /**
- * Configuration for TonApiGaslessProvider.
+ * Configuration for `TonApiGaslessProvider`.
+ *
+ * Shape mirrors `TonApiStreamingProviderConfig` — one provider instance per
+ * network. To support both mainnet and testnet, register two providers.
  */
 export interface TonApiGaslessProviderConfig {
-    /** Pre-configured TonApi client (brings its own baseUrl / API key). */
-    client: TonApiClient;
-    /** Optional provider id override. Defaults to 'tonapi'. */
+    /** Network this provider operates on. Determines the default endpoint. */
+    network: Network;
+    /** Optional TonAPI REST endpoint override. */
+    endpoint?: string;
+    /** Optional bearer token for TonAPI. */
+    apiKey?: string;
+    /** Optional fetch implementation override (testing / SSR). */
+    fetchApi?: typeof fetch;
+    /** Optional provider id override. Defaults to `tonapi-${network.chainId}`. */
     providerId?: string;
-    /** Networks on which this provider can operate. Defaults to `[Network.mainnet()]`. */
-    networks?: Network[];
     /** Number of send retries on transient errors. Defaults to 5. */
     sendRetries?: number;
     /** Delay between send retries in ms. Defaults to 2000. */
@@ -42,53 +75,56 @@ export interface TonApiGaslessProviderConfig {
 }
 
 /**
- * Gasless provider implementation backed by TonApi (@ton-api/client).
+ * Gasless provider implementation backed by the public TonAPI REST API.
  *
- * Follows the public gasless flow documented at
- * https://docs.tonapi.io/tonapi/rest-api/gasless.
+ * Implements the flow documented at https://docs.tonapi.io/tonapi/rest-api/gasless.
  *
  * @example
  * ```typescript
- * import { TonApiClient } from '@ton-api/client';
- * import { TonApiGaslessProvider } from '@ton/walletkit/gasless/tonapi';
+ * import { Network } from '@ton/walletkit';
+ * import { createTonApiGaslessProvider } from '@ton/walletkit/gasless/tonapi';
  *
- * const provider = new TonApiGaslessProvider({
- *     client: new TonApiClient({ baseUrl: 'https://tonapi.io' }),
+ * const provider = createTonApiGaslessProvider({
+ *     network: Network.mainnet(),
+ *     apiKey: process.env.TON_API_KEY,
  * });
  *
- * kit.registerProvider(provider);
+ * kit.gasless.registerProvider(provider);
  * ```
  */
 export class TonApiGaslessProvider extends GaslessProvider {
     readonly providerId: string;
 
-    private readonly client: TonApiClient;
-    private readonly networks: Network[];
+    private readonly network: Network;
+    private readonly http: TonApiHttpClient;
     private readonly sendRetries: number;
     private readonly sendRetryDelayMs: number;
 
     constructor(config: TonApiGaslessProviderConfig) {
         super();
-        this.client = config.client;
-        this.providerId = config.providerId ?? 'tonapi';
-        this.networks = config.networks ?? [Network.mainnet()];
-        this.sendRetries = config.sendRetries ?? 5;
-        this.sendRetryDelayMs = config.sendRetryDelayMs ?? 2000;
+        this.network = config.network;
+        this.providerId = config.providerId ?? `tonapi-${config.network.chainId}`;
+        this.sendRetries = config.sendRetries ?? DEFAULT_SEND_RETRIES;
+        this.sendRetryDelayMs = config.sendRetryDelayMs ?? DEFAULT_SEND_RETRY_DELAY_MS;
+        this.http = new TonApiHttpClient(
+            {
+                endpoint: config.endpoint,
+                apiKey: config.apiKey,
+                fetchApi: config.fetchApi,
+                network: config.network,
+            },
+            defaultEndpoint(config.network),
+        );
     }
 
     getSupportedNetworks(): Network[] {
-        return this.networks;
+        return [this.network];
     }
 
     async getConfig(): Promise<GaslessConfig> {
         try {
-            const cfg = await this.client.gasless.gaslessConfig();
-            return {
-                relayAddress: cfg.relayAddress.toString({ bounceable: true }),
-                supportedGasJettons: cfg.gasJettons.map((jetton) => ({
-                    jettonMaster: jetton.masterId.toString({ bounceable: true }),
-                })),
-            };
+            const raw = await this.http.getJson<TonApiGaslessConfig>('/v2/gasless/config');
+            return mapGaslessConfig(raw);
         } catch (error) {
             log.error('Failed to fetch gasless config', { error });
             throw new GaslessError(
@@ -100,33 +136,15 @@ export class TonApiGaslessProvider extends GaslessProvider {
     }
 
     async estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult> {
-        const feeJettonMaster = Address.parse(params.feeJettonMaster);
-        const walletAddress = Address.parse(params.walletAddress);
-        const walletPublicKey = stripHexPrefix(params.walletPublicKey);
-
-        const messagesBoc = params.messages.map((message) => ({
-            boc: buildInternalMessageCell(message),
-        }));
+        const masterId = Address.parse(params.feeJettonMaster).toRawString();
+        const body = buildGaslessEstimateRequest(params);
 
         try {
-            const result = await this.client.gasless.gaslessEstimate(feeJettonMaster, {
-                walletAddress,
-                walletPublicKey,
-                messages: messagesBoc,
-            });
-
-            return {
-                messages: result.messages.map((message) => ({
-                    address: message.address.toString({ bounceable: true }),
-                    amount: message.amount,
-                    payload: message.payload ? cellToBase64(message.payload) : undefined,
-                    stateInit: message.stateInit ? cellToBase64(message.stateInit) : undefined,
-                })),
-                fee: result.commission.toString(),
-                validUntil: result.validUntil,
-                relayAddress: result.relayAddress.toString({ bounceable: true }),
-                from: result.from.toString({ bounceable: true }),
-            };
+            const raw = await this.http.postJson<TonApiGaslessEstimateResponse>(
+                `/v2/gasless/estimate/${masterId}`,
+                body,
+            );
+            return mapGaslessEstimate(raw);
         } catch (error) {
             log.error('Failed to estimate gasless transaction', { error, params });
             throw new GaslessError(
@@ -138,16 +156,11 @@ export class TonApiGaslessProvider extends GaslessProvider {
     }
 
     async send(params: GaslessSendParams): Promise<void> {
-        const walletPublicKey = stripHexPrefix(params.walletPublicKey);
-        const externalBoc = internalBocToExternalMessageBoc(params.internalBoc);
+        const body = buildGaslessSendRequest(params);
 
         try {
             await CallForSuccess(
-                () =>
-                    this.client.gasless.gaslessSend({
-                        walletPublicKey,
-                        boc: externalBoc,
-                    }),
+                () => this.http.postJson('/v2/gasless/send', body),
                 this.sendRetries,
                 this.sendRetryDelayMs,
             );
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
new file mode 100644
index 000000000..adcd48cd7
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessConfig } from '../../../../api/models';
+import { asAddressFriendly } from '../../../../utils/address';
+import type { TonApiGaslessConfig } from '../types/config';
+
+export const mapGaslessConfig = (raw: TonApiGaslessConfig): GaslessConfig => ({
+    relayAddress: asAddressFriendly(raw.relay_address),
+    supportedGasJettons: raw.gas_jettons.map((jetton) => ({
+        jettonMaster: asAddressFriendly(jetton.master_id),
+    })),
+});
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-estimate.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-estimate.ts
new file mode 100644
index 000000000..861e07d97
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-estimate.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { Address } from '@ton/core';
+
+import type { GaslessEstimateParams, GaslessEstimateResult } from '../../../../api/models';
+import { asAddressFriendly } from '../../../../utils/address';
+import { HexToBase64 } from '../../../../utils/base64';
+import { asHex } from '../../../../utils/hex';
+import { buildInternalMessageCell, stripHexPrefix } from '../utils';
+import type { TonApiGaslessEstimateRequest, TonApiGaslessEstimateResponse } from '../types/estimate';
+
+/**
+ * TonAPI returns BoCs as bare hex strings (no `0x` prefix); the walletkit
+ * domain uses base64 (`Base64String`). Re-encoding is byte-identical.
+ */
+const hexBocToBase64 = (hex: string) => {
+    const normalizedHex = asHex(hex.startsWith('0x') ? hex : `0x${hex}`);
+    return HexToBase64(normalizedHex);
+};
+
+/**
+ * Domain → wire: build the JSON body for `POST /v2/gasless/estimate/{master_id}`.
+ *
+ * Caller messages are encoded as hex BoCs of internal messages (TonAPI's wire format).
+ */
+export const buildGaslessEstimateRequest = (params: GaslessEstimateParams): TonApiGaslessEstimateRequest => ({
+    wallet_address: Address.parse(params.walletAddress).toRawString(),
+    wallet_public_key: stripHexPrefix(params.walletPublicKey),
+    messages: params.messages.map((message) => ({
+        boc: buildInternalMessageCell(message).toBoc().toString('hex'),
+    })),
+});
+
+/**
+ * Wire → domain: map the TonAPI estimate response to `GaslessEstimateResult`.
+ *
+ * Hex BoCs in `payload` / `state_init` are converted back to base64.
+ */
+export const mapGaslessEstimate = (raw: TonApiGaslessEstimateResponse): GaslessEstimateResult => ({
+    messages: raw.messages.map((message) => ({
+        address: asAddressFriendly(message.address),
+        amount: message.amount,
+        payload: message.payload ? hexBocToBase64(message.payload) : undefined,
+        stateInit: message.state_init ? hexBocToBase64(message.state_init) : undefined,
+    })),
+    fee: raw.commission,
+    validUntil: raw.valid_until,
+    relayAddress: asAddressFriendly(raw.relay_address),
+    from: asAddressFriendly(raw.from),
+});
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
new file mode 100644
index 000000000..5eacca489
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessSendParams } from '../../../../api/models';
+import { internalBocToExternalMessageBoc, stripHexPrefix } from '../utils';
+import type { TonApiGaslessSendRequest } from '../types/send';
+
+/**
+ * Domain → wire: build the JSON body for `POST /v2/gasless/send`.
+ *
+ * The signed internal-message BoC (returned by `wallet.signMessage`) is
+ * unwrapped into an external message BoC that the relayer can broadcast.
+ */
+export const buildGaslessSendRequest = (params: GaslessSendParams): TonApiGaslessSendRequest => ({
+    wallet_public_key: stripHexPrefix(params.walletPublicKey),
+    boc: internalBocToExternalMessageBoc(params.internalBoc).toBoc().toString('hex'),
+});
diff --git a/packages/walletkit/src/defi/gasless/tonapi/types/config.ts b/packages/walletkit/src/defi/gasless/tonapi/types/config.ts
new file mode 100644
index 000000000..b8c701750
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/types/config.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/**
+ * Wire-format response from `GET /v2/gasless/config`.
+ * See https://docs.tonapi.io/tonapi/rest-api/gasless.
+ */
+export interface TonApiGaslessConfig {
+    relay_address: string;
+    gas_jettons: TonApiGaslessGasJetton[];
+}
+
+export interface TonApiGaslessGasJetton {
+    master_id: string;
+}
diff --git a/packages/walletkit/src/defi/gasless/tonapi/types/estimate.ts b/packages/walletkit/src/defi/gasless/tonapi/types/estimate.ts
new file mode 100644
index 000000000..6a13feed2
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/types/estimate.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/**
+ * Wire-format request body for `POST /v2/gasless/estimate/{master_id}`.
+ * See https://docs.tonapi.io/tonapi/rest-api/gasless.
+ */
+export interface TonApiGaslessEstimateRequest {
+    wallet_address: string;
+    wallet_public_key: string;
+    messages: Array<{ boc: string }>;
+}
+
+/**
+ * Wire-format response from `POST /v2/gasless/estimate/{master_id}`.
+ */
+export interface TonApiGaslessEstimateResponse {
+    relay_address: string;
+    commission: string;
+    from: string;
+    valid_until: number;
+    messages: TonApiGaslessRawMessage[];
+}
+
+export interface TonApiGaslessRawMessage {
+    address: string;
+    amount: string;
+    payload?: string;
+    state_init?: string;
+}
diff --git a/packages/walletkit/src/defi/gasless/tonapi/types/send.ts b/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
new file mode 100644
index 000000000..75d98af7e
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/**
+ * Wire-format request body for `POST /v2/gasless/send`.
+ * See https://docs.tonapi.io/tonapi/rest-api/gasless.
+ */
+export interface TonApiGaslessSendRequest {
+    wallet_public_key: string;
+    boc: string;
+}
diff --git a/packages/walletkit/src/utils/base64.ts b/packages/walletkit/src/utils/base64.ts
index 0a397bcbc..359500900 100644
--- a/packages/walletkit/src/utils/base64.ts
+++ b/packages/walletkit/src/utils/base64.ts
@@ -122,7 +122,7 @@ export function Base64ToUint8Array(data?: string | null): Uint8Array | null {
  * @param data Uint8Array
  * @returns Base64 string
  */
-export function Uint8ArrayToBase64(data: Uint8Array): string {
+export function Uint8ArrayToBase64(data: Uint8Array): Base64String {
     if (typeof btoa === 'undefined' && typeof Buffer === 'undefined') {
         throw new Error('btoa is not available in this environment');
     }
@@ -130,7 +130,9 @@ export function Uint8ArrayToBase64(data: Uint8Array): string {
     for (let i = 0; i < data.length; i++) {
         binary += String.fromCharCode(data[i]);
     }
-    return typeof btoa === 'function' ? btoa(binary) : Buffer.from(data).toString('base64');
+    return typeof btoa === 'function'
+        ? (btoa(binary) as Base64String)
+        : (Buffer.from(data).toString('base64') as Base64String);
 }
 
 /**
@@ -205,6 +207,6 @@ export function HexToUint8Array(data: Hex): Uint8Array {
  * @param data Hex (hex string starting with 0x)
  * @returns Base64 string
  */
-export function HexToBase64(data: Hex): string {
+export function HexToBase64(data: Hex): Base64String {
     return Uint8ArrayToBase64(HexToUint8Array(data));
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9e5c9292f..5d6a1e1be 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -878,9 +878,6 @@ importers:
       '@ston-fi/omniston-sdk':
         specifier: ^0.7.9
         version: 0.7.9(bufferutil@4.1.0)(utf-8-validate@5.0.10)
-      '@ton-api/client':
-        specifier: ^0.4.0
-        version: 0.4.0(@ton/core@0.63.1(@ton/crypto@3.3.0))
 
   packages/walletkit-android-bridge:
     dependencies:
@@ -4033,11 +4030,6 @@ packages:
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
 
-  '@ton-api/client@0.4.0':
-    resolution: {integrity: sha512-k3d6RzNWRDEZpVa9Gig2kHqp74tGvaK/imkjb08RIGxn+wKC7Yv5g98GnXEHf3srRkjtRCG0Nnjx8EsasOMJkw==}
-    peerDependencies:
-      '@ton/core': '>=0.59.0'
-
   '@ton-community/ton-ledger@7.3.0':
     resolution: {integrity: sha512-eG4KqQaQoUgdVzedUlt8ZkwHDw7JiXnPqZOO+1fUKISwjU2OdiRIeo+TB0yKK3X3fm/0hgQbFBEZAbGSCKvzTw==}
     peerDependencies:
@@ -5353,9 +5345,6 @@ packages:
   core-js-compat@3.48.0:
     resolution: {integrity: sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==}
 
-  core-js-pure@3.49.0:
-    resolution: {integrity: sha512-XM4RFka59xATyJv/cS3O3Kml72hQXUeGRuuTmMYFxwzc9/7C8OYTaIR/Ji+Yt8DXzsFLNhat15cE/JP15HrCgw==}
-
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
@@ -14002,12 +13991,6 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.4.1
 
-  '@ton-api/client@0.4.0(@ton/core@0.63.1(@ton/crypto@3.3.0))':
-    dependencies:
-      '@ton/core': 0.63.1(@ton/crypto@3.3.0)
-      core-js-pure: 3.49.0
-    optional: true
-
   '@ton-community/ton-ledger@7.3.0(@ton/core@0.63.1(@ton/crypto@3.3.0))':
     dependencies:
       '@ledgerhq/hw-transport': 6.35.0
@@ -15636,9 +15619,6 @@ snapshots:
     dependencies:
       browserslist: 4.28.1
 
-  core-js-pure@3.49.0:
-    optional: true
-
   core-util-is@1.0.3: {}
 
   cors@2.8.6:

From e4498f435824aea0b4407e49ab8a94e4794e220a Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 14:14:25 +0400
Subject: [PATCH 08/46] feat(gasless): rename provider methods

---
 apps/appkit-minter/src/pages/gasless-page.tsx | 40 +++++-----
 .../appkit/actions/gasless/gasless-actions.ts | 14 ++--
 .../appkit/actions/gasless/gasless.test.ts    | 10 +--
 ...ess-estimate.tsx => use-gasless-quote.tsx} | 18 ++---
 .../gasless/use-send-gasless-transaction.tsx  | 10 +--
 packages/appkit-react/docs/hooks.md           | 26 +++---
 .../gasless/hooks/use-gasless-estimate.ts     | 42 ----------
 .../gasless/hooks/use-gasless-quote.ts        | 37 +++++++++
 .../src/features/gasless/index.ts             |  8 +-
 packages/appkit/docs/actions.md               | 24 +++---
 ...sless-estimate.ts => get-gasless-quote.ts} | 19 ++---
 .../gasless/send-gasless-transaction.test.ts  | 63 ++++++++-------
 .../gasless/send-gasless-transaction.ts       | 34 ++++----
 packages/appkit/src/actions/index.ts          | 10 +--
 packages/appkit/src/gasless/index.ts          |  4 +-
 .../queries/gasless/get-gasless-estimate.ts   | 80 -------------------
 .../src/queries/gasless/get-gasless-quote.ts  | 80 +++++++++++++++++++
 packages/appkit/src/queries/index.ts          | 18 ++---
 .../src/api/interfaces/GaslessAPI.ts          | 18 ++---
 ...slessEstimateResult.ts => GaslessQuote.ts} |  6 +-
 ...stimateParams.ts => GaslessQuoteParams.ts} |  4 +-
 packages/walletkit/src/api/models/index.ts    |  4 +-
 .../src/defi/gasless/GaslessManager.spec.ts   | 28 +++----
 .../src/defi/gasless/GaslessManager.ts        | 16 ++--
 .../src/defi/gasless/GaslessProvider.ts       | 16 ++--
 packages/walletkit/src/defi/gasless/README.md | 32 ++++----
 packages/walletkit/src/defi/gasless/errors.ts |  2 +-
 .../tonapi/TonApiGaslessProvider.spec.ts      | 34 ++++----
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 23 +++---
 ...sless-estimate.ts => map-gasless-quote.ts} |  8 +-
 30 files changed, 353 insertions(+), 375 deletions(-)
 rename demo/examples/src/appkit/hooks/gasless/{use-gasless-estimate.tsx => use-gasless-quote.tsx} (57%)
 delete mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
 rename packages/appkit/src/actions/gasless/{get-gasless-estimate.ts => get-gasless-quote.ts} (70%)
 delete mode 100644 packages/appkit/src/queries/gasless/get-gasless-estimate.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-quote.ts
 rename packages/walletkit/src/api/models/gasless/{GaslessEstimateResult.ts => GaslessQuote.ts} (85%)
 rename packages/walletkit/src/api/models/gasless/{GaslessEstimateParams.ts => GaslessQuoteParams.ts} (90%)
 rename packages/walletkit/src/defi/gasless/tonapi/mappers/{map-gasless-estimate.ts => map-gasless-quote.ts} (85%)

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index b68cd9393..03939f322 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -11,7 +11,7 @@ import type { FC } from 'react';
 import {
     useAddress,
     useGaslessConfig,
-    useGaslessEstimate,
+    useGaslessQuote,
     useJettonBalanceByAddress,
     useJettonWalletAddress,
     useSelectedWallet,
@@ -108,10 +108,10 @@ export const GaslessPage: FC = () => {
     }, [address, amount, recipient, usdtWalletAddress]);
 
     const {
-        data: estimate,
-        isFetching: isEstimating,
-        error: estimateError,
-    } = useGaslessEstimate({
+        data: quote,
+        isFetching: isQuoting,
+        error: quoteError,
+    } = useGaslessQuote({
         feeJettonMaster: feeJettonMaster ?? undefined,
         messages: messages ?? undefined,
         query: { enabled: Boolean(address && feeJettonMaster && messages) },
@@ -119,26 +119,26 @@ export const GaslessPage: FC = () => {
 
     const now = useNow();
     const validUntilText = useMemo(() => {
-        if (!estimate) return null;
+        if (!quote) return null;
         // `now` is in the dep array so the countdown ticks every second.
         void now;
-        return formatRelativeTimeFromNow(estimate.validUntil);
-    }, [estimate, now]);
+        return formatRelativeTimeFromNow(quote.validUntil);
+    }, [quote, now]);
 
     const formattedFee = useMemo(() => {
-        if (!estimate) return null;
-        const feeWhole = Number(estimate.fee) / 10 ** USDT_DECIMALS;
+        if (!quote) return null;
+        const feeWhole = Number(quote.fee) / 10 ** USDT_DECIMALS;
         return feeWhole.toFixed(USDT_DECIMALS);
-    }, [estimate]);
+    }, [quote]);
 
     const handleSend = async () => {
-        if (!estimate) {
-            toast.error('No estimate available yet');
+        if (!quote) {
+            toast.error('No quote available yet');
             return;
         }
 
         try {
-            const result = await sendGasless({ estimate });
+            const result = await sendGasless({ quote });
             const explorerUrl = `https://tonviewer.com/transaction/${result.internalBoc}`;
             toast.success('Gasless transaction submitted!', {
                 description: 'View internal BoC on explorer',
@@ -223,11 +223,9 @@ export const GaslessPage: FC = () => {
                             />
                         </div>
 
-                        {estimateError && (
-                            <div className="text-xs text-red-500">Estimate failed: {estimateError.message}</div>
-                        )}
+                        {quoteError && <div className="text-xs text-red-500">Quote failed: {quoteError.message}</div>}
 
-                        {estimate && (
+                        {quote && (
                             <div className="grid grid-cols-2 gap-2 text-xs">
                                 <div className="text-muted-foreground">Relayer fee</div>
                                 <div className="text-right font-mono">{formattedFee} USDT</div>
@@ -239,12 +237,12 @@ export const GaslessPage: FC = () => {
                         <button
                             className="w-full py-3 bg-primary text-primary-foreground rounded-xl font-semibold disabled:opacity-50"
                             onClick={handleSend}
-                            disabled={isSending || isEstimating || !estimate || !supportsSignMessage}
+                            disabled={isSending || isQuoting || !quote || !supportsSignMessage}
                         >
                             {isSending
                                 ? 'Sending…'
-                                : isEstimating
-                                  ? 'Estimating…'
+                                : isQuoting
+                                  ? 'Quoting…'
                                   : !supportsSignMessage
                                     ? 'SignMessage not supported'
                                     : 'Send Gasless'}
diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
index 6bb4147cd..6d8c887c1 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -9,10 +9,10 @@
 import type { AppKit } from '@ton/appkit';
 import {
     getGaslessConfig,
-    getGaslessEstimate,
     getGaslessManager,
     getGaslessProvider,
     getGaslessProviders,
+    getGaslessQuote,
     sendGaslessTransaction,
     setDefaultGaslessProvider,
     watchGaslessProviders,
@@ -52,8 +52,8 @@ export const gaslessExample = async (appKit: AppKit) => {
     console.log('Relay address:', config.relayAddress);
     // SAMPLE_END: GET_GASLESS_CONFIG
 
-    // SAMPLE_START: GET_GASLESS_ESTIMATE
-    const estimate = await getGaslessEstimate(appKit, {
+    // SAMPLE_START: GET_GASLESS_QUOTE
+    const quote = await getGaslessQuote(appKit, {
         feeJettonMaster: feeJetton,
         messages: [
             {
@@ -63,13 +63,13 @@ export const gaslessExample = async (appKit: AppKit) => {
             },
         ],
     });
-    console.log('Relayer fee:', estimate.fee, 'valid until:', estimate.validUntil);
-    // SAMPLE_END: GET_GASLESS_ESTIMATE
+    console.log('Relayer fee:', quote.fee, 'valid until:', quote.validUntil);
+    // SAMPLE_END: GET_GASLESS_QUOTE
 
     // SAMPLE_START: SEND_GASLESS_TRANSACTION
-    const { internalBoc, fee } = await sendGaslessTransaction(appKit, { estimate });
+    const { internalBoc, fee } = await sendGaslessTransaction(appKit, { quote });
     console.log('Submitted gasless transaction. Fee:', fee, 'BoC:', internalBoc);
     // SAMPLE_END: SEND_GASLESS_TRANSACTION
 
-    return { gaslessManager, provider, config, estimate };
+    return { gaslessManager, provider, config, quote };
 };
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index 925103b0b..ebd5b5d98 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -20,7 +20,7 @@ describe('Gasless Actions Examples', () => {
     let appKit: AppKit;
     let consoleSpy: ReturnType<typeof vi.spyOn>;
     let mockGetConfig: ReturnType<typeof vi.fn>;
-    let mockEstimate: ReturnType<typeof vi.fn>;
+    let mockGetQuote: ReturnType<typeof vi.fn>;
     let mockSend: ReturnType<typeof vi.fn>;
     let mockSignMessage: ReturnType<typeof vi.fn>;
 
@@ -38,7 +38,7 @@ describe('Gasless Actions Examples', () => {
             relayAddress: TEST_ADDRESS,
             supportedGasJettons: [{ jettonMaster: TEST_ADDRESS }],
         });
-        mockEstimate = vi.fn().mockResolvedValue({
+        mockGetQuote = vi.fn().mockResolvedValue({
             messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
             fee: '1234',
             validUntil: Math.floor(Date.now() / 1000) + 120,
@@ -56,9 +56,9 @@ describe('Gasless Actions Examples', () => {
         // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'getConfig').mockImplementation(mockGetConfig);
         // @ts-expect-error - internal mock access
-        vi.spyOn(appKit.gaslessManager, 'estimate').mockImplementation(mockEstimate);
+        vi.spyOn(appKit.gaslessManager, 'getQuote').mockImplementation(mockGetQuote);
         // @ts-expect-error - internal mock access
-        vi.spyOn(appKit.gaslessManager, 'send').mockImplementation(mockSend);
+        vi.spyOn(appKit.gaslessManager, 'sendTransaction').mockImplementation(mockSend);
         vi.spyOn(appKit.gaslessManager, 'setDefaultProvider').mockImplementation(() => {});
     });
 
@@ -89,7 +89,7 @@ describe('Gasless Actions Examples', () => {
         await gaslessExample(appKit);
 
         expect(mockGetConfig).toHaveBeenCalled();
-        expect(mockEstimate).toHaveBeenCalled();
+        expect(mockGetQuote).toHaveBeenCalled();
         expect(mockSignMessage).toHaveBeenCalled();
         expect(mockSend).toHaveBeenCalled();
     });
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-estimate.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
similarity index 57%
rename from demo/examples/src/appkit/hooks/gasless/use-gasless-estimate.tsx
rename to demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
index 53a04eeb8..70763a91d 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-gasless-estimate.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
@@ -7,11 +7,11 @@
  */
 
 import type { Base64String } from '@ton/appkit';
-import { useGaslessEstimate } from '@ton/appkit-react';
+import { useGaslessQuote } from '@ton/appkit-react';
 
-export const UseGaslessEstimateExample = () => {
-    // SAMPLE_START: USE_GASLESS_ESTIMATE
-    const { data: estimate, isFetching } = useGaslessEstimate({
+export const UseGaslessQuoteExample = () => {
+    // SAMPLE_START: USE_GASLESS_QUOTE
+    const { data: quote, isFetching } = useGaslessQuote({
         feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
         messages: [
             {
@@ -24,14 +24,14 @@ export const UseGaslessEstimateExample = () => {
 
     return (
         <div>
-            {isFetching && <span>Estimating...</span>}
-            {estimate && (
+            {isFetching && <span>Quoting...</span>}
+            {quote && (
                 <>
-                    <div>Fee: {estimate.fee}</div>
-                    <div>Valid until: {new Date(estimate.validUntil * 1000).toISOString()}</div>
+                    <div>Fee: {quote.fee}</div>
+                    <div>Valid until: {new Date(quote.validUntil * 1000).toISOString()}</div>
                 </>
             )}
         </div>
     );
-    // SAMPLE_END: USE_GASLESS_ESTIMATE
+    // SAMPLE_END: USE_GASLESS_QUOTE
 };
diff --git a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
index ed0589ccb..248fcb14f 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
@@ -7,13 +7,13 @@
  */
 
 import type { Base64String } from '@ton/appkit';
-import { useGaslessEstimate, useSendGaslessTransaction } from '@ton/appkit-react';
+import { useGaslessQuote, useSendGaslessTransaction } from '@ton/appkit-react';
 
 /* eslint-disable no-console */
 
 export const UseSendGaslessTransactionExample = () => {
     // SAMPLE_START: USE_SEND_GASLESS_TRANSACTION
-    const { data: estimate } = useGaslessEstimate({
+    const { data: quote } = useGaslessQuote({
         feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
         messages: [
             {
@@ -26,9 +26,9 @@ export const UseSendGaslessTransactionExample = () => {
     const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
 
     const handleSend = async () => {
-        if (!estimate) return;
+        if (!quote) return;
         try {
-            const { internalBoc, fee } = await sendGasless({ estimate });
+            const { internalBoc, fee } = await sendGasless({ quote });
             console.log('Submitted. Fee:', fee, 'BoC:', internalBoc);
         } catch (e) {
             console.error(e);
@@ -36,7 +36,7 @@ export const UseSendGaslessTransactionExample = () => {
     };
 
     return (
-        <button onClick={handleSend} disabled={!estimate || isPending}>
+        <button onClick={handleSend} disabled={!quote || isPending}>
             {isPending ? 'Sending...' : 'Send Gasless'}
         </button>
     );
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index 3e1818196..012e542e5 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -858,12 +858,12 @@ return (
 );
 ```
 
-### `useGaslessEstimate`
+### `useGaslessQuote`
 
-Hook to fetch a gasless estimate. Auto-refetches as inputs change; cached results become stale after ~2 minutes (matches the relayer `validUntil` window).
+Hook to fetch a gasless quote. Auto-refetches as inputs change; cached results become stale after ~2 minutes (matches the relayer `validUntil` window).
 
 ```tsx
-const { data: estimate, isFetching } = useGaslessEstimate({
+const { data: quote, isFetching } = useGaslessQuote({
     feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
     messages: [
         {
@@ -876,11 +876,11 @@ const { data: estimate, isFetching } = useGaslessEstimate({
 
 return (
     <div>
-        {isFetching && <span>Estimating...</span>}
-        {estimate && (
+        {isFetching && <span>Quoting...</span>}
+        {quote && (
             <>
-                <div>Fee: {estimate.fee}</div>
-                <div>Valid until: {new Date(estimate.validUntil * 1000).toISOString()}</div>
+                <div>Fee: {quote.fee}</div>
+                <div>Valid until: {new Date(quote.validUntil * 1000).toISOString()}</div>
             </>
         )}
     </div>
@@ -889,24 +889,24 @@ return (
 
 ### `useSendGaslessTransaction`
 
-Hook to sign a previously computed estimate and submit the resulting BoC to the relayer.
+Hook to sign a previously computed quote and submit the resulting BoC to the relayer.
 
 Throws:
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the wallet does not advertise `SignMessage`.
-- `GaslessError(TOO_MANY_MESSAGES)` if the estimate carries more messages than the wallet's `maxMessages` cap.
+- `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
 ```tsx
-const { data: estimate } = useGaslessEstimate({ feeJettonMaster, messages });
+const { data: quote } = useGaslessQuote({ feeJettonMaster, messages });
 const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
 
 const handleSend = async () => {
-    if (!estimate) return;
-    const { internalBoc, fee } = await sendGasless({ estimate });
+    if (!quote) return;
+    const { internalBoc, fee } = await sendGasless({ quote });
     console.log('Submitted. Fee:', fee, 'BoC:', internalBoc);
 };
 
 return (
-    <button onClick={handleSend} disabled={!estimate || isPending}>
+    <button onClick={handleSend} disabled={!quote || isPending}>
         {isPending ? 'Sending...' : 'Send Gasless'}
     </button>
 );
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts
deleted file mode 100644
index ba7bdb685..000000000
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-estimate.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-'use client';
-
-import { getGaslessEstimateQueryOptions } from '@ton/appkit/queries';
-import type {
-    GetGaslessEstimateData,
-    GetGaslessEstimateErrorType,
-    GetGaslessEstimateQueryConfig,
-} from '@ton/appkit/queries';
-
-import { useAppKit } from '../../settings';
-import { useQuery } from '../../../libs/query';
-import type { UseQueryReturnType } from '../../../libs/query';
-
-export type UseGaslessEstimateParameters<selectData = GetGaslessEstimateData> =
-    GetGaslessEstimateQueryConfig<selectData>;
-
-export type UseGaslessEstimateReturnType<selectData = GetGaslessEstimateData> = UseQueryReturnType<
-    selectData,
-    GetGaslessEstimateErrorType
->;
-
-/**
- * Hook to fetch a gasless estimate. Auto-refetches as inputs change.
- *
- * The estimate carries a relayer-provided `validUntil` window; cached results
- * become stale after `GASLESS_ESTIMATE_STALE_TIME_MS` (2 minutes).
- */
-export const useGaslessEstimate = <selectData = GetGaslessEstimateData>(
-    parameters: UseGaslessEstimateParameters<selectData> = {},
-): UseGaslessEstimateReturnType<selectData> => {
-    const appKit = useAppKit();
-
-    return useQuery(getGaslessEstimateQueryOptions(appKit, parameters));
-};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
new file mode 100644
index 000000000..e3e549339
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { getGaslessQuoteQueryOptions } from '@ton/appkit/queries';
+import type { GetGaslessQuoteData, GetGaslessQuoteErrorType, GetGaslessQuoteQueryConfig } from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+
+export type UseGaslessQuoteParameters<selectData = GetGaslessQuoteData> = GetGaslessQuoteQueryConfig<selectData>;
+
+export type UseGaslessQuoteReturnType<selectData = GetGaslessQuoteData> = UseQueryReturnType<
+    selectData,
+    GetGaslessQuoteErrorType
+>;
+
+/**
+ * Hook to fetch a gasless quote. Auto-refetches as inputs change.
+ *
+ * The quote carries a relayer-provided `validUntil` window; cached results
+ * become stale after `GASLESS_QUOTE_STALE_TIME_MS` (2 minutes).
+ */
+export const useGaslessQuote = <selectData = GetGaslessQuoteData>(
+    parameters: UseGaslessQuoteParameters<selectData> = {},
+): UseGaslessQuoteReturnType<selectData> => {
+    const appKit = useAppKit();
+
+    return useQuery(getGaslessQuoteQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/index.ts b/packages/appkit-react/src/features/gasless/index.ts
index bd35f9294..df17b7101 100644
--- a/packages/appkit-react/src/features/gasless/index.ts
+++ b/packages/appkit-react/src/features/gasless/index.ts
@@ -12,10 +12,10 @@ export {
     type UseGaslessConfigReturnType,
 } from './hooks/use-gasless-config';
 export {
-    useGaslessEstimate,
-    type UseGaslessEstimateParameters,
-    type UseGaslessEstimateReturnType,
-} from './hooks/use-gasless-estimate';
+    useGaslessQuote,
+    type UseGaslessQuoteParameters,
+    type UseGaslessQuoteReturnType,
+} from './hooks/use-gasless-quote';
 export { useGaslessProvider, type UseGaslessProviderReturnType } from './hooks/use-gasless-provider';
 export { useGaslessProviders, type UseGaslessProvidersReturnType } from './hooks/use-gasless-providers';
 export {
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index e10e9506f..6966691d4 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -638,7 +638,7 @@ Gasless lets a dApp submit on-chain transactions without the user holding TON fo
 
 The high-level flow is:
 1. `getGaslessConfig` – discover which jettons the relayer accepts as fee payment.
-2. `getGaslessEstimate` – ask the relayer for fee + wrapped messages (with a `validUntil`).
+2. `getGaslessQuote` – ask the relayer for fee + wrapped messages (with a `validUntil`).
 3. `sendGaslessTransaction` – sign the wrapped messages via the wallet and submit the signed BoC.
 
 ### `getGaslessManager`
@@ -671,7 +671,7 @@ console.log(
 
 ### `setDefaultGaslessProvider`
 
-Set the default gasless provider. Subsequent estimate and send calls will use this provider when none is specified.
+Set the default gasless provider. Subsequent quote and send calls will use this provider when none is specified.
 
 ```ts
 setDefaultGaslessProvider(appKit, { providerId: 'tonapi' });
@@ -697,14 +697,14 @@ const config = await getGaslessConfig(appKit);
 const feeJetton = config.supportedGasJettons[0].jettonMaster;
 ```
 
-### `getGaslessEstimate`
+### `getGaslessQuote`
 
-Ask the relayer to estimate a gasless transaction. Returns relayer-wrapped messages, the fee charged in the fee jetton, and the bundle validity window (`validUntil`).
+Ask the relayer for a gasless transaction quote. Returns relayer-wrapped messages, the fee charged in the fee jetton, and the bundle validity window (`validUntil`).
 
-The estimate is intended to be passed verbatim to `sendGaslessTransaction`, which validates `validUntil` before signing. Estimates are typically valid for ~2 minutes.
+The quote is intended to be passed verbatim to `sendGaslessTransaction`. Quotes are typically valid for ~2 minutes.
 
 ```ts
-const estimate = await getGaslessEstimate(appKit, {
+const quote = await getGaslessQuote(appKit, {
     feeJettonMaster: feeJetton,
     messages: [
         {
@@ -714,22 +714,22 @@ const estimate = await getGaslessEstimate(appKit, {
         },
     ],
 });
-console.log('Relayer fee:', estimate.fee);
-console.log('Valid until:', new Date(estimate.validUntil * 1000));
+console.log('Relayer fee:', quote.fee);
+console.log('Valid until:', new Date(quote.validUntil * 1000));
 ```
 
 ### `sendGaslessTransaction`
 
-Sign a previously computed gasless estimate and submit the resulting BoC to the relayer.
+Sign a previously computed gasless quote and submit the resulting BoC to the relayer.
 
-Estimate freshness is owned by the query layer: `useGaslessEstimate` uses a 2-minute `staleTime` matching the relayer `validUntil` window. If you submit a stale estimate anyway, the relayer rejects it and the error surfaces through `gaslessManager.send`.
+Quote freshness is owned by the query layer: `useGaslessQuote` uses a 2-minute `staleTime` matching the relayer `validUntil` window. If you submit a stale quote anyway, the relayer rejects it and the error surfaces through `gaslessManager.sendTransaction`.
 
 Throws:
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the connected wallet does not advertise the `SignMessage` feature.
-- `GaslessError(TOO_MANY_MESSAGES)` if the estimate carries more messages than the wallet's `maxMessages` cap.
+- `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
 ```ts
-const { internalBoc, fee } = await sendGaslessTransaction(appKit, { estimate });
+const { internalBoc, fee } = await sendGaslessTransaction(appKit, { quote });
 console.log('Submitted gasless transaction. Fee:', fee);
 ```
 
diff --git a/packages/appkit/src/actions/gasless/get-gasless-estimate.ts b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
similarity index 70%
rename from packages/appkit/src/actions/gasless/get-gasless-estimate.ts
rename to packages/appkit/src/actions/gasless/get-gasless-quote.ts
index e32f41186..749502ccd 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-estimate.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
@@ -6,13 +6,13 @@
  *
  */
 
-import type { GaslessEstimateResult } from '@ton/walletkit';
+import type { GaslessQuote } from '@ton/walletkit';
 
 import type { TransactionRequestMessage } from '../../types/transaction';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
-export interface GetGaslessEstimateOptions {
+export interface GetGaslessQuoteOptions {
     /** Master address of the jetton used to pay the relayer's fee */
     feeJettonMaster: string;
     /** User's messages to include in the gasless transaction */
@@ -21,30 +21,27 @@ export interface GetGaslessEstimateOptions {
     providerId?: string;
 }
 
-export type GetGaslessEstimateReturnType = Promise<GaslessEstimateResult>;
+export type GetGaslessQuoteReturnType = Promise<GaslessQuote>;
 
-export type GetGaslessEstimateErrorType = Error;
+export type GetGaslessQuoteErrorType = Error;
 
 /**
- * Ask the relayer to estimate a gasless transaction.
+ * Ask the relayer for a gasless transaction quote.
  *
  * Returns relayer-wrapped messages (ready to be signed via `signMessage`), the
  * fee charged in the fee jetton, and the bundle validity window (`validUntil`).
  *
  * The result is intended to be passed verbatim to `sendGaslessTransaction`,
- * which validates `validUntil` and forwards the signed BoC to the relayer.
+ * which forwards the signed BoC to the relayer.
  */
-export const getGaslessEstimate = async (
-    appKit: AppKit,
-    options: GetGaslessEstimateOptions,
-): GetGaslessEstimateReturnType => {
+export const getGaslessQuote = async (appKit: AppKit, options: GetGaslessQuoteOptions): GetGaslessQuoteReturnType => {
     const wallet = getSelectedWallet(appKit);
 
     if (!wallet) {
         throw new Error('Wallet not connected');
     }
 
-    return appKit.gaslessManager.estimate(
+    return appKit.gaslessManager.getQuote(
         {
             feeJettonMaster: options.feeJettonMaster,
             walletAddress: wallet.getAddress(),
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
index b66dc8ae4..5858d1189 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -8,7 +8,7 @@
 
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { GaslessErrorCode } from '@ton/walletkit';
-import type { Feature, GaslessEstimateResult } from '@ton/walletkit';
+import type { Feature, GaslessQuote } from '@ton/walletkit';
 
 import type { AppKit } from '../../core/app-kit';
 import type { Base64String } from '../../types/primitives';
@@ -18,7 +18,7 @@ import { sendGaslessTransaction } from './send-gasless-transaction';
 const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 const FAKE_INTERNAL_BOC = 'te6cckEBAQEAAgAAAA==' as Base64String;
 
-const makeEstimate = (overrides: Partial<GaslessEstimateResult> = {}): GaslessEstimateResult => ({
+const makeQuote = (overrides: Partial<GaslessQuote> = {}): GaslessQuote => ({
     messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
     fee: '1234',
     validUntil: Math.floor(Date.now() / 1000) + 60,
@@ -45,14 +45,14 @@ const makeWallet = (overrides: Partial<WalletInterface> = {}): WalletInterface =
 };
 
 const makeAppKit = (wallet: WalletInterface | null) => {
-    const send = vi.fn<() => Promise<void>>().mockResolvedValue(undefined);
+    const sendTransaction = vi.fn<() => Promise<void>>().mockResolvedValue(undefined);
 
     const appKit = {
         walletsManager: { selectedWallet: wallet },
-        gaslessManager: { send },
+        gaslessManager: { sendTransaction },
     } as unknown as AppKit;
 
-    return { appKit, send };
+    return { appKit, sendTransaction };
 };
 
 describe('sendGaslessTransaction', () => {
@@ -62,35 +62,36 @@ describe('sendGaslessTransaction', () => {
         wallet = makeWallet();
     });
 
-    it('signs the estimate and submits the resulting BoC to the relayer', async () => {
-        const { appKit, send } = makeAppKit(wallet);
-        const estimate = makeEstimate();
+    it('signs the quote and submits the resulting BoC to the relayer', async () => {
+        const { appKit, sendTransaction } = makeAppKit(wallet);
+        const quote = makeQuote();
 
-        const result = await sendGaslessTransaction(appKit, { estimate });
+        const result = await sendGaslessTransaction(appKit, { quote });
 
         expect(wallet.signMessage).toHaveBeenCalledWith({
-            messages: estimate.messages,
-            validUntil: estimate.validUntil,
+            messages: quote.messages,
+            validUntil: quote.validUntil,
         });
-        expect(send).toHaveBeenCalledWith({ walletPublicKey: '0xabc', internalBoc: FAKE_INTERNAL_BOC }, undefined);
+        expect(sendTransaction).toHaveBeenCalledWith(
+            { walletPublicKey: '0xabc', internalBoc: FAKE_INTERNAL_BOC },
+            undefined,
+        );
         expect(result.internalBoc).toBe(FAKE_INTERNAL_BOC);
-        expect(result.fee).toBe(estimate.fee);
+        expect(result.fee).toBe(quote.fee);
     });
 
-    it('forwards providerId to gaslessManager.send', async () => {
-        const { appKit, send } = makeAppKit(wallet);
+    it('forwards providerId to gaslessManager.sendTransaction', async () => {
+        const { appKit, sendTransaction } = makeAppKit(wallet);
 
-        await sendGaslessTransaction(appKit, { estimate: makeEstimate(), providerId: 'custom' });
+        await sendGaslessTransaction(appKit, { quote: makeQuote(), providerId: 'custom' });
 
-        expect(send).toHaveBeenCalledWith(expect.anything(), 'custom');
+        expect(sendTransaction).toHaveBeenCalledWith(expect.anything(), 'custom');
     });
 
     it('throws plain Error when no wallet is connected', async () => {
         const { appKit } = makeAppKit(null);
 
-        await expect(sendGaslessTransaction(appKit, { estimate: makeEstimate() })).rejects.toThrow(
-            'Wallet not connected',
-        );
+        await expect(sendGaslessTransaction(appKit, { quote: makeQuote() })).rejects.toThrow('Wallet not connected');
     });
 
     it('throws GaslessError(SIGN_MESSAGE_NOT_SUPPORTED) when wallet lacks SignMessage feature', async () => {
@@ -99,26 +100,26 @@ describe('sendGaslessTransaction', () => {
         });
         const { appKit } = makeAppKit(walletWithoutFeature);
 
-        await expect(sendGaslessTransaction(appKit, { estimate: makeEstimate() })).rejects.toMatchObject({
+        await expect(sendGaslessTransaction(appKit, { quote: makeQuote() })).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.SignMessageNotSupported,
         });
         expect(walletWithoutFeature.signMessage).not.toHaveBeenCalled();
     });
 
-    it('throws GaslessError(TOO_MANY_MESSAGES) when estimate exceeds wallet maxMessages', async () => {
+    it('throws GaslessError(TOO_MANY_MESSAGES) when quote exceeds wallet maxMessages', async () => {
         const walletWithCap = makeWallet({
             getSupportedFeatures: () => [{ name: 'SignMessage', maxMessages: 1 }],
         });
         const { appKit } = makeAppKit(walletWithCap);
-        const estimate = makeEstimate({
+        const quote = makeQuote({
             messages: [
                 { address: TEST_ADDRESS, amount: '1' },
                 { address: TEST_ADDRESS, amount: '2' },
             ],
         });
 
-        await expect(sendGaslessTransaction(appKit, { estimate })).rejects.toMatchObject({
+        await expect(sendGaslessTransaction(appKit, { quote })).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.TooManyMessages,
         });
@@ -127,18 +128,18 @@ describe('sendGaslessTransaction', () => {
 
     it('proceeds when wallet returns undefined features (unknown capabilities)', async () => {
         const walletWithUnknown = makeWallet({ getSupportedFeatures: () => undefined });
-        const { appKit, send } = makeAppKit(walletWithUnknown);
+        const { appKit, sendTransaction } = makeAppKit(walletWithUnknown);
 
-        await sendGaslessTransaction(appKit, { estimate: makeEstimate() });
+        await sendGaslessTransaction(appKit, { quote: makeQuote() });
 
         expect(walletWithUnknown.signMessage).toHaveBeenCalled();
-        expect(send).toHaveBeenCalled();
+        expect(sendTransaction).toHaveBeenCalled();
     });
 
-    it('propagates errors from gaslessManager.send', async () => {
-        const { appKit, send } = makeAppKit(wallet);
-        send.mockRejectedValueOnce(new Error('relayer offline'));
+    it('propagates errors from gaslessManager.sendTransaction', async () => {
+        const { appKit, sendTransaction } = makeAppKit(wallet);
+        sendTransaction.mockRejectedValueOnce(new Error('relayer offline'));
 
-        await expect(sendGaslessTransaction(appKit, { estimate: makeEstimate() })).rejects.toThrow('relayer offline');
+        await expect(sendGaslessTransaction(appKit, { quote: makeQuote() })).rejects.toThrow('relayer offline');
     });
 });
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index 925221271..f13fbd13f 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import type { GaslessEstimateResult, TokenAmount } from '@ton/walletkit';
+import type { GaslessQuote, TokenAmount } from '@ton/walletkit';
 
 import { GaslessError, GaslessErrorCode } from '../../gasless';
 import type { Base64String } from '../../types/primitives';
@@ -14,8 +14,8 @@ import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
 export interface SendGaslessTransactionParameters {
-    /** Pre-computed estimate obtained via `getGaslessEstimate` */
-    estimate: GaslessEstimateResult;
+    /** Pre-computed quote obtained via `getGaslessQuote` */
+    quote: GaslessQuote;
     /** Gasless provider id. Uses the default provider when omitted. */
     providerId?: string;
 }
@@ -23,31 +23,31 @@ export interface SendGaslessTransactionParameters {
 export interface SendGaslessTransactionReturnType {
     /** Signed internal BoC that was submitted to the relayer */
     internalBoc: Base64String;
-    /** Relayer fee in fee-jetton nanounits (mirrors the estimate) */
+    /** Relayer fee in fee-jetton nanounits (mirrors the quote) */
     fee: TokenAmount;
 }
 
 export type SendGaslessTransactionErrorType = Error;
 
 /**
- * Sign a previously computed gasless estimate and submit the resulting BoC
+ * Sign a previously computed gasless quote and submit the resulting BoC
  * to the relayer.
  *
- * Estimate freshness is owned by the query layer (`getGaslessEstimateQueryOptions`
+ * Quote freshness is owned by the query layer (`getGaslessQuoteQueryOptions`
  * sets a 2-minute `staleTime` matching the relayer `validUntil` window). If a
- * stale estimate is submitted anyway, the relayer rejects it and the error
- * surfaces through `gaslessManager.send`.
+ * stale quote is submitted anyway, the relayer rejects it and the error
+ * surfaces through `gaslessManager.sendTransaction`.
  *
  * @throws GaslessError(SIGN_MESSAGE_NOT_SUPPORTED) when the wallet does not
  *         advertise the `SignMessage` feature.
- * @throws GaslessError(TOO_MANY_MESSAGES) when the estimate carries more
+ * @throws GaslessError(TOO_MANY_MESSAGES) when the quote carries more
  *         messages than the wallet's advertised `maxMessages` cap.
  */
 export const sendGaslessTransaction = async (
     appKit: AppKit,
     parameters: SendGaslessTransactionParameters,
 ): Promise<SendGaslessTransactionReturnType> => {
-    const { estimate, providerId } = parameters;
+    const { quote, providerId } = parameters;
 
     const wallet = getSelectedWallet(appKit);
 
@@ -65,21 +65,21 @@ export const sendGaslessTransaction = async (
             );
         }
         const { maxMessages } = signMessageFeature as { maxMessages: number };
-        if (estimate.messages.length > maxMessages) {
+        if (quote.messages.length > maxMessages) {
             throw new GaslessError(
-                `Estimate has ${estimate.messages.length} messages but the wallet only supports up to ${maxMessages}.`,
+                `Quote has ${quote.messages.length} messages but the wallet only supports up to ${maxMessages}.`,
                 GaslessErrorCode.TooManyMessages,
-                { messages: estimate.messages.length, maxMessages },
+                { messages: quote.messages.length, maxMessages },
             );
         }
     }
 
     const { internalBoc } = await wallet.signMessage({
-        messages: estimate.messages,
-        validUntil: estimate.validUntil,
+        messages: quote.messages,
+        validUntil: quote.validUntil,
     });
 
-    await appKit.gaslessManager.send(
+    await appKit.gaslessManager.sendTransaction(
         {
             walletPublicKey: wallet.getPublicKey(),
             internalBoc,
@@ -89,6 +89,6 @@ export const sendGaslessTransaction = async (
 
     return {
         internalBoc,
-        fee: estimate.fee,
+        fee: quote.fee,
     };
 };
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index 06bc9f5d6..78fdb0003 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -133,11 +133,11 @@ export {
     type GetGaslessConfigErrorType,
 } from './gasless/get-gasless-config';
 export {
-    getGaslessEstimate,
-    type GetGaslessEstimateOptions,
-    type GetGaslessEstimateReturnType,
-    type GetGaslessEstimateErrorType,
-} from './gasless/get-gasless-estimate';
+    getGaslessQuote,
+    type GetGaslessQuoteOptions,
+    type GetGaslessQuoteReturnType,
+    type GetGaslessQuoteErrorType,
+} from './gasless/get-gasless-quote';
 export {
     sendGaslessTransaction,
     type SendGaslessTransactionParameters,
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index f5f709e0e..68d75d83a 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -13,7 +13,7 @@ export type {
     GaslessProviderInterface,
     GaslessConfig,
     GaslessGasJetton,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
+    GaslessQuoteParams,
+    GaslessQuote,
     GaslessSendParams,
 } from '@ton/walletkit';
diff --git a/packages/appkit/src/queries/gasless/get-gasless-estimate.ts b/packages/appkit/src/queries/gasless/get-gasless-estimate.ts
deleted file mode 100644
index d03e4601f..000000000
--- a/packages/appkit/src/queries/gasless/get-gasless-estimate.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { getGaslessEstimate } from '../../actions/gasless/get-gasless-estimate';
-import type {
-    GetGaslessEstimateErrorType,
-    GetGaslessEstimateOptions,
-    GetGaslessEstimateReturnType,
-} from '../../actions/gasless/get-gasless-estimate';
-import type { AppKit } from '../../core/app-kit';
-import type { QueryOptions, QueryParameter } from '../../types/query';
-import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions } from '../../utils';
-
-export type { GetGaslessEstimateErrorType };
-
-/**
- * Default time-to-live for a gasless estimate. The relayer returns its own
- * `validUntil`; this is the upper bound used by react-query to refresh the
- * estimate before it expires.
- */
-export const GASLESS_ESTIMATE_STALE_TIME_MS = 2 * 60 * 1000;
-
-export type GetGaslessEstimateQueryConfig<selectData = GetGaslessEstimateData> = Compute<
-    ExactPartial<GetGaslessEstimateOptions>
-> &
-    QueryParameter<GetGaslessEstimateQueryFnData, GetGaslessEstimateErrorType, selectData, GetGaslessEstimateQueryKey>;
-
-export const getGaslessEstimateQueryOptions = <selectData = GetGaslessEstimateData>(
-    appKit: AppKit,
-    options: GetGaslessEstimateQueryConfig<selectData> = {},
-): GetGaslessEstimateQueryOptions<selectData> => {
-    return {
-        staleTime: GASLESS_ESTIMATE_STALE_TIME_MS,
-        ...options.query,
-        enabled: Boolean(
-            options.feeJettonMaster &&
-            options.messages &&
-            options.messages.length > 0 &&
-            (options.query?.enabled ?? true),
-        ),
-        queryFn: async (context) => {
-            const [, parameters] = context.queryKey as [string, GetGaslessEstimateOptions];
-
-            if (!parameters.feeJettonMaster) {
-                throw new Error('feeJettonMaster is required');
-            }
-            if (!parameters.messages || parameters.messages.length === 0) {
-                throw new Error('messages is required');
-            }
-
-            return getGaslessEstimate(appKit, parameters);
-        },
-        queryKey: getGaslessEstimateQueryKey(options),
-    };
-};
-
-export type GetGaslessEstimateQueryFnData = Compute<Awaited<GetGaslessEstimateReturnType>>;
-
-export type GetGaslessEstimateData = GetGaslessEstimateQueryFnData;
-
-export const getGaslessEstimateQueryKey = (
-    options: Compute<ExactPartial<GetGaslessEstimateOptions>> = {},
-): GetGaslessEstimateQueryKey => {
-    return ['gaslessEstimate', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
-};
-
-export type GetGaslessEstimateQueryKey = readonly ['gaslessEstimate', Compute<ExactPartial<GetGaslessEstimateOptions>>];
-
-export type GetGaslessEstimateQueryOptions<selectData = GetGaslessEstimateData> = QueryOptions<
-    GetGaslessEstimateQueryFnData,
-    GetGaslessEstimateErrorType,
-    selectData,
-    GetGaslessEstimateQueryKey
->;
diff --git a/packages/appkit/src/queries/gasless/get-gasless-quote.ts b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
new file mode 100644
index 000000000..2002bec22
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessQuote } from '../../actions/gasless/get-gasless-quote';
+import type {
+    GetGaslessQuoteErrorType,
+    GetGaslessQuoteOptions,
+    GetGaslessQuoteReturnType,
+} from '../../actions/gasless/get-gasless-quote';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+
+export type { GetGaslessQuoteErrorType };
+
+/**
+ * Default time-to-live for a gasless quote. The relayer returns its own
+ * `validUntil`; this is the upper bound used by react-query to refresh the
+ * quote before it expires.
+ */
+export const GASLESS_QUOTE_STALE_TIME_MS = 2 * 60 * 1000;
+
+export type GetGaslessQuoteQueryConfig<selectData = GetGaslessQuoteData> = Compute<
+    ExactPartial<GetGaslessQuoteOptions>
+> &
+    QueryParameter<GetGaslessQuoteQueryFnData, GetGaslessQuoteErrorType, selectData, GetGaslessQuoteQueryKey>;
+
+export const getGaslessQuoteQueryOptions = <selectData = GetGaslessQuoteData>(
+    appKit: AppKit,
+    options: GetGaslessQuoteQueryConfig<selectData> = {},
+): GetGaslessQuoteQueryOptions<selectData> => {
+    return {
+        staleTime: GASLESS_QUOTE_STALE_TIME_MS,
+        ...options.query,
+        enabled: Boolean(
+            options.feeJettonMaster &&
+            options.messages &&
+            options.messages.length > 0 &&
+            (options.query?.enabled ?? true),
+        ),
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [string, GetGaslessQuoteOptions];
+
+            if (!parameters.feeJettonMaster) {
+                throw new Error('feeJettonMaster is required');
+            }
+            if (!parameters.messages || parameters.messages.length === 0) {
+                throw new Error('messages is required');
+            }
+
+            return getGaslessQuote(appKit, parameters);
+        },
+        queryKey: getGaslessQuoteQueryKey(options),
+    };
+};
+
+export type GetGaslessQuoteQueryFnData = Compute<Awaited<GetGaslessQuoteReturnType>>;
+
+export type GetGaslessQuoteData = GetGaslessQuoteQueryFnData;
+
+export const getGaslessQuoteQueryKey = (
+    options: Compute<ExactPartial<GetGaslessQuoteOptions>> = {},
+): GetGaslessQuoteQueryKey => {
+    return ['gaslessQuote', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
+};
+
+export type GetGaslessQuoteQueryKey = readonly ['gaslessQuote', Compute<ExactPartial<GetGaslessQuoteOptions>>];
+
+export type GetGaslessQuoteQueryOptions<selectData = GetGaslessQuoteData> = QueryOptions<
+    GetGaslessQuoteQueryFnData,
+    GetGaslessQuoteErrorType,
+    selectData,
+    GetGaslessQuoteQueryKey
+>;
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index 7b3c15198..1e484761d 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -173,15 +173,15 @@ export {
     type GetGaslessConfigErrorType,
 } from './gasless/get-gasless-config';
 export {
-    getGaslessEstimateQueryOptions,
-    getGaslessEstimateQueryKey,
-    GASLESS_ESTIMATE_STALE_TIME_MS,
-    type GetGaslessEstimateQueryConfig,
-    type GetGaslessEstimateData,
-    type GetGaslessEstimateErrorType,
-    type GetGaslessEstimateQueryKey,
-    type GetGaslessEstimateQueryOptions,
-} from './gasless/get-gasless-estimate';
+    getGaslessQuoteQueryOptions,
+    getGaslessQuoteQueryKey,
+    GASLESS_QUOTE_STALE_TIME_MS,
+    type GetGaslessQuoteQueryConfig,
+    type GetGaslessQuoteData,
+    type GetGaslessQuoteErrorType,
+    type GetGaslessQuoteQueryKey,
+    type GetGaslessQuoteQueryOptions,
+} from './gasless/get-gasless-quote';
 export {
     sendGaslessTransactionMutationOptions,
     type SendGaslessTransactionMutationConfig,
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
index 1b2f027e5..2f9a9f815 100644
--- a/packages/walletkit/src/api/interfaces/GaslessAPI.ts
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../models';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../models';
 import type { DefiManagerAPI } from './DefiManagerAPI';
 import type { DefiProvider } from './DefiProvider';
 
@@ -24,15 +24,15 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
     getConfig(providerId?: string): Promise<GaslessConfig>;
 
     /**
-     * Estimate fees and obtain relayer-wrapped messages for signing.
+     * Quote fees and obtain relayer-wrapped messages for signing.
      *
      * Pass the returned `messages` to `wallet.signMessage` to obtain a signed
-     * internal-message BoC, then submit it via `send`.
+     * internal-message BoC, then submit it via `sendTransaction`.
      *
-     * @param params Estimation parameters (wallet identity, fee jetton, messages)
+     * @param params Quote parameters (wallet identity, fee jetton, messages)
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
-    estimate(params: GaslessEstimateParams, providerId?: string): Promise<GaslessEstimateResult>;
+    getQuote(params: GaslessQuoteParams, providerId?: string): Promise<GaslessQuote>;
 
     /**
      * Submit a signed transaction BoC to the relayer for on-chain execution.
@@ -40,7 +40,7 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
      * @param params Signed message and wallet public key
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
-    send(params: GaslessSendParams, providerId?: string): Promise<void>;
+    sendTransaction(params: GaslessSendParams, providerId?: string): Promise<void>;
 }
 
 /**
@@ -60,12 +60,12 @@ export interface GaslessProviderInterface extends DefiProvider {
     getConfig(): Promise<GaslessConfig>;
 
     /**
-     * Estimate fees and return relayer-wrapped messages for signing.
+     * Quote fees and return relayer-wrapped messages for signing.
      */
-    estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult>;
+    getQuote(params: GaslessQuoteParams): Promise<GaslessQuote>;
 
     /**
      * Submit a signed transaction BoC to the relayer.
      */
-    send(params: GaslessSendParams): Promise<void>;
+    sendTransaction(params: GaslessSendParams): Promise<void>;
 }
diff --git a/packages/walletkit/src/api/models/gasless/GaslessEstimateResult.ts b/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
similarity index 85%
rename from packages/walletkit/src/api/models/gasless/GaslessEstimateResult.ts
rename to packages/walletkit/src/api/models/gasless/GaslessQuote.ts
index 2ac48d670..375f628f3 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessEstimateResult.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
@@ -11,13 +11,13 @@ import type { TokenAmount } from '../core/TokenAmount';
 import type { TransactionRequestMessage } from '../transactions/TransactionRequest';
 
 /**
- * Result of gasless estimation.
+ * Quote for a gasless transaction produced by `GaslessProvider.getQuote`.
  *
  * Contains relayer-wrapped messages that should be passed to `wallet.signMessage`
  * in place of the caller's original messages, together with the fee the relayer
- * will deduct and the timestamp after which the estimate expires.
+ * will deduct and the timestamp after which the bundle expires.
  */
-export interface GaslessEstimateResult {
+export interface GaslessQuote {
     /** Relayer-wrapped messages ready to be signed */
     messages: TransactionRequestMessage[];
     /** Relayer fee in fee-jetton nanounits */
diff --git a/packages/walletkit/src/api/models/gasless/GaslessEstimateParams.ts b/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
similarity index 90%
rename from packages/walletkit/src/api/models/gasless/GaslessEstimateParams.ts
rename to packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
index de1298172..5eb073bc4 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessEstimateParams.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
@@ -10,12 +10,12 @@ import type { Hex, UserFriendlyAddress } from '../core/Primitives';
 import type { TransactionRequestMessage } from '../transactions/TransactionRequest';
 
 /**
- * Parameters to estimate a gasless transaction.
+ * Parameters to quote a gasless transaction.
  *
  * The relayer wraps the caller's messages with fee-collection logic and
  * returns a new set of messages that the wallet should sign via `signMessage`.
  */
-export interface GaslessEstimateParams {
+export interface GaslessQuoteParams {
     /** Master address of the jetton used to pay the relayer's fee */
     feeJettonMaster: UserFriendlyAddress;
     /** Sender wallet address */
diff --git a/packages/walletkit/src/api/models/index.ts b/packages/walletkit/src/api/models/index.ts
index fbc6750a0..91eb02d23 100644
--- a/packages/walletkit/src/api/models/index.ts
+++ b/packages/walletkit/src/api/models/index.ts
@@ -140,8 +140,8 @@ export { UnstakeMode } from './staking/UnstakeMode';
 // Gasless models
 export type { GaslessConfig } from './gasless/GaslessConfig';
 export type { GaslessGasJetton } from './gasless/GaslessGasJetton';
-export type { GaslessEstimateParams } from './gasless/GaslessEstimateParams';
-export type { GaslessEstimateResult } from './gasless/GaslessEstimateResult';
+export type { GaslessQuoteParams } from './gasless/GaslessQuoteParams';
+export type { GaslessQuote } from './gasless/GaslessQuote';
 export type { GaslessSendParams } from './gasless/GaslessSendParams';
 
 // Transaction models
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index 52563a6b8..e6a3ce756 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -9,7 +9,7 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
-import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../../api/models';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../../api/models';
 import { Network } from '../../api/models';
 import { EventEmitter } from '../../core/EventEmitter';
 import type { ProviderFactoryContext } from '../../types/factory';
@@ -26,14 +26,14 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
         relayAddress: TEST_ADDRESS,
         supportedGasJettons: [{ jettonMaster: TEST_ADDRESS }],
     }),
-    estimate: vi.fn<(p: GaslessEstimateParams) => Promise<GaslessEstimateResult>>().mockResolvedValue({
+    getQuote: vi.fn<(p: GaslessQuoteParams) => Promise<GaslessQuote>>().mockResolvedValue({
         messages: [],
         fee: '0',
         validUntil: 0,
         relayAddress: TEST_ADDRESS,
         from: TEST_ADDRESS,
     }),
-    send: vi.fn<(p: GaslessSendParams) => Promise<void>>().mockResolvedValue(undefined),
+    sendTransaction: vi.fn<(p: GaslessSendParams) => Promise<void>>().mockResolvedValue(undefined),
 });
 
 const makeManager = (): { manager: GaslessManager; emitter: EventEmitter<never> } => {
@@ -115,14 +115,14 @@ describe('GaslessManager delegation', () => {
         expect(provider.getConfig).toHaveBeenCalledTimes(1);
     });
 
-    it('forwards estimate to the named provider', async () => {
+    it('forwards getQuote to the named provider', async () => {
         const { manager } = makeManager();
         const a = makeProvider('a');
         const b = makeProvider('b');
         manager.registerProvider(a);
         manager.registerProvider(b);
 
-        await manager.estimate(
+        await manager.getQuote(
             {
                 feeJettonMaster: TEST_ADDRESS,
                 walletAddress: TEST_ADDRESS,
@@ -132,29 +132,29 @@ describe('GaslessManager delegation', () => {
             'b',
         );
 
-        expect(a.estimate).not.toHaveBeenCalled();
-        expect(b.estimate).toHaveBeenCalledTimes(1);
+        expect(a.getQuote).not.toHaveBeenCalled();
+        expect(b.getQuote).toHaveBeenCalledTimes(1);
     });
 
-    it('forwards send to the default provider', async () => {
+    it('forwards sendTransaction to the default provider', async () => {
         const { manager } = makeManager();
         const provider = makeProvider('one');
         manager.registerProvider(provider);
 
-        await manager.send({ walletPublicKey: '0xabc', internalBoc: 'AAA=' as never });
+        await manager.sendTransaction({ walletPublicKey: '0xabc', internalBoc: 'AAA=' as never });
 
-        expect(provider.send).toHaveBeenCalledTimes(1);
+        expect(provider.sendTransaction).toHaveBeenCalledTimes(1);
     });
 
-    it('rethrows provider errors from estimate without wrapping', async () => {
+    it('rethrows provider errors from getQuote without wrapping', async () => {
         const { manager } = makeManager();
         const provider = makeProvider('one');
-        const error = new GaslessError('relayer down', GaslessErrorCode.EstimateFailed);
-        (provider.estimate as ReturnType<typeof vi.fn>).mockRejectedValueOnce(error);
+        const error = new GaslessError('relayer down', GaslessErrorCode.QuoteFailed);
+        (provider.getQuote as ReturnType<typeof vi.fn>).mockRejectedValueOnce(error);
         manager.registerProvider(provider);
 
         await expect(
-            manager.estimate({
+            manager.getQuote({
                 feeJettonMaster: TEST_ADDRESS,
                 walletAddress: TEST_ADDRESS,
                 walletPublicKey: '0xabc',
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index d3a3f0de2..4f5a1e67d 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -7,7 +7,7 @@
  */
 
 import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
-import type { GaslessConfig, GaslessEstimateParams, GaslessEstimateResult, GaslessSendParams } from '../../api/models';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../../api/models';
 import { globalLogger } from '../../core/Logger';
 import type { ProviderFactoryContext } from '../../types/factory';
 import { DefiManager } from '../DefiManager';
@@ -42,10 +42,10 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
     }
 
     /**
-     * Estimate fees and obtain relayer-wrapped messages for signing.
+     * Quote fees and obtain relayer-wrapped messages for signing.
      */
-    async estimate(params: GaslessEstimateParams, providerId?: string): Promise<GaslessEstimateResult> {
-        log.debug('Estimating gasless transaction', {
+    async getQuote(params: GaslessQuoteParams, providerId?: string): Promise<GaslessQuote> {
+        log.debug('Quoting gasless transaction', {
             walletAddress: params.walletAddress,
             feeJettonMaster: params.feeJettonMaster,
             messagesCount: params.messages.length,
@@ -53,9 +53,9 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
         });
 
         try {
-            return await this.getProvider(providerId ?? this.defaultProviderId).estimate(params);
+            return await this.getProvider(providerId ?? this.defaultProviderId).getQuote(params);
         } catch (error) {
-            log.error('Failed to estimate gasless transaction', { error, params });
+            log.error('Failed to quote gasless transaction', { error, params });
             throw error;
         }
     }
@@ -63,11 +63,11 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
     /**
      * Submit a signed transaction BoC to the relayer.
      */
-    async send(params: GaslessSendParams, providerId?: string): Promise<void> {
+    async sendTransaction(params: GaslessSendParams, providerId?: string): Promise<void> {
         log.debug('Sending gasless transaction', { providerId: providerId ?? this.defaultProviderId });
 
         try {
-            await this.getProvider(providerId ?? this.defaultProviderId).send(params);
+            await this.getProvider(providerId ?? this.defaultProviderId).sendTransaction(params);
         } catch (error) {
             log.error('Failed to send gasless transaction', { error });
             throw error;
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index 6750771ae..075359d21 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -7,13 +7,7 @@
  */
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
-import type {
-    GaslessConfig,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
-    GaslessSendParams,
-    Network,
-} from '../../api/models';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../../api/models';
 
 /**
  * Abstract base class for gasless relay providers.
@@ -27,8 +21,8 @@ import type {
  *   readonly providerId = 'my-relayer';
  *
  *   async getConfig(): Promise<GaslessConfig> { ... }
- *   async estimate(params): Promise<GaslessEstimateResult> { ... }
- *   async send(params): Promise<void> { ... }
+ *   async getQuote(params): Promise<GaslessQuote> { ... }
+ *   async sendTransaction(params): Promise<void> { ... }
  * }
  * ```
  */
@@ -38,6 +32,6 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
 
     abstract getSupportedNetworks(): Network[];
     abstract getConfig(): Promise<GaslessConfig>;
-    abstract estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult>;
-    abstract send(params: GaslessSendParams): Promise<void>;
+    abstract getQuote(params: GaslessQuoteParams): Promise<GaslessQuote>;
+    abstract sendTransaction(params: GaslessSendParams): Promise<void>;
 }
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index aec569c0e..c73c939dc 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -5,9 +5,9 @@
 ## Flow
 
 1. **Configure** – fetch the relayer config (`getConfig`) to learn which jettons it accepts as fee payment and its relay address.
-2. **Estimate** – call `estimate` with your messages and chosen fee jetton. The relayer returns *wrapped* messages, a fee, and a `validUntil` window.
+2. **Quote** – call `getQuote` with your messages and chosen fee jetton. The relayer returns *wrapped* messages, a fee, and a `validUntil` window.
 3. **Sign** – pass the wrapped messages to `wallet.signMessage` (TonConnect `SignMessage` feature). The wallet returns a signed *internal-message* BoC.
-4. **Send** – submit the signed BoC via `send`; the relayer converts it to an external message, pays the gas, and broadcasts.
+4. **Send** – submit the signed BoC via `sendTransaction`; the relayer converts it to an external message, pays the gas, and broadcasts.
 
 ## Quick Start
 
@@ -42,7 +42,7 @@ import { Network } from '@ton/walletkit';
 const config = await kit.gasless.getConfig();
 const feeJetton = config.supportedGasJettons[0].jettonMaster;
 
-const estimate = await kit.gasless.estimate({
+const quote = await kit.gasless.getQuote({
     feeJettonMaster: feeJetton,
     walletAddress: wallet.getAddress(),
     walletPublicKey: wallet.getPublicKey(),
@@ -56,30 +56,30 @@ const estimate = await kit.gasless.estimate({
 });
 
 const { internalBoc } = await wallet.signMessage({
-    messages: estimate.messages,
-    validUntil: estimate.validUntil,
+    messages: quote.messages,
+    validUntil: quote.validUntil,
 });
 
-await kit.gasless.send({
+await kit.gasless.sendTransaction({
     walletPublicKey: wallet.getPublicKey(),
     internalBoc,
 });
 ```
 
-The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@ton/appkit-react`, `useGaslessEstimate` already refreshes estimates automatically via a 2-minute `staleTime`; if you wire `estimate` manually, re-call it for long-running UIs before signing.
+The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@ton/appkit-react`, `useGaslessQuote` already refreshes quotes automatically via a 2-minute `staleTime`; if you wire `getQuote` manually, re-call it for long-running UIs before signing.
 
 ## Error Codes
 
-`GaslessError` extends `DefiError`. The codes are exposed as both static constants on `GaslessError` and a `GaslessErrorCode` enum:
+`GaslessError` extends `DefiError`. The codes are exposed via the `GaslessErrorCode` enum:
 
 | Code | Meaning |
 |---|---|
 | `UNSUPPORTED_FEE_JETTON` | The relayer does not accept the chosen jetton as fee payment. |
-| `ESTIMATE_FAILED` | Relayer rejected the estimate (insufficient liquidity, malformed messages, …). |
+| `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
 | `CONFIG_FAILED` | Relayer config endpoint failed. |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not implement the `SignMessage` feature. Surfaced by the higher-level `sendGaslessTransaction` action in `@ton/appkit`. |
-| `TOO_MANY_MESSAGES` | The estimate carries more messages than the wallet's advertised `SignMessage.maxMessages` cap. Surfaced by `sendGaslessTransaction` in `@ton/appkit`. |
+| `TOO_MANY_MESSAGES` | The quote carries more messages than the wallet's advertised `SignMessage.maxMessages` cap. Surfaced by `sendGaslessTransaction` in `@ton/appkit`. |
 
 ## Creating a Custom Gasless Provider
 
@@ -89,8 +89,8 @@ To target a different relayer, extend `GaslessProvider`:
 import {
     GaslessProvider,
     type GaslessConfig,
-    type GaslessEstimateParams,
-    type GaslessEstimateResult,
+    type GaslessQuoteParams,
+    type GaslessQuote,
     type GaslessSendParams,
     type Network,
 } from '@ton/walletkit';
@@ -106,11 +106,11 @@ export class MyGaslessProvider extends GaslessProvider {
         // …
     }
 
-    async estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult> {
+    async getQuote(params: GaslessQuoteParams): Promise<GaslessQuote> {
         // …
     }
 
-    async send(params: GaslessSendParams): Promise<void> {
+    async sendTransaction(params: GaslessSendParams): Promise<void> {
         // …
     }
 }
@@ -127,10 +127,10 @@ export class MyGaslessProvider extends GaslessProvider {
 #### `getConfig(providerId?)`
 Fetch the relayer config (supported jettons, relay address).
 
-#### `estimate(params, providerId?)`
+#### `getQuote(params, providerId?)`
 Wrap caller's messages with relayer fee-collection logic. Returns wrapped messages, fee, and `validUntil`.
 
-#### `send(params, providerId?)`
+#### `sendTransaction(params, providerId?)`
 Submit a signed internal-message BoC to the relayer.
 
 #### `registerProvider(provider)` / `setDefaultProvider(providerId)`
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index 412cbbbf0..d8ceac314 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -10,7 +10,7 @@ import { DefiError } from '../errors';
 
 export enum GaslessErrorCode {
     UnsupportedFeeJetton = 'UNSUPPORTED_FEE_JETTON',
-    EstimateFailed = 'ESTIMATE_FAILED',
+    QuoteFailed = 'QUOTE_FAILED',
     SendFailed = 'SEND_FAILED',
     ConfigFailed = 'CONFIG_FAILED',
     SignMessageNotSupported = 'SIGN_MESSAGE_NOT_SUPPORTED',
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 1025d0711..a25ea2695 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -146,7 +146,7 @@ describe('TonApiGaslessProvider.getConfig', () => {
     });
 });
 
-describe('TonApiGaslessProvider.estimate', () => {
+describe('TonApiGaslessProvider.getQuote', () => {
     let fetchApi: ReturnType<typeof makeFetch>;
     let provider: TonApiGaslessProvider;
 
@@ -155,7 +155,7 @@ describe('TonApiGaslessProvider.estimate', () => {
         provider = makeProvider(fetchApi);
     });
 
-    const makeRawEstimate = (overrides: Record<string, unknown> = {}) => ({
+    const makeRawQuote = (overrides: Record<string, unknown> = {}) => ({
         messages: [
             {
                 address: Address.parse(TEST_ADDRESS).toRawString(),
@@ -170,10 +170,10 @@ describe('TonApiGaslessProvider.estimate', () => {
         ...overrides,
     });
 
-    it('maps relayer response to GaslessEstimateResult', async () => {
-        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawEstimate()));
+    it('maps relayer response to GaslessQuote', async () => {
+        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawQuote()));
 
-        const result = await provider.estimate({
+        const result = await provider.getQuote({
             feeJettonMaster: TEST_ADDRESS,
             walletAddress: TEST_ADDRESS,
             walletPublicKey: TEST_PUBKEY,
@@ -189,9 +189,9 @@ describe('TonApiGaslessProvider.estimate', () => {
     });
 
     it('strips 0x prefix from walletPublicKey and serializes BoCs as hex', async () => {
-        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawEstimate({ messages: [], commission: '0', validUntil: 0 })));
+        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawQuote({ messages: [], commission: '0', valid_until: 0 })));
 
-        await provider.estimate({
+        await provider.getQuote({
             feeJettonMaster: TEST_ADDRESS,
             walletAddress: TEST_ADDRESS,
             walletPublicKey: TEST_PUBKEY,
@@ -207,11 +207,9 @@ describe('TonApiGaslessProvider.estimate', () => {
     });
 
     it('posts to /v2/gasless/estimate/{master_id}', async () => {
-        fetchApi.mockResolvedValueOnce(
-            jsonResponse(makeRawEstimate({ messages: [], commission: '0', valid_until: 0 })),
-        );
+        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawQuote({ messages: [], commission: '0', valid_until: 0 })));
 
-        await provider.estimate({
+        await provider.getQuote({
             feeJettonMaster: TEST_ADDRESS,
             walletAddress: TEST_ADDRESS,
             walletPublicKey: TEST_PUBKEY,
@@ -224,11 +222,11 @@ describe('TonApiGaslessProvider.estimate', () => {
         expect(init.method).toBe('POST');
     });
 
-    it('wraps fetch errors in GaslessError(ESTIMATE_FAILED)', async () => {
+    it('wraps fetch errors in GaslessError(QUOTE_FAILED)', async () => {
         fetchApi.mockResolvedValueOnce(new Response('relayer down', { status: 502 }));
 
         await expect(
-            provider.estimate({
+            provider.getQuote({
                 feeJettonMaster: TEST_ADDRESS,
                 walletAddress: TEST_ADDRESS,
                 walletPublicKey: TEST_PUBKEY,
@@ -236,18 +234,18 @@ describe('TonApiGaslessProvider.estimate', () => {
             }),
         ).rejects.toMatchObject({
             name: 'GaslessError',
-            code: GaslessErrorCode.EstimateFailed,
+            code: GaslessErrorCode.QuoteFailed,
         });
     });
 });
 
-describe('TonApiGaslessProvider.send', () => {
+describe('TonApiGaslessProvider.sendTransaction', () => {
     it('forwards a parsed external BoC (hex) to the relayer', async () => {
         const fetchApi = makeFetch();
         const provider = makeProvider(fetchApi);
         fetchApi.mockResolvedValueOnce(jsonResponse({}));
 
-        await provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
+        await provider.sendTransaction({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
 
         expect(fetchApi).toHaveBeenCalledTimes(1);
         const init = fetchApi.mock.calls[0][1] as RequestInit;
@@ -265,7 +263,7 @@ describe('TonApiGaslessProvider.send', () => {
             .mockResolvedValueOnce(new Response('transient', { status: 500 }))
             .mockResolvedValueOnce(jsonResponse({}));
 
-        await provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
+        await provider.sendTransaction({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
 
         expect(fetchApi).toHaveBeenCalledTimes(3);
     });
@@ -276,7 +274,7 @@ describe('TonApiGaslessProvider.send', () => {
         fetchApi.mockResolvedValue(new Response('boom', { status: 500 }));
 
         await expect(
-            provider.send({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() }),
+            provider.sendTransaction({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() }),
         ).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.SendFailed,
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 2ae9f3471..41468c329 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -8,12 +8,7 @@
 
 import { Address } from '@ton/core';
 
-import type {
-    GaslessConfig,
-    GaslessEstimateParams,
-    GaslessEstimateResult,
-    GaslessSendParams,
-} from '../../../api/models';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../../../api/models';
 import { Network } from '../../../api/models';
 import { BaseApiClient } from '../../../clients/BaseApiClient';
 import { globalLogger } from '../../../core/Logger';
@@ -22,7 +17,7 @@ import { CallForSuccess } from '../../../utils/retry';
 import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
 import { mapGaslessConfig } from './mappers/map-gasless-config';
-import { buildGaslessEstimateRequest, mapGaslessEstimate } from './mappers/map-gasless-estimate';
+import { buildGaslessQuoteRequest, mapGaslessQuote } from './mappers/map-gasless-quote';
 import { buildGaslessSendRequest } from './mappers/map-gasless-send';
 import type { TonApiGaslessConfig } from './types/config';
 import type { TonApiGaslessEstimateResponse } from './types/estimate';
@@ -135,27 +130,27 @@ export class TonApiGaslessProvider extends GaslessProvider {
         }
     }
 
-    async estimate(params: GaslessEstimateParams): Promise<GaslessEstimateResult> {
+    async getQuote(params: GaslessQuoteParams): Promise<GaslessQuote> {
         const masterId = Address.parse(params.feeJettonMaster).toRawString();
-        const body = buildGaslessEstimateRequest(params);
+        const body = buildGaslessQuoteRequest(params);
 
         try {
             const raw = await this.http.postJson<TonApiGaslessEstimateResponse>(
                 `/v2/gasless/estimate/${masterId}`,
                 body,
             );
-            return mapGaslessEstimate(raw);
+            return mapGaslessQuote(raw);
         } catch (error) {
-            log.error('Failed to estimate gasless transaction', { error, params });
+            log.error('Failed to quote gasless transaction', { error, params });
             throw new GaslessError(
-                error instanceof Error ? error.message : 'Failed to estimate gasless transaction',
-                GaslessErrorCode.EstimateFailed,
+                error instanceof Error ? error.message : 'Failed to quote gasless transaction',
+                GaslessErrorCode.QuoteFailed,
                 error,
             );
         }
     }
 
-    async send(params: GaslessSendParams): Promise<void> {
+    async sendTransaction(params: GaslessSendParams): Promise<void> {
         const body = buildGaslessSendRequest(params);
 
         try {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-estimate.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
similarity index 85%
rename from packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-estimate.ts
rename to packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
index 861e07d97..7f318ad78 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-estimate.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
@@ -8,7 +8,7 @@
 
 import { Address } from '@ton/core';
 
-import type { GaslessEstimateParams, GaslessEstimateResult } from '../../../../api/models';
+import type { GaslessQuote, GaslessQuoteParams } from '../../../../api/models';
 import { asAddressFriendly } from '../../../../utils/address';
 import { HexToBase64 } from '../../../../utils/base64';
 import { asHex } from '../../../../utils/hex';
@@ -29,7 +29,7 @@ const hexBocToBase64 = (hex: string) => {
  *
  * Caller messages are encoded as hex BoCs of internal messages (TonAPI's wire format).
  */
-export const buildGaslessEstimateRequest = (params: GaslessEstimateParams): TonApiGaslessEstimateRequest => ({
+export const buildGaslessQuoteRequest = (params: GaslessQuoteParams): TonApiGaslessEstimateRequest => ({
     wallet_address: Address.parse(params.walletAddress).toRawString(),
     wallet_public_key: stripHexPrefix(params.walletPublicKey),
     messages: params.messages.map((message) => ({
@@ -38,11 +38,11 @@ export const buildGaslessEstimateRequest = (params: GaslessEstimateParams): TonA
 });
 
 /**
- * Wire → domain: map the TonAPI estimate response to `GaslessEstimateResult`.
+ * Wire → domain: map the TonAPI estimate response to `GaslessQuote`.
  *
  * Hex BoCs in `payload` / `state_init` are converted back to base64.
  */
-export const mapGaslessEstimate = (raw: TonApiGaslessEstimateResponse): GaslessEstimateResult => ({
+export const mapGaslessQuote = (raw: TonApiGaslessEstimateResponse): GaslessQuote => ({
     messages: raw.messages.map((message) => ({
         address: asAddressFriendly(message.address),
         amount: message.amount,

From bfd48c759ee63fd64f98dc67246460466fcd309d Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 14:37:22 +0400
Subject: [PATCH 09/46] feat(gasless): add error mapping

---
 packages/walletkit/src/defi/gasless/README.md |  3 +-
 packages/walletkit/src/defi/gasless/errors.ts |  1 +
 .../tonapi/TonApiGaslessProvider.spec.ts      | 22 ++++++++
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 21 ++------
 .../tonapi/mappers/map-gasless-error.ts       | 50 +++++++++++++++++++
 5 files changed, 80 insertions(+), 17 deletions(-)
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts

diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index c73c939dc..5b8cc31bf 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -74,7 +74,8 @@ The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@to
 
 | Code | Meaning |
 |---|---|
-| `UNSUPPORTED_FEE_JETTON` | The relayer does not accept the chosen jetton as fee payment. |
+| `UNSUPPORTED_FEE_JETTON` | The relayer does not accept the chosen jetton as fee payment. The TonAPI provider surfaces this when the server replies with `error_code: 40000`. |
+| `UNSUPPORTED_OPERATION` | Sentinel for provider-side capability mismatches (analogue of `StakingErrorCode.UnsupportedOperation`). Currently unused; reserved for future providers that may not implement every method. |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
 | `CONFIG_FAILED` | Relayer config endpoint failed. |
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index d8ceac314..f1f7e86d8 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -10,6 +10,7 @@ import { DefiError } from '../errors';
 
 export enum GaslessErrorCode {
     UnsupportedFeeJetton = 'UNSUPPORTED_FEE_JETTON',
+    UnsupportedOperation = 'UNSUPPORTED_OPERATION',
     QuoteFailed = 'QUOTE_FAILED',
     SendFailed = 'SEND_FAILED',
     ConfigFailed = 'CONFIG_FAILED',
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index a25ea2695..9c349a33b 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -237,6 +237,28 @@ describe('TonApiGaslessProvider.getQuote', () => {
             code: GaslessErrorCode.QuoteFailed,
         });
     });
+
+    it('maps TonAPI error_code 40000 to GaslessError(UNSUPPORTED_FEE_JETTON)', async () => {
+        fetchApi.mockResolvedValueOnce(
+            new Response(JSON.stringify({ error: 'Jetton is not supported.', error_code: 40000 }), {
+                status: 400,
+                headers: { 'content-type': 'application/json' },
+            }),
+        );
+
+        await expect(
+            provider.getQuote({
+                feeJettonMaster: TEST_ADDRESS,
+                walletAddress: TEST_ADDRESS,
+                walletPublicKey: TEST_PUBKEY,
+                messages: [{ address: TEST_ADDRESS, amount: '0' }],
+            }),
+        ).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.UnsupportedFeeJetton,
+            message: 'Jetton is not supported.',
+        });
+    });
 });
 
 describe('TonApiGaslessProvider.sendTransaction', () => {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 41468c329..183bced20 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -14,9 +14,10 @@ import { BaseApiClient } from '../../../clients/BaseApiClient';
 import { globalLogger } from '../../../core/Logger';
 import type { ProviderFactoryContext } from '../../../types/factory';
 import { CallForSuccess } from '../../../utils/retry';
-import { GaslessError, GaslessErrorCode } from '../errors';
+import { GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
 import { mapGaslessConfig } from './mappers/map-gasless-config';
+import { mapTonApiGaslessError } from './mappers/map-gasless-error';
 import { buildGaslessQuoteRequest, mapGaslessQuote } from './mappers/map-gasless-quote';
 import { buildGaslessSendRequest } from './mappers/map-gasless-send';
 import type { TonApiGaslessConfig } from './types/config';
@@ -122,11 +123,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
             return mapGaslessConfig(raw);
         } catch (error) {
             log.error('Failed to fetch gasless config', { error });
-            throw new GaslessError(
-                error instanceof Error ? error.message : 'Failed to fetch gasless config',
-                GaslessErrorCode.ConfigFailed,
-                error,
-            );
+            throw mapTonApiGaslessError(error, GaslessErrorCode.ConfigFailed, 'Failed to fetch gasless config');
         }
     }
 
@@ -142,11 +139,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
             return mapGaslessQuote(raw);
         } catch (error) {
             log.error('Failed to quote gasless transaction', { error, params });
-            throw new GaslessError(
-                error instanceof Error ? error.message : 'Failed to quote gasless transaction',
-                GaslessErrorCode.QuoteFailed,
-                error,
-            );
+            throw mapTonApiGaslessError(error, GaslessErrorCode.QuoteFailed, 'Failed to quote gasless transaction');
         }
     }
 
@@ -161,11 +154,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
             );
         } catch (error) {
             log.error('Failed to send gasless transaction', { error });
-            throw new GaslessError(
-                error instanceof Error ? error.message : 'Failed to send gasless transaction',
-                GaslessErrorCode.SendFailed,
-                error,
-            );
+            throw mapTonApiGaslessError(error, GaslessErrorCode.SendFailed, 'Failed to send gasless transaction');
         }
     }
 }
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
new file mode 100644
index 000000000..156a67cf2
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { TonClientError } from '../../../../clients/TonClientError';
+import { GaslessError, GaslessErrorCode } from '../../errors';
+
+/**
+ * TonAPI gasless responses surface a small undocumented numeric `error_code`
+ * inside the error body. Only `40000` ("Jetton is not supported.") maps to a
+ * specific domain concept; everything else falls back to the caller-provided
+ * code.
+ *
+ * Wire shape observed in practice:
+ *   `{ "error": "Jetton is not supported.", "error_code": 40000 }`
+ *   `{ "error": "invalid public key size", "error_code": 40004 }`
+ *   `{ "error": "invalid wallet address" }`            (no `error_code`)
+ *   `{ "Error": "operation Gasless...: decode ..." }`  (decoder failure, no `error_code`)
+ */
+interface TonApiErrorBody {
+    error?: string;
+    error_code?: number;
+}
+
+const TONAPI_UNSUPPORTED_FEE_JETTON_CODE = 40000;
+
+export const mapTonApiGaslessError = (
+    error: unknown,
+    fallbackCode: GaslessErrorCode,
+    fallbackMessage: string,
+): GaslessError => {
+    if (error instanceof TonClientError) {
+        const body = error.details as TonApiErrorBody | undefined;
+
+        if (body && typeof body === 'object' && body.error_code === TONAPI_UNSUPPORTED_FEE_JETTON_CODE) {
+            return new GaslessError(
+                body.error ?? 'Jetton is not supported by the gasless relayer',
+                GaslessErrorCode.UnsupportedFeeJetton,
+                error,
+            );
+        }
+    }
+
+    const message = error instanceof Error ? error.message : fallbackMessage;
+    return new GaslessError(message, fallbackCode, error);
+};

From 4c56c1391e2fcaa941de908c8bf7e0e96aab41b6 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 18:46:58 +0400
Subject: [PATCH 10/46] feat(gasless): rework network management in tonapi
 provider

---
 .../appkit-minter/src/core/configs/app-kit.ts |   6 +-
 packages/appkit-react/.storybook/app-kit.ts   |   8 +-
 .../src/actions/gasless/get-gasless-config.ts |   7 +-
 .../src/actions/gasless/get-gasless-quote.ts  |   4 +
 .../gasless/send-gasless-transaction.test.ts  |   5 +-
 .../gasless/send-gasless-transaction.ts       |   1 +
 .../src/api/interfaces/GaslessAPI.ts          |  13 +-
 .../src/api/models/gasless/GaslessQuote.ts    |   3 +
 .../api/models/gasless/GaslessQuoteParams.ts  |   3 +
 .../api/models/gasless/GaslessSendParams.ts   |   3 +
 .../src/defi/gasless/GaslessManager.spec.ts   |  11 +-
 .../src/defi/gasless/GaslessManager.ts        |  21 +-
 .../src/defi/gasless/GaslessProvider.ts       |   4 +-
 .../tonapi/TonApiGaslessProvider.spec.ts      | 198 ++++++++++------
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 215 ++++++++++--------
 .../src/defi/gasless/tonapi/constants.ts      |  16 ++
 .../src/defi/gasless/tonapi/helpers.ts        |  44 ++++
 .../src/defi/gasless/tonapi/index.ts          |   2 +-
 .../tonapi/mappers/map-gasless-error.ts       |   6 +
 .../tonapi/mappers/map-gasless-quote.ts       |   8 +-
 .../tonapi/models/TonApiGaslessChainConfig.ts |  17 ++
 .../models/TonApiGaslessProviderConfig.ts     |  38 ++++
 .../src/defi/gasless/tonapi/models/index.ts   |  10 +
 23 files changed, 453 insertions(+), 190 deletions(-)
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/constants.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/helpers.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessChainConfig.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/models/index.ts

diff --git a/apps/appkit-minter/src/core/configs/app-kit.ts b/apps/appkit-minter/src/core/configs/app-kit.ts
index 57593832d..23456acbc 100644
--- a/apps/appkit-minter/src/core/configs/app-kit.ts
+++ b/apps/appkit-minter/src/core/configs/app-kit.ts
@@ -55,10 +55,6 @@ export const appKit = new AppKit({
         createTonstakersProvider(),
         createTonCenterStreamingProvider({ network: Network.mainnet(), apiKey: ENV_TON_API_KEY_MAINNET }),
         createTonCenterStreamingProvider({ network: Network.testnet(), apiKey: ENV_TON_API_KEY_TESTNET }),
-        // Note: `apiKey` is intentionally omitted. ENV_TON_API_KEY_MAINNET is a Toncenter v3 key
-        // (hex format) — TonAPI uses a different base32 token format, so passing the Toncenter
-        // key as Bearer here triggers a 401 "illegal base32 data" from TonAPI. The gasless
-        // config endpoint is public; supply a real TonAPI key here if you need higher rate limits.
-        createTonApiGaslessProvider({ network: Network.mainnet() }),
+        createTonApiGaslessProvider(),
     ],
 });
diff --git a/packages/appkit-react/.storybook/app-kit.ts b/packages/appkit-react/.storybook/app-kit.ts
index 67ba0f626..a9928f281 100644
--- a/packages/appkit-react/.storybook/app-kit.ts
+++ b/packages/appkit-react/.storybook/app-kit.ts
@@ -11,6 +11,7 @@ import { createTonConnectConnector } from '@ton/appkit';
 import { createOmnistonProvider } from '@ton/appkit/swap/omniston';
 import { createDeDustProvider } from '@ton/appkit/swap/dedust';
 import { createTonstakersProvider } from '@ton/appkit/staking/tonstakers';
+import { createTonApiGaslessProvider } from '@ton/appkit/gasless/tonapi';
 
 export const appKit = new AppKit({
     networks: {
@@ -35,5 +36,10 @@ export const appKit = new AppKit({
             },
         }),
     ],
-    providers: [createOmnistonProvider(), createDeDustProvider(), createTonstakersProvider()],
+    providers: [
+        createOmnistonProvider(),
+        createDeDustProvider(),
+        createTonstakersProvider(),
+        createTonApiGaslessProvider(),
+    ],
 });
diff --git a/packages/appkit/src/actions/gasless/get-gasless-config.ts b/packages/appkit/src/actions/gasless/get-gasless-config.ts
index 89053c162..41bc3889e 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-config.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-config.ts
@@ -9,8 +9,12 @@
 import type { GaslessConfig } from '@ton/walletkit';
 
 import type { AppKit } from '../../core/app-kit';
+import type { Network } from '../../types/network';
+import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
 export interface GetGaslessConfigOptions {
+    /** Network to query. Defaults to the selected wallet's network, then provider's first supported. */
+    network?: Network;
     /** Gasless provider id. Uses the default provider when omitted. */
     providerId?: string;
 }
@@ -28,5 +32,6 @@ export const getGaslessConfig = async (
     appKit: AppKit,
     options: GetGaslessConfigOptions = {},
 ): GetGaslessConfigReturnType => {
-    return appKit.gaslessManager.getConfig(options.providerId);
+    const network = options.network ?? getSelectedWallet(appKit)?.getNetwork();
+    return appKit.gaslessManager.getConfig(network, options.providerId);
 };
diff --git a/packages/appkit/src/actions/gasless/get-gasless-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
index 749502ccd..d6250c6ef 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-quote.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
@@ -8,6 +8,7 @@
 
 import type { GaslessQuote } from '@ton/walletkit';
 
+import type { Network } from '../../types/network';
 import type { TransactionRequestMessage } from '../../types/transaction';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
@@ -17,6 +18,8 @@ export interface GetGaslessQuoteOptions {
     feeJettonMaster: string;
     /** User's messages to include in the gasless transaction */
     messages: TransactionRequestMessage[];
+    /** Network to quote on. Defaults to the selected wallet's network. */
+    network?: Network;
     /** Gasless provider id. Uses the default provider when omitted. */
     providerId?: string;
 }
@@ -43,6 +46,7 @@ export const getGaslessQuote = async (appKit: AppKit, options: GetGaslessQuoteOp
 
     return appKit.gaslessManager.getQuote(
         {
+            network: options.network ?? wallet.getNetwork(),
             feeJettonMaster: options.feeJettonMaster,
             walletAddress: wallet.getAddress(),
             walletPublicKey: wallet.getPublicKey(),
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
index 5858d1189..e8247c555 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { GaslessErrorCode } from '@ton/walletkit';
+import { GaslessErrorCode, Network } from '@ton/walletkit';
 import type { Feature, GaslessQuote } from '@ton/walletkit';
 
 import type { AppKit } from '../../core/app-kit';
@@ -19,6 +19,7 @@ const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 const FAKE_INTERNAL_BOC = 'te6cckEBAQEAAgAAAA==' as Base64String;
 
 const makeQuote = (overrides: Partial<GaslessQuote> = {}): GaslessQuote => ({
+    network: Network.mainnet(),
     messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
     fee: '1234',
     validUntil: Math.floor(Date.now() / 1000) + 60,
@@ -73,7 +74,7 @@ describe('sendGaslessTransaction', () => {
             validUntil: quote.validUntil,
         });
         expect(sendTransaction).toHaveBeenCalledWith(
-            { walletPublicKey: '0xabc', internalBoc: FAKE_INTERNAL_BOC },
+            { network: quote.network, walletPublicKey: '0xabc', internalBoc: FAKE_INTERNAL_BOC },
             undefined,
         );
         expect(result.internalBoc).toBe(FAKE_INTERNAL_BOC);
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index f13fbd13f..ed8d5ec9a 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -81,6 +81,7 @@ export const sendGaslessTransaction = async (
 
     await appKit.gaslessManager.sendTransaction(
         {
+            network: quote.network,
             walletPublicKey: wallet.getPublicKey(),
             internalBoc,
         },
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
index 2f9a9f815..3c5e90ab8 100644
--- a/packages/walletkit/src/api/interfaces/GaslessAPI.ts
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../models';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../models';
 import type { DefiManagerAPI } from './DefiManagerAPI';
 import type { DefiProvider } from './DefiProvider';
 
@@ -19,9 +19,10 @@ import type { DefiProvider } from './DefiProvider';
 export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
     /**
      * Fetch relayer configuration (supported jettons and relay address).
+     * @param network Network to query (optional, falls back to the provider's first supported network)
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
-    getConfig(providerId?: string): Promise<GaslessConfig>;
+    getConfig(network?: Network, providerId?: string): Promise<GaslessConfig>;
 
     /**
      * Quote fees and obtain relayer-wrapped messages for signing.
@@ -29,7 +30,7 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
      * Pass the returned `messages` to `wallet.signMessage` to obtain a signed
      * internal-message BoC, then submit it via `sendTransaction`.
      *
-     * @param params Quote parameters (wallet identity, fee jetton, messages)
+     * @param params Quote parameters (network, wallet identity, fee jetton, messages)
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
     getQuote(params: GaslessQuoteParams, providerId?: string): Promise<GaslessQuote>;
@@ -37,7 +38,7 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
     /**
      * Submit a signed transaction BoC to the relayer for on-chain execution.
      *
-     * @param params Signed message and wallet public key
+     * @param params Signed message bundle (network, wallet public key, internal BoC)
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
     sendTransaction(params: GaslessSendParams, providerId?: string): Promise<void>;
@@ -55,9 +56,9 @@ export interface GaslessProviderInterface extends DefiProvider {
     readonly providerId: string;
 
     /**
-     * Fetch relayer configuration (supported jettons and relay address).
+     * Fetch relayer configuration (supported jettons and relay address) for the requested network.
      */
-    getConfig(): Promise<GaslessConfig>;
+    getConfig(network: Network): Promise<GaslessConfig>;
 
     /**
      * Quote fees and return relayer-wrapped messages for signing.
diff --git a/packages/walletkit/src/api/models/gasless/GaslessQuote.ts b/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
index 375f628f3..496ef091a 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
@@ -6,6 +6,7 @@
  *
  */
 
+import type { Network } from '../core/Network';
 import type { UserFriendlyAddress } from '../core/Primitives';
 import type { TokenAmount } from '../core/TokenAmount';
 import type { TransactionRequestMessage } from '../transactions/TransactionRequest';
@@ -18,6 +19,8 @@ import type { TransactionRequestMessage } from '../transactions/TransactionReque
  * will deduct and the timestamp after which the bundle expires.
  */
 export interface GaslessQuote {
+    /** Network the quote is bound to (mirrors the request `network`) */
+    network: Network;
     /** Relayer-wrapped messages ready to be signed */
     messages: TransactionRequestMessage[];
     /** Relayer fee in fee-jetton nanounits */
diff --git a/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts b/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
index 5eb073bc4..6ce29b8c4 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
@@ -6,6 +6,7 @@
  *
  */
 
+import type { Network } from '../core/Network';
 import type { Hex, UserFriendlyAddress } from '../core/Primitives';
 import type { TransactionRequestMessage } from '../transactions/TransactionRequest';
 
@@ -16,6 +17,8 @@ import type { TransactionRequestMessage } from '../transactions/TransactionReque
  * returns a new set of messages that the wallet should sign via `signMessage`.
  */
 export interface GaslessQuoteParams {
+    /** Network the gasless transaction should run on */
+    network: Network;
     /** Master address of the jetton used to pay the relayer's fee */
     feeJettonMaster: UserFriendlyAddress;
     /** Sender wallet address */
diff --git a/packages/walletkit/src/api/models/gasless/GaslessSendParams.ts b/packages/walletkit/src/api/models/gasless/GaslessSendParams.ts
index 829a2ef90..2ffbbfe76 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessSendParams.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessSendParams.ts
@@ -6,12 +6,15 @@
  *
  */
 
+import type { Network } from '../core/Network';
 import type { Base64String, Hex } from '../core/Primitives';
 
 /**
  * Parameters to submit a signed gasless transaction to the relayer.
  */
 export interface GaslessSendParams {
+    /** Network the signed BoC was produced for */
+    network: Network;
     /** Sender wallet public key */
     walletPublicKey: Hex;
     /** Signed internal-message BoC obtained from `wallet.signMessage` */
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index e6a3ce756..64dea927f 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -22,11 +22,12 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
     type: 'gasless',
     providerId,
     getSupportedNetworks: () => [Network.mainnet()],
-    getConfig: vi.fn<() => Promise<GaslessConfig>>().mockResolvedValue({
+    getConfig: vi.fn<(n: Network) => Promise<GaslessConfig>>().mockResolvedValue({
         relayAddress: TEST_ADDRESS,
         supportedGasJettons: [{ jettonMaster: TEST_ADDRESS }],
     }),
     getQuote: vi.fn<(p: GaslessQuoteParams) => Promise<GaslessQuote>>().mockResolvedValue({
+        network: Network.mainnet(),
         messages: [],
         fee: '0',
         validUntil: 0,
@@ -124,6 +125,7 @@ describe('GaslessManager delegation', () => {
 
         await manager.getQuote(
             {
+                network: Network.mainnet(),
                 feeJettonMaster: TEST_ADDRESS,
                 walletAddress: TEST_ADDRESS,
                 walletPublicKey: '0xabc',
@@ -141,7 +143,11 @@ describe('GaslessManager delegation', () => {
         const provider = makeProvider('one');
         manager.registerProvider(provider);
 
-        await manager.sendTransaction({ walletPublicKey: '0xabc', internalBoc: 'AAA=' as never });
+        await manager.sendTransaction({
+            network: Network.mainnet(),
+            walletPublicKey: '0xabc',
+            internalBoc: 'AAA=' as never,
+        });
 
         expect(provider.sendTransaction).toHaveBeenCalledTimes(1);
     });
@@ -155,6 +161,7 @@ describe('GaslessManager delegation', () => {
 
         await expect(
             manager.getQuote({
+                network: Network.mainnet(),
                 feeJettonMaster: TEST_ADDRESS,
                 walletAddress: TEST_ADDRESS,
                 walletPublicKey: '0xabc',
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index 4f5a1e67d..e05ecd9a2 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -7,7 +7,7 @@
  */
 
 import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../../api/models';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../../api/models';
 import { globalLogger } from '../../core/Logger';
 import type { ProviderFactoryContext } from '../../types/factory';
 import { DefiManager } from '../DefiManager';
@@ -29,12 +29,19 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
 
     /**
      * Fetch relayer configuration (supported jettons and relay address).
+     *
+     * `network` defaults to the provider's first supported network.
      */
-    async getConfig(providerId?: string): Promise<GaslessConfig> {
-        log.debug('Getting gasless config', { providerId: providerId ?? this.defaultProviderId });
+    async getConfig(network?: Network, providerId?: string): Promise<GaslessConfig> {
+        const provider = this.getProvider(providerId ?? this.defaultProviderId);
+        const targetNetwork = network ?? provider.getSupportedNetworks()[0];
+        log.debug('Getting gasless config', {
+            network: targetNetwork?.chainId,
+            providerId: providerId ?? this.defaultProviderId,
+        });
 
         try {
-            return await this.getProvider(providerId ?? this.defaultProviderId).getConfig();
+            return await provider.getConfig(targetNetwork);
         } catch (error) {
             log.error('Failed to get gasless config', { error });
             throw error;
@@ -46,6 +53,7 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
      */
     async getQuote(params: GaslessQuoteParams, providerId?: string): Promise<GaslessQuote> {
         log.debug('Quoting gasless transaction', {
+            network: params.network.chainId,
             walletAddress: params.walletAddress,
             feeJettonMaster: params.feeJettonMaster,
             messagesCount: params.messages.length,
@@ -64,7 +72,10 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
      * Submit a signed transaction BoC to the relayer.
      */
     async sendTransaction(params: GaslessSendParams, providerId?: string): Promise<void> {
-        log.debug('Sending gasless transaction', { providerId: providerId ?? this.defaultProviderId });
+        log.debug('Sending gasless transaction', {
+            network: params.network.chainId,
+            providerId: providerId ?? this.defaultProviderId,
+        });
 
         try {
             await this.getProvider(providerId ?? this.defaultProviderId).sendTransaction(params);
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index 075359d21..e7cb6cf19 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -20,7 +20,7 @@ import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams
  * class MyGaslessProvider extends GaslessProvider {
  *   readonly providerId = 'my-relayer';
  *
- *   async getConfig(): Promise<GaslessConfig> { ... }
+ *   async getConfig(network: Network): Promise<GaslessConfig> { ... }
  *   async getQuote(params): Promise<GaslessQuote> { ... }
  *   async sendTransaction(params): Promise<void> { ... }
  * }
@@ -31,7 +31,7 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
     abstract readonly providerId: string;
 
     abstract getSupportedNetworks(): Network[];
-    abstract getConfig(): Promise<GaslessConfig>;
+    abstract getConfig(network: Network): Promise<GaslessConfig>;
     abstract getQuote(params: GaslessQuoteParams): Promise<GaslessQuote>;
     abstract sendTransaction(params: GaslessSendParams): Promise<void>;
 }
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 9c349a33b..222ed0589 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -11,6 +11,7 @@ import { Address, beginCell, Cell, internal, storeMessageRelaxed } from '@ton/co
 
 import type { Base64String } from '../../../api/models';
 import { Network } from '../../../api/models';
+import type { ProviderFactoryContext } from '../../../types/factory';
 import { GaslessErrorCode } from '../errors';
 import { TonApiGaslessProvider, createTonApiGaslessProvider } from './TonApiGaslessProvider';
 
@@ -37,23 +38,30 @@ const jsonResponse = (body: unknown, init: { status?: number } = {}): Response =
 
 const makeFetch = () => vi.fn<typeof fetch>();
 
+const ctxWith = (networks: Network[]): ProviderFactoryContext =>
+    ({
+        networkManager: {
+            getConfiguredNetworks: () => networks,
+        },
+    }) as unknown as ProviderFactoryContext;
+
 const makeProvider = (
     fetchApi: ReturnType<typeof makeFetch>,
-    overrides: Partial<Parameters<typeof createTonApiGaslessProvider>[0]> = {},
+    options: Partial<Parameters<typeof createTonApiGaslessProvider>[0]> & { networks?: Network[] } = {},
 ): TonApiGaslessProvider => {
-    return new TonApiGaslessProvider({
-        network: Network.mainnet(),
+    const { networks = [Network.mainnet()], ...config } = options;
+    return TonApiGaslessProvider.createFromContext(ctxWith(networks), {
         fetchApi,
         sendRetries: 1,
         sendRetryDelayMs: 0,
-        ...overrides,
+        ...config,
     });
 };
 
 describe('TonApiGaslessProvider configuration', () => {
-    it('defaults providerId to tonapi-${network.chainId}', () => {
+    it('defaults providerId to "tonapi"', () => {
         const provider = makeProvider(makeFetch());
-        expect(provider.providerId).toBe(`tonapi-${Network.mainnet().chainId}`);
+        expect(provider.providerId).toBe('tonapi');
     });
 
     it('respects providerId override', () => {
@@ -61,9 +69,29 @@ describe('TonApiGaslessProvider configuration', () => {
         expect(provider.providerId).toBe('custom');
     });
 
-    it('reports the configured network in getSupportedNetworks', () => {
-        const provider = makeProvider(makeFetch(), { network: Network.testnet() });
-        expect(provider.getSupportedNetworks()).toEqual([Network.testnet()]);
+    it('auto-registers all configured networks when chains is omitted', () => {
+        const provider = makeProvider(makeFetch(), { networks: [Network.mainnet(), Network.testnet()] });
+        expect(
+            provider
+                .getSupportedNetworks()
+                .map((n) => n.chainId)
+                .sort(),
+        ).toEqual([Network.mainnet().chainId, Network.testnet().chainId].sort());
+    });
+
+    it('only registers chains that intersect with kit-configured networks', () => {
+        const provider = makeProvider(makeFetch(), {
+            networks: [Network.mainnet()],
+            chains: {
+                [Network.mainnet().chainId]: { apiKey: 'k1' },
+                [Network.testnet().chainId]: { apiKey: 'k2' }, // not configured
+            },
+        });
+        expect(provider.getSupportedNetworks()).toEqual([Network.mainnet()]);
+    });
+
+    it('throws when no networks are configured and no chains are passed', () => {
+        expect(() => TonApiGaslessProvider.createFromContext(ctxWith([]), {})).toThrow(/no eligible networks/);
     });
 
     it('exposes "gasless" provider type', () => {
@@ -74,8 +102,8 @@ describe('TonApiGaslessProvider configuration', () => {
 
 describe('createTonApiGaslessProvider', () => {
     it('returns a factory producing a TonApiGaslessProvider', () => {
-        const factory = createTonApiGaslessProvider({ network: Network.mainnet() });
-        const provider = factory({} as never);
+        const factory = createTonApiGaslessProvider({});
+        const provider = factory(ctxWith([Network.mainnet()]));
         expect(provider).toBeInstanceOf(TonApiGaslessProvider);
     });
 });
@@ -86,7 +114,7 @@ describe('TonApiGaslessProvider.getConfig', () => {
 
     beforeEach(() => {
         fetchApi = makeFetch();
-        provider = makeProvider(fetchApi);
+        provider = makeProvider(fetchApi, { networks: [Network.mainnet(), Network.testnet()] });
     });
 
     const rawConfig = (overrides: Record<string, unknown> = {}) => ({
@@ -98,48 +126,54 @@ describe('TonApiGaslessProvider.getConfig', () => {
     it('maps the TonApi response to GaslessConfig', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig()));
 
-        const cfg = await provider.getConfig();
+        const cfg = await provider.getConfig(Network.mainnet());
 
         expect(cfg.relayAddress).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
         expect(cfg.supportedGasJettons).toHaveLength(1);
-        expect(cfg.supportedGasJettons[0].jettonMaster).toBe(
-            Address.parse(TEST_ADDRESS).toString({ bounceable: true }),
-        );
     });
 
-    it('hits /v2/gasless/config on the network endpoint', async () => {
+    it('hits /v2/gasless/config on the mainnet endpoint when called for mainnet', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await provider.getConfig();
+        await provider.getConfig(Network.mainnet());
 
-        const url = (fetchApi.mock.calls[0][0] as URL).toString();
-        expect(url).toBe('https://tonapi.io/v2/gasless/config');
+        expect((fetchApi.mock.calls[0][0] as URL).toString()).toBe('https://tonapi.io/v2/gasless/config');
     });
 
-    it('uses the testnet endpoint for testnet provider', async () => {
-        const testnetProvider = makeProvider(fetchApi, { network: Network.testnet() });
+    it('uses the testnet endpoint when called for testnet', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await testnetProvider.getConfig();
+        await provider.getConfig(Network.testnet());
 
         expect((fetchApi.mock.calls[0][0] as URL).origin).toBe('https://testnet.tonapi.io');
     });
 
-    it('sends Bearer authorization when apiKey is provided', async () => {
-        const authedProvider = makeProvider(fetchApi, { apiKey: 'sk_test_123' });
+    it('sends Bearer authorization when apiKey is configured for the chain', async () => {
+        const authedProvider = makeProvider(fetchApi, {
+            chains: { [Network.mainnet().chainId]: { apiKey: 'sk_test_123' } },
+        });
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await authedProvider.getConfig();
+        await authedProvider.getConfig(Network.mainnet());
 
         const init = fetchApi.mock.calls[0][1] as RequestInit;
         const headers = init.headers as Headers;
         expect(headers.get('Authorization')).toBe('Bearer sk_test_123');
     });
 
+    it('throws GaslessError(UNSUPPORTED_OPERATION) when called for a non-configured chain', async () => {
+        const mainnetOnly = makeProvider(fetchApi, { networks: [Network.mainnet()] });
+
+        await expect(mainnetOnly.getConfig(Network.testnet())).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.UnsupportedOperation,
+        });
+    });
+
     it('wraps fetch errors in GaslessError(CONFIG_FAILED)', async () => {
         fetchApi.mockResolvedValueOnce(new Response('boom', { status: 500 }));
 
-        await expect(provider.getConfig()).rejects.toMatchObject({
+        await expect(provider.getConfig(Network.mainnet())).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.ConfigFailed,
         });
@@ -170,33 +204,30 @@ describe('TonApiGaslessProvider.getQuote', () => {
         ...overrides,
     });
 
-    it('maps relayer response to GaslessQuote', async () => {
+    const baseQuoteParams = {
+        network: Network.mainnet(),
+        feeJettonMaster: TEST_ADDRESS,
+        walletAddress: TEST_ADDRESS,
+        walletPublicKey: TEST_PUBKEY,
+        messages: [{ address: TEST_ADDRESS, amount: '0' }],
+    };
+
+    it('maps relayer response to GaslessQuote and threads network through', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(makeRawQuote()));
 
-        const result = await provider.getQuote({
-            feeJettonMaster: TEST_ADDRESS,
-            walletAddress: TEST_ADDRESS,
-            walletPublicKey: TEST_PUBKEY,
-            messages: [{ address: TEST_ADDRESS, amount: '0' }],
-        });
+        const result = await provider.getQuote(baseQuoteParams);
 
+        expect(result.network).toEqual(Network.mainnet());
         expect(result.fee).toBe('1234');
         expect(result.validUntil).toBe(999999);
         expect(result.messages).toHaveLength(1);
-        expect(result.messages[0].payload).toBeDefined();
-        // Returned payload must be a valid base64 BoC
         expect(() => Cell.fromBase64(result.messages[0].payload as string)).not.toThrow();
     });
 
     it('strips 0x prefix from walletPublicKey and serializes BoCs as hex', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(makeRawQuote({ messages: [], commission: '0', valid_until: 0 })));
 
-        await provider.getQuote({
-            feeJettonMaster: TEST_ADDRESS,
-            walletAddress: TEST_ADDRESS,
-            walletPublicKey: TEST_PUBKEY,
-            messages: [{ address: TEST_ADDRESS, amount: '0' }],
-        });
+        await provider.getQuote(baseQuoteParams);
 
         const init = fetchApi.mock.calls[0][1] as RequestInit;
         const body = JSON.parse(init.body as string);
@@ -206,15 +237,19 @@ describe('TonApiGaslessProvider.getQuote', () => {
         expect(body.messages[0].boc).toMatch(/^[0-9a-f]+$/);
     });
 
+    it('routes to the chain-specific endpoint based on params.network', async () => {
+        const multiChain = makeProvider(fetchApi, { networks: [Network.mainnet(), Network.testnet()] });
+        fetchApi.mockResolvedValueOnce(jsonResponse(makeRawQuote({ messages: [], commission: '0', valid_until: 0 })));
+
+        await multiChain.getQuote({ ...baseQuoteParams, network: Network.testnet() });
+
+        expect((fetchApi.mock.calls[0][0] as URL).origin).toBe('https://testnet.tonapi.io');
+    });
+
     it('posts to /v2/gasless/estimate/{master_id}', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(makeRawQuote({ messages: [], commission: '0', valid_until: 0 })));
 
-        await provider.getQuote({
-            feeJettonMaster: TEST_ADDRESS,
-            walletAddress: TEST_ADDRESS,
-            walletPublicKey: TEST_PUBKEY,
-            messages: [{ address: TEST_ADDRESS, amount: '0' }],
-        });
+        await provider.getQuote(baseQuoteParams);
 
         const url = (fetchApi.mock.calls[0][0] as URL).toString();
         expect(url).toContain('/v2/gasless/estimate/');
@@ -225,14 +260,7 @@ describe('TonApiGaslessProvider.getQuote', () => {
     it('wraps fetch errors in GaslessError(QUOTE_FAILED)', async () => {
         fetchApi.mockResolvedValueOnce(new Response('relayer down', { status: 502 }));
 
-        await expect(
-            provider.getQuote({
-                feeJettonMaster: TEST_ADDRESS,
-                walletAddress: TEST_ADDRESS,
-                walletPublicKey: TEST_PUBKEY,
-                messages: [{ address: TEST_ADDRESS, amount: '0' }],
-            }),
-        ).rejects.toMatchObject({
+        await expect(provider.getQuote(baseQuoteParams)).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.QuoteFailed,
         });
@@ -246,14 +274,7 @@ describe('TonApiGaslessProvider.getQuote', () => {
             }),
         );
 
-        await expect(
-            provider.getQuote({
-                feeJettonMaster: TEST_ADDRESS,
-                walletAddress: TEST_ADDRESS,
-                walletPublicKey: TEST_PUBKEY,
-                messages: [{ address: TEST_ADDRESS, amount: '0' }],
-            }),
-        ).rejects.toMatchObject({
+        await expect(provider.getQuote(baseQuoteParams)).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.UnsupportedFeeJetton,
             message: 'Jetton is not supported.',
@@ -262,12 +283,18 @@ describe('TonApiGaslessProvider.getQuote', () => {
 });
 
 describe('TonApiGaslessProvider.sendTransaction', () => {
+    const baseSendParams = {
+        network: Network.mainnet(),
+        walletPublicKey: TEST_PUBKEY,
+        internalBoc: buildSignedInternalBoc(),
+    };
+
     it('forwards a parsed external BoC (hex) to the relayer', async () => {
         const fetchApi = makeFetch();
         const provider = makeProvider(fetchApi);
         fetchApi.mockResolvedValueOnce(jsonResponse({}));
 
-        await provider.sendTransaction({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
+        await provider.sendTransaction(baseSendParams);
 
         expect(fetchApi).toHaveBeenCalledTimes(1);
         const init = fetchApi.mock.calls[0][1] as RequestInit;
@@ -276,28 +303,53 @@ describe('TonApiGaslessProvider.sendTransaction', () => {
         expect(body.boc).toMatch(/^[0-9a-f]+$/);
     });
 
-    it('retries on transient failure up to sendRetries', async () => {
+    it('routes to the chain-specific endpoint based on params.network', async () => {
         const fetchApi = makeFetch();
-        const provider = makeProvider(fetchApi, { sendRetries: 3 });
+        const provider = makeProvider(fetchApi, { networks: [Network.mainnet(), Network.testnet()] });
+        fetchApi.mockResolvedValueOnce(jsonResponse({}));
+
+        await provider.sendTransaction({ ...baseSendParams, network: Network.testnet() });
+
+        expect((fetchApi.mock.calls[0][0] as URL).origin).toBe('https://testnet.tonapi.io');
+    });
+
+    it('retries on transient 5xx failures up to sendRetries', async () => {
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi, { sendRetries: 2 });
 
         fetchApi
             .mockResolvedValueOnce(new Response('transient', { status: 500 }))
-            .mockResolvedValueOnce(new Response('transient', { status: 500 }))
+            .mockResolvedValueOnce(new Response('transient', { status: 503 }))
             .mockResolvedValueOnce(jsonResponse({}));
 
-        await provider.sendTransaction({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() });
+        await provider.sendTransaction(baseSendParams);
 
         expect(fetchApi).toHaveBeenCalledTimes(3);
     });
 
-    it('wraps persistent send errors in GaslessError(SEND_FAILED)', async () => {
+    it('does NOT retry on 4xx client errors', async () => {
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi, { sendRetries: 3 });
+        fetchApi.mockResolvedValueOnce(
+            new Response(JSON.stringify({ error: 'invalid signature' }), {
+                status: 400,
+                headers: { 'content-type': 'application/json' },
+            }),
+        );
+
+        await expect(provider.sendTransaction(baseSendParams)).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.SendFailed,
+        });
+        expect(fetchApi).toHaveBeenCalledTimes(1);
+    });
+
+    it('wraps persistent 5xx errors in GaslessError(SEND_FAILED) after exhausting retries', async () => {
         const fetchApi = makeFetch();
         const provider = makeProvider(fetchApi);
         fetchApi.mockResolvedValue(new Response('boom', { status: 500 }));
 
-        await expect(
-            provider.sendTransaction({ walletPublicKey: TEST_PUBKEY, internalBoc: buildSignedInternalBoc() }),
-        ).rejects.toMatchObject({
+        await expect(provider.sendTransaction(baseSendParams)).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.SendFailed,
         });
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 183bced20..fd6561283 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -8,68 +8,25 @@
 
 import { Address } from '@ton/core';
 
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../../../api/models';
-import { Network } from '../../../api/models';
-import { BaseApiClient } from '../../../clients/BaseApiClient';
+import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../../../api/models';
+import { ApiClientTonApi } from '../../../clients/tonapi/ApiClientTonApi';
 import { globalLogger } from '../../../core/Logger';
 import type { ProviderFactoryContext } from '../../../types/factory';
-import { CallForSuccess } from '../../../utils/retry';
-import { GaslessErrorCode } from '../errors';
+import { delay } from '../../../utils/delay';
+import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
+import { DEFAULT_PROVIDER_ID, DEFAULT_SEND_RETRIES, DEFAULT_SEND_RETRY_DELAY_MS } from './constants';
+import { isTransientError, networkFromChainId } from './helpers';
 import { mapGaslessConfig } from './mappers/map-gasless-config';
 import { mapTonApiGaslessError } from './mappers/map-gasless-error';
 import { buildGaslessQuoteRequest, mapGaslessQuote } from './mappers/map-gasless-quote';
 import { buildGaslessSendRequest } from './mappers/map-gasless-send';
+import type { TonApiGaslessChainConfig, TonApiGaslessProviderConfig } from './models';
 import type { TonApiGaslessConfig } from './types/config';
 import type { TonApiGaslessEstimateResponse } from './types/estimate';
 
 const log = globalLogger.createChild('TonApiGaslessProvider');
 
-const DEFAULT_SEND_RETRIES = 5;
-const DEFAULT_SEND_RETRY_DELAY_MS = 2000;
-
-const defaultEndpoint = (network: Network): string => {
-    switch (network.chainId) {
-        case Network.mainnet().chainId:
-            return 'https://tonapi.io';
-        case Network.tetra().chainId:
-            return 'https://tetra.tonapi.io';
-        default:
-            return 'https://testnet.tonapi.io';
-    }
-};
-
-class TonApiHttpClient extends BaseApiClient {
-    protected appendAuthHeaders(headers: Headers): void {
-        if (this.apiKey) {
-            headers.set('Authorization', `Bearer ${this.apiKey}`);
-        }
-    }
-}
-
-/**
- * Configuration for `TonApiGaslessProvider`.
- *
- * Shape mirrors `TonApiStreamingProviderConfig` — one provider instance per
- * network. To support both mainnet and testnet, register two providers.
- */
-export interface TonApiGaslessProviderConfig {
-    /** Network this provider operates on. Determines the default endpoint. */
-    network: Network;
-    /** Optional TonAPI REST endpoint override. */
-    endpoint?: string;
-    /** Optional bearer token for TonAPI. */
-    apiKey?: string;
-    /** Optional fetch implementation override (testing / SSR). */
-    fetchApi?: typeof fetch;
-    /** Optional provider id override. Defaults to `tonapi-${network.chainId}`. */
-    providerId?: string;
-    /** Number of send retries on transient errors. Defaults to 5. */
-    sendRetries?: number;
-    /** Delay between send retries in ms. Defaults to 2000. */
-    sendRetryDelayMs?: number;
-}
-
 /**
  * Gasless provider implementation backed by the public TonAPI REST API.
  *
@@ -81,8 +38,9 @@ export interface TonApiGaslessProviderConfig {
  * import { createTonApiGaslessProvider } from '@ton/walletkit/gasless/tonapi';
  *
  * const provider = createTonApiGaslessProvider({
- *     network: Network.mainnet(),
- *     apiKey: process.env.TON_API_KEY,
+ *     chains: {
+ *         [Network.mainnet().chainId]: { apiKey: process.env.TON_API_KEY },
+ *     },
  * });
  *
  * kit.gasless.registerProvider(provider);
@@ -91,38 +49,77 @@ export interface TonApiGaslessProviderConfig {
 export class TonApiGaslessProvider extends GaslessProvider {
     readonly providerId: string;
 
-    private readonly network: Network;
-    private readonly http: TonApiHttpClient;
+    private readonly chainConfig: Record<string, TonApiGaslessChainConfig>;
+    private readonly fetchApi?: typeof fetch;
+    private readonly clients: Record<string, ApiClientTonApi> = {};
     private readonly sendRetries: number;
     private readonly sendRetryDelayMs: number;
 
-    constructor(config: TonApiGaslessProviderConfig) {
+    /**
+     * @internal Use {@link createTonApiGaslessProvider} (AppKit) or {@link TonApiGaslessProvider.createFromContext}.
+     */
+    private constructor(chainConfig: Record<string, TonApiGaslessChainConfig>, options: TonApiGaslessProviderConfig) {
         super();
-        this.network = config.network;
-        this.providerId = config.providerId ?? `tonapi-${config.network.chainId}`;
-        this.sendRetries = config.sendRetries ?? DEFAULT_SEND_RETRIES;
-        this.sendRetryDelayMs = config.sendRetryDelayMs ?? DEFAULT_SEND_RETRY_DELAY_MS;
-        this.http = new TonApiHttpClient(
-            {
-                endpoint: config.endpoint,
-                apiKey: config.apiKey,
-                fetchApi: config.fetchApi,
-                network: config.network,
-            },
-            defaultEndpoint(config.network),
-        );
+        this.chainConfig = chainConfig;
+        this.fetchApi = options.fetchApi;
+        this.providerId = options.providerId ?? DEFAULT_PROVIDER_ID;
+        this.sendRetries = options.sendRetries ?? DEFAULT_SEND_RETRIES;
+        this.sendRetryDelayMs = options.sendRetryDelayMs ?? DEFAULT_SEND_RETRY_DELAY_MS;
+
+        log.info('TonApiGaslessProvider initialized', {
+            providerId: this.providerId,
+            chains: Object.keys(this.chainConfig),
+        });
+    }
+
+    /**
+     * Build a provider that serves every network the kit was configured with.
+     *
+     * If `config.chains` is provided, only those chains are registered (and they
+     * must intersect with the kit's configured networks). Otherwise every
+     * configured network gets a default TonAPI client.
+     */
+    static createFromContext(
+        ctx: ProviderFactoryContext,
+        config: TonApiGaslessProviderConfig = {},
+    ): TonApiGaslessProvider {
+        const configuredChains = new Set(ctx.networkManager.getConfiguredNetworks().map((n) => n.chainId));
+        const chainConfig: Record<string, TonApiGaslessChainConfig> = {};
+
+        if (config.chains) {
+            for (const [chainId, perChain] of Object.entries(config.chains)) {
+                if (!configuredChains.has(chainId)) {
+                    log.warn('Skipping TonApi gasless chain not configured in the kit', { chainId });
+                    continue;
+                }
+                chainConfig[chainId] = perChain;
+            }
+        } else {
+            for (const chainId of configuredChains) {
+                chainConfig[chainId] = {};
+            }
+        }
+
+        if (Object.keys(chainConfig).length === 0) {
+            throw new Error(
+                'createTonApiGaslessProvider: no eligible networks (configure at least one network in the kit, or pass `chains` matching a configured network)',
+            );
+        }
+
+        return new TonApiGaslessProvider(chainConfig, config);
     }
 
     getSupportedNetworks(): Network[] {
-        return [this.network];
+        return Object.keys(this.chainConfig).map(networkFromChainId);
     }
 
-    async getConfig(): Promise<GaslessConfig> {
+    async getConfig(network: Network): Promise<GaslessConfig> {
         try {
-            const raw = await this.http.getJson<TonApiGaslessConfig>('/v2/gasless/config');
+            const http = this.getClient(network);
+            const raw = await http.getJson<TonApiGaslessConfig>('/v2/gasless/config');
             return mapGaslessConfig(raw);
         } catch (error) {
-            log.error('Failed to fetch gasless config', { error });
+            log.error('Failed to fetch gasless config', { error, chainId: network.chainId });
             throw mapTonApiGaslessError(error, GaslessErrorCode.ConfigFailed, 'Failed to fetch gasless config');
         }
     }
@@ -132,11 +129,9 @@ export class TonApiGaslessProvider extends GaslessProvider {
         const body = buildGaslessQuoteRequest(params);
 
         try {
-            const raw = await this.http.postJson<TonApiGaslessEstimateResponse>(
-                `/v2/gasless/estimate/${masterId}`,
-                body,
-            );
-            return mapGaslessQuote(raw);
+            const http = this.getClient(params.network);
+            const raw = await http.postJson<TonApiGaslessEstimateResponse>(`/v2/gasless/estimate/${masterId}`, body);
+            return mapGaslessQuote(raw, params.network);
         } catch (error) {
             log.error('Failed to quote gasless transaction', { error, params });
             throw mapTonApiGaslessError(error, GaslessErrorCode.QuoteFailed, 'Failed to quote gasless transaction');
@@ -145,26 +140,68 @@ export class TonApiGaslessProvider extends GaslessProvider {
 
     async sendTransaction(params: GaslessSendParams): Promise<void> {
         const body = buildGaslessSendRequest(params);
+        const http = this.getClient(params.network);
+
+        // Exponential backoff, transient-only retry. The wallet's seqno guard
+        // protects against on-chain double-spend if a retry duplicates a BoC
+        // that was actually accepted; we still avoid hammering 4xx errors to
+        // keep relayer gas burn down and surface real failures fast.
+        const attemptsTotal = this.sendRetries + 1;
+        let attempt = 0;
+        let lastError: unknown;
+
+        while (attempt < attemptsTotal) {
+            try {
+                await http.postJson('/v2/gasless/send', body);
+                return;
+            } catch (error) {
+                lastError = error;
+
+                const lastAttempt = attempt === attemptsTotal - 1;
+                if (lastAttempt || !isTransientError(error)) {
+                    break;
+                }
+
+                await delay(this.sendRetryDelayMs * 2 ** attempt);
+                attempt++;
+            }
+        }
 
-        try {
-            await CallForSuccess(
-                () => this.http.postJson('/v2/gasless/send', body),
-                this.sendRetries,
-                this.sendRetryDelayMs,
+        log.error('Failed to send gasless transaction', { error: lastError, chainId: params.network.chainId });
+        throw mapTonApiGaslessError(lastError, GaslessErrorCode.SendFailed, 'Failed to send gasless transaction');
+    }
+
+    private getClient(network: Network): ApiClientTonApi {
+        const chainId = network.chainId;
+        const perChain = this.chainConfig[chainId];
+
+        if (!perChain) {
+            throw new GaslessError(
+                `TonApi gasless not configured for chain ${chainId}`,
+                GaslessErrorCode.UnsupportedOperation,
+                { chainId, configured: Object.keys(this.chainConfig) },
             );
-        } catch (error) {
-            log.error('Failed to send gasless transaction', { error });
-            throw mapTonApiGaslessError(error, GaslessErrorCode.SendFailed, 'Failed to send gasless transaction');
         }
+
+        if (!this.clients[chainId]) {
+            this.clients[chainId] = new ApiClientTonApi({
+                network,
+                endpoint: perChain.endpoint,
+                apiKey: perChain.apiKey,
+                fetchApi: this.fetchApi,
+            });
+        }
+
+        return this.clients[chainId];
     }
 }
 
 /**
- * Factory for `TonApiGaslessProvider` matching the `(ctx) => Provider` shape
- * expected by `AppKit.registerProvider`.
+ * Returns an AppKit / `ProviderInput` factory: pass to `providers: [createTonApiGaslessProvider(config)]`.
+ * At kit init, the factory receives context and builds the provider using `ctx.networkManager`.
  */
 export const createTonApiGaslessProvider = (
-    config: TonApiGaslessProviderConfig,
+    config: TonApiGaslessProviderConfig = {},
 ): ((ctx: ProviderFactoryContext) => TonApiGaslessProvider) => {
-    return () => new TonApiGaslessProvider(config);
+    return (ctx: ProviderFactoryContext) => TonApiGaslessProvider.createFromContext(ctx, config);
 };
diff --git a/packages/walletkit/src/defi/gasless/tonapi/constants.ts b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
new file mode 100644
index 000000000..ed34b4438
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/** Default provider id used when none is supplied in the config. */
+export const DEFAULT_PROVIDER_ID = 'tonapi';
+
+/** Default number of retries for `/v2/gasless/send` on transient failures (5xx / network). */
+export const DEFAULT_SEND_RETRIES = 3;
+
+/** Base delay between send retries (ms). Subsequent retries use exponential backoff (2× per attempt). */
+export const DEFAULT_SEND_RETRY_DELAY_MS = 2000;
diff --git a/packages/walletkit/src/defi/gasless/tonapi/helpers.ts b/packages/walletkit/src/defi/gasless/tonapi/helpers.ts
new file mode 100644
index 000000000..59a6ea4b5
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/helpers.ts
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { Network } from '../../../api/models';
+import { TonClientError } from '../../../clients/TonClientError';
+
+/**
+ * Reconstruct a `Network` instance from a chainId string. Used to map
+ * `Object.keys(chainConfig)` back to `Network` objects.
+ */
+export const networkFromChainId = (chainId: string): Network => {
+    switch (chainId) {
+        case Network.mainnet().chainId:
+            return Network.mainnet();
+        case Network.testnet().chainId:
+            return Network.testnet();
+        case Network.tetra().chainId:
+            return Network.tetra();
+        default:
+            return Network.custom(chainId);
+    }
+};
+
+/**
+ * Decide whether a `/v2/gasless/send` failure is worth retrying.
+ *
+ * Retry on 5xx server errors and HTTP 408/429 (timeout / rate limit), and on
+ * non-HTTP errors (network failures: fetch `TypeError`, `AbortError`).
+ *
+ * Skip retry on 4xx client errors — they will not improve, and re-sending a
+ * BoC that was actually accepted would burn relayer gas on a duplicate
+ * (although the wallet's seqno guard prevents on-chain double-spend).
+ */
+export const isTransientError = (error: unknown): boolean => {
+    if (error instanceof TonClientError) {
+        return error.status >= 500 || error.status === 408 || error.status === 429;
+    }
+    return error instanceof Error;
+};
diff --git a/packages/walletkit/src/defi/gasless/tonapi/index.ts b/packages/walletkit/src/defi/gasless/tonapi/index.ts
index c5928cac7..b7a54db5c 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/index.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/index.ts
@@ -7,4 +7,4 @@
  */
 
 export { TonApiGaslessProvider, createTonApiGaslessProvider } from './TonApiGaslessProvider';
-export type { TonApiGaslessProviderConfig } from './TonApiGaslessProvider';
+export type { TonApiGaslessChainConfig, TonApiGaslessProviderConfig } from './models';
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
index 156a67cf2..f5bcdda76 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
@@ -33,6 +33,12 @@ export const mapTonApiGaslessError = (
     fallbackCode: GaslessErrorCode,
     fallbackMessage: string,
 ): GaslessError => {
+    // Pre-classified `GaslessError`s (e.g. thrown from `getClient` for a
+    // non-configured chain) pass through unchanged.
+    if (error instanceof GaslessError) {
+        return error;
+    }
+
     if (error instanceof TonClientError) {
         const body = error.details as TonApiErrorBody | undefined;
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
index 7f318ad78..63f5dc065 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
@@ -8,7 +8,7 @@
 
 import { Address } from '@ton/core';
 
-import type { GaslessQuote, GaslessQuoteParams } from '../../../../api/models';
+import type { GaslessQuote, GaslessQuoteParams, Network } from '../../../../api/models';
 import { asAddressFriendly } from '../../../../utils/address';
 import { HexToBase64 } from '../../../../utils/base64';
 import { asHex } from '../../../../utils/hex';
@@ -40,9 +40,11 @@ export const buildGaslessQuoteRequest = (params: GaslessQuoteParams): TonApiGasl
 /**
  * Wire → domain: map the TonAPI estimate response to `GaslessQuote`.
  *
- * Hex BoCs in `payload` / `state_init` are converted back to base64.
+ * Hex BoCs in `payload` / `state_init` are converted back to base64. `network`
+ * is threaded in from the request — the relayer does not echo it.
  */
-export const mapGaslessQuote = (raw: TonApiGaslessEstimateResponse): GaslessQuote => ({
+export const mapGaslessQuote = (raw: TonApiGaslessEstimateResponse, network: Network): GaslessQuote => ({
+    network,
     messages: raw.messages.map((message) => ({
         address: asAddressFriendly(message.address),
         amount: message.amount,
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessChainConfig.ts b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessChainConfig.ts
new file mode 100644
index 000000000..9f7a0fb00
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessChainConfig.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/**
+ * Per-chain TonAPI gasless settings.
+ */
+export interface TonApiGaslessChainConfig {
+    /** TonAPI REST endpoint override for this chain (defaults to TonAPI's per-network host). */
+    endpoint?: string;
+    /** Bearer token used for this chain's TonAPI calls. */
+    apiKey?: string;
+}
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
new file mode 100644
index 000000000..55753a364
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { TonApiGaslessChainConfig } from './TonApiGaslessChainConfig';
+
+/**
+ * Configuration for `TonApiGaslessProvider`.
+ *
+ * One provider instance handles every configured chain. When `chains` is omitted,
+ * `createFromContext` auto-registers every network the kit was configured with.
+ *
+ * @example
+ * ```ts
+ * createTonApiGaslessProvider({
+ *     chains: {
+ *         [Network.mainnet().chainId]: { apiKey: process.env.TON_API_KEY_MAINNET },
+ *         [Network.testnet().chainId]: { apiKey: process.env.TON_API_KEY_TESTNET },
+ *     },
+ * });
+ * ```
+ */
+export interface TonApiGaslessProviderConfig {
+    /** Per-chain settings keyed by `Network#chainId`. */
+    chains?: Record<string, TonApiGaslessChainConfig>;
+    /** Custom fetch implementation (testing / SSR). Applies to every chain. */
+    fetchApi?: typeof fetch;
+    /** Provider id. Defaults to `tonapi`. */
+    providerId?: string;
+    /** Number of send retries on transient errors. Defaults to 5. */
+    sendRetries?: number;
+    /** Delay between send retries in ms. Defaults to 2000. */
+    sendRetryDelayMs?: number;
+}
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/index.ts b/packages/walletkit/src/defi/gasless/tonapi/models/index.ts
new file mode 100644
index 000000000..de2a10b70
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/index.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export type { TonApiGaslessChainConfig } from './TonApiGaslessChainConfig';
+export type { TonApiGaslessProviderConfig } from './TonApiGaslessProviderConfig';

From 0fa390802ab1232f6856aa9eac8af86732b9b94c Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 20:27:13 +0400
Subject: [PATCH 11/46] feat(gasless): return external boc + normalized hash

---
 apps/appkit-minter/src/pages/gasless-page.tsx | 21 +++++----
 .../appkit/actions/gasless/gasless-actions.ts |  4 +-
 .../appkit/actions/gasless/gasless.test.ts    |  7 ++-
 .../gasless/use-send-gasless-transaction.tsx  |  4 +-
 .../gasless/send-gasless-transaction.test.ts  | 17 +++++--
 .../gasless/send-gasless-transaction.ts       | 25 +++++------
 packages/appkit/src/gasless/index.ts          |  1 +
 .../src/api/interfaces/GaslessAPI.ts          | 17 +++++--
 .../api/models/gasless/GaslessSendResponse.ts | 21 +++++++++
 packages/walletkit/src/api/models/index.ts    |  1 +
 .../src/defi/gasless/GaslessManager.spec.ts   | 17 ++++++-
 .../src/defi/gasless/GaslessManager.ts        | 13 ++++--
 .../src/defi/gasless/GaslessProvider.ts       | 13 ++++--
 .../tonapi/TonApiGaslessProvider.spec.ts      | 44 +++++++++++++++++--
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 18 +++++---
 .../tonapi/mappers/map-gasless-send.ts        | 28 +++++++++++-
 .../src/defi/gasless/tonapi/types/send.ts     | 11 +++++
 17 files changed, 211 insertions(+), 51 deletions(-)
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessSendResponse.ts

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index 03939f322..fbd1f3ba3 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -139,14 +139,19 @@ export const GaslessPage: FC = () => {
 
         try {
             const result = await sendGasless({ quote });
-            const explorerUrl = `https://tonviewer.com/transaction/${result.internalBoc}`;
-            toast.success('Gasless transaction submitted!', {
-                description: 'View internal BoC on explorer',
-                action: {
-                    label: 'Open',
-                    onClick: () => window.open(explorerUrl, '_blank'),
-                },
-            });
+            const txHash = result.normalizedHash;
+            if (txHash) {
+                const explorerUrl = `https://tonviewer.com/transaction/${txHash}`;
+                toast.success('Gasless transaction submitted!', {
+                    description: txHash.slice(0, 10) + '…',
+                    action: {
+                        label: 'Explorer',
+                        onClick: () => window.open(explorerUrl, '_blank'),
+                    },
+                });
+            } else {
+                toast.success('Gasless transaction submitted!');
+            }
         } catch (error) {
             if (error instanceof GaslessError) {
                 toast.error(`${error.code}: ${error.message}`);
diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
index 6d8c887c1..529e6095e 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -67,8 +67,8 @@ export const gaslessExample = async (appKit: AppKit) => {
     // SAMPLE_END: GET_GASLESS_QUOTE
 
     // SAMPLE_START: SEND_GASLESS_TRANSACTION
-    const { internalBoc, fee } = await sendGaslessTransaction(appKit, { quote });
-    console.log('Submitted gasless transaction. Fee:', fee, 'BoC:', internalBoc);
+    const result = await sendGaslessTransaction(appKit, { quote });
+    console.log('Submitted gasless transaction. Hash:', result.normalizedHash, 'BoC:', result.internalBoc);
     // SAMPLE_END: SEND_GASLESS_TRANSACTION
 
     return { gaslessManager, provider, config, quote };
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index ebd5b5d98..bad0b4cac 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -45,7 +45,12 @@ describe('Gasless Actions Examples', () => {
             relayAddress: TEST_ADDRESS,
             from: TEST_ADDRESS,
         });
-        mockSend = vi.fn().mockResolvedValue(undefined);
+        mockSend = vi.fn().mockResolvedValue({
+            boc: 'AAA=',
+            normalizedBoc: 'AAA=',
+            normalizedHash: '0x' + 'a'.repeat(64),
+            internalBoc: 'AAAA',
+        });
         mockSignMessage = vi.fn().mockResolvedValue({ internalBoc: 'AAAA' });
 
         // @ts-expect-error - internal mock access
diff --git a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
index 248fcb14f..2e9d15dcc 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
@@ -28,8 +28,8 @@ export const UseSendGaslessTransactionExample = () => {
     const handleSend = async () => {
         if (!quote) return;
         try {
-            const { internalBoc, fee } = await sendGasless({ quote });
-            console.log('Submitted. Fee:', fee, 'BoC:', internalBoc);
+            const { internalBoc, normalizedHash } = await sendGasless({ quote });
+            console.log('Submitted. Hash:', normalizedHash, 'BoC:', internalBoc);
         } catch (e) {
             console.error(e);
         }
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
index e8247c555..bfb2ebce5 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -45,8 +45,17 @@ const makeWallet = (overrides: Partial<WalletInterface> = {}): WalletInterface =
     } as WalletInterface;
 };
 
+type MockSendResult = { boc: string; normalizedBoc: string; normalizedHash: string; internalBoc: string };
+
+const DEFAULT_SEND_RESULT: MockSendResult = {
+    boc: 'external_boc_b64',
+    normalizedBoc: 'normalized_b64',
+    normalizedHash: '0xabcdef',
+    internalBoc: FAKE_INTERNAL_BOC,
+};
+
 const makeAppKit = (wallet: WalletInterface | null) => {
-    const sendTransaction = vi.fn<() => Promise<void>>().mockResolvedValue(undefined);
+    const sendTransaction = vi.fn<() => Promise<MockSendResult>>().mockResolvedValue({ ...DEFAULT_SEND_RESULT });
 
     const appKit = {
         walletsManager: { selectedWallet: wallet },
@@ -63,7 +72,7 @@ describe('sendGaslessTransaction', () => {
         wallet = makeWallet();
     });
 
-    it('signs the quote and submits the resulting BoC to the relayer', async () => {
+    it('signs the quote and forwards SendTransactionResponse-shaped fields from the relayer', async () => {
         const { appKit, sendTransaction } = makeAppKit(wallet);
         const quote = makeQuote();
 
@@ -78,7 +87,9 @@ describe('sendGaslessTransaction', () => {
             undefined,
         );
         expect(result.internalBoc).toBe(FAKE_INTERNAL_BOC);
-        expect(result.fee).toBe(quote.fee);
+        expect(result.boc).toBe(DEFAULT_SEND_RESULT.boc);
+        expect(result.normalizedBoc).toBe(DEFAULT_SEND_RESULT.normalizedBoc);
+        expect(result.normalizedHash).toBe(DEFAULT_SEND_RESULT.normalizedHash);
     });
 
     it('forwards providerId to gaslessManager.sendTransaction', async () => {
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index ed8d5ec9a..c701dd0cb 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -6,10 +6,9 @@
  *
  */
 
-import type { GaslessQuote, TokenAmount } from '@ton/walletkit';
+import type { GaslessQuote, GaslessSendResponse } from '@ton/walletkit';
 
 import { GaslessError, GaslessErrorCode } from '../../gasless';
-import type { Base64String } from '../../types/primitives';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
@@ -20,12 +19,13 @@ export interface SendGaslessTransactionParameters {
     providerId?: string;
 }
 
-export interface SendGaslessTransactionReturnType {
-    /** Signed internal BoC that was submitted to the relayer */
-    internalBoc: Base64String;
-    /** Relayer fee in fee-jetton nanounits (mirrors the quote) */
-    fee: TokenAmount;
-}
+/**
+ * Return type is `GaslessSendResponse` — `SendTransactionResponse` plus
+ * `internalBoc`. Consumers can drop `result.boc` straight into
+ * `getTransactionStatus({ boc })` or build explorer links from
+ * `result.normalizedHash` the same way as regular `sendTransaction`.
+ */
+export type SendGaslessTransactionReturnType = GaslessSendResponse;
 
 export type SendGaslessTransactionErrorType = Error;
 
@@ -42,6 +42,8 @@ export type SendGaslessTransactionErrorType = Error;
  *         advertise the `SignMessage` feature.
  * @throws GaslessError(TOO_MANY_MESSAGES) when the quote carries more
  *         messages than the wallet's advertised `maxMessages` cap.
+ * @throws GaslessError(SEND_FAILED) when the relayer accepts the BoC but
+ *         omits the broadcasted external message in its response.
  */
 export const sendGaslessTransaction = async (
     appKit: AppKit,
@@ -79,7 +81,7 @@ export const sendGaslessTransaction = async (
         validUntil: quote.validUntil,
     });
 
-    await appKit.gaslessManager.sendTransaction(
+    return appKit.gaslessManager.sendTransaction(
         {
             network: quote.network,
             walletPublicKey: wallet.getPublicKey(),
@@ -87,9 +89,4 @@ export const sendGaslessTransaction = async (
         },
         providerId,
     );
-
-    return {
-        internalBoc,
-        fee: quote.fee,
-    };
 };
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index 68d75d83a..c5f793ebf 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -16,4 +16,5 @@ export type {
     GaslessQuoteParams,
     GaslessQuote,
     GaslessSendParams,
+    GaslessSendResponse,
 } from '@ton/walletkit';
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
index 3c5e90ab8..e6b0c1906 100644
--- a/packages/walletkit/src/api/interfaces/GaslessAPI.ts
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -6,7 +6,14 @@
  *
  */
 
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../models';
+import type {
+    GaslessConfig,
+    GaslessQuote,
+    GaslessQuoteParams,
+    GaslessSendParams,
+    GaslessSendResponse,
+    Network,
+} from '../models';
 import type { DefiManagerAPI } from './DefiManagerAPI';
 import type { DefiProvider } from './DefiProvider';
 
@@ -38,10 +45,14 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
     /**
      * Submit a signed transaction BoC to the relayer for on-chain execution.
      *
+     * Returns `GaslessSendResponse` — a strict superset of `SendTransactionResponse`
+     * adding the signed `internalBoc` — so gasless and regular sends share the same
+     * `{ boc, normalizedBoc, normalizedHash }` triple for explorer / status lookup.
+     *
      * @param params Signed message bundle (network, wallet public key, internal BoC)
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
-    sendTransaction(params: GaslessSendParams, providerId?: string): Promise<void>;
+    sendTransaction(params: GaslessSendParams, providerId?: string): Promise<GaslessSendResponse>;
 }
 
 /**
@@ -68,5 +79,5 @@ export interface GaslessProviderInterface extends DefiProvider {
     /**
      * Submit a signed transaction BoC to the relayer.
      */
-    sendTransaction(params: GaslessSendParams): Promise<void>;
+    sendTransaction(params: GaslessSendParams): Promise<GaslessSendResponse>;
 }
diff --git a/packages/walletkit/src/api/models/gasless/GaslessSendResponse.ts b/packages/walletkit/src/api/models/gasless/GaslessSendResponse.ts
new file mode 100644
index 000000000..84dc68c29
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessSendResponse.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Base64String } from '../core/Primitives';
+import type { SendTransactionResponse } from '../transactions/SendTransactionResponse';
+
+/**
+ * Response from a gasless send. Extends `SendTransactionResponse` (`boc`,
+ * `normalizedBoc`, `normalizedHash` of the broadcasted external-in message)
+ * with the signed internal-message BoC produced by `wallet.signMessage` for
+ * the relayer to wrap.
+ */
+export interface GaslessSendResponse extends SendTransactionResponse {
+    /** Signed internal-message BoC produced by `wallet.signMessage`. */
+    internalBoc: Base64String;
+}
diff --git a/packages/walletkit/src/api/models/index.ts b/packages/walletkit/src/api/models/index.ts
index 91eb02d23..5cd5f0af6 100644
--- a/packages/walletkit/src/api/models/index.ts
+++ b/packages/walletkit/src/api/models/index.ts
@@ -143,6 +143,7 @@ export type { GaslessGasJetton } from './gasless/GaslessGasJetton';
 export type { GaslessQuoteParams } from './gasless/GaslessQuoteParams';
 export type { GaslessQuote } from './gasless/GaslessQuote';
 export type { GaslessSendParams } from './gasless/GaslessSendParams';
+export type { GaslessSendResponse } from './gasless/GaslessSendResponse';
 
 // Transaction models
 export * from './transactions/Transaction';
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index 64dea927f..68f0c8ca8 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -9,7 +9,15 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams } from '../../api/models';
+import type {
+    Base64String,
+    GaslessConfig,
+    GaslessQuote,
+    GaslessQuoteParams,
+    GaslessSendParams,
+    GaslessSendResponse,
+    Hex,
+} from '../../api/models';
 import { Network } from '../../api/models';
 import { EventEmitter } from '../../core/EventEmitter';
 import type { ProviderFactoryContext } from '../../types/factory';
@@ -34,7 +42,12 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
         relayAddress: TEST_ADDRESS,
         from: TEST_ADDRESS,
     }),
-    sendTransaction: vi.fn<(p: GaslessSendParams) => Promise<void>>().mockResolvedValue(undefined),
+    sendTransaction: vi.fn<(p: GaslessSendParams) => Promise<GaslessSendResponse>>().mockResolvedValue({
+        boc: 'AAA=' as Base64String,
+        normalizedBoc: 'AAA=' as Base64String,
+        normalizedHash: ('0x' + 'a'.repeat(64)) as Hex,
+        internalBoc: 'AAA=' as Base64String,
+    }),
 });
 
 const makeManager = (): { manager: GaslessManager; emitter: EventEmitter<never> } => {
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index e05ecd9a2..71dc8a819 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -7,7 +7,14 @@
  */
 
 import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../../api/models';
+import type {
+    GaslessConfig,
+    GaslessQuote,
+    GaslessQuoteParams,
+    GaslessSendParams,
+    GaslessSendResponse,
+    Network,
+} from '../../api/models';
 import { globalLogger } from '../../core/Logger';
 import type { ProviderFactoryContext } from '../../types/factory';
 import { DefiManager } from '../DefiManager';
@@ -71,14 +78,14 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
     /**
      * Submit a signed transaction BoC to the relayer.
      */
-    async sendTransaction(params: GaslessSendParams, providerId?: string): Promise<void> {
+    async sendTransaction(params: GaslessSendParams, providerId?: string): Promise<GaslessSendResponse> {
         log.debug('Sending gasless transaction', {
             network: params.network.chainId,
             providerId: providerId ?? this.defaultProviderId,
         });
 
         try {
-            await this.getProvider(providerId ?? this.defaultProviderId).sendTransaction(params);
+            return await this.getProvider(providerId ?? this.defaultProviderId).sendTransaction(params);
         } catch (error) {
             log.error('Failed to send gasless transaction', { error });
             throw error;
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index e7cb6cf19..1e3313377 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -7,7 +7,14 @@
  */
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../../api/models';
+import type {
+    GaslessConfig,
+    GaslessQuote,
+    GaslessQuoteParams,
+    GaslessSendParams,
+    GaslessSendResponse,
+    Network,
+} from '../../api/models';
 
 /**
  * Abstract base class for gasless relay providers.
@@ -22,7 +29,7 @@ import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams
  *
  *   async getConfig(network: Network): Promise<GaslessConfig> { ... }
  *   async getQuote(params): Promise<GaslessQuote> { ... }
- *   async sendTransaction(params): Promise<void> { ... }
+ *   async sendTransaction(params): Promise<GaslessSendResponse> { ... }
  * }
  * ```
  */
@@ -33,5 +40,5 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
     abstract getSupportedNetworks(): Network[];
     abstract getConfig(network: Network): Promise<GaslessConfig>;
     abstract getQuote(params: GaslessQuoteParams): Promise<GaslessQuote>;
-    abstract sendTransaction(params: GaslessSendParams): Promise<void>;
+    abstract sendTransaction(params: GaslessSendParams): Promise<GaslessSendResponse>;
 }
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 222ed0589..363e65b94 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -14,6 +14,7 @@ import { Network } from '../../../api/models';
 import type { ProviderFactoryContext } from '../../../types/factory';
 import { GaslessErrorCode } from '../errors';
 import { TonApiGaslessProvider, createTonApiGaslessProvider } from './TonApiGaslessProvider';
+import { internalBocToExternalMessageBoc } from './utils';
 
 const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 const TEST_PUBKEY = '0x' + 'a'.repeat(64);
@@ -289,10 +290,15 @@ describe('TonApiGaslessProvider.sendTransaction', () => {
         internalBoc: buildSignedInternalBoc(),
     };
 
+    // TonAPI's `external` is the hex BoC of the broadcasted external-in message.
+    // The provider expects it to be present; build a valid one once and reuse.
+    const validExternalHex = internalBocToExternalMessageBoc(buildSignedInternalBoc()).toBoc().toString('hex');
+    const successfulSendResponse = () => jsonResponse({ protocol_name: 'tonapi', external: validExternalHex });
+
     it('forwards a parsed external BoC (hex) to the relayer', async () => {
         const fetchApi = makeFetch();
         const provider = makeProvider(fetchApi);
-        fetchApi.mockResolvedValueOnce(jsonResponse({}));
+        fetchApi.mockResolvedValueOnce(successfulSendResponse());
 
         await provider.sendTransaction(baseSendParams);
 
@@ -303,10 +309,42 @@ describe('TonApiGaslessProvider.sendTransaction', () => {
         expect(body.boc).toMatch(/^[0-9a-f]+$/);
     });
 
+    it('parses the relayer-broadcast external BoC and returns a GaslessSendResponse', async () => {
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi);
+        // TonAPI's `external` is the hex-encoded BoC of the broadcast external-in message
+        // (NOT a hash, despite the OpenAPI description). Reuse our helper to construct
+        // one matching the wire format.
+        const externalCell = internalBocToExternalMessageBoc(buildSignedInternalBoc());
+        const externalHex = externalCell.toBoc().toString('hex');
+        fetchApi.mockResolvedValueOnce(jsonResponse({ protocol_name: 'tonapi', external: externalHex }));
+
+        const result = await provider.sendTransaction(baseSendParams);
+
+        // All three SendTransactionResponse fields populated
+        expect(result.boc).toBe(externalCell.toBoc().toString('base64'));
+        expect(result.normalizedBoc).toBeDefined();
+        expect(() => Cell.fromBase64(result.normalizedBoc)).not.toThrow();
+        expect(result.normalizedHash).toMatch(/^0x[0-9a-f]{64}$/);
+        // Plus the gasless-specific internalBoc echoed back from params
+        expect(result.internalBoc).toBe(baseSendParams.internalBoc);
+    });
+
+    it('throws GaslessError(SEND_FAILED) when the relayer omits the external field', async () => {
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi);
+        fetchApi.mockResolvedValueOnce(jsonResponse({ protocol_name: 'tonapi' }));
+
+        await expect(provider.sendTransaction(baseSendParams)).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.SendFailed,
+        });
+    });
+
     it('routes to the chain-specific endpoint based on params.network', async () => {
         const fetchApi = makeFetch();
         const provider = makeProvider(fetchApi, { networks: [Network.mainnet(), Network.testnet()] });
-        fetchApi.mockResolvedValueOnce(jsonResponse({}));
+        fetchApi.mockResolvedValueOnce(successfulSendResponse());
 
         await provider.sendTransaction({ ...baseSendParams, network: Network.testnet() });
 
@@ -320,7 +358,7 @@ describe('TonApiGaslessProvider.sendTransaction', () => {
         fetchApi
             .mockResolvedValueOnce(new Response('transient', { status: 500 }))
             .mockResolvedValueOnce(new Response('transient', { status: 503 }))
-            .mockResolvedValueOnce(jsonResponse({}));
+            .mockResolvedValueOnce(successfulSendResponse());
 
         await provider.sendTransaction(baseSendParams);
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index fd6561283..2da21a422 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -8,7 +8,14 @@
 
 import { Address } from '@ton/core';
 
-import type { GaslessConfig, GaslessQuote, GaslessQuoteParams, GaslessSendParams, Network } from '../../../api/models';
+import type {
+    GaslessConfig,
+    GaslessQuote,
+    GaslessQuoteParams,
+    GaslessSendParams,
+    GaslessSendResponse,
+    Network,
+} from '../../../api/models';
 import { ApiClientTonApi } from '../../../clients/tonapi/ApiClientTonApi';
 import { globalLogger } from '../../../core/Logger';
 import type { ProviderFactoryContext } from '../../../types/factory';
@@ -20,10 +27,11 @@ import { isTransientError, networkFromChainId } from './helpers';
 import { mapGaslessConfig } from './mappers/map-gasless-config';
 import { mapTonApiGaslessError } from './mappers/map-gasless-error';
 import { buildGaslessQuoteRequest, mapGaslessQuote } from './mappers/map-gasless-quote';
-import { buildGaslessSendRequest } from './mappers/map-gasless-send';
+import { buildGaslessSendRequest, mapGaslessSend } from './mappers/map-gasless-send';
 import type { TonApiGaslessChainConfig, TonApiGaslessProviderConfig } from './models';
 import type { TonApiGaslessConfig } from './types/config';
 import type { TonApiGaslessEstimateResponse } from './types/estimate';
+import type { TonApiGaslessSendResponse } from './types/send';
 
 const log = globalLogger.createChild('TonApiGaslessProvider');
 
@@ -138,7 +146,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
         }
     }
 
-    async sendTransaction(params: GaslessSendParams): Promise<void> {
+    async sendTransaction(params: GaslessSendParams): Promise<GaslessSendResponse> {
         const body = buildGaslessSendRequest(params);
         const http = this.getClient(params.network);
 
@@ -152,8 +160,8 @@ export class TonApiGaslessProvider extends GaslessProvider {
 
         while (attempt < attemptsTotal) {
             try {
-                await http.postJson('/v2/gasless/send', body);
-                return;
+                const raw = await http.postJson<TonApiGaslessSendResponse>('/v2/gasless/send', body);
+                return { ...mapGaslessSend(raw), internalBoc: params.internalBoc };
             } catch (error) {
                 lastError = error;
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
index 5eacca489..f2c1b14f4 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
@@ -6,9 +6,11 @@
  *
  */
 
-import type { GaslessSendParams } from '../../../../api/models';
+import type { Base64String, GaslessSendParams, SendTransactionResponse } from '../../../../api/models';
+import { getNormalizedExtMessageHash } from '../../../../utils/getNormalizedExtMessageHash';
+import { GaslessError, GaslessErrorCode } from '../../errors';
 import { internalBocToExternalMessageBoc, stripHexPrefix } from '../utils';
-import type { TonApiGaslessSendRequest } from '../types/send';
+import type { TonApiGaslessSendRequest, TonApiGaslessSendResponse } from '../types/send';
 
 /**
  * Domain → wire: build the JSON body for `POST /v2/gasless/send`.
@@ -20,3 +22,25 @@ export const buildGaslessSendRequest = (params: GaslessSendParams): TonApiGasles
     wallet_public_key: stripHexPrefix(params.walletPublicKey),
     boc: internalBocToExternalMessageBoc(params.internalBoc).toBoc().toString('hex'),
 });
+
+/**
+ * Wire → domain: turn TonAPI's `GaslessTx` response into a `SendTransactionResponse`.
+ *
+ * The OpenAPI description claims `external` is a "Normalized hash of the
+ * external message", but the wire payload is actually the **full BoC** of the
+ * external-in message the relayer broadcasted (hex-encoded). We re-encode it
+ * to base64 and normalize via `getNormalizedExtMessageHash` so consumers get
+ * the same `{ boc, normalizedBoc, normalizedHash }` triple as
+ * `wallet.sendTransaction` returns.
+ */
+export const mapGaslessSend = (raw: TonApiGaslessSendResponse): SendTransactionResponse => {
+    if (!raw.external) {
+        throw new GaslessError('Relayer did not return the broadcasted external message', GaslessErrorCode.SendFailed, {
+            protocolName: raw.protocol_name,
+        });
+    }
+
+    const boc = Buffer.from(raw.external, 'hex').toString('base64') as Base64String;
+    const { hash: normalizedHash, boc: normalizedBoc } = getNormalizedExtMessageHash(boc);
+    return { boc, normalizedBoc, normalizedHash };
+};
diff --git a/packages/walletkit/src/defi/gasless/tonapi/types/send.ts b/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
index 75d98af7e..89ddf2205 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
@@ -14,3 +14,14 @@ export interface TonApiGaslessSendRequest {
     wallet_public_key: string;
     boc: string;
 }
+
+/**
+ * Wire-format response from `POST /v2/gasless/send` (TonAPI `GaslessTx`).
+ *
+ * `external` is the TEP-467 normalized hash of the external message the relayer
+ * broadcasted. Optional in the schema; required field is `protocol_name`.
+ */
+export interface TonApiGaslessSendResponse {
+    external?: string;
+    protocol_name: string;
+}

From 641a547e737d3e8695f16b580d15fe26b52c9a0c Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 21:40:01 +0400
Subject: [PATCH 12/46] feat(gasless): rename jetton to asset

---
 apps/appkit-minter/src/pages/gasless-page.tsx | 32 ++++++++--------
 .../appkit/actions/gasless/gasless-actions.ts |  4 +-
 .../appkit/actions/gasless/gasless.test.ts    |  2 +-
 .../hooks/gasless/use-gasless-config.tsx      |  6 +--
 .../hooks/gasless/use-gasless-quote.tsx       |  2 +-
 .../gasless/use-send-gasless-transaction.tsx  |  2 +-
 packages/appkit-react/docs/hooks.md           | 18 ++++-----
 packages/appkit/docs/actions.md               |  8 ++--
 .../src/actions/gasless/get-gasless-quote.ts  | 11 ++++--
 packages/appkit/src/gasless/index.ts          |  2 +-
 .../src/queries/gasless/get-gasless-quote.ts  | 13 ++-----
 .../src/api/models/gasless/GaslessConfig.ts   | 14 ++++---
 .../api/models/gasless/GaslessGasJetton.ts    | 17 ---------
 .../api/models/gasless/GaslessQuoteParams.ts  | 13 ++++++-
 .../models/gasless/GaslessSupportedAsset.ts   | 21 +++++++++++
 packages/walletkit/src/api/models/index.ts    |  2 +-
 .../src/defi/gasless/GaslessManager.spec.ts   |  6 +--
 .../src/defi/gasless/GaslessManager.ts        |  2 +-
 packages/walletkit/src/defi/gasless/README.md | 37 +++++++++++--------
 .../tonapi/TonApiGaslessProvider.spec.ts      | 23 +++++++++++-
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 10 ++++-
 .../tonapi/mappers/map-gasless-config.ts      |  4 +-
 22 files changed, 149 insertions(+), 100 deletions(-)
 delete mode 100644 packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessSupportedAsset.ts

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index fbd1f3ba3..727f64807 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -18,7 +18,7 @@ import {
     useSendGaslessTransaction,
 } from '@ton/appkit-react';
 import { asBase64, compareAddress, createJettonTransferPayload, GaslessError, parseUnits } from '@ton/appkit';
-import type { GaslessGasJetton, TransactionRequestMessage } from '@ton/appkit';
+import type { GaslessSupportedAsset, TransactionRequestMessage } from '@ton/appkit';
 import { toast } from 'sonner';
 
 import { Layout } from '@/core/components';
@@ -55,20 +55,20 @@ export const GaslessPage: FC = () => {
 
     const [recipient, setRecipient] = useState('');
     const [amount, setAmount] = useState('0.1');
-    const [feeJettonMaster, setFeeJettonMaster] = useState<string | null>(null);
+    const [feeAsset, setFeeAsset] = useState<string | null>(null);
 
     useEffect(() => {
         if (address && !recipient) setRecipient(address);
     }, [address, recipient]);
 
     useEffect(() => {
-        if (!feeJettonMaster && gaslessConfig?.supportedGasJettons.length) {
-            const preferred = gaslessConfig.supportedGasJettons.find((j: GaslessGasJetton) =>
-                compareAddress(j.jettonMaster, USDT_MASTER_MAINNET),
+        if (!feeAsset && gaslessConfig?.supportedAssets.length) {
+            const preferred = gaslessConfig.supportedAssets.find((j: GaslessSupportedAsset) =>
+                compareAddress(j.address, USDT_MASTER_MAINNET),
             );
-            setFeeJettonMaster(preferred?.jettonMaster ?? gaslessConfig.supportedGasJettons[0].jettonMaster);
+            setFeeAsset(preferred?.address ?? gaslessConfig.supportedAssets[0].address);
         }
-    }, [feeJettonMaster, gaslessConfig]);
+    }, [feeAsset, gaslessConfig]);
 
     const { data: usdtBalance } = useJettonBalanceByAddress({
         jettonAddress: USDT_MASTER_MAINNET,
@@ -112,9 +112,9 @@ export const GaslessPage: FC = () => {
         isFetching: isQuoting,
         error: quoteError,
     } = useGaslessQuote({
-        feeJettonMaster: feeJettonMaster ?? undefined,
+        feeAsset: feeAsset ?? undefined,
         messages: messages ?? undefined,
-        query: { enabled: Boolean(address && feeJettonMaster && messages) },
+        query: { enabled: Boolean(address && feeAsset && messages) },
     });
 
     const now = useNow();
@@ -193,16 +193,16 @@ export const GaslessPage: FC = () => {
                         </div>
 
                         <div className="space-y-2">
-                            <label className="text-sm font-medium">Fee jetton</label>
+                            <label className="text-sm font-medium">Fee asset</label>
                             <select
                                 className="w-full p-2 bg-secondary rounded-md border border-border"
-                                value={feeJettonMaster ?? ''}
-                                onChange={(e) => setFeeJettonMaster(e.target.value)}
-                                disabled={isConfigLoading || !gaslessConfig?.supportedGasJettons.length}
+                                value={feeAsset ?? ''}
+                                onChange={(e) => setFeeAsset(e.target.value)}
+                                disabled={isConfigLoading || !gaslessConfig?.supportedAssets.length}
                             >
-                                {gaslessConfig?.supportedGasJettons.map((j) => (
-                                    <option key={j.jettonMaster} value={j.jettonMaster}>
-                                        {j.jettonMaster.slice(0, 6)}…{j.jettonMaster.slice(-4)}
+                                {gaslessConfig?.supportedAssets.map((asset) => (
+                                    <option key={asset.address} value={asset.address}>
+                                        {asset.address.slice(0, 6)}…{asset.address.slice(-4)}
                                     </option>
                                 ))}
                             </select>
diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
index 529e6095e..426790bd3 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -48,13 +48,13 @@ export const gaslessExample = async (appKit: AppKit) => {
 
     // SAMPLE_START: GET_GASLESS_CONFIG
     const config = await getGaslessConfig(appKit);
-    const feeJetton = config.supportedGasJettons[0].jettonMaster;
+    const feeAsset = config.supportedAssets[0].address;
     console.log('Relay address:', config.relayAddress);
     // SAMPLE_END: GET_GASLESS_CONFIG
 
     // SAMPLE_START: GET_GASLESS_QUOTE
     const quote = await getGaslessQuote(appKit, {
-        feeJettonMaster: feeJetton,
+        feeAsset,
         messages: [
             {
                 address: 'EQ...jetton_wallet_address',
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index bad0b4cac..6280aef26 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -36,7 +36,7 @@ describe('Gasless Actions Examples', () => {
 
         mockGetConfig = vi.fn().mockResolvedValue({
             relayAddress: TEST_ADDRESS,
-            supportedGasJettons: [{ jettonMaster: TEST_ADDRESS }],
+            supportedAssets: [{ address: TEST_ADDRESS }],
         });
         mockGetQuote = vi.fn().mockResolvedValue({
             messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
index 3fb9edf34..c51a085b0 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
@@ -16,9 +16,9 @@ export const UseGaslessConfigExample = () => {
 
     return (
         <select>
-            {config?.supportedGasJettons.map((j) => (
-                <option key={j.jettonMaster} value={j.jettonMaster}>
-                    {j.jettonMaster}
+            {config?.supportedAssets.map((asset) => (
+                <option key={asset.address} value={asset.address}>
+                    {asset.address}
                 </option>
             ))}
         </select>
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
index 70763a91d..8e8d900bc 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
@@ -12,7 +12,7 @@ import { useGaslessQuote } from '@ton/appkit-react';
 export const UseGaslessQuoteExample = () => {
     // SAMPLE_START: USE_GASLESS_QUOTE
     const { data: quote, isFetching } = useGaslessQuote({
-        feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
+        feeAsset: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
         messages: [
             {
                 address: 'EQ...jetton_wallet_address',
diff --git a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
index 2e9d15dcc..b6dd513e7 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
@@ -14,7 +14,7 @@ import { useGaslessQuote, useSendGaslessTransaction } from '@ton/appkit-react';
 export const UseSendGaslessTransactionExample = () => {
     // SAMPLE_START: USE_SEND_GASLESS_TRANSACTION
     const { data: quote } = useGaslessQuote({
-        feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
+        feeAsset: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
         messages: [
             {
                 address: 'EQ...jetton_wallet_address',
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index 012e542e5..4ac7940d4 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -843,15 +843,15 @@ Gasless lets a dApp submit on-chain transactions without the user holding TON fo
 
 ### `useGaslessConfig`
 
-Hook to fetch the relayer config (supported jettons + relay address).
+Hook to fetch the relayer config (supported fee assets + relay address).
 
 ```tsx
 const { data: config, isLoading } = useGaslessConfig();
 return (
     <select>
-        {config?.supportedGasJettons.map((j) => (
-            <option key={j.jettonMaster} value={j.jettonMaster}>
-                {j.jettonMaster}
+        {config?.supportedAssets.map((asset) => (
+            <option key={asset.address} value={asset.address}>
+                {asset.address}
             </option>
         ))}
     </select>
@@ -860,11 +860,11 @@ return (
 
 ### `useGaslessQuote`
 
-Hook to fetch a gasless quote. Auto-refetches as inputs change; cached results become stale after ~2 minutes (matches the relayer `validUntil` window).
+Hook to fetch a gasless quote. Auto-refetches as inputs change; cached results become stale after ~2 minutes (matches the relayer `validUntil` window). Omit `feeAsset` for free / sponsored providers — jetton-fee providers throw `GaslessError(UNSUPPORTED_OPERATION)` in that case.
 
 ```tsx
 const { data: quote, isFetching } = useGaslessQuote({
-    feeJettonMaster: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
+    feeAsset: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
     messages: [
         {
             address: 'EQ...jetton_wallet_address',
@@ -896,13 +896,13 @@ Throws:
 - `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
 ```tsx
-const { data: quote } = useGaslessQuote({ feeJettonMaster, messages });
+const { data: quote } = useGaslessQuote({ feeAsset, messages });
 const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
 
 const handleSend = async () => {
     if (!quote) return;
-    const { internalBoc, fee } = await sendGasless({ quote });
-    console.log('Submitted. Fee:', fee, 'BoC:', internalBoc);
+    const { normalizedHash, internalBoc } = await sendGasless({ quote });
+    console.log('Submitted. Hash:', normalizedHash, 'BoC:', internalBoc);
 };
 
 return (
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 6966691d4..96a33b91b 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -690,22 +690,22 @@ unsubscribe();
 
 ### `getGaslessConfig`
 
-Fetch relayer configuration (supported jettons + relay address).
+Fetch relayer configuration (supported fee assets + relay address).
 
 ```ts
 const config = await getGaslessConfig(appKit);
-const feeJetton = config.supportedGasJettons[0].jettonMaster;
+const feeAsset = config.supportedAssets[0].address;
 ```
 
 ### `getGaslessQuote`
 
-Ask the relayer for a gasless transaction quote. Returns relayer-wrapped messages, the fee charged in the fee jetton, and the bundle validity window (`validUntil`).
+Ask the relayer for a gasless transaction quote. Returns relayer-wrapped messages, the fee charged in the chosen `feeAsset`, and the bundle validity window (`validUntil`). Omit `feeAsset` for free / sponsored providers — jetton-fee providers (like TonAPI) throw `GaslessError(UNSUPPORTED_OPERATION)` in that case.
 
 The quote is intended to be passed verbatim to `sendGaslessTransaction`. Quotes are typically valid for ~2 minutes.
 
 ```ts
 const quote = await getGaslessQuote(appKit, {
-    feeJettonMaster: feeJetton,
+    feeAsset,
     messages: [
         {
             address: 'EQ...jetton_wallet_address',
diff --git a/packages/appkit/src/actions/gasless/get-gasless-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
index d6250c6ef..75e7609ce 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-quote.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
@@ -14,8 +14,13 @@ import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
 export interface GetGaslessQuoteOptions {
-    /** Master address of the jetton used to pay the relayer's fee */
-    feeJettonMaster: string;
+    /**
+     * Asset address used to pay the relayer's fee (currently a jetton master
+     * for TonAPI; future providers may accept NFT items or other assets).
+     * Omit for free / sponsored providers — jetton-only providers will throw
+     * `GaslessError(UnsupportedOperation)` in that case.
+     */
+    feeAsset?: string;
     /** User's messages to include in the gasless transaction */
     messages: TransactionRequestMessage[];
     /** Network to quote on. Defaults to the selected wallet's network. */
@@ -47,7 +52,7 @@ export const getGaslessQuote = async (appKit: AppKit, options: GetGaslessQuoteOp
     return appKit.gaslessManager.getQuote(
         {
             network: options.network ?? wallet.getNetwork(),
-            feeJettonMaster: options.feeJettonMaster,
+            feeAsset: options.feeAsset,
             walletAddress: wallet.getAddress(),
             walletPublicKey: wallet.getPublicKey(),
             messages: options.messages,
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index c5f793ebf..75f88ae7d 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -12,7 +12,7 @@ export type {
     GaslessAPI,
     GaslessProviderInterface,
     GaslessConfig,
-    GaslessGasJetton,
+    GaslessSupportedAsset,
     GaslessQuoteParams,
     GaslessQuote,
     GaslessSendParams,
diff --git a/packages/appkit/src/queries/gasless/get-gasless-quote.ts b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
index 2002bec22..80e8932f9 100644
--- a/packages/appkit/src/queries/gasless/get-gasless-quote.ts
+++ b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
@@ -38,18 +38,13 @@ export const getGaslessQuoteQueryOptions = <selectData = GetGaslessQuoteData>(
     return {
         staleTime: GASLESS_QUOTE_STALE_TIME_MS,
         ...options.query,
-        enabled: Boolean(
-            options.feeJettonMaster &&
-            options.messages &&
-            options.messages.length > 0 &&
-            (options.query?.enabled ?? true),
-        ),
+        // `feeAsset` is intentionally not part of the gate: free / sponsored
+        // providers accept an undefined asset, and jetton-only providers throw
+        // a typed error themselves. We only require messages to send.
+        enabled: Boolean(options.messages && options.messages.length > 0 && (options.query?.enabled ?? true)),
         queryFn: async (context) => {
             const [, parameters] = context.queryKey as [string, GetGaslessQuoteOptions];
 
-            if (!parameters.feeJettonMaster) {
-                throw new Error('feeJettonMaster is required');
-            }
             if (!parameters.messages || parameters.messages.length === 0) {
                 throw new Error('messages is required');
             }
diff --git a/packages/walletkit/src/api/models/gasless/GaslessConfig.ts b/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
index c61be999a..ecfd67552 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
@@ -7,17 +7,21 @@
  */
 
 import type { UserFriendlyAddress } from '../core/Primitives';
-import type { GaslessGasJetton } from './GaslessGasJetton';
+import type { GaslessSupportedAsset } from './GaslessSupportedAsset';
 
 /**
  * Relayer configuration for gasless transactions.
  *
- * Reports which jettons the relayer accepts as fee payment and the address
- * where the relayer fee is routed.
+ * Reports which assets the relayer accepts as fee payment and the address
+ * where the relayer fee is routed. `supportedAssets` may be empty for
+ * free / sponsored providers that do not charge a per-transaction fee.
  */
 export interface GaslessConfig {
     /** Address where the relayer expects to receive the fee */
     relayAddress: UserFriendlyAddress;
-    /** Jettons supported by the relayer for paying the fee */
-    supportedGasJettons: GaslessGasJetton[];
+    /**
+     * Assets the relayer accepts as fee payment. Currently jetton masters
+     * for TonAPI; future providers may advertise NFT items or other assets.
+     */
+    supportedAssets: GaslessSupportedAsset[];
 }
diff --git a/packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts b/packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts
deleted file mode 100644
index d8cb80417..000000000
--- a/packages/walletkit/src/api/models/gasless/GaslessGasJetton.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import type { UserFriendlyAddress } from '../core/Primitives';
-
-/**
- * A jetton accepted by the relayer as a fee payment option.
- */
-export interface GaslessGasJetton {
-    /** Jetton master address */
-    jettonMaster: UserFriendlyAddress;
-}
diff --git a/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts b/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
index 6ce29b8c4..bdcea8c65 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessQuoteParams.ts
@@ -19,8 +19,17 @@ import type { TransactionRequestMessage } from '../transactions/TransactionReque
 export interface GaslessQuoteParams {
     /** Network the gasless transaction should run on */
     network: Network;
-    /** Master address of the jetton used to pay the relayer's fee */
-    feeJettonMaster: UserFriendlyAddress;
+    /**
+     * Asset address used to pay the relayer's fee. Today this is the master
+     * address of a jetton (the only mode TonAPI supports), but the field is
+     * intentionally generic — future providers may accept NFT items or other
+     * assets and the provider decides at runtime which is supported.
+     *
+     * Omit (`undefined`) for free / sponsored providers that do not charge a
+     * per-transaction fee. Jetton-only providers (e.g. TonAPI) throw
+     * `GaslessError(UnsupportedOperation)` in that case.
+     */
+    feeAsset?: UserFriendlyAddress;
     /** Sender wallet address */
     walletAddress: UserFriendlyAddress;
     /** Sender wallet public key */
diff --git a/packages/walletkit/src/api/models/gasless/GaslessSupportedAsset.ts b/packages/walletkit/src/api/models/gasless/GaslessSupportedAsset.ts
new file mode 100644
index 000000000..d6a01b3bc
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessSupportedAsset.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { UserFriendlyAddress } from '../core/Primitives';
+
+/**
+ * An asset the relayer accepts as fee payment.
+ *
+ * Address shape is currently always a jetton master (TonAPI's only supported
+ * mode), but the type is intentionally generic so future relayers can
+ * advertise NFT items or other assets without re-shaping the model.
+ */
+export interface GaslessSupportedAsset {
+    /** Asset address — jetton master, NFT item, etc. */
+    address: UserFriendlyAddress;
+}
diff --git a/packages/walletkit/src/api/models/index.ts b/packages/walletkit/src/api/models/index.ts
index 5cd5f0af6..61c7fc68c 100644
--- a/packages/walletkit/src/api/models/index.ts
+++ b/packages/walletkit/src/api/models/index.ts
@@ -139,7 +139,7 @@ export { UnstakeMode } from './staking/UnstakeMode';
 
 // Gasless models
 export type { GaslessConfig } from './gasless/GaslessConfig';
-export type { GaslessGasJetton } from './gasless/GaslessGasJetton';
+export type { GaslessSupportedAsset } from './gasless/GaslessSupportedAsset';
 export type { GaslessQuoteParams } from './gasless/GaslessQuoteParams';
 export type { GaslessQuote } from './gasless/GaslessQuote';
 export type { GaslessSendParams } from './gasless/GaslessSendParams';
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index 68f0c8ca8..35d2e1e26 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -32,7 +32,7 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
     getSupportedNetworks: () => [Network.mainnet()],
     getConfig: vi.fn<(n: Network) => Promise<GaslessConfig>>().mockResolvedValue({
         relayAddress: TEST_ADDRESS,
-        supportedGasJettons: [{ jettonMaster: TEST_ADDRESS }],
+        supportedAssets: [{ address: TEST_ADDRESS }],
     }),
     getQuote: vi.fn<(p: GaslessQuoteParams) => Promise<GaslessQuote>>().mockResolvedValue({
         network: Network.mainnet(),
@@ -139,7 +139,7 @@ describe('GaslessManager delegation', () => {
         await manager.getQuote(
             {
                 network: Network.mainnet(),
-                feeJettonMaster: TEST_ADDRESS,
+                feeAsset: TEST_ADDRESS,
                 walletAddress: TEST_ADDRESS,
                 walletPublicKey: '0xabc',
                 messages: [{ address: TEST_ADDRESS, amount: '0' }],
@@ -175,7 +175,7 @@ describe('GaslessManager delegation', () => {
         await expect(
             manager.getQuote({
                 network: Network.mainnet(),
-                feeJettonMaster: TEST_ADDRESS,
+                feeAsset: TEST_ADDRESS,
                 walletAddress: TEST_ADDRESS,
                 walletPublicKey: '0xabc',
                 messages: [{ address: TEST_ADDRESS, amount: '0' }],
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index 71dc8a819..76a217054 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -62,7 +62,7 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
         log.debug('Quoting gasless transaction', {
             network: params.network.chainId,
             walletAddress: params.walletAddress,
-            feeJettonMaster: params.feeJettonMaster,
+            feeAsset: params.feeAsset,
             messagesCount: params.messages.length,
             providerId: providerId ?? this.defaultProviderId,
         });
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index 5b8cc31bf..ddda8eeb6 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -1,11 +1,11 @@
 # Gasless Manager
 
-`GaslessManager` lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return.
+`GaslessManager` lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, charging the user in a relayer-accepted asset (e.g. a jetton).
 
 ## Flow
 
-1. **Configure** – fetch the relayer config (`getConfig`) to learn which jettons it accepts as fee payment and its relay address.
-2. **Quote** – call `getQuote` with your messages and chosen fee jetton. The relayer returns *wrapped* messages, a fee, and a `validUntil` window.
+1. **Configure** – fetch the relayer config (`getConfig`) to learn which assets it accepts as fee payment and its relay address.
+2. **Quote** – call `getQuote` with your messages and chosen fee asset. The relayer returns *wrapped* messages, a fee, and a `validUntil` window.
 3. **Sign** – pass the wrapped messages to `wallet.signMessage` (TonConnect `SignMessage` feature). The wallet returns a signed *internal-message* BoC.
 4. **Send** – submit the signed BoC via `sendTransaction`; the relayer converts it to an external message, pays the gas, and broadcasts.
 
@@ -23,12 +23,15 @@ const kit = new TonWalletKit({
 
 kit.gasless.registerProvider(
     createTonApiGaslessProvider({
-        network: Network.mainnet(),
-        apiKey: process.env.TON_API_KEY,
+        chains: {
+            [Network.mainnet().chainId]: { apiKey: process.env.TON_API_KEY },
+        },
     }),
 );
 ```
 
+`createTonApiGaslessProvider()` with no arguments auto-registers every network the kit was configured with.
+
 ## Wallet Requirements
 
 The connected wallet must expose the `SignMessage` feature (advertised via TonConnect device info). Wallets that only support `SendTransaction` cannot be used for gasless flows — check `wallet.getSupportedFeatures()` before invoking `send`.
@@ -40,10 +43,10 @@ import { Address } from '@ton/core';
 import { Network } from '@ton/walletkit';
 
 const config = await kit.gasless.getConfig();
-const feeJetton = config.supportedGasJettons[0].jettonMaster;
+const feeAsset = config.supportedAssets[0].address;
 
 const quote = await kit.gasless.getQuote({
-    feeJettonMaster: feeJetton,
+    feeAsset,
     walletAddress: wallet.getAddress(),
     walletPublicKey: wallet.getPublicKey(),
     messages: [
@@ -60,7 +63,8 @@ const { internalBoc } = await wallet.signMessage({
     validUntil: quote.validUntil,
 });
 
-await kit.gasless.sendTransaction({
+const { normalizedHash } = await kit.gasless.sendTransaction({
+    network: wallet.getNetwork(),
     walletPublicKey: wallet.getPublicKey(),
     internalBoc,
 });
@@ -74,8 +78,8 @@ The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@to
 
 | Code | Meaning |
 |---|---|
-| `UNSUPPORTED_FEE_JETTON` | The relayer does not accept the chosen jetton as fee payment. The TonAPI provider surfaces this when the server replies with `error_code: 40000`. |
-| `UNSUPPORTED_OPERATION` | Sentinel for provider-side capability mismatches (analogue of `StakingErrorCode.UnsupportedOperation`). Currently unused; reserved for future providers that may not implement every method. |
+| `UNSUPPORTED_FEE_JETTON` | The relayer does not accept the chosen fee asset. The TonAPI provider surfaces this when the server replies with `error_code: 40000`. |
+| `UNSUPPORTED_OPERATION` | Provider does not implement the requested mode (e.g. TonAPI provider called without `feeAsset` — it only supports jetton-fee mode). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
 | `CONFIG_FAILED` | Relayer config endpoint failed. |
@@ -93,6 +97,7 @@ import {
     type GaslessQuoteParams,
     type GaslessQuote,
     type GaslessSendParams,
+    type GaslessSendResponse,
     type Network,
 } from '@ton/walletkit';
 
@@ -111,7 +116,7 @@ export class MyGaslessProvider extends GaslessProvider {
         // …
     }
 
-    async sendTransaction(params: GaslessSendParams): Promise<void> {
+    async sendTransaction(params: GaslessSendParams): Promise<GaslessSendResponse> {
         // …
     }
 }
@@ -119,20 +124,20 @@ export class MyGaslessProvider extends GaslessProvider {
 
 ## Available Providers
 
-- **TonApi** (`@ton/walletkit/gasless/tonapi`) – uses the public TonApi gasless REST API documented at `https://docs.tonapi.io/tonapi/rest-api/gasless`. One provider instance per network: pass `network: Network.mainnet()` (default endpoint `https://tonapi.io`) or `network: Network.testnet()` (`https://testnet.tonapi.io`). No external SDK dependency — talks to TonAPI directly via `fetch`.
+- **TonApi** (`@ton/walletkit/gasless/tonapi`) – uses the public TonApi gasless REST API documented at `https://docs.tonapi.io/tonapi/rest-api/gasless`. Multi-network: pass a per-chain `chains` map (each entry can override `endpoint`/`apiKey`), or omit it to auto-register every configured network with default endpoints. No external SDK dependency — talks to TonAPI directly via `fetch`.
 
 ## API Reference
 
 ### GaslessManager
 
-#### `getConfig(providerId?)`
-Fetch the relayer config (supported jettons, relay address).
+#### `getConfig(network?, providerId?)`
+Fetch the relayer config (supported fee assets, relay address). `network` defaults to the provider's first supported network.
 
 #### `getQuote(params, providerId?)`
-Wrap caller's messages with relayer fee-collection logic. Returns wrapped messages, fee, and `validUntil`.
+Wrap caller's messages with relayer fee-collection logic. Returns wrapped messages, fee, and `validUntil`. Pass `feeAsset` to choose a jetton master (omit for free / sponsored providers).
 
 #### `sendTransaction(params, providerId?)`
-Submit a signed internal-message BoC to the relayer.
+Submit a signed internal-message BoC to the relayer. Returns a `GaslessSendResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`) — a strict superset of the regular `SendTransactionResponse`.
 
 #### `registerProvider(provider)` / `setDefaultProvider(providerId)`
 Standard `DefiManager` lifecycle methods.
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 363e65b94..c1cb0f605 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -130,7 +130,7 @@ describe('TonApiGaslessProvider.getConfig', () => {
         const cfg = await provider.getConfig(Network.mainnet());
 
         expect(cfg.relayAddress).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
-        expect(cfg.supportedGasJettons).toHaveLength(1);
+        expect(cfg.supportedAssets).toHaveLength(1);
     });
 
     it('hits /v2/gasless/config on the mainnet endpoint when called for mainnet', async () => {
@@ -207,7 +207,7 @@ describe('TonApiGaslessProvider.getQuote', () => {
 
     const baseQuoteParams = {
         network: Network.mainnet(),
-        feeJettonMaster: TEST_ADDRESS,
+        feeAsset: TEST_ADDRESS,
         walletAddress: TEST_ADDRESS,
         walletPublicKey: TEST_PUBKEY,
         messages: [{ address: TEST_ADDRESS, amount: '0' }],
@@ -281,6 +281,25 @@ describe('TonApiGaslessProvider.getQuote', () => {
             message: 'Jetton is not supported.',
         });
     });
+
+    it('throws GaslessError(UnsupportedOperation) when feeAsset is omitted', async () => {
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi);
+
+        await expect(
+            provider.getQuote({
+                network: Network.mainnet(),
+                feeAsset: undefined,
+                walletAddress: TEST_ADDRESS,
+                walletPublicKey: TEST_PUBKEY,
+                messages: [{ address: TEST_ADDRESS, amount: '0' }],
+            }),
+        ).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.UnsupportedOperation,
+        });
+        expect(fetchApi).not.toHaveBeenCalled();
+    });
 });
 
 describe('TonApiGaslessProvider.sendTransaction', () => {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 2da21a422..011be78d1 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -133,7 +133,15 @@ export class TonApiGaslessProvider extends GaslessProvider {
     }
 
     async getQuote(params: GaslessQuoteParams): Promise<GaslessQuote> {
-        const masterId = Address.parse(params.feeJettonMaster).toRawString();
+        if (!params.feeAsset) {
+            throw new GaslessError(
+                'TonAPI gasless requires `feeAsset` (jetton master). Free / sponsored modes are not supported by this provider.',
+                GaslessErrorCode.UnsupportedOperation,
+                { network: params.network.chainId },
+            );
+        }
+
+        const masterId = Address.parse(params.feeAsset).toRawString();
         const body = buildGaslessQuoteRequest(params);
 
         try {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
index adcd48cd7..c8bd652d8 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
@@ -12,7 +12,7 @@ import type { TonApiGaslessConfig } from '../types/config';
 
 export const mapGaslessConfig = (raw: TonApiGaslessConfig): GaslessConfig => ({
     relayAddress: asAddressFriendly(raw.relay_address),
-    supportedGasJettons: raw.gas_jettons.map((jetton) => ({
-        jettonMaster: asAddressFriendly(jetton.master_id),
+    supportedAssets: raw.gas_jettons.map((jetton) => ({
+        address: asAddressFriendly(jetton.master_id),
     })),
 });

From 1d72552ed941d0e4f09a5f255c1beba9e415a32c Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 21:54:11 +0400
Subject: [PATCH 13/46] feat(gasless): add metadata

---
 .../appkit/actions/gasless/gasless-actions.ts |  6 ++
 .../appkit/actions/gasless/gasless.test.ts    |  5 ++
 .../gasless/use-gasless-provider-metadata.tsx | 25 +++++++
 packages/appkit-react/docs/hooks.md           | 14 ++++
 .../hooks/use-gasless-provider-metadata.ts    | 39 +++++++++++
 .../src/features/gasless/index.ts             |  5 ++
 packages/appkit/docs/actions.md               |  9 +++
 .../gasless/get-gasless-provider-metadata.ts  | 29 ++++++++
 packages/appkit/src/actions/index.ts          |  6 ++
 packages/appkit/src/gasless/index.ts          |  2 +
 .../gasless/get-gasless-provider-metadata.ts  | 66 +++++++++++++++++++
 packages/appkit/src/queries/index.ts          |  9 +++
 .../src/api/interfaces/GaslessAPI.ts          | 12 ++++
 .../models/gasless/GaslessProviderMetadata.ts | 25 +++++++
 packages/walletkit/src/api/models/index.ts    |  1 +
 .../src/defi/gasless/GaslessManager.spec.ts   | 10 +++
 .../src/defi/gasless/GaslessManager.ts        | 16 +++++
 .../src/defi/gasless/GaslessProvider.ts       |  5 +-
 packages/walletkit/src/defi/gasless/README.md |  8 +++
 .../tonapi/TonApiGaslessProvider.spec.ts      | 11 ++++
 .../gasless/tonapi/TonApiGaslessProvider.ts   |  7 +-
 .../src/defi/gasless/tonapi/constants.ts      |  8 +++
 22 files changed, 316 insertions(+), 2 deletions(-)
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-provider-metadata.tsx
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-provider-metadata.ts
 create mode 100644 packages/appkit/src/actions/gasless/get-gasless-provider-metadata.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-provider-metadata.ts
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessProviderMetadata.ts

diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
index 426790bd3..a3d25f22d 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -11,6 +11,7 @@ import {
     getGaslessConfig,
     getGaslessManager,
     getGaslessProvider,
+    getGaslessProviderMetadata,
     getGaslessProviders,
     getGaslessQuote,
     sendGaslessTransaction,
@@ -46,6 +47,11 @@ export const gaslessExample = async (appKit: AppKit) => {
     unsubscribe();
     // SAMPLE_END: WATCH_GASLESS_PROVIDERS
 
+    // SAMPLE_START: GET_GASLESS_PROVIDER_METADATA
+    const metadata = await getGaslessProviderMetadata(appKit);
+    console.log('Gasless provider:', metadata.name, metadata.url);
+    // SAMPLE_END: GET_GASLESS_PROVIDER_METADATA
+
     // SAMPLE_START: GET_GASLESS_CONFIG
     const config = await getGaslessConfig(appKit);
     const feeAsset = config.supportedAssets[0].address;
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index 6280aef26..921f17a8e 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -19,6 +19,7 @@ const SIGN_MESSAGE_FEATURE = { name: 'SignMessage', maxMessages: 4 } as const;
 describe('Gasless Actions Examples', () => {
     let appKit: AppKit;
     let consoleSpy: ReturnType<typeof vi.spyOn>;
+    let mockGetMetadata: ReturnType<typeof vi.fn>;
     let mockGetConfig: ReturnType<typeof vi.fn>;
     let mockGetQuote: ReturnType<typeof vi.fn>;
     let mockSend: ReturnType<typeof vi.fn>;
@@ -34,6 +35,7 @@ describe('Gasless Actions Examples', () => {
             },
         });
 
+        mockGetMetadata = vi.fn().mockResolvedValue({ name: 'TonAPI', url: 'https://tonapi.io' });
         mockGetConfig = vi.fn().mockResolvedValue({
             relayAddress: TEST_ADDRESS,
             supportedAssets: [{ address: TEST_ADDRESS }],
@@ -59,6 +61,8 @@ describe('Gasless Actions Examples', () => {
         }));
         vi.spyOn(appKit.gaslessManager, 'getProviders').mockReturnValue([]);
         // @ts-expect-error - internal mock access
+        vi.spyOn(appKit.gaslessManager, 'getMetadata').mockImplementation(mockGetMetadata);
+        // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'getConfig').mockImplementation(mockGetConfig);
         // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'getQuote').mockImplementation(mockGetQuote);
@@ -93,6 +97,7 @@ describe('Gasless Actions Examples', () => {
 
         await gaslessExample(appKit);
 
+        expect(mockGetMetadata).toHaveBeenCalled();
         expect(mockGetConfig).toHaveBeenCalled();
         expect(mockGetQuote).toHaveBeenCalled();
         expect(mockSignMessage).toHaveBeenCalled();
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-provider-metadata.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-provider-metadata.tsx
new file mode 100644
index 000000000..a242bd54d
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-provider-metadata.tsx
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useGaslessProviderMetadata } from '@ton/appkit-react';
+
+export const UseGaslessProviderMetadataExample = () => {
+    // SAMPLE_START: USE_GASLESS_PROVIDER_METADATA
+    const { data: metadata, isLoading } = useGaslessProviderMetadata();
+
+    if (isLoading) return <div>Loading provider...</div>;
+    if (!metadata) return null;
+
+    return (
+        <a href={metadata.url} target="_blank" rel="noreferrer">
+            {metadata.logo && <img src={metadata.logo} alt="" width={16} height={16} />}
+            {metadata.name}
+        </a>
+    );
+    // SAMPLE_END: USE_GASLESS_PROVIDER_METADATA
+};
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index 4ac7940d4..c07308e92 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -841,6 +841,20 @@ return (
 
 Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return. The connected wallet must support the `SignMessage` TonConnect feature.
 
+### `useGaslessProviderMetadata`
+
+Hook to fetch static metadata (display name, logo, url) for a gasless provider.
+
+```tsx
+const { data: metadata, isLoading } = useGaslessProviderMetadata();
+if (isLoading || !metadata) return null;
+return (
+    <a href={metadata.url} target="_blank" rel="noreferrer">
+        {metadata.name}
+    </a>
+);
+```
+
 ### `useGaslessConfig`
 
 Hook to fetch the relayer config (supported fee assets + relay address).
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-provider-metadata.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-provider-metadata.ts
new file mode 100644
index 000000000..97a78687d
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-provider-metadata.ts
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { getGaslessProviderMetadataQueryOptions } from '@ton/appkit/queries';
+import type {
+    GetGaslessProviderMetadataData,
+    GetGaslessProviderMetadataErrorType,
+    GetGaslessProviderMetadataQueryConfig,
+} from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+
+export type UseGaslessProviderMetadataParameters<selectData = GetGaslessProviderMetadataData> =
+    GetGaslessProviderMetadataQueryConfig<selectData>;
+
+export type UseGaslessProviderMetadataReturnType<selectData = GetGaslessProviderMetadataData> = UseQueryReturnType<
+    selectData,
+    GetGaslessProviderMetadataErrorType
+>;
+
+/**
+ * Hook to get static metadata for a gasless provider (display name, logo, url).
+ */
+export const useGaslessProviderMetadata = <selectData = GetGaslessProviderMetadataData>(
+    parameters: UseGaslessProviderMetadataParameters<selectData> = {},
+): UseGaslessProviderMetadataReturnType<selectData> => {
+    const appKit = useAppKit();
+
+    return useQuery(getGaslessProviderMetadataQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/index.ts b/packages/appkit-react/src/features/gasless/index.ts
index df17b7101..bf6839b51 100644
--- a/packages/appkit-react/src/features/gasless/index.ts
+++ b/packages/appkit-react/src/features/gasless/index.ts
@@ -11,6 +11,11 @@ export {
     type UseGaslessConfigParameters,
     type UseGaslessConfigReturnType,
 } from './hooks/use-gasless-config';
+export {
+    useGaslessProviderMetadata,
+    type UseGaslessProviderMetadataParameters,
+    type UseGaslessProviderMetadataReturnType,
+} from './hooks/use-gasless-provider-metadata';
 export {
     useGaslessQuote,
     type UseGaslessQuoteParameters,
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 96a33b91b..00a9ef24e 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -688,6 +688,15 @@ const unsubscribe = watchGaslessProviders(appKit, {
 unsubscribe();
 ```
 
+### `getGaslessProviderMetadata`
+
+Fetch static metadata (display name, logo, url) for a gasless provider.
+
+```ts
+const metadata = await getGaslessProviderMetadata(appKit);
+console.log('Gasless provider:', metadata.name, metadata.url);
+```
+
 ### `getGaslessConfig`
 
 Fetch relayer configuration (supported fee assets + relay address).
diff --git a/packages/appkit/src/actions/gasless/get-gasless-provider-metadata.ts b/packages/appkit/src/actions/gasless/get-gasless-provider-metadata.ts
new file mode 100644
index 000000000..8015b29a9
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/get-gasless-provider-metadata.ts
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessProviderMetadata } from '../../gasless';
+import type { AppKit } from '../../core/app-kit';
+
+export interface GetGaslessProviderMetadataOptions {
+    /** Gasless provider id. Uses the default provider when omitted. */
+    providerId?: string;
+}
+
+export type GetGaslessProviderMetadataReturnType = Promise<GaslessProviderMetadata>;
+
+export type GetGaslessProviderMetadataErrorType = Error;
+
+/**
+ * Get static metadata for a gasless provider (display name, logo, url).
+ */
+export const getGaslessProviderMetadata = async (
+    appKit: AppKit,
+    options: GetGaslessProviderMetadataOptions = {},
+): GetGaslessProviderMetadataReturnType => {
+    return appKit.gaslessManager.getMetadata(options.providerId);
+};
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index 78fdb0003..479df7455 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -132,6 +132,12 @@ export {
     type GetGaslessConfigReturnType,
     type GetGaslessConfigErrorType,
 } from './gasless/get-gasless-config';
+export {
+    getGaslessProviderMetadata,
+    type GetGaslessProviderMetadataOptions,
+    type GetGaslessProviderMetadataReturnType,
+    type GetGaslessProviderMetadataErrorType,
+} from './gasless/get-gasless-provider-metadata';
 export {
     getGaslessQuote,
     type GetGaslessQuoteOptions,
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index 75f88ae7d..6aef0c43d 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -13,6 +13,8 @@ export type {
     GaslessProviderInterface,
     GaslessConfig,
     GaslessSupportedAsset,
+    GaslessProviderMetadata,
+    GaslessProviderMetadataOverride,
     GaslessQuoteParams,
     GaslessQuote,
     GaslessSendParams,
diff --git a/packages/appkit/src/queries/gasless/get-gasless-provider-metadata.ts b/packages/appkit/src/queries/gasless/get-gasless-provider-metadata.ts
new file mode 100644
index 000000000..8aa1fd5c5
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-provider-metadata.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessProviderMetadata } from '../../actions/gasless/get-gasless-provider-metadata';
+import type {
+    GetGaslessProviderMetadataErrorType,
+    GetGaslessProviderMetadataOptions,
+    GetGaslessProviderMetadataReturnType,
+} from '../../actions/gasless/get-gasless-provider-metadata';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+
+export type { GetGaslessProviderMetadataErrorType };
+
+export type GetGaslessProviderMetadataQueryConfig<selectData = GetGaslessProviderMetadataData> = Compute<
+    ExactPartial<GetGaslessProviderMetadataOptions>
+> &
+    QueryParameter<
+        GetGaslessProviderMetadataQueryFnData,
+        GetGaslessProviderMetadataErrorType,
+        selectData,
+        GetGaslessProviderMetadataQueryKey
+    >;
+
+export const getGaslessProviderMetadataQueryOptions = <selectData = GetGaslessProviderMetadataData>(
+    appKit: AppKit,
+    options: GetGaslessProviderMetadataQueryConfig<selectData> = {},
+): GetGaslessProviderMetadataQueryOptions<selectData> => {
+    return {
+        ...options.query,
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [string, GetGaslessProviderMetadataOptions];
+            return getGaslessProviderMetadata(appKit, parameters);
+        },
+        queryKey: getGaslessProviderMetadataQueryKey(options),
+    };
+};
+
+export type GetGaslessProviderMetadataQueryFnData = Compute<Awaited<GetGaslessProviderMetadataReturnType>>;
+
+export type GetGaslessProviderMetadataData = GetGaslessProviderMetadataQueryFnData;
+
+export const getGaslessProviderMetadataQueryKey = (
+    options: Compute<ExactPartial<GetGaslessProviderMetadataOptions>> = {},
+): GetGaslessProviderMetadataQueryKey => {
+    return ['gaslessProviderMetadata', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
+};
+
+export type GetGaslessProviderMetadataQueryKey = readonly [
+    'gaslessProviderMetadata',
+    Compute<ExactPartial<GetGaslessProviderMetadataOptions>>,
+];
+
+export type GetGaslessProviderMetadataQueryOptions<selectData = GetGaslessProviderMetadataData> = QueryOptions<
+    GetGaslessProviderMetadataQueryFnData,
+    GetGaslessProviderMetadataErrorType,
+    selectData,
+    GetGaslessProviderMetadataQueryKey
+>;
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index 1e484761d..e0bf85bc6 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -172,6 +172,15 @@ export {
     type GetGaslessConfigData,
     type GetGaslessConfigErrorType,
 } from './gasless/get-gasless-config';
+export {
+    getGaslessProviderMetadataQueryOptions,
+    getGaslessProviderMetadataQueryKey,
+    type GetGaslessProviderMetadataQueryConfig,
+    type GetGaslessProviderMetadataData,
+    type GetGaslessProviderMetadataErrorType,
+    type GetGaslessProviderMetadataQueryKey,
+    type GetGaslessProviderMetadataQueryOptions,
+} from './gasless/get-gasless-provider-metadata';
 export {
     getGaslessQuoteQueryOptions,
     getGaslessQuoteQueryKey,
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
index e6b0c1906..df92bdb20 100644
--- a/packages/walletkit/src/api/interfaces/GaslessAPI.ts
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -8,6 +8,7 @@
 
 import type {
     GaslessConfig,
+    GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
@@ -24,6 +25,12 @@ import type { DefiProvider } from './DefiProvider';
  * for gas: a relayer co-signs and covers the gas, taking a jetton fee in return.
  */
 export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
+    /**
+     * Get static metadata for a gasless provider (display name, logo, url).
+     * @param providerId Provider identifier (optional, uses default if not specified)
+     */
+    getMetadata(providerId?: string): Promise<GaslessProviderMetadata>;
+
     /**
      * Fetch relayer configuration (supported jettons and relay address).
      * @param network Network to query (optional, falls back to the provider's first supported network)
@@ -66,6 +73,11 @@ export interface GaslessProviderInterface extends DefiProvider {
      */
     readonly providerId: string;
 
+    /**
+     * Get static metadata for the provider (display name, logo, url).
+     */
+    getMetadata(): Promise<GaslessProviderMetadata>;
+
     /**
      * Fetch relayer configuration (supported jettons and relay address) for the requested network.
      */
diff --git a/packages/walletkit/src/api/models/gasless/GaslessProviderMetadata.ts b/packages/walletkit/src/api/models/gasless/GaslessProviderMetadata.ts
new file mode 100644
index 000000000..fbd995d79
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessProviderMetadata.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/**
+ * Static metadata for a gasless provider.
+ */
+export interface GaslessProviderMetadata {
+    name: string;
+    logo?: string;
+    url?: string;
+}
+
+/**
+ * Used in provider configuration to override fields of the provider's metadata.
+ */
+export interface GaslessProviderMetadataOverride {
+    name?: string;
+    logo?: string;
+    url?: string;
+}
diff --git a/packages/walletkit/src/api/models/index.ts b/packages/walletkit/src/api/models/index.ts
index 61c7fc68c..0cd9e0e51 100644
--- a/packages/walletkit/src/api/models/index.ts
+++ b/packages/walletkit/src/api/models/index.ts
@@ -140,6 +140,7 @@ export { UnstakeMode } from './staking/UnstakeMode';
 // Gasless models
 export type { GaslessConfig } from './gasless/GaslessConfig';
 export type { GaslessSupportedAsset } from './gasless/GaslessSupportedAsset';
+export type { GaslessProviderMetadata, GaslessProviderMetadataOverride } from './gasless/GaslessProviderMetadata';
 export type { GaslessQuoteParams } from './gasless/GaslessQuoteParams';
 export type { GaslessQuote } from './gasless/GaslessQuote';
 export type { GaslessSendParams } from './gasless/GaslessSendParams';
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index 35d2e1e26..a1dc0dc7b 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -30,6 +30,7 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
     type: 'gasless',
     providerId,
     getSupportedNetworks: () => [Network.mainnet()],
+    getMetadata: vi.fn().mockResolvedValue({ name: 'Test', url: 'https://test.example' }),
     getConfig: vi.fn<(n: Network) => Promise<GaslessConfig>>().mockResolvedValue({
         relayAddress: TEST_ADDRESS,
         supportedAssets: [{ address: TEST_ADDRESS }],
@@ -119,6 +120,15 @@ describe('GaslessManager.setDefaultProvider', () => {
 });
 
 describe('GaslessManager delegation', () => {
+    it('forwards getMetadata to the default provider', async () => {
+        const { manager } = makeManager();
+        const provider = makeProvider('one');
+        manager.registerProvider(provider);
+
+        await expect(manager.getMetadata()).resolves.toEqual({ name: 'Test', url: 'https://test.example' });
+        expect(provider.getMetadata).toHaveBeenCalledTimes(1);
+    });
+
     it('forwards getConfig to the default provider', async () => {
         const { manager } = makeManager();
         const provider = makeProvider('one');
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index 76a217054..712e0c4a2 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -9,6 +9,7 @@
 import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
 import type {
     GaslessConfig,
+    GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
@@ -34,6 +35,21 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
         super(createFactoryContext);
     }
 
+    /**
+     * Get static metadata for a gasless provider (display name, logo, url).
+     */
+    async getMetadata(providerId?: string): Promise<GaslessProviderMetadata> {
+        const selectedProviderId = providerId ?? this.defaultProviderId;
+        log.debug('Getting gasless provider metadata', { providerId: selectedProviderId });
+
+        try {
+            return await this.getProvider(selectedProviderId).getMetadata();
+        } catch (error) {
+            log.error('Failed to get gasless provider metadata', { error });
+            throw error;
+        }
+    }
+
     /**
      * Fetch relayer configuration (supported jettons and relay address).
      *
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index 1e3313377..3d389c728 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -9,6 +9,7 @@
 import type { GaslessProviderInterface } from '../../api/interfaces';
 import type {
     GaslessConfig,
+    GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
@@ -19,7 +20,7 @@ import type {
 /**
  * Abstract base class for gasless relay providers.
  *
- * Concrete providers (e.g. TonApiGaslessProvider) implement the three methods
+ * Concrete providers (e.g. TonApiGaslessProvider) implement the methods
  * below against a specific relayer backend.
  *
  * @example
@@ -27,6 +28,7 @@ import type {
  * class MyGaslessProvider extends GaslessProvider {
  *   readonly providerId = 'my-relayer';
  *
+ *   async getMetadata(): Promise<GaslessProviderMetadata> { ... }
  *   async getConfig(network: Network): Promise<GaslessConfig> { ... }
  *   async getQuote(params): Promise<GaslessQuote> { ... }
  *   async sendTransaction(params): Promise<GaslessSendResponse> { ... }
@@ -38,6 +40,7 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
     abstract readonly providerId: string;
 
     abstract getSupportedNetworks(): Network[];
+    abstract getMetadata(): Promise<GaslessProviderMetadata>;
     abstract getConfig(network: Network): Promise<GaslessConfig>;
     abstract getQuote(params: GaslessQuoteParams): Promise<GaslessQuote>;
     abstract sendTransaction(params: GaslessSendParams): Promise<GaslessSendResponse>;
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index ddda8eeb6..6e2ec02f5 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -94,6 +94,7 @@ To target a different relayer, extend `GaslessProvider`:
 import {
     GaslessProvider,
     type GaslessConfig,
+    type GaslessProviderMetadata,
     type GaslessQuoteParams,
     type GaslessQuote,
     type GaslessSendParams,
@@ -108,6 +109,10 @@ export class MyGaslessProvider extends GaslessProvider {
         return [Network.mainnet()];
     }
 
+    async getMetadata(): Promise<GaslessProviderMetadata> {
+        return { name: 'My Relayer', url: 'https://my-relayer.example' };
+    }
+
     async getConfig(): Promise<GaslessConfig> {
         // …
     }
@@ -130,6 +135,9 @@ export class MyGaslessProvider extends GaslessProvider {
 
 ### GaslessManager
 
+#### `getMetadata(providerId?)`
+Static metadata for the gasless provider: `{ name, logo?, url? }`. Useful for rendering provider info in the UI.
+
 #### `getConfig(network?, providerId?)`
 Fetch the relayer config (supported fee assets, relay address). `network` defaults to the provider's first supported network.
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index c1cb0f605..78a4bd17a 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -109,6 +109,17 @@ describe('createTonApiGaslessProvider', () => {
     });
 });
 
+describe('TonApiGaslessProvider.getMetadata', () => {
+    it('returns the static TonAPI provider metadata', async () => {
+        const provider = makeProvider(makeFetch(), { networks: [Network.mainnet()] });
+
+        await expect(provider.getMetadata()).resolves.toEqual({
+            name: 'TonAPI',
+            url: 'https://tonapi.io',
+        });
+    });
+});
+
 describe('TonApiGaslessProvider.getConfig', () => {
     let fetchApi: ReturnType<typeof makeFetch>;
     let provider: TonApiGaslessProvider;
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 011be78d1..3354a1cc1 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -10,6 +10,7 @@ import { Address } from '@ton/core';
 
 import type {
     GaslessConfig,
+    GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
@@ -22,7 +23,7 @@ import type { ProviderFactoryContext } from '../../../types/factory';
 import { delay } from '../../../utils/delay';
 import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
-import { DEFAULT_PROVIDER_ID, DEFAULT_SEND_RETRIES, DEFAULT_SEND_RETRY_DELAY_MS } from './constants';
+import { DEFAULT_METADATA, DEFAULT_PROVIDER_ID, DEFAULT_SEND_RETRIES, DEFAULT_SEND_RETRY_DELAY_MS } from './constants';
 import { isTransientError, networkFromChainId } from './helpers';
 import { mapGaslessConfig } from './mappers/map-gasless-config';
 import { mapTonApiGaslessError } from './mappers/map-gasless-error';
@@ -121,6 +122,10 @@ export class TonApiGaslessProvider extends GaslessProvider {
         return Object.keys(this.chainConfig).map(networkFromChainId);
     }
 
+    async getMetadata(): Promise<GaslessProviderMetadata> {
+        return DEFAULT_METADATA;
+    }
+
     async getConfig(network: Network): Promise<GaslessConfig> {
         try {
             const http = this.getClient(network);
diff --git a/packages/walletkit/src/defi/gasless/tonapi/constants.ts b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
index ed34b4438..aa1f245a5 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/constants.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
@@ -6,9 +6,17 @@
  *
  */
 
+import type { GaslessProviderMetadata } from '../../../api/models';
+
 /** Default provider id used when none is supplied in the config. */
 export const DEFAULT_PROVIDER_ID = 'tonapi';
 
+/** Static metadata returned by `TonApiGaslessProvider.getMetadata()`. */
+export const DEFAULT_METADATA: GaslessProviderMetadata = {
+    name: 'TonAPI',
+    url: 'https://tonapi.io',
+};
+
 /** Default number of retries for `/v2/gasless/send` on transient failures (5xx / network). */
 export const DEFAULT_SEND_RETRIES = 3;
 

From b51fa81d2ee6f350727e7f92dd84fbfa854908cb Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 22:12:32 +0400
Subject: [PATCH 14/46] feat(gasless): replace gasless config with suppported
 assets

---
 apps/appkit-minter/src/pages/gasless-page.tsx | 18 ++---
 .../appkit/actions/gasless/gasless-actions.ts | 14 ++--
 .../appkit/actions/gasless/gasless.test.ts    | 11 ++--
 .../hooks/gasless/use-gasless-config.tsx      | 27 --------
 .../gasless/use-gasless-supported-assets.tsx  | 27 ++++++++
 packages/appkit-react/docs/hooks.md           |  8 +--
 .../gasless/hooks/use-gasless-config.ts       | 31 ---------
 .../hooks/use-gasless-supported-assets.ts     | 39 +++++++++++
 .../src/features/gasless/index.ts             |  8 +--
 packages/appkit/docs/actions.md               |  8 +--
 ...fig.ts => get-gasless-supported-assets.ts} | 21 +++---
 packages/appkit/src/actions/index.ts          | 10 +--
 packages/appkit/src/gasless/index.ts          |  1 -
 .../src/queries/gasless/get-gasless-config.ts | 58 ----------------
 .../gasless/get-gasless-supported-assets.ts   | 66 +++++++++++++++++++
 packages/appkit/src/queries/index.ts          | 13 ++--
 .../src/api/interfaces/GaslessAPI.ts          | 10 +--
 .../src/api/models/gasless/GaslessConfig.ts   | 27 --------
 packages/walletkit/src/api/models/index.ts    |  1 -
 .../src/defi/gasless/GaslessManager.spec.ts   | 15 ++---
 .../src/defi/gasless/GaslessManager.ts        | 12 ++--
 .../src/defi/gasless/GaslessProvider.ts       |  6 +-
 packages/walletkit/src/defi/gasless/README.md | 14 ++--
 .../tonapi/TonApiGaslessProvider.spec.ts      | 20 +++---
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 16 +++--
 ...fig.ts => map-gasless-supported-assets.ts} | 10 ++-
 26 files changed, 238 insertions(+), 253 deletions(-)
 delete mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx
 delete mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts
 rename packages/appkit/src/actions/gasless/{get-gasless-config.ts => get-gasless-supported-assets.ts} (55%)
 delete mode 100644 packages/appkit/src/queries/gasless/get-gasless-config.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts
 delete mode 100644 packages/walletkit/src/api/models/gasless/GaslessConfig.ts
 rename packages/walletkit/src/defi/gasless/tonapi/mappers/{map-gasless-config.ts => map-gasless-supported-assets.ts} (56%)

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index 727f64807..38b2b4bf4 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -10,7 +10,7 @@ import { useState, useEffect, useMemo } from 'react';
 import type { FC } from 'react';
 import {
     useAddress,
-    useGaslessConfig,
+    useGaslessSupportedAssets,
     useGaslessQuote,
     useJettonBalanceByAddress,
     useJettonWalletAddress,
@@ -50,7 +50,7 @@ export const GaslessPage: FC = () => {
     const address = useAddress();
     const [selectedWallet] = useSelectedWallet();
 
-    const { data: gaslessConfig, isLoading: isConfigLoading } = useGaslessConfig();
+    const { data: supportedAssets, isLoading: isAssetsLoading } = useGaslessSupportedAssets();
     const { mutateAsync: sendGasless, isPending: isSending } = useSendGaslessTransaction();
 
     const [recipient, setRecipient] = useState('');
@@ -62,13 +62,13 @@ export const GaslessPage: FC = () => {
     }, [address, recipient]);
 
     useEffect(() => {
-        if (!feeAsset && gaslessConfig?.supportedAssets.length) {
-            const preferred = gaslessConfig.supportedAssets.find((j: GaslessSupportedAsset) =>
-                compareAddress(j.address, USDT_MASTER_MAINNET),
+        if (!feeAsset && supportedAssets?.length) {
+            const preferred = supportedAssets.find((asset: GaslessSupportedAsset) =>
+                compareAddress(asset.address, USDT_MASTER_MAINNET),
             );
-            setFeeAsset(preferred?.address ?? gaslessConfig.supportedAssets[0].address);
+            setFeeAsset(preferred?.address ?? supportedAssets[0].address);
         }
-    }, [feeAsset, gaslessConfig]);
+    }, [feeAsset, supportedAssets]);
 
     const { data: usdtBalance } = useJettonBalanceByAddress({
         jettonAddress: USDT_MASTER_MAINNET,
@@ -198,9 +198,9 @@ export const GaslessPage: FC = () => {
                                 className="w-full p-2 bg-secondary rounded-md border border-border"
                                 value={feeAsset ?? ''}
                                 onChange={(e) => setFeeAsset(e.target.value)}
-                                disabled={isConfigLoading || !gaslessConfig?.supportedAssets.length}
+                                disabled={isAssetsLoading || !supportedAssets?.length}
                             >
-                                {gaslessConfig?.supportedAssets.map((asset) => (
+                                {supportedAssets?.map((asset) => (
                                     <option key={asset.address} value={asset.address}>
                                         {asset.address.slice(0, 6)}…{asset.address.slice(-4)}
                                     </option>
diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
index a3d25f22d..d4d01f69a 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -8,12 +8,12 @@
 
 import type { AppKit } from '@ton/appkit';
 import {
-    getGaslessConfig,
     getGaslessManager,
     getGaslessProvider,
     getGaslessProviderMetadata,
     getGaslessProviders,
     getGaslessQuote,
+    getGaslessSupportedAssets,
     sendGaslessTransaction,
     setDefaultGaslessProvider,
     watchGaslessProviders,
@@ -52,11 +52,11 @@ export const gaslessExample = async (appKit: AppKit) => {
     console.log('Gasless provider:', metadata.name, metadata.url);
     // SAMPLE_END: GET_GASLESS_PROVIDER_METADATA
 
-    // SAMPLE_START: GET_GASLESS_CONFIG
-    const config = await getGaslessConfig(appKit);
-    const feeAsset = config.supportedAssets[0].address;
-    console.log('Relay address:', config.relayAddress);
-    // SAMPLE_END: GET_GASLESS_CONFIG
+    // SAMPLE_START: GET_GASLESS_SUPPORTED_ASSETS
+    const supportedAssets = await getGaslessSupportedAssets(appKit);
+    const feeAsset = supportedAssets[0].address;
+    console.log('Supported fee assets:', supportedAssets.length);
+    // SAMPLE_END: GET_GASLESS_SUPPORTED_ASSETS
 
     // SAMPLE_START: GET_GASLESS_QUOTE
     const quote = await getGaslessQuote(appKit, {
@@ -77,5 +77,5 @@ export const gaslessExample = async (appKit: AppKit) => {
     console.log('Submitted gasless transaction. Hash:', result.normalizedHash, 'BoC:', result.internalBoc);
     // SAMPLE_END: SEND_GASLESS_TRANSACTION
 
-    return { gaslessManager, provider, config, quote };
+    return { gaslessManager, provider, supportedAssets, quote };
 };
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index 921f17a8e..40193c82e 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -20,7 +20,7 @@ describe('Gasless Actions Examples', () => {
     let appKit: AppKit;
     let consoleSpy: ReturnType<typeof vi.spyOn>;
     let mockGetMetadata: ReturnType<typeof vi.fn>;
-    let mockGetConfig: ReturnType<typeof vi.fn>;
+    let mockGetSupportedAssets: ReturnType<typeof vi.fn>;
     let mockGetQuote: ReturnType<typeof vi.fn>;
     let mockSend: ReturnType<typeof vi.fn>;
     let mockSignMessage: ReturnType<typeof vi.fn>;
@@ -36,10 +36,7 @@ describe('Gasless Actions Examples', () => {
         });
 
         mockGetMetadata = vi.fn().mockResolvedValue({ name: 'TonAPI', url: 'https://tonapi.io' });
-        mockGetConfig = vi.fn().mockResolvedValue({
-            relayAddress: TEST_ADDRESS,
-            supportedAssets: [{ address: TEST_ADDRESS }],
-        });
+        mockGetSupportedAssets = vi.fn().mockResolvedValue([{ address: TEST_ADDRESS }]);
         mockGetQuote = vi.fn().mockResolvedValue({
             messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
             fee: '1234',
@@ -63,7 +60,7 @@ describe('Gasless Actions Examples', () => {
         // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'getMetadata').mockImplementation(mockGetMetadata);
         // @ts-expect-error - internal mock access
-        vi.spyOn(appKit.gaslessManager, 'getConfig').mockImplementation(mockGetConfig);
+        vi.spyOn(appKit.gaslessManager, 'getSupportedAssets').mockImplementation(mockGetSupportedAssets);
         // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'getQuote').mockImplementation(mockGetQuote);
         // @ts-expect-error - internal mock access
@@ -98,7 +95,7 @@ describe('Gasless Actions Examples', () => {
         await gaslessExample(appKit);
 
         expect(mockGetMetadata).toHaveBeenCalled();
-        expect(mockGetConfig).toHaveBeenCalled();
+        expect(mockGetSupportedAssets).toHaveBeenCalled();
         expect(mockGetQuote).toHaveBeenCalled();
         expect(mockSignMessage).toHaveBeenCalled();
         expect(mockSend).toHaveBeenCalled();
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
deleted file mode 100644
index c51a085b0..000000000
--- a/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { useGaslessConfig } from '@ton/appkit-react';
-
-export const UseGaslessConfigExample = () => {
-    // SAMPLE_START: USE_GASLESS_CONFIG
-    const { data: config, isLoading } = useGaslessConfig();
-
-    if (isLoading) return <div>Loading relayer config...</div>;
-
-    return (
-        <select>
-            {config?.supportedAssets.map((asset) => (
-                <option key={asset.address} value={asset.address}>
-                    {asset.address}
-                </option>
-            ))}
-        </select>
-    );
-    // SAMPLE_END: USE_GASLESS_CONFIG
-};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx
new file mode 100644
index 000000000..adc9a6a49
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useGaslessSupportedAssets } from '@ton/appkit-react';
+
+export const UseGaslessSupportedAssetsExample = () => {
+    // SAMPLE_START: USE_GASLESS_SUPPORTED_ASSETS
+    const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
+
+    if (isLoading) return <div>Loading fee assets...</div>;
+
+    return (
+        <select>
+            {supportedAssets?.map((asset) => (
+                <option key={asset.address} value={asset.address}>
+                    {asset.address}
+                </option>
+            ))}
+        </select>
+    );
+    // SAMPLE_END: USE_GASLESS_SUPPORTED_ASSETS
+};
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index c07308e92..3ba8d765e 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -855,15 +855,15 @@ return (
 );
 ```
 
-### `useGaslessConfig`
+### `useGaslessSupportedAssets`
 
-Hook to fetch the relayer config (supported fee assets + relay address).
+Hook to discover the assets the gasless relayer accepts as fee payment.
 
 ```tsx
-const { data: config, isLoading } = useGaslessConfig();
+const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
 return (
     <select>
-        {config?.supportedAssets.map((asset) => (
+        {supportedAssets?.map((asset) => (
             <option key={asset.address} value={asset.address}>
                 {asset.address}
             </option>
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
deleted file mode 100644
index d62731e16..000000000
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { getGaslessConfigQueryOptions } from '@ton/appkit/queries';
-import type { GetGaslessConfigData, GetGaslessConfigErrorType, GetGaslessConfigQueryConfig } from '@ton/appkit/queries';
-
-import { useAppKit } from '../../settings';
-import { useQuery } from '../../../libs/query';
-import type { UseQueryReturnType } from '../../../libs/query';
-
-export type UseGaslessConfigParameters<selectData = GetGaslessConfigData> = GetGaslessConfigQueryConfig<selectData>;
-export type UseGaslessConfigReturnType<selectData = GetGaslessConfigData> = UseQueryReturnType<
-    selectData,
-    GetGaslessConfigErrorType
->;
-
-/**
- * Hook to get gasless relayer configuration.
- */
-export const useGaslessConfig = <selectData = GetGaslessConfigData>(
-    parameters: UseGaslessConfigParameters<selectData> = {},
-): UseGaslessConfigReturnType<selectData> => {
-    const appKit = useAppKit();
-
-    return useQuery(getGaslessConfigQueryOptions(appKit, parameters));
-};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts
new file mode 100644
index 000000000..703da56a5
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { getGaslessSupportedAssetsQueryOptions } from '@ton/appkit/queries';
+import type {
+    GetGaslessSupportedAssetsData,
+    GetGaslessSupportedAssetsErrorType,
+    GetGaslessSupportedAssetsQueryConfig,
+} from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+
+export type UseGaslessSupportedAssetsParameters<selectData = GetGaslessSupportedAssetsData> =
+    GetGaslessSupportedAssetsQueryConfig<selectData>;
+
+export type UseGaslessSupportedAssetsReturnType<selectData = GetGaslessSupportedAssetsData> = UseQueryReturnType<
+    selectData,
+    GetGaslessSupportedAssetsErrorType
+>;
+
+/**
+ * Hook to discover the assets the gasless relayer accepts as fee payment.
+ */
+export const useGaslessSupportedAssets = <selectData = GetGaslessSupportedAssetsData>(
+    parameters: UseGaslessSupportedAssetsParameters<selectData> = {},
+): UseGaslessSupportedAssetsReturnType<selectData> => {
+    const appKit = useAppKit();
+
+    return useQuery(getGaslessSupportedAssetsQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/index.ts b/packages/appkit-react/src/features/gasless/index.ts
index bf6839b51..9c73bb7f2 100644
--- a/packages/appkit-react/src/features/gasless/index.ts
+++ b/packages/appkit-react/src/features/gasless/index.ts
@@ -7,10 +7,10 @@
  */
 
 export {
-    useGaslessConfig,
-    type UseGaslessConfigParameters,
-    type UseGaslessConfigReturnType,
-} from './hooks/use-gasless-config';
+    useGaslessSupportedAssets,
+    type UseGaslessSupportedAssetsParameters,
+    type UseGaslessSupportedAssetsReturnType,
+} from './hooks/use-gasless-supported-assets';
 export {
     useGaslessProviderMetadata,
     type UseGaslessProviderMetadataParameters,
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 00a9ef24e..437c5948c 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -697,13 +697,13 @@ const metadata = await getGaslessProviderMetadata(appKit);
 console.log('Gasless provider:', metadata.name, metadata.url);
 ```
 
-### `getGaslessConfig`
+### `getGaslessSupportedAssets`
 
-Fetch relayer configuration (supported fee assets + relay address).
+Discover the assets the gasless relayer accepts as fee payment.
 
 ```ts
-const config = await getGaslessConfig(appKit);
-const feeAsset = config.supportedAssets[0].address;
+const supportedAssets = await getGaslessSupportedAssets(appKit);
+const feeAsset = supportedAssets[0].address;
 ```
 
 ### `getGaslessQuote`
diff --git a/packages/appkit/src/actions/gasless/get-gasless-config.ts b/packages/appkit/src/actions/gasless/get-gasless-supported-assets.ts
similarity index 55%
rename from packages/appkit/src/actions/gasless/get-gasless-config.ts
rename to packages/appkit/src/actions/gasless/get-gasless-supported-assets.ts
index 41bc3889e..439afb03b 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-config.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-supported-assets.ts
@@ -6,32 +6,29 @@
  *
  */
 
-import type { GaslessConfig } from '@ton/walletkit';
-
+import type { GaslessSupportedAsset } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 import type { Network } from '../../types/network';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
-export interface GetGaslessConfigOptions {
+export interface GetGaslessSupportedAssetsOptions {
     /** Network to query. Defaults to the selected wallet's network, then provider's first supported. */
     network?: Network;
     /** Gasless provider id. Uses the default provider when omitted. */
     providerId?: string;
 }
 
-export type GetGaslessConfigReturnType = Promise<GaslessConfig>;
+export type GetGaslessSupportedAssetsReturnType = Promise<GaslessSupportedAsset[]>;
 
-export type GetGaslessConfigErrorType = Error;
+export type GetGaslessSupportedAssetsErrorType = Error;
 
 /**
- * Fetch gasless relayer configuration.
- *
- * Returns the relay address and jettons accepted by the relayer as fee payment.
+ * Discover the assets the gasless relayer accepts as fee payment.
  */
-export const getGaslessConfig = async (
+export const getGaslessSupportedAssets = async (
     appKit: AppKit,
-    options: GetGaslessConfigOptions = {},
-): GetGaslessConfigReturnType => {
+    options: GetGaslessSupportedAssetsOptions = {},
+): GetGaslessSupportedAssetsReturnType => {
     const network = options.network ?? getSelectedWallet(appKit)?.getNetwork();
-    return appKit.gaslessManager.getConfig(network, options.providerId);
+    return appKit.gaslessManager.getSupportedAssets(network, options.providerId);
 };
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index 479df7455..7490b7620 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -127,11 +127,11 @@ export {
     type WatchGaslessProvidersReturnType,
 } from './gasless/watch-gasless-providers';
 export {
-    getGaslessConfig,
-    type GetGaslessConfigOptions,
-    type GetGaslessConfigReturnType,
-    type GetGaslessConfigErrorType,
-} from './gasless/get-gasless-config';
+    getGaslessSupportedAssets,
+    type GetGaslessSupportedAssetsOptions,
+    type GetGaslessSupportedAssetsReturnType,
+    type GetGaslessSupportedAssetsErrorType,
+} from './gasless/get-gasless-supported-assets';
 export {
     getGaslessProviderMetadata,
     type GetGaslessProviderMetadataOptions,
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index 6aef0c43d..1e57cd664 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -11,7 +11,6 @@ export { GaslessProvider, GaslessError, GaslessErrorCode, GaslessManager } from
 export type {
     GaslessAPI,
     GaslessProviderInterface,
-    GaslessConfig,
     GaslessSupportedAsset,
     GaslessProviderMetadata,
     GaslessProviderMetadataOverride,
diff --git a/packages/appkit/src/queries/gasless/get-gasless-config.ts b/packages/appkit/src/queries/gasless/get-gasless-config.ts
deleted file mode 100644
index 815d4af38..000000000
--- a/packages/appkit/src/queries/gasless/get-gasless-config.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { getGaslessConfig } from '../../actions/gasless/get-gasless-config';
-import type {
-    GetGaslessConfigErrorType,
-    GetGaslessConfigOptions,
-    GetGaslessConfigReturnType,
-} from '../../actions/gasless/get-gasless-config';
-import type { AppKit } from '../../core/app-kit';
-import type { QueryOptions, QueryParameter } from '../../types/query';
-import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions } from '../../utils';
-
-export type { GetGaslessConfigErrorType };
-
-export type GetGaslessConfigQueryConfig<selectData = GetGaslessConfigData> = Compute<
-    ExactPartial<GetGaslessConfigOptions>
-> &
-    QueryParameter<GetGaslessConfigQueryFnData, GetGaslessConfigErrorType, selectData, GetGaslessConfigQueryKey>;
-
-export const getGaslessConfigQueryOptions = <selectData = GetGaslessConfigData>(
-    appKit: AppKit,
-    options: GetGaslessConfigQueryConfig<selectData> = {},
-): GetGaslessConfigQueryOptions<selectData> => {
-    return {
-        ...options.query,
-        queryFn: async (context) => {
-            const [, parameters] = context.queryKey as [string, GetGaslessConfigOptions];
-            return getGaslessConfig(appKit, parameters);
-        },
-        queryKey: getGaslessConfigQueryKey(options),
-    };
-};
-
-export type GetGaslessConfigQueryFnData = Compute<Awaited<GetGaslessConfigReturnType>>;
-
-export type GetGaslessConfigData = GetGaslessConfigQueryFnData;
-
-export const getGaslessConfigQueryKey = (
-    options: Compute<ExactPartial<GetGaslessConfigOptions>> = {},
-): GetGaslessConfigQueryKey => {
-    return ['gaslessConfig', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
-};
-
-export type GetGaslessConfigQueryKey = readonly ['gaslessConfig', Compute<ExactPartial<GetGaslessConfigOptions>>];
-
-export type GetGaslessConfigQueryOptions<selectData = GetGaslessConfigData> = QueryOptions<
-    GetGaslessConfigQueryFnData,
-    GetGaslessConfigErrorType,
-    selectData,
-    GetGaslessConfigQueryKey
->;
diff --git a/packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts b/packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts
new file mode 100644
index 000000000..166f4ea92
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessSupportedAssets } from '../../actions/gasless/get-gasless-supported-assets';
+import type {
+    GetGaslessSupportedAssetsErrorType,
+    GetGaslessSupportedAssetsOptions,
+    GetGaslessSupportedAssetsReturnType,
+} from '../../actions/gasless/get-gasless-supported-assets';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+
+export type { GetGaslessSupportedAssetsErrorType };
+
+export type GetGaslessSupportedAssetsQueryConfig<selectData = GetGaslessSupportedAssetsData> = Compute<
+    ExactPartial<GetGaslessSupportedAssetsOptions>
+> &
+    QueryParameter<
+        GetGaslessSupportedAssetsQueryFnData,
+        GetGaslessSupportedAssetsErrorType,
+        selectData,
+        GetGaslessSupportedAssetsQueryKey
+    >;
+
+export const getGaslessSupportedAssetsQueryOptions = <selectData = GetGaslessSupportedAssetsData>(
+    appKit: AppKit,
+    options: GetGaslessSupportedAssetsQueryConfig<selectData> = {},
+): GetGaslessSupportedAssetsQueryOptions<selectData> => {
+    return {
+        ...options.query,
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [string, GetGaslessSupportedAssetsOptions];
+            return getGaslessSupportedAssets(appKit, parameters);
+        },
+        queryKey: getGaslessSupportedAssetsQueryKey(options),
+    };
+};
+
+export type GetGaslessSupportedAssetsQueryFnData = Compute<Awaited<GetGaslessSupportedAssetsReturnType>>;
+
+export type GetGaslessSupportedAssetsData = GetGaslessSupportedAssetsQueryFnData;
+
+export const getGaslessSupportedAssetsQueryKey = (
+    options: Compute<ExactPartial<GetGaslessSupportedAssetsOptions>> = {},
+): GetGaslessSupportedAssetsQueryKey => {
+    return ['gaslessSupportedAssets', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
+};
+
+export type GetGaslessSupportedAssetsQueryKey = readonly [
+    'gaslessSupportedAssets',
+    Compute<ExactPartial<GetGaslessSupportedAssetsOptions>>,
+];
+
+export type GetGaslessSupportedAssetsQueryOptions<selectData = GetGaslessSupportedAssetsData> = QueryOptions<
+    GetGaslessSupportedAssetsQueryFnData,
+    GetGaslessSupportedAssetsErrorType,
+    selectData,
+    GetGaslessSupportedAssetsQueryKey
+>;
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index e0bf85bc6..68d9e53b6 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -167,11 +167,14 @@ export {
 
 // Gasless
 export {
-    getGaslessConfigQueryOptions,
-    type GetGaslessConfigQueryConfig,
-    type GetGaslessConfigData,
-    type GetGaslessConfigErrorType,
-} from './gasless/get-gasless-config';
+    getGaslessSupportedAssetsQueryOptions,
+    getGaslessSupportedAssetsQueryKey,
+    type GetGaslessSupportedAssetsQueryConfig,
+    type GetGaslessSupportedAssetsData,
+    type GetGaslessSupportedAssetsErrorType,
+    type GetGaslessSupportedAssetsQueryKey,
+    type GetGaslessSupportedAssetsQueryOptions,
+} from './gasless/get-gasless-supported-assets';
 export {
     getGaslessProviderMetadataQueryOptions,
     getGaslessProviderMetadataQueryKey,
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
index df92bdb20..e052335d8 100644
--- a/packages/walletkit/src/api/interfaces/GaslessAPI.ts
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -7,12 +7,12 @@
  */
 
 import type {
-    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
+    GaslessSupportedAsset,
     Network,
 } from '../models';
 import type { DefiManagerAPI } from './DefiManagerAPI';
@@ -32,11 +32,11 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
     getMetadata(providerId?: string): Promise<GaslessProviderMetadata>;
 
     /**
-     * Fetch relayer configuration (supported jettons and relay address).
+     * Discover the assets the relayer accepts as fee payment.
      * @param network Network to query (optional, falls back to the provider's first supported network)
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
-    getConfig(network?: Network, providerId?: string): Promise<GaslessConfig>;
+    getSupportedAssets(network?: Network, providerId?: string): Promise<GaslessSupportedAsset[]>;
 
     /**
      * Quote fees and obtain relayer-wrapped messages for signing.
@@ -79,9 +79,9 @@ export interface GaslessProviderInterface extends DefiProvider {
     getMetadata(): Promise<GaslessProviderMetadata>;
 
     /**
-     * Fetch relayer configuration (supported jettons and relay address) for the requested network.
+     * Discover the assets the relayer accepts as fee payment for the requested network.
      */
-    getConfig(network: Network): Promise<GaslessConfig>;
+    getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]>;
 
     /**
      * Quote fees and return relayer-wrapped messages for signing.
diff --git a/packages/walletkit/src/api/models/gasless/GaslessConfig.ts b/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
deleted file mode 100644
index ecfd67552..000000000
--- a/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import type { UserFriendlyAddress } from '../core/Primitives';
-import type { GaslessSupportedAsset } from './GaslessSupportedAsset';
-
-/**
- * Relayer configuration for gasless transactions.
- *
- * Reports which assets the relayer accepts as fee payment and the address
- * where the relayer fee is routed. `supportedAssets` may be empty for
- * free / sponsored providers that do not charge a per-transaction fee.
- */
-export interface GaslessConfig {
-    /** Address where the relayer expects to receive the fee */
-    relayAddress: UserFriendlyAddress;
-    /**
-     * Assets the relayer accepts as fee payment. Currently jetton masters
-     * for TonAPI; future providers may advertise NFT items or other assets.
-     */
-    supportedAssets: GaslessSupportedAsset[];
-}
diff --git a/packages/walletkit/src/api/models/index.ts b/packages/walletkit/src/api/models/index.ts
index 0cd9e0e51..ab076a0d2 100644
--- a/packages/walletkit/src/api/models/index.ts
+++ b/packages/walletkit/src/api/models/index.ts
@@ -138,7 +138,6 @@ export type { UnstakeModes } from './staking/UnstakeMode';
 export { UnstakeMode } from './staking/UnstakeMode';
 
 // Gasless models
-export type { GaslessConfig } from './gasless/GaslessConfig';
 export type { GaslessSupportedAsset } from './gasless/GaslessSupportedAsset';
 export type { GaslessProviderMetadata, GaslessProviderMetadataOverride } from './gasless/GaslessProviderMetadata';
 export type { GaslessQuoteParams } from './gasless/GaslessQuoteParams';
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index a1dc0dc7b..559c1684d 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -11,11 +11,11 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
 import type { GaslessProviderInterface } from '../../api/interfaces';
 import type {
     Base64String,
-    GaslessConfig,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
+    GaslessSupportedAsset,
     Hex,
 } from '../../api/models';
 import { Network } from '../../api/models';
@@ -31,10 +31,9 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
     providerId,
     getSupportedNetworks: () => [Network.mainnet()],
     getMetadata: vi.fn().mockResolvedValue({ name: 'Test', url: 'https://test.example' }),
-    getConfig: vi.fn<(n: Network) => Promise<GaslessConfig>>().mockResolvedValue({
-        relayAddress: TEST_ADDRESS,
-        supportedAssets: [{ address: TEST_ADDRESS }],
-    }),
+    getSupportedAssets: vi
+        .fn<(n: Network) => Promise<GaslessSupportedAsset[]>>()
+        .mockResolvedValue([{ address: TEST_ADDRESS }]),
     getQuote: vi.fn<(p: GaslessQuoteParams) => Promise<GaslessQuote>>().mockResolvedValue({
         network: Network.mainnet(),
         messages: [],
@@ -129,14 +128,14 @@ describe('GaslessManager delegation', () => {
         expect(provider.getMetadata).toHaveBeenCalledTimes(1);
     });
 
-    it('forwards getConfig to the default provider', async () => {
+    it('forwards getSupportedAssets to the default provider', async () => {
         const { manager } = makeManager();
         const provider = makeProvider('one');
         manager.registerProvider(provider);
 
-        await manager.getConfig();
+        await manager.getSupportedAssets();
 
-        expect(provider.getConfig).toHaveBeenCalledTimes(1);
+        expect(provider.getSupportedAssets).toHaveBeenCalledTimes(1);
     });
 
     it('forwards getQuote to the named provider', async () => {
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index 712e0c4a2..a5806a764 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -8,12 +8,12 @@
 
 import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
 import type {
-    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
+    GaslessSupportedAsset,
     Network,
 } from '../../api/models';
 import { globalLogger } from '../../core/Logger';
@@ -51,22 +51,22 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
     }
 
     /**
-     * Fetch relayer configuration (supported jettons and relay address).
+     * Discover the assets the relayer accepts as fee payment.
      *
      * `network` defaults to the provider's first supported network.
      */
-    async getConfig(network?: Network, providerId?: string): Promise<GaslessConfig> {
+    async getSupportedAssets(network?: Network, providerId?: string): Promise<GaslessSupportedAsset[]> {
         const provider = this.getProvider(providerId ?? this.defaultProviderId);
         const targetNetwork = network ?? provider.getSupportedNetworks()[0];
-        log.debug('Getting gasless config', {
+        log.debug('Getting gasless supported assets', {
             network: targetNetwork?.chainId,
             providerId: providerId ?? this.defaultProviderId,
         });
 
         try {
-            return await provider.getConfig(targetNetwork);
+            return await provider.getSupportedAssets(targetNetwork);
         } catch (error) {
-            log.error('Failed to get gasless config', { error });
+            log.error('Failed to get gasless supported assets', { error });
             throw error;
         }
     }
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index 3d389c728..0d757998a 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -8,12 +8,12 @@
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
 import type {
-    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
+    GaslessSupportedAsset,
     Network,
 } from '../../api/models';
 
@@ -29,7 +29,7 @@ import type {
  *   readonly providerId = 'my-relayer';
  *
  *   async getMetadata(): Promise<GaslessProviderMetadata> { ... }
- *   async getConfig(network: Network): Promise<GaslessConfig> { ... }
+ *   async getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]> { ... }
  *   async getQuote(params): Promise<GaslessQuote> { ... }
  *   async sendTransaction(params): Promise<GaslessSendResponse> { ... }
  * }
@@ -41,7 +41,7 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
 
     abstract getSupportedNetworks(): Network[];
     abstract getMetadata(): Promise<GaslessProviderMetadata>;
-    abstract getConfig(network: Network): Promise<GaslessConfig>;
+    abstract getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]>;
     abstract getQuote(params: GaslessQuoteParams): Promise<GaslessQuote>;
     abstract sendTransaction(params: GaslessSendParams): Promise<GaslessSendResponse>;
 }
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index 6e2ec02f5..b61f7448f 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -4,7 +4,7 @@
 
 ## Flow
 
-1. **Configure** – fetch the relayer config (`getConfig`) to learn which assets it accepts as fee payment and its relay address.
+1. **Discover** – call `getSupportedAssets` to learn which assets the relayer accepts as fee payment (omit if the dApp already knows which asset it wants to charge).
 2. **Quote** – call `getQuote` with your messages and chosen fee asset. The relayer returns *wrapped* messages, a fee, and a `validUntil` window.
 3. **Sign** – pass the wrapped messages to `wallet.signMessage` (TonConnect `SignMessage` feature). The wallet returns a signed *internal-message* BoC.
 4. **Send** – submit the signed BoC via `sendTransaction`; the relayer converts it to an external message, pays the gas, and broadcasts.
@@ -42,8 +42,8 @@ The connected wallet must expose the `SignMessage` feature (advertised via TonCo
 import { Address } from '@ton/core';
 import { Network } from '@ton/walletkit';
 
-const config = await kit.gasless.getConfig();
-const feeAsset = config.supportedAssets[0].address;
+const supportedAssets = await kit.gasless.getSupportedAssets();
+const feeAsset = supportedAssets[0].address;
 
 const quote = await kit.gasless.getQuote({
     feeAsset,
@@ -93,12 +93,12 @@ To target a different relayer, extend `GaslessProvider`:
 ```typescript
 import {
     GaslessProvider,
-    type GaslessConfig,
     type GaslessProviderMetadata,
     type GaslessQuoteParams,
     type GaslessQuote,
     type GaslessSendParams,
     type GaslessSendResponse,
+    type GaslessSupportedAsset,
     type Network,
 } from '@ton/walletkit';
 
@@ -113,7 +113,7 @@ export class MyGaslessProvider extends GaslessProvider {
         return { name: 'My Relayer', url: 'https://my-relayer.example' };
     }
 
-    async getConfig(): Promise<GaslessConfig> {
+    async getSupportedAssets(): Promise<GaslessSupportedAsset[]> {
         // …
     }
 
@@ -138,8 +138,8 @@ export class MyGaslessProvider extends GaslessProvider {
 #### `getMetadata(providerId?)`
 Static metadata for the gasless provider: `{ name, logo?, url? }`. Useful for rendering provider info in the UI.
 
-#### `getConfig(network?, providerId?)`
-Fetch the relayer config (supported fee assets, relay address). `network` defaults to the provider's first supported network.
+#### `getSupportedAssets(network?, providerId?)`
+Discover the assets the relayer accepts as fee payment. `network` defaults to the provider's first supported network.
 
 #### `getQuote(params, providerId?)`
 Wrap caller's messages with relayer fee-collection logic. Returns wrapped messages, fee, and `validUntil`. Pass `feeAsset` to choose a jetton master (omit for free / sponsored providers).
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 78a4bd17a..67927fe39 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -120,7 +120,7 @@ describe('TonApiGaslessProvider.getMetadata', () => {
     });
 });
 
-describe('TonApiGaslessProvider.getConfig', () => {
+describe('TonApiGaslessProvider.getSupportedAssets', () => {
     let fetchApi: ReturnType<typeof makeFetch>;
     let provider: TonApiGaslessProvider;
 
@@ -135,19 +135,19 @@ describe('TonApiGaslessProvider.getConfig', () => {
         ...overrides,
     });
 
-    it('maps the TonApi response to GaslessConfig', async () => {
+    it('maps the TonApi response to GaslessSupportedAsset[]', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig()));
 
-        const cfg = await provider.getConfig(Network.mainnet());
+        const assets = await provider.getSupportedAssets(Network.mainnet());
 
-        expect(cfg.relayAddress).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
-        expect(cfg.supportedAssets).toHaveLength(1);
+        expect(assets).toHaveLength(1);
+        expect(assets[0].address).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
     });
 
     it('hits /v2/gasless/config on the mainnet endpoint when called for mainnet', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await provider.getConfig(Network.mainnet());
+        await provider.getSupportedAssets(Network.mainnet());
 
         expect((fetchApi.mock.calls[0][0] as URL).toString()).toBe('https://tonapi.io/v2/gasless/config');
     });
@@ -155,7 +155,7 @@ describe('TonApiGaslessProvider.getConfig', () => {
     it('uses the testnet endpoint when called for testnet', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await provider.getConfig(Network.testnet());
+        await provider.getSupportedAssets(Network.testnet());
 
         expect((fetchApi.mock.calls[0][0] as URL).origin).toBe('https://testnet.tonapi.io');
     });
@@ -166,7 +166,7 @@ describe('TonApiGaslessProvider.getConfig', () => {
         });
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await authedProvider.getConfig(Network.mainnet());
+        await authedProvider.getSupportedAssets(Network.mainnet());
 
         const init = fetchApi.mock.calls[0][1] as RequestInit;
         const headers = init.headers as Headers;
@@ -176,7 +176,7 @@ describe('TonApiGaslessProvider.getConfig', () => {
     it('throws GaslessError(UNSUPPORTED_OPERATION) when called for a non-configured chain', async () => {
         const mainnetOnly = makeProvider(fetchApi, { networks: [Network.mainnet()] });
 
-        await expect(mainnetOnly.getConfig(Network.testnet())).rejects.toMatchObject({
+        await expect(mainnetOnly.getSupportedAssets(Network.testnet())).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.UnsupportedOperation,
         });
@@ -185,7 +185,7 @@ describe('TonApiGaslessProvider.getConfig', () => {
     it('wraps fetch errors in GaslessError(CONFIG_FAILED)', async () => {
         fetchApi.mockResolvedValueOnce(new Response('boom', { status: 500 }));
 
-        await expect(provider.getConfig(Network.mainnet())).rejects.toMatchObject({
+        await expect(provider.getSupportedAssets(Network.mainnet())).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.ConfigFailed,
         });
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 3354a1cc1..42d09c05a 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -9,12 +9,12 @@
 import { Address } from '@ton/core';
 
 import type {
-    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
+    GaslessSupportedAsset,
     Network,
 } from '../../../api/models';
 import { ApiClientTonApi } from '../../../clients/tonapi/ApiClientTonApi';
@@ -25,7 +25,7 @@ import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
 import { DEFAULT_METADATA, DEFAULT_PROVIDER_ID, DEFAULT_SEND_RETRIES, DEFAULT_SEND_RETRY_DELAY_MS } from './constants';
 import { isTransientError, networkFromChainId } from './helpers';
-import { mapGaslessConfig } from './mappers/map-gasless-config';
+import { mapGaslessSupportedAssets } from './mappers/map-gasless-supported-assets';
 import { mapTonApiGaslessError } from './mappers/map-gasless-error';
 import { buildGaslessQuoteRequest, mapGaslessQuote } from './mappers/map-gasless-quote';
 import { buildGaslessSendRequest, mapGaslessSend } from './mappers/map-gasless-send';
@@ -126,14 +126,18 @@ export class TonApiGaslessProvider extends GaslessProvider {
         return DEFAULT_METADATA;
     }
 
-    async getConfig(network: Network): Promise<GaslessConfig> {
+    async getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]> {
         try {
             const http = this.getClient(network);
             const raw = await http.getJson<TonApiGaslessConfig>('/v2/gasless/config');
-            return mapGaslessConfig(raw);
+            return mapGaslessSupportedAssets(raw);
         } catch (error) {
-            log.error('Failed to fetch gasless config', { error, chainId: network.chainId });
-            throw mapTonApiGaslessError(error, GaslessErrorCode.ConfigFailed, 'Failed to fetch gasless config');
+            log.error('Failed to fetch gasless supported assets', { error, chainId: network.chainId });
+            throw mapTonApiGaslessError(
+                error,
+                GaslessErrorCode.ConfigFailed,
+                'Failed to fetch gasless supported assets',
+            );
         }
     }
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-supported-assets.ts
similarity index 56%
rename from packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
rename to packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-supported-assets.ts
index c8bd652d8..c5f29f71c 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-supported-assets.ts
@@ -6,13 +6,11 @@
  *
  */
 
-import type { GaslessConfig } from '../../../../api/models';
+import type { GaslessSupportedAsset } from '../../../../api/models';
 import { asAddressFriendly } from '../../../../utils/address';
 import type { TonApiGaslessConfig } from '../types/config';
 
-export const mapGaslessConfig = (raw: TonApiGaslessConfig): GaslessConfig => ({
-    relayAddress: asAddressFriendly(raw.relay_address),
-    supportedAssets: raw.gas_jettons.map((jetton) => ({
+export const mapGaslessSupportedAssets = (raw: TonApiGaslessConfig): GaslessSupportedAsset[] =>
+    raw.gas_jettons.map((jetton) => ({
         address: asAddressFriendly(jetton.master_id),
-    })),
-});
+    }));

From f0409b193f3c9e3632bddb803232e536d6d3af24 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 25 May 2026 23:30:55 +0400
Subject: [PATCH 15/46] feat(gasless): polishing

---
 apps/appkit-minter/src/pages/gasless-page.tsx |  15 +-
 .../appkit/actions/gasless/gasless.test.ts    |   1 -
 .../src/appkit/hooks/gasless/gasless.test.tsx | 186 ++++++++++++++++++
 .../hooks/gasless/use-gasless-quote.tsx       |   3 +-
 .../gasless/use-send-gasless-transaction.tsx  |   3 +-
 packages/appkit-react/docs/hooks.md           |   2 +-
 packages/appkit-react/package.json            |   1 -
 packages/appkit/docs/actions.md               |   2 +-
 .../actions/gasless/get-gasless-manager.ts    |   3 +-
 .../actions/gasless/get-gasless-provider.ts   |   3 +-
 .../actions/gasless/get-gasless-providers.ts  |   3 +-
 .../src/actions/gasless/get-gasless-quote.ts  |   6 +-
 .../gasless/send-gasless-transaction.test.ts  |   8 +-
 .../gasless/send-gasless-transaction.ts       |   3 +-
 .../create-transfer-ton-transaction.ts        |   8 +-
 .../adapters/ton-connect-wallet-adapter.ts    |   4 +-
 packages/appkit/src/types/wallet.ts           |   2 +
 packages/appkit/src/utils/index.ts            |  10 +-
 .../src/api/models/gasless/GaslessQuote.ts    |   2 -
 .../src/defi/gasless/GaslessManager.spec.ts   |   1 -
 packages/walletkit/src/defi/gasless/README.md |   4 +-
 packages/walletkit/src/defi/gasless/errors.ts |   4 +-
 .../src/defi/gasless/tonapi/README.md         |  49 +++++
 .../tonapi/TonApiGaslessProvider.spec.ts      |   8 +-
 .../gasless/tonapi/TonApiGaslessProvider.ts   |   2 +-
 .../tonapi/mappers/map-gasless-error.ts       |   8 +-
 .../tonapi/mappers/map-gasless-quote.ts       |   1 -
 .../tonapi/mappers/map-gasless-send.ts        |   5 +-
 .../src/defi/gasless/tonapi/utils.ts          |   3 +-
 packages/walletkit/src/index.ts               |   2 +-
 30 files changed, 299 insertions(+), 53 deletions(-)
 create mode 100644 demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/README.md

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index 38b2b4bf4..9188c8e08 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -17,8 +17,15 @@ import {
     useSelectedWallet,
     useSendGaslessTransaction,
 } from '@ton/appkit-react';
-import { asBase64, compareAddress, createJettonTransferPayload, GaslessError, parseUnits } from '@ton/appkit';
-import type { GaslessSupportedAsset, TransactionRequestMessage } from '@ton/appkit';
+import {
+    asAddressFriendly,
+    asBase64,
+    compareAddress,
+    createJettonTransferPayload,
+    GaslessError,
+    parseUnits,
+} from '@ton/appkit';
+import type { GaslessSupportedAsset, TransactionRequestMessage, UserFriendlyAddress } from '@ton/appkit';
 import { toast } from 'sonner';
 
 import { Layout } from '@/core/components';
@@ -55,7 +62,7 @@ export const GaslessPage: FC = () => {
 
     const [recipient, setRecipient] = useState('');
     const [amount, setAmount] = useState('0.1');
-    const [feeAsset, setFeeAsset] = useState<string | null>(null);
+    const [feeAsset, setFeeAsset] = useState<UserFriendlyAddress | null>(null);
 
     useEffect(() => {
         if (address && !recipient) setRecipient(address);
@@ -197,7 +204,7 @@ export const GaslessPage: FC = () => {
                             <select
                                 className="w-full p-2 bg-secondary rounded-md border border-border"
                                 value={feeAsset ?? ''}
-                                onChange={(e) => setFeeAsset(e.target.value)}
+                                onChange={(e) => setFeeAsset(asAddressFriendly(e.target.value))}
                                 disabled={isAssetsLoading || !supportedAssets?.length}
                             >
                                 {supportedAssets?.map((asset) => (
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index 40193c82e..0972ed96c 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -41,7 +41,6 @@ describe('Gasless Actions Examples', () => {
             messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
             fee: '1234',
             validUntil: Math.floor(Date.now() / 1000) + 120,
-            relayAddress: TEST_ADDRESS,
             from: TEST_ADDRESS,
         });
         mockSend = vi.fn().mockResolvedValue({
diff --git a/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx b/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
new file mode 100644
index 000000000..432a1ae07
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
@@ -0,0 +1,186 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import * as AppKitReact from '@ton/appkit-react';
+
+import { UseGaslessProvidersExample } from './use-gasless-providers';
+import { UseGaslessProviderExample } from './use-gasless-provider';
+import { UseGaslessProviderMetadataExample } from './use-gasless-provider-metadata';
+import { UseGaslessSupportedAssetsExample } from './use-gasless-supported-assets';
+import { UseGaslessQuoteExample } from './use-gasless-quote';
+import { UseSendGaslessTransactionExample } from './use-send-gasless-transaction';
+
+vi.mock('@ton/appkit-react', async () => {
+    const actual = await vi.importActual('@ton/appkit-react');
+    return {
+        ...actual,
+        useGaslessProviders: vi.fn(),
+        useGaslessProvider: vi.fn(),
+        useGaslessProviderMetadata: vi.fn(),
+        useGaslessSupportedAssets: vi.fn(),
+        useGaslessQuote: vi.fn(),
+        useSendGaslessTransaction: vi.fn(),
+    };
+});
+
+const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+
+describe('Gasless Hooks Examples', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('UseGaslessProvidersExample', () => {
+        it('renders the list of provider ids', () => {
+            vi.mocked(AppKitReact.useGaslessProviders).mockReturnValue([
+                { providerId: 'tonapi' },
+            ] as unknown as AppKitReact.UseGaslessProvidersReturnType);
+
+            render(<UseGaslessProvidersExample />);
+            expect(screen.getByText('tonapi')).toBeDefined();
+        });
+    });
+
+    describe('UseGaslessProviderExample', () => {
+        it('renders the current provider id', () => {
+            vi.mocked(AppKitReact.useGaslessProvider).mockReturnValue([
+                { providerId: 'tonapi' },
+                vi.fn(),
+            ] as unknown as AppKitReact.UseGaslessProviderReturnType);
+
+            render(<UseGaslessProviderExample />);
+            expect(screen.getByText('Current: tonapi')).toBeDefined();
+        });
+    });
+
+    describe('UseGaslessProviderMetadataExample', () => {
+        it('renders loading state', () => {
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessProviderMetadata).mockReturnValue({
+                isLoading: true,
+                data: undefined,
+            });
+
+            render(<UseGaslessProviderMetadataExample />);
+            expect(screen.getByText('Loading provider...')).toBeDefined();
+        });
+
+        it('renders provider name and url', () => {
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessProviderMetadata).mockReturnValue({
+                isLoading: false,
+                data: { name: 'TonAPI', url: 'https://tonapi.io' },
+            });
+
+            render(<UseGaslessProviderMetadataExample />);
+            const link = screen.getByText('TonAPI');
+            expect(link).toBeDefined();
+            expect(link.closest('a')?.getAttribute('href')).toBe('https://tonapi.io');
+        });
+    });
+
+    describe('UseGaslessSupportedAssetsExample', () => {
+        it('renders loading state', () => {
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessSupportedAssets).mockReturnValue({
+                isLoading: true,
+                data: undefined,
+            });
+
+            render(<UseGaslessSupportedAssetsExample />);
+            expect(screen.getByText('Loading fee assets...')).toBeDefined();
+        });
+
+        it('renders supported asset options', () => {
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessSupportedAssets).mockReturnValue({
+                isLoading: false,
+                data: [{ address: TEST_ADDRESS }],
+            });
+
+            render(<UseGaslessSupportedAssetsExample />);
+            expect(screen.getByRole('option', { name: TEST_ADDRESS })).toBeDefined();
+        });
+    });
+
+    describe('UseGaslessQuoteExample', () => {
+        it('renders loading state', () => {
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessQuote).mockReturnValue({
+                isFetching: true,
+                data: undefined,
+            });
+
+            render(<UseGaslessQuoteExample />);
+            expect(screen.getByText('Quoting...')).toBeDefined();
+        });
+
+        it('renders quote fee', () => {
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessQuote).mockReturnValue({
+                isFetching: false,
+                data: { fee: '1234', validUntil: 1735680000 },
+            });
+
+            render(<UseGaslessQuoteExample />);
+            expect(screen.getByText('Fee: 1234')).toBeDefined();
+        });
+    });
+
+    describe('UseSendGaslessTransactionExample', () => {
+        it('calls sendGasless on click and logs result', async () => {
+            const mockQuote = { fee: '1234', validUntil: 1735680000 };
+            const mockSend = vi.fn().mockResolvedValue({
+                internalBoc: 'AAA=',
+                normalizedHash: '0x' + 'a'.repeat(64),
+            });
+            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessQuote).mockReturnValue({
+                data: mockQuote,
+                isFetching: false,
+            });
+
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useSendGaslessTransaction).mockReturnValue({
+                mutateAsync: mockSend,
+                isPending: false,
+            });
+
+            render(<UseSendGaslessTransactionExample />);
+            fireEvent.click(screen.getByText('Send Gasless'));
+
+            await waitFor(() => {
+                expect(mockSend).toHaveBeenCalledWith({ quote: mockQuote });
+            });
+
+            consoleSpy.mockRestore();
+        });
+
+        it('disables the button while pending', () => {
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessQuote).mockReturnValue({
+                data: { fee: '1234', validUntil: 1735680000 },
+                isFetching: false,
+            });
+
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useSendGaslessTransaction).mockReturnValue({
+                mutateAsync: vi.fn(),
+                isPending: true,
+            });
+
+            render(<UseSendGaslessTransactionExample />);
+            const button = screen.getByText('Sending...');
+            expect(button.closest('button')?.disabled).toBe(true);
+        });
+    });
+});
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
index 8e8d900bc..06c1b6c56 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-quote.tsx
@@ -6,13 +6,14 @@
  *
  */
 
+import { asAddressFriendly } from '@ton/appkit';
 import type { Base64String } from '@ton/appkit';
 import { useGaslessQuote } from '@ton/appkit-react';
 
 export const UseGaslessQuoteExample = () => {
     // SAMPLE_START: USE_GASLESS_QUOTE
     const { data: quote, isFetching } = useGaslessQuote({
-        feeAsset: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
+        feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'), // USDT
         messages: [
             {
                 address: 'EQ...jetton_wallet_address',
diff --git a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
index b6dd513e7..6a4b1d65d 100644
--- a/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/use-send-gasless-transaction.tsx
@@ -6,6 +6,7 @@
  *
  */
 
+import { asAddressFriendly } from '@ton/appkit';
 import type { Base64String } from '@ton/appkit';
 import { useGaslessQuote, useSendGaslessTransaction } from '@ton/appkit-react';
 
@@ -14,7 +15,7 @@ import { useGaslessQuote, useSendGaslessTransaction } from '@ton/appkit-react';
 export const UseSendGaslessTransactionExample = () => {
     // SAMPLE_START: USE_SEND_GASLESS_TRANSACTION
     const { data: quote } = useGaslessQuote({
-        feeAsset: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
+        feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'),
         messages: [
             {
                 address: 'EQ...jetton_wallet_address',
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index 3ba8d765e..134340e8d 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -878,7 +878,7 @@ Hook to fetch a gasless quote. Auto-refetches as inputs change; cached results b
 
 ```tsx
 const { data: quote, isFetching } = useGaslessQuote({
-    feeAsset: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs', // USDT
+    feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'), // USDT
     messages: [
         {
             address: 'EQ...jetton_wallet_address',
diff --git a/packages/appkit-react/package.json b/packages/appkit-react/package.json
index 82ddcba2a..fcb3b63f6 100644
--- a/packages/appkit-react/package.json
+++ b/packages/appkit-react/package.json
@@ -45,7 +45,6 @@
   "dependencies": {
     "@ton/appkit": "workspace:*",
     "clsx": "2.1.1",
-    "radix-ui": "^1.4.3",
     "rosetta": "1.1.0"
   },
   "devDependencies": {
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 437c5948c..4b4ee78e1 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -637,7 +637,7 @@ console.log('Staked Balance:', balance);
 Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return. The connected wallet must support the `SignMessage` TonConnect feature.
 
 The high-level flow is:
-1. `getGaslessConfig` – discover which jettons the relayer accepts as fee payment.
+1. `getGaslessSupportedAssets` – discover which assets the relayer accepts as fee payment.
 2. `getGaslessQuote` – ask the relayer for fee + wrapped messages (with a `validUntil`).
 3. `sendGaslessTransaction` – sign the wrapped messages via the wallet and submit the signed BoC.
 
diff --git a/packages/appkit/src/actions/gasless/get-gasless-manager.ts b/packages/appkit/src/actions/gasless/get-gasless-manager.ts
index a298092d2..cf1e07756 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-manager.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-manager.ts
@@ -6,8 +6,7 @@
  *
  */
 
-import type { GaslessManager } from '@ton/walletkit';
-
+import type { GaslessManager } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 
 export type GetGaslessManagerReturnType = GaslessManager;
diff --git a/packages/appkit/src/actions/gasless/get-gasless-provider.ts b/packages/appkit/src/actions/gasless/get-gasless-provider.ts
index c493ac35e..4805aef4b 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-provider.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-provider.ts
@@ -6,8 +6,7 @@
  *
  */
 
-import type { GaslessProviderInterface } from '@ton/walletkit';
-
+import type { GaslessProviderInterface } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 
 export interface GetGaslessProviderOptions {
diff --git a/packages/appkit/src/actions/gasless/get-gasless-providers.ts b/packages/appkit/src/actions/gasless/get-gasless-providers.ts
index 4cd0656ba..dee5ae668 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-providers.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-providers.ts
@@ -6,8 +6,7 @@
  *
  */
 
-import type { GaslessProviderInterface } from '@ton/walletkit';
-
+import type { GaslessProviderInterface } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 
 export type GetGaslessProvidersReturnType = GaslessProviderInterface[];
diff --git a/packages/appkit/src/actions/gasless/get-gasless-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
index 75e7609ce..dfd6e2da5 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-quote.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-quote.ts
@@ -6,9 +6,9 @@
  *
  */
 
-import type { GaslessQuote } from '@ton/walletkit';
-
+import type { GaslessQuote } from '../../gasless';
 import type { Network } from '../../types/network';
+import type { UserFriendlyAddress } from '../../types/primitives';
 import type { TransactionRequestMessage } from '../../types/transaction';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
@@ -20,7 +20,7 @@ export interface GetGaslessQuoteOptions {
      * Omit for free / sponsored providers — jetton-only providers will throw
      * `GaslessError(UnsupportedOperation)` in that case.
      */
-    feeAsset?: string;
+    feeAsset?: UserFriendlyAddress;
     /** User's messages to include in the gasless transaction */
     messages: TransactionRequestMessage[];
     /** Network to quote on. Defaults to the selected wallet's network. */
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
index bfb2ebce5..d3545f563 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -7,12 +7,13 @@
  */
 
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { GaslessErrorCode, Network } from '@ton/walletkit';
-import type { Feature, GaslessQuote } from '@ton/walletkit';
 
+import { GaslessErrorCode } from '../../gasless';
+import type { GaslessQuote } from '../../gasless';
+import { Network } from '../../types/network';
 import type { AppKit } from '../../core/app-kit';
 import type { Base64String } from '../../types/primitives';
-import type { WalletInterface } from '../../types/wallet';
+import type { Feature, WalletInterface } from '../../types/wallet';
 import { sendGaslessTransaction } from './send-gasless-transaction';
 
 const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
@@ -23,7 +24,6 @@ const makeQuote = (overrides: Partial<GaslessQuote> = {}): GaslessQuote => ({
     messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
     fee: '1234',
     validUntil: Math.floor(Date.now() / 1000) + 60,
-    relayAddress: TEST_ADDRESS,
     from: TEST_ADDRESS,
     ...overrides,
 });
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index c701dd0cb..9cfd5479f 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -6,9 +6,8 @@
  *
  */
 
-import type { GaslessQuote, GaslessSendResponse } from '@ton/walletkit';
-
 import { GaslessError, GaslessErrorCode } from '../../gasless';
+import type { GaslessQuote, GaslessSendResponse } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
diff --git a/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts b/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts
index b27d2b882..c7c5123c5 100644
--- a/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts
+++ b/packages/appkit/src/actions/transaction/create-transfer-ton-transaction.ts
@@ -9,7 +9,7 @@
 import { createCommentPayloadBase64, parseUnits } from '@ton/walletkit';
 
 import type { TransactionRequest, TransactionRequestMessage } from '../../types/transaction';
-import type { Base64String } from '../../types/primitives';
+import { asBase64 } from '../../utils';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
@@ -46,14 +46,14 @@ export const createTransferTonTransaction = (
     const message: TransactionRequestMessage = {
         address: recipientAddress,
         amount: parseUnits(amount, 9).toString(),
-        stateInit: stateInit as Base64String,
+        stateInit: stateInit ? asBase64(stateInit) : undefined,
     };
 
     // Payload takes priority, otherwise use comment
     if (payload) {
-        message.payload = payload as Base64String;
+        message.payload = asBase64(payload);
     } else if (comment) {
-        message.payload = createCommentPayloadBase64(comment) as Base64String;
+        message.payload = createCommentPayloadBase64(comment);
     }
 
     return {
diff --git a/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts b/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts
index 3f748cdc9..31cc8db0c 100644
--- a/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts
+++ b/packages/appkit/src/connectors/tonconnect/adapters/ton-connect-wallet-adapter.ts
@@ -10,7 +10,7 @@ import { Address } from '@ton/core';
 import type { Wallet as TonConnectWallet } from '@tonconnect/sdk';
 import type { SignDataPayload as TonConnectSignDataPayload } from '@tonconnect/sdk';
 import type { Feature, SendTransactionResponse, UserFriendlyAddress, Hex } from '@ton/walletkit';
-import { asHex, createWalletId, getNormalizedExtMessageHash } from '@ton/walletkit';
+import { asBase64, asHex, createWalletId, getNormalizedExtMessageHash } from '@ton/walletkit';
 import type { TonConnectUI } from '@tonconnect/ui';
 
 import type { TransactionRequest } from '../../../types/transaction';
@@ -100,7 +100,7 @@ export class TonConnectWalletAdapter implements WalletInterface {
         const result = await this.tonConnectUI.signMessage(message);
 
         return {
-            internalBoc: result.internalBoc as Base64String,
+            internalBoc: asBase64(result.internalBoc),
         };
     }
 
diff --git a/packages/appkit/src/types/wallet.ts b/packages/appkit/src/types/wallet.ts
index b6255415a..6d84a95cf 100644
--- a/packages/appkit/src/types/wallet.ts
+++ b/packages/appkit/src/types/wallet.ts
@@ -8,6 +8,8 @@
 
 import type { Feature, SendTransactionResponse, Hex, UserFriendlyAddress } from '@ton/walletkit';
 
+export type { Feature } from '@ton/walletkit';
+
 import type { TransactionRequest } from './transaction';
 import type { SignDataRequest, SignDataResponse, SignMessageResponse } from './signing';
 import type { Network } from './network';
diff --git a/packages/appkit/src/utils/index.ts b/packages/appkit/src/utils/index.ts
index bdf904c8a..7b1c0d1b8 100644
--- a/packages/appkit/src/utils/index.ts
+++ b/packages/appkit/src/utils/index.ts
@@ -6,7 +6,15 @@
  *
  */
 
-export { formatUnits, parseUnits, compareAddress, createJettonTransferPayload, asBase64, asHex } from '@ton/walletkit';
+export {
+    formatUnits,
+    parseUnits,
+    compareAddress,
+    createJettonTransferPayload,
+    asAddressFriendly,
+    asBase64,
+    asHex,
+} from '@ton/walletkit';
 
 export * from './address/is-valid-address';
 export * from './address/to-bounceble-address';
diff --git a/packages/walletkit/src/api/models/gasless/GaslessQuote.ts b/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
index 496ef091a..f19315266 100644
--- a/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
+++ b/packages/walletkit/src/api/models/gasless/GaslessQuote.ts
@@ -27,8 +27,6 @@ export interface GaslessQuote {
     fee: TokenAmount;
     /** Unix timestamp after which the bundle becomes invalid for relay */
     validUntil: number;
-    /** Address of the relayer that produced this estimate */
-    relayAddress: UserFriendlyAddress;
     /** Sender wallet address echoed by the relayer */
     from: UserFriendlyAddress;
 }
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index 559c1684d..d6afe252d 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -39,7 +39,6 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
         messages: [],
         fee: '0',
         validUntil: 0,
-        relayAddress: TEST_ADDRESS,
         from: TEST_ADDRESS,
     }),
     sendTransaction: vi.fn<(p: GaslessSendParams) => Promise<GaslessSendResponse>>().mockResolvedValue({
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index b61f7448f..f564622fa 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -78,11 +78,11 @@ The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@to
 
 | Code | Meaning |
 |---|---|
-| `UNSUPPORTED_FEE_JETTON` | The relayer does not accept the chosen fee asset. The TonAPI provider surfaces this when the server replies with `error_code: 40000`. |
+| `UNSUPPORTED_FEE_ASSET` | The relayer does not accept the chosen fee asset. The TonAPI provider surfaces this when the server replies with `error_code: 40000`. |
 | `UNSUPPORTED_OPERATION` | Provider does not implement the requested mode (e.g. TonAPI provider called without `feeAsset` — it only supports jetton-fee mode). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
-| `CONFIG_FAILED` | Relayer config endpoint failed. |
+| `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not implement the `SignMessage` feature. Surfaced by the higher-level `sendGaslessTransaction` action in `@ton/appkit`. |
 | `TOO_MANY_MESSAGES` | The quote carries more messages than the wallet's advertised `SignMessage.maxMessages` cap. Surfaced by `sendGaslessTransaction` in `@ton/appkit`. |
 
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index f1f7e86d8..9dd53ecfd 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -9,11 +9,11 @@
 import { DefiError } from '../errors';
 
 export enum GaslessErrorCode {
-    UnsupportedFeeJetton = 'UNSUPPORTED_FEE_JETTON',
+    UnsupportedFeeAsset = 'UNSUPPORTED_FEE_ASSET',
     UnsupportedOperation = 'UNSUPPORTED_OPERATION',
     QuoteFailed = 'QUOTE_FAILED',
     SendFailed = 'SEND_FAILED',
-    ConfigFailed = 'CONFIG_FAILED',
+    SupportedAssetsFailed = 'SUPPORTED_ASSETS_FAILED',
     SignMessageNotSupported = 'SIGN_MESSAGE_NOT_SUPPORTED',
     TooManyMessages = 'TOO_MANY_MESSAGES',
 }
diff --git a/packages/walletkit/src/defi/gasless/tonapi/README.md b/packages/walletkit/src/defi/gasless/tonapi/README.md
new file mode 100644
index 000000000..f856826ab
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/README.md
@@ -0,0 +1,49 @@
+# TonAPI gasless provider
+
+Gasless relay via the public [TonAPI gasless REST API](https://docs.tonapi.io/tonapi/rest-api/gasless): relayer pays gas, user pays a fee in a relayer-accepted jetton.
+
+Public entry: **`createTonApiGaslessProvider`** from `@ton/walletkit/gasless/tonapi`. It returns a factory `(ctx) => TonApiGaslessProvider` for `kit.gasless.registerProvider(createTonApiGaslessProvider(config))`. For advanced use, `TonApiGaslessProvider.createFromContext(ctx, config)` builds the provider from a `ProviderFactoryContext`.
+
+## Configuration
+
+Per-chain overrides are keyed by `chainId` (same keys as `TonWalletKit` `networks`):
+
+```typescript
+import { Network } from '@ton/walletkit';
+import type { TonApiGaslessProviderConfig } from '@ton/walletkit/gasless/tonapi';
+
+const config: TonApiGaslessProviderConfig = {
+    chains: {
+        [Network.mainnet().chainId]: {
+            apiKey: process.env.TON_API_KEY_MAINNET, // optional Bearer token
+            endpoint: 'https://tonapi.io', // optional override; defaults to the network's public TonAPI endpoint
+        },
+        [Network.testnet().chainId]: { apiKey: process.env.TON_API_KEY_TESTNET },
+    },
+    fetchApi: customFetch, // optional fetch impl (testing / SSR)
+    providerId: 'tonapi', // optional id; defaults to 'tonapi'
+    sendRetries: 3, // optional override; defaults to 3
+    sendRetryDelayMs: 2000, // optional override; defaults to 2000
+};
+```
+
+`chains` is optional — when omitted, every network the kit was configured with auto-registers with default endpoints. Pass a partial map to override only specific chains.
+
+If no chain ends up configured, the factory throws.
+
+## Retry policy
+
+`sendTransaction` retries on transient failures only (HTTP 5xx, 408, 429, network errors) with exponential backoff (`sendRetryDelayMs * 2 ** attempt`, starting at 2000ms). 4xx responses fail fast. The wallet's seqno guard protects against on-chain double-spend if a retry duplicates an accepted BoC.
+
+`getQuote` and `getSupportedAssets` do not retry — quotes are short-lived (~2 min `validUntil`), and the asset list is cached at the React Query layer.
+
+## BoC encoding
+
+TonAPI accepts and returns BoCs as hex strings; our domain types are base64 (`Base64String`). Mappers (`mappers/map-gasless-quote.ts`, `mappers/map-gasless-send.ts`) handle the conversion — callers always see base64.
+
+The `send` response carries the broadcasted external message as hex; we run it through `getNormalizedExtMessageHash` (TEP-467) to derive `normalizedHash` for explorer / status lookup.
+
+## Resources
+
+- [TonAPI gasless REST API docs](https://docs.tonapi.io/tonapi/rest-api/gasless)
+- [TEP-467: Normalized external message hash](https://github.com/ton-blockchain/TEPs/blob/master/text/0467-normalized-message-hash.md)
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 67927fe39..ebf042704 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -182,12 +182,12 @@ describe('TonApiGaslessProvider.getSupportedAssets', () => {
         });
     });
 
-    it('wraps fetch errors in GaslessError(CONFIG_FAILED)', async () => {
+    it('wraps fetch errors in GaslessError(SUPPORTED_ASSETS_FAILED)', async () => {
         fetchApi.mockResolvedValueOnce(new Response('boom', { status: 500 }));
 
         await expect(provider.getSupportedAssets(Network.mainnet())).rejects.toMatchObject({
             name: 'GaslessError',
-            code: GaslessErrorCode.ConfigFailed,
+            code: GaslessErrorCode.SupportedAssetsFailed,
         });
     });
 });
@@ -278,7 +278,7 @@ describe('TonApiGaslessProvider.getQuote', () => {
         });
     });
 
-    it('maps TonAPI error_code 40000 to GaslessError(UNSUPPORTED_FEE_JETTON)', async () => {
+    it('maps TonAPI error_code 40000 to GaslessError(UNSUPPORTED_FEE_ASSET)', async () => {
         fetchApi.mockResolvedValueOnce(
             new Response(JSON.stringify({ error: 'Jetton is not supported.', error_code: 40000 }), {
                 status: 400,
@@ -288,7 +288,7 @@ describe('TonApiGaslessProvider.getQuote', () => {
 
         await expect(provider.getQuote(baseQuoteParams)).rejects.toMatchObject({
             name: 'GaslessError',
-            code: GaslessErrorCode.UnsupportedFeeJetton,
+            code: GaslessErrorCode.UnsupportedFeeAsset,
             message: 'Jetton is not supported.',
         });
     });
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 42d09c05a..c72e088c7 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -135,7 +135,7 @@ export class TonApiGaslessProvider extends GaslessProvider {
             log.error('Failed to fetch gasless supported assets', { error, chainId: network.chainId });
             throw mapTonApiGaslessError(
                 error,
-                GaslessErrorCode.ConfigFailed,
+                GaslessErrorCode.SupportedAssetsFailed,
                 'Failed to fetch gasless supported assets',
             );
         }
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
index f5bcdda76..18e6c191f 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
@@ -26,7 +26,7 @@ interface TonApiErrorBody {
     error_code?: number;
 }
 
-const TONAPI_UNSUPPORTED_FEE_JETTON_CODE = 40000;
+const TONAPI_UNSUPPORTED_FEE_ASSET_CODE = 40000;
 
 export const mapTonApiGaslessError = (
     error: unknown,
@@ -42,10 +42,10 @@ export const mapTonApiGaslessError = (
     if (error instanceof TonClientError) {
         const body = error.details as TonApiErrorBody | undefined;
 
-        if (body && typeof body === 'object' && body.error_code === TONAPI_UNSUPPORTED_FEE_JETTON_CODE) {
+        if (body && typeof body === 'object' && body.error_code === TONAPI_UNSUPPORTED_FEE_ASSET_CODE) {
             return new GaslessError(
-                body.error ?? 'Jetton is not supported by the gasless relayer',
-                GaslessErrorCode.UnsupportedFeeJetton,
+                body.error ?? 'Fee asset is not supported by the gasless relayer',
+                GaslessErrorCode.UnsupportedFeeAsset,
                 error,
             );
         }
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
index 63f5dc065..e3441957d 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
@@ -53,6 +53,5 @@ export const mapGaslessQuote = (raw: TonApiGaslessEstimateResponse, network: Net
     })),
     fee: raw.commission,
     validUntil: raw.valid_until,
-    relayAddress: asAddressFriendly(raw.relay_address),
     from: asAddressFriendly(raw.from),
 });
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
index f2c1b14f4..932d6e0e1 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
@@ -6,7 +6,8 @@
  *
  */
 
-import type { Base64String, GaslessSendParams, SendTransactionResponse } from '../../../../api/models';
+import type { GaslessSendParams, SendTransactionResponse } from '../../../../api/models';
+import { asBase64 } from '../../../../utils/base64';
 import { getNormalizedExtMessageHash } from '../../../../utils/getNormalizedExtMessageHash';
 import { GaslessError, GaslessErrorCode } from '../../errors';
 import { internalBocToExternalMessageBoc, stripHexPrefix } from '../utils';
@@ -40,7 +41,7 @@ export const mapGaslessSend = (raw: TonApiGaslessSendResponse): SendTransactionR
         });
     }
 
-    const boc = Buffer.from(raw.external, 'hex').toString('base64') as Base64String;
+    const boc = asBase64(Buffer.from(raw.external, 'hex').toString('base64'));
     const { hash: normalizedHash, boc: normalizedBoc } = getNormalizedExtMessageHash(boc);
     return { boc, normalizedBoc, normalizedHash };
 };
diff --git a/packages/walletkit/src/defi/gasless/tonapi/utils.ts b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
index a1a26aed4..f0ae638fd 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/utils.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
@@ -19,6 +19,7 @@ import {
 } from '@ton/core';
 
 import type { Base64String, TransactionRequestMessage } from '../../../api/models';
+import { asBase64 } from '../../../utils/base64';
 import { GaslessError, GaslessErrorCode } from '../errors';
 
 export const stripHexPrefix = (value: string): string => {
@@ -26,7 +27,7 @@ export const stripHexPrefix = (value: string): string => {
 };
 
 export const cellToBase64 = (cell: Cell): Base64String => {
-    return cell.toBoc().toString('base64') as Base64String;
+    return asBase64(cell.toBoc().toString('base64'));
 };
 
 export const buildInternalMessageCell = (message: TransactionRequestMessage): Cell => {
diff --git a/packages/walletkit/src/index.ts b/packages/walletkit/src/index.ts
index 6f7cd8c5c..a073c2e1c 100644
--- a/packages/walletkit/src/index.ts
+++ b/packages/walletkit/src/index.ts
@@ -100,7 +100,7 @@ export { DefaultSignature, FakeSignature } from './utils/sign';
 export { wrapWalletInterface } from './core/Initializer';
 export type { NftTransferParamsHuman, NftTransferParamsRaw } from './types/nfts';
 
-export { isValidAddress, compareAddress } from './utils/address';
+export { isValidAddress, compareAddress, asAddressFriendly } from './utils/address';
 export { validateTransactionMessage } from './validation';
 export { createDeviceInfo, createWalletManifest, getMaxOutgoingMessages } from './utils/getDefaultWalletConfig';
 export { Signer } from './utils/Signer';

From 912e0a25a387e443e511080d2aaffbf7e874fbb7 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Tue, 26 May 2026 00:14:44 +0400
Subject: [PATCH 16/46] feat(gasless): add docs

---
 .changeset/gasless-transactions.md            |  29 ++++
 .../src/appkit/gasless/send-usdt-gasless.ts   |  51 ++++++
 .../src/appkit/gasless/send-usdt-regular.ts   |  49 ++++++
 demo/examples/src/appkit/gasless/tonapi.ts    |  49 ++++++
 packages/appkit-react/docs/hooks.md           |  92 ++++++-----
 packages/appkit/docs/actions.md               |  22 ++-
 packages/appkit/docs/gasless.md               | 149 ++++++++++++++++++
 template/packages/appkit-react/docs/hooks.md  |  44 ++++++
 template/packages/appkit/docs/actions.md      |  67 ++++++++
 template/packages/appkit/docs/gasless.md      |  68 ++++++++
 10 files changed, 571 insertions(+), 49 deletions(-)
 create mode 100644 .changeset/gasless-transactions.md
 create mode 100644 demo/examples/src/appkit/gasless/send-usdt-gasless.ts
 create mode 100644 demo/examples/src/appkit/gasless/send-usdt-regular.ts
 create mode 100644 demo/examples/src/appkit/gasless/tonapi.ts
 create mode 100644 packages/appkit/docs/gasless.md
 create mode 100644 template/packages/appkit/docs/gasless.md

diff --git a/.changeset/gasless-transactions.md b/.changeset/gasless-transactions.md
new file mode 100644
index 000000000..29871c856
--- /dev/null
+++ b/.changeset/gasless-transactions.md
@@ -0,0 +1,29 @@
+---
+'@ton/walletkit': patch
+'@ton/appkit': patch
+'@ton/appkit-react': patch
+---
+
+Added gasless transactions support. A relayer pays gas; the user pays a fee in a relayer-accepted asset (e.g. USDT). See [`@ton/appkit/docs/gasless.md`](https://github.com/ton-connect/kit/blob/main/packages/appkit/docs/gasless.md) for a regular-send → gasless-send migration guide.
+
+- `@ton/walletkit`:
+    - New `GaslessManager` and `GaslessProvider` abstract base, parallel to `StakingManager` / `SwapManager`.
+    - `TonApiGaslessProvider` (`createTonApiGaslessProvider`) — multi-network gasless via the public TonAPI REST API. No external SDK dependency; talks to TonAPI via `fetch`. Auto-discovers networks from the kit when `chains` is omitted; per-chain `apiKey`/`endpoint` overrides supported.
+    - Models: `GaslessSupportedAsset`, `GaslessProviderMetadata` (`{ name, logo?, url? }`), `GaslessQuote`, `GaslessQuoteParams` (`feeAsset?: UserFriendlyAddress`), `GaslessSendParams`, `GaslessSendResponse` (strict superset of `SendTransactionResponse` adding `internalBoc`).
+    - `GaslessError` + `GaslessErrorCode` enum: `UnsupportedFeeAsset`, `UnsupportedOperation`, `QuoteFailed`, `SendFailed`, `SupportedAssetsFailed`, `SignMessageNotSupported`, `TooManyMessages`.
+    - Send retry: 3 retries with exponential backoff on transient errors (5xx / 408 / 429 / network); 4xx fails fast. Wallet seqno guard protects against on-chain double-spend on retry.
+    - `WalletAdapter` interface gains `signMessage(request): Promise<SignMessageResponse>` and `getSupportedFeatures(): Feature[] | undefined`.
+    - `asAddressFriendly` now re-exported from the package root.
+    - `Uint8ArrayToBase64` and `HexToBase64` return types tightened from `string` to `Base64String`.
+
+- `@ton/appkit`:
+    - Actions: `getGaslessManager`, `getGaslessProvider`, `getGaslessProviders`, `setDefaultGaslessProvider`, `watchGaslessProviders`, `getGaslessProviderMetadata`, `getGaslessSupportedAssets`, `getGaslessQuote`, `sendGaslessTransaction`.
+    - Queries: `getGaslessProviderMetadataQueryOptions`, `getGaslessSupportedAssetsQueryOptions`, `getGaslessQuoteQueryOptions` (2-min `staleTime` matching the relayer `validUntil`), `sendGaslessTransactionMutationOptions`.
+    - `sendGaslessTransaction` enforces the wallet's `SignMessage` capability and message cap, throwing `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` / `GaslessError(TOO_MANY_MESSAGES)` before submission.
+    - New `signMessage` action and `signMessageMutationOptions` (the underlying primitive for gasless signing).
+    - `TonConnectWalletAdapter` now implements `signMessage` and `getSupportedFeatures`.
+    - `WalletInterface` gains `signMessage` and `getSupportedFeatures`.
+    - `asAddressFriendly` re-exported from `@ton/appkit/utils`.
+
+- `@ton/appkit-react`:
+    - Hooks: `useGaslessProviderMetadata`, `useGaslessSupportedAssets`, `useGaslessProvider`, `useGaslessProviders`, `useGaslessQuote`, `useSendGaslessTransaction`, `useSignMessage`.
diff --git a/demo/examples/src/appkit/gasless/send-usdt-gasless.ts b/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
new file mode 100644
index 000000000..01d4b4c75
--- /dev/null
+++ b/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '@ton/appkit';
+import {
+    asBase64,
+    createJettonTransferPayload,
+    getGaslessQuote,
+    getJettonWalletAddress,
+    getSelectedWallet,
+    parseUnits,
+    sendGaslessTransaction,
+} from '@ton/appkit';
+
+const USDT_MASTER = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+const USDT_DECIMALS = 6;
+
+export const sendUsdtGaslessExample = async (appKit: AppKit, recipient: string, amount: string) => {
+    // SAMPLE_START: SEND_USDT_GASLESS
+    const wallet = getSelectedWallet(appKit);
+    if (!wallet) throw new Error('No wallet connected');
+    const ownerAddress = wallet.getAddress();
+
+    const usdtWallet = await getJettonWalletAddress(appKit, {
+        jettonAddress: USDT_MASTER,
+        ownerAddress,
+    });
+
+    const payload = createJettonTransferPayload({
+        amount: parseUnits(amount, USDT_DECIMALS),
+        destination: recipient,
+        responseDestination: ownerAddress,
+    });
+
+    const messages = [
+        {
+            address: usdtWallet,
+            amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
+            payload: asBase64(payload.toBoc().toString('base64')),
+        },
+    ];
+
+    const quote = await getGaslessQuote(appKit, { messages });
+    await sendGaslessTransaction(appKit, { quote });
+    // SAMPLE_END: SEND_USDT_GASLESS
+};
diff --git a/demo/examples/src/appkit/gasless/send-usdt-regular.ts b/demo/examples/src/appkit/gasless/send-usdt-regular.ts
new file mode 100644
index 000000000..88bd9f2f1
--- /dev/null
+++ b/demo/examples/src/appkit/gasless/send-usdt-regular.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { AppKit } from '@ton/appkit';
+import {
+    asBase64,
+    createJettonTransferPayload,
+    getJettonWalletAddress,
+    getSelectedWallet,
+    parseUnits,
+    sendTransaction,
+} from '@ton/appkit';
+
+const USDT_MASTER = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+const USDT_DECIMALS = 6;
+
+export const sendUsdtRegularExample = async (appKit: AppKit, recipient: string, amount: string) => {
+    // SAMPLE_START: SEND_USDT_REGULAR
+    const wallet = getSelectedWallet(appKit);
+    if (!wallet) throw new Error('No wallet connected');
+    const ownerAddress = wallet.getAddress();
+
+    const usdtWallet = await getJettonWalletAddress(appKit, {
+        jettonAddress: USDT_MASTER,
+        ownerAddress,
+    });
+
+    const payload = createJettonTransferPayload({
+        amount: parseUnits(amount, USDT_DECIMALS),
+        destination: recipient,
+        responseDestination: ownerAddress,
+    });
+
+    const messages = [
+        {
+            address: usdtWallet,
+            amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
+            payload: asBase64(payload.toBoc().toString('base64')),
+        },
+    ];
+
+    await sendTransaction(appKit, { messages });
+    // SAMPLE_END: SEND_USDT_REGULAR
+};
diff --git a/demo/examples/src/appkit/gasless/tonapi.ts b/demo/examples/src/appkit/gasless/tonapi.ts
new file mode 100644
index 000000000..e4e4a26a0
--- /dev/null
+++ b/demo/examples/src/appkit/gasless/tonapi.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { AppKit, Network } from '@ton/appkit';
+import { createTonApiGaslessProvider } from '@ton/appkit/gasless/tonapi';
+
+export const gaslessProviderInitExample = () => {
+    // SAMPLE_START: GASLESS_PROVIDER_INIT
+    // Initialize AppKit with the TonAPI gasless provider.
+    // With no arguments, the factory auto-registers every network the kit was configured with.
+    const appKit = new AppKit({
+        networks: {
+            [Network.mainnet().chainId]: {
+                apiClient: { url: 'https://toncenter.com', key: 'your-key' },
+            },
+        },
+        providers: [createTonApiGaslessProvider()],
+    });
+    // SAMPLE_END: GASLESS_PROVIDER_INIT
+
+    return appKit;
+};
+
+export const gaslessProviderChainsExample = () => {
+    // SAMPLE_START: GASLESS_PROVIDER_CHAINS
+    // Per-chain overrides — pass an `apiKey` and/or `endpoint` per network.
+    const appKit = new AppKit({
+        networks: {
+            [Network.mainnet().chainId]: {
+                apiClient: { url: 'https://toncenter.com', key: 'your-key' },
+            },
+        },
+        providers: [
+            createTonApiGaslessProvider({
+                chains: {
+                    [Network.mainnet().chainId]: { apiKey: process.env.TON_API_KEY },
+                },
+            }),
+        ],
+    });
+    // SAMPLE_END: GASLESS_PROVIDER_CHAINS
+
+    return appKit;
+};
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index 134340e8d..f900c9d57 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -839,7 +839,36 @@ return (
 
 ## Gasless
 
-Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return. The connected wallet must support the `SignMessage` TonConnect feature.
+Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT). The connected wallet must support the `SignMessage` TonConnect feature. See the [gasless guide](https://github.com/ton-connect/kit/blob/main/packages/appkit/docs/gasless.md) for a regular-send → gasless-send migration.
+
+### `useGaslessProviders`
+
+Hook to get all registered gasless providers.
+
+```tsx
+const providers = useGaslessProviders();
+return (
+    <ul>
+        {providers.map((p) => (
+            <li key={p.providerId}>{p.providerId}</li>
+        ))}
+    </ul>
+);
+```
+
+### `useGaslessProvider`
+
+Hook to get the current default gasless provider and a setter to switch the default.
+
+```tsx
+const [provider, setProviderId] = useGaslessProvider();
+return (
+    <div>
+        <div>Current: {provider?.providerId ?? 'none'}</div>
+        <button onClick={() => setProviderId('tonapi')}>Use TonApi</button>
+    </div>
+);
+```
 
 ### `useGaslessProviderMetadata`
 
@@ -847,9 +876,13 @@ Hook to fetch static metadata (display name, logo, url) for a gasless provider.
 
 ```tsx
 const { data: metadata, isLoading } = useGaslessProviderMetadata();
-if (isLoading || !metadata) return null;
+
+if (isLoading) return <div>Loading provider...</div>;
+if (!metadata) return null;
+
 return (
     <a href={metadata.url} target="_blank" rel="noreferrer">
+        {metadata.logo && <img src={metadata.logo} alt="" width={16} height={16} />}
         {metadata.name}
     </a>
 );
@@ -861,6 +894,9 @@ Hook to discover the assets the gasless relayer accepts as fee payment.
 
 ```tsx
 const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
+
+if (isLoading) return <div>Loading fee assets...</div>;
+
 return (
     <select>
         {supportedAssets?.map((asset) => (
@@ -883,7 +919,7 @@ const { data: quote, isFetching } = useGaslessQuote({
         {
             address: 'EQ...jetton_wallet_address',
             amount: '60000000', // 0.06 TON gas budget
-            payload: jettonTransferPayloadBase64,
+            payload: 'te6cckEBAQEAAgAAAA==' as Base64String,
         },
     ],
 });
@@ -903,20 +939,33 @@ return (
 
 ### `useSendGaslessTransaction`
 
-Hook to sign a previously computed quote and submit the resulting BoC to the relayer.
+Hook to sign a previously computed quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
 
 Throws:
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the wallet does not advertise `SignMessage`.
 - `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
 ```tsx
-const { data: quote } = useGaslessQuote({ feeAsset, messages });
+const { data: quote } = useGaslessQuote({
+    feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'),
+    messages: [
+        {
+            address: 'EQ...jetton_wallet_address',
+            amount: '60000000',
+            payload: 'te6cckEBAQEAAgAAAA==' as Base64String,
+        },
+    ],
+});
 const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
 
 const handleSend = async () => {
     if (!quote) return;
-    const { normalizedHash, internalBoc } = await sendGasless({ quote });
-    console.log('Submitted. Hash:', normalizedHash, 'BoC:', internalBoc);
+    try {
+        const { internalBoc, normalizedHash } = await sendGasless({ quote });
+        console.log('Submitted. Hash:', normalizedHash, 'BoC:', internalBoc);
+    } catch (e) {
+        console.error(e);
+    }
 };
 
 return (
@@ -926,35 +975,6 @@ return (
 );
 ```
 
-### `useGaslessProvider`
-
-Hook to read and change the currently selected gasless provider. Returns a tuple `[provider, setProviderId]` — mirrors `useSwapProvider`.
-
-```tsx
-const [provider, setProviderId] = useGaslessProvider();
-return (
-    <div>
-        <div>Current: {provider?.providerId ?? 'none'}</div>
-        <button onClick={() => setProviderId('tonapi')}>Use TonApi</button>
-    </div>
-);
-```
-
-### `useGaslessProviders`
-
-Hook to get all registered gasless providers. The returned array keeps a stable reference until the provider list changes.
-
-```tsx
-const providers = useGaslessProviders();
-return (
-    <ul>
-        {providers.map((p) => (
-            <li key={p.providerId}>{p.providerId}</li>
-        ))}
-    </ul>
-);
-```
-
 ## Transaction
 
 ### `useSendTransaction`
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 4b4ee78e1..76074fe47 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -634,7 +634,7 @@ console.log('Staked Balance:', balance);
 
 ## Gasless
 
-Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, taking a jetton fee in return. The connected wallet must support the `SignMessage` TonConnect feature.
+Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT). The connected wallet must support the `SignMessage` TonConnect feature. See the [gasless guide](./gasless.md) for a regular-send → gasless-send migration.
 
 The high-level flow is:
 1. `getGaslessSupportedAssets` – discover which assets the relayer accepts as fee payment.
@@ -659,7 +659,7 @@ const provider = getGaslessProvider(appKit, { id: 'tonapi' });
 
 ### `getGaslessProviders`
 
-Get all registered gasless providers. The returned array keeps a stable reference until the provider list changes.
+Get all registered gasless providers.
 
 ```ts
 const providers = getGaslessProviders(appKit);
@@ -704,13 +704,12 @@ Discover the assets the gasless relayer accepts as fee payment.
 ```ts
 const supportedAssets = await getGaslessSupportedAssets(appKit);
 const feeAsset = supportedAssets[0].address;
+console.log('Supported fee assets:', supportedAssets.length);
 ```
 
 ### `getGaslessQuote`
 
-Ask the relayer for a gasless transaction quote. Returns relayer-wrapped messages, the fee charged in the chosen `feeAsset`, and the bundle validity window (`validUntil`). Omit `feeAsset` for free / sponsored providers — jetton-fee providers (like TonAPI) throw `GaslessError(UNSUPPORTED_OPERATION)` in that case.
-
-The quote is intended to be passed verbatim to `sendGaslessTransaction`. Quotes are typically valid for ~2 minutes.
+Ask the relayer for a gasless transaction quote. Returns relayer-wrapped messages, the fee charged in the chosen `feeAsset`, and the bundle validity window (`validUntil`). Omit `feeAsset` for free / sponsored providers — jetton-fee providers (like TonAPI) throw `GaslessError(UNSUPPORTED_OPERATION)` in that case. Quotes are typically valid for ~2 minutes.
 
 ```ts
 const quote = await getGaslessQuote(appKit, {
@@ -719,27 +718,24 @@ const quote = await getGaslessQuote(appKit, {
         {
             address: 'EQ...jetton_wallet_address',
             amount: '60000000', // 0.06 TON gas budget
-            payload: jettonTransferPayloadBase64,
+            payload: 'te6cckEBAQEAAgAAAA==' as never,
         },
     ],
 });
-console.log('Relayer fee:', quote.fee);
-console.log('Valid until:', new Date(quote.validUntil * 1000));
+console.log('Relayer fee:', quote.fee, 'valid until:', quote.validUntil);
 ```
 
 ### `sendGaslessTransaction`
 
-Sign a previously computed gasless quote and submit the resulting BoC to the relayer.
-
-Quote freshness is owned by the query layer: `useGaslessQuote` uses a 2-minute `staleTime` matching the relayer `validUntil` window. If you submit a stale quote anyway, the relayer rejects it and the error surfaces through `gaslessManager.sendTransaction`.
+Sign a previously computed gasless quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` — a strict superset of `SendTransactionResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
 
 Throws:
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the connected wallet does not advertise the `SignMessage` feature.
 - `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
 ```ts
-const { internalBoc, fee } = await sendGaslessTransaction(appKit, { quote });
-console.log('Submitted gasless transaction. Fee:', fee);
+const result = await sendGaslessTransaction(appKit, { quote });
+console.log('Submitted gasless transaction. Hash:', result.normalizedHash, 'BoC:', result.internalBoc);
 ```
 
 ## Transaction
diff --git a/packages/appkit/docs/gasless.md b/packages/appkit/docs/gasless.md
new file mode 100644
index 000000000..7c77ea022
--- /dev/null
+++ b/packages/appkit/docs/gasless.md
@@ -0,0 +1,149 @@
+# Gasless
+
+AppKit supports gasless transactions: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT) instead of TON. Useful when the user holds jettons but no TON.
+
+Available providers:
+
+- **createTonApiGaslessProvider** – relay via the [TonAPI gasless REST API](https://docs.tonapi.io/tonapi/rest-api/gasless) (no extra dependencies, [provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md))
+
+## Wallet requirements
+
+The connected wallet must advertise the `SignMessage` TonConnect feature. Gasless sends the *internal* message BoC to the relayer instead of an external message, so the wallet needs a different signing capability than `sendTransaction`. Check via `wallet.getSupportedFeatures()` — `sendGaslessTransaction` throws `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the feature is missing.
+
+## Setup
+
+Pass `createTonApiGaslessProvider()` to the `AppKit` constructor. With no arguments, the factory auto-registers every network the kit was configured with:
+
+```ts
+// Initialize AppKit with the TonAPI gasless provider.
+// With no arguments, the factory auto-registers every network the kit was configured with.
+const appKit = new AppKit({
+    networks: {
+        [Network.mainnet().chainId]: {
+            apiClient: { url: 'https://toncenter.com', key: 'your-key' },
+        },
+    },
+    providers: [createTonApiGaslessProvider()],
+});
+```
+
+To pass per-chain `apiKey` / `endpoint` overrides:
+
+```ts
+// Per-chain overrides — pass an `apiKey` and/or `endpoint` per network.
+const appKit = new AppKit({
+    networks: {
+        [Network.mainnet().chainId]: {
+            apiClient: { url: 'https://toncenter.com', key: 'your-key' },
+        },
+    },
+    providers: [
+        createTonApiGaslessProvider({
+            chains: {
+                [Network.mainnet().chainId]: { apiKey: process.env.TON_API_KEY },
+            },
+        }),
+    ],
+});
+```
+
+## Regular vs. gasless USDT transfer
+
+Both flows produce the same on-chain outcome — a USDT jetton transfer from the user. The difference is *who pays the TON gas* and *what the wallet signs*.
+
+### Regular jetton transfer (user pays TON gas)
+
+```ts
+const wallet = getSelectedWallet(appKit);
+if (!wallet) throw new Error('No wallet connected');
+const ownerAddress = wallet.getAddress();
+
+const usdtWallet = await getJettonWalletAddress(appKit, {
+    jettonAddress: USDT_MASTER,
+    ownerAddress,
+});
+
+const payload = createJettonTransferPayload({
+    amount: parseUnits(amount, USDT_DECIMALS),
+    destination: recipient,
+    responseDestination: ownerAddress,
+});
+
+const messages = [
+    {
+        address: usdtWallet,
+        amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
+        payload: asBase64(payload.toBoc().toString('base64')),
+    },
+];
+
+await sendTransaction(appKit, { messages });
+```
+
+Cost: the user spends **~0.06 TON** on gas (whatever is unused is refunded). Wallet needs the `SendTransaction` feature (almost all do).
+
+### Gasless jetton transfer (user pays only the jetton fee)
+
+```ts
+const wallet = getSelectedWallet(appKit);
+if (!wallet) throw new Error('No wallet connected');
+const ownerAddress = wallet.getAddress();
+
+const usdtWallet = await getJettonWalletAddress(appKit, {
+    jettonAddress: USDT_MASTER,
+    ownerAddress,
+});
+
+const payload = createJettonTransferPayload({
+    amount: parseUnits(amount, USDT_DECIMALS),
+    destination: recipient,
+    responseDestination: ownerAddress,
+});
+
+const messages = [
+    {
+        address: usdtWallet,
+        amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
+        payload: asBase64(payload.toBoc().toString('base64')),
+    },
+];
+
+const quote = await getGaslessQuote(appKit, { messages });
+await sendGaslessTransaction(appKit, { quote });
+```
+
+Cost: the user spends **0 TON** and a small amount of USDT (the relayer fee, shown in `quote.fee`). Wallet needs the `SignMessage` feature.
+
+## Migration recipe
+
+The jetton-transfer payload and the `messages` array are unchanged — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages })` followed by `sendGaslessTransaction(appKit, { quote })`.
+
+To pick a specific fee asset, pass `feeAsset` to `getGaslessQuote`. Discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)` — or hardcode the jetton master you want to charge in.
+
+For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`) — see [hooks reference](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless).
+
+## Error codes
+
+| Code | When it happens |
+|---|---|
+| `UNSUPPORTED_FEE_ASSET` | Relayer does not accept the chosen `feeAsset`. Surfaced from TonAPI's `error_code: 40000`. |
+| `UNSUPPORTED_OPERATION` | Provider does not implement the requested mode (e.g. TonAPI requires `feeAsset`). |
+| `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
+| `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
+| `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
+| `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
+| `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
+
+## Related
+
+- [Gasless API reference (actions)](./actions.md#gasless)
+- [Gasless React hooks](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless)
+- [TonApi gasless provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md)
+- [Gasless Manager (walletkit)](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/README.md)
+
+<!--
+This file is auto-generated. Do not edit manually.
+Changes will be overwritten when running the docs update script.
+Source template: template/packages/appkit/docs/gasless.md
+-->
+
diff --git a/template/packages/appkit-react/docs/hooks.md b/template/packages/appkit-react/docs/hooks.md
index 8f07ba845..45b10c98b 100644
--- a/template/packages/appkit-react/docs/hooks.md
+++ b/template/packages/appkit-react/docs/hooks.md
@@ -238,6 +238,50 @@ Hook to build a stake transaction from a previously fetched quote.
 
 %%demo/examples/src/appkit/hooks/staking#USE_BUILD_STAKE_TRANSACTION%%
 
+## Gasless
+
+Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT). The connected wallet must support the `SignMessage` TonConnect feature. See the [gasless guide](https://github.com/ton-connect/kit/blob/main/packages/appkit/docs/gasless.md) for a regular-send → gasless-send migration.
+
+### `useGaslessProviders`
+
+Hook to get all registered gasless providers.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_PROVIDERS%%
+
+### `useGaslessProvider`
+
+Hook to get the current default gasless provider and a setter to switch the default.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_PROVIDER%%
+
+### `useGaslessProviderMetadata`
+
+Hook to fetch static metadata (display name, logo, url) for a gasless provider.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_PROVIDER_METADATA%%
+
+### `useGaslessSupportedAssets`
+
+Hook to discover the assets the gasless relayer accepts as fee payment.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_SUPPORTED_ASSETS%%
+
+### `useGaslessQuote`
+
+Hook to fetch a gasless quote. Auto-refetches as inputs change; cached results become stale after ~2 minutes (matches the relayer `validUntil` window). Omit `feeAsset` for free / sponsored providers — jetton-fee providers throw `GaslessError(UNSUPPORTED_OPERATION)` in that case.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_QUOTE%%
+
+### `useSendGaslessTransaction`
+
+Hook to sign a previously computed quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
+
+Throws:
+- `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the wallet does not advertise `SignMessage`.
+- `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_SEND_GASLESS_TRANSACTION%%
+
 ## Transaction
 
 ### `useSendTransaction`
diff --git a/template/packages/appkit/docs/actions.md b/template/packages/appkit/docs/actions.md
index abdd49261..afc0ae64d 100644
--- a/template/packages/appkit/docs/actions.md
+++ b/template/packages/appkit/docs/actions.md
@@ -318,6 +318,73 @@ Get the user's staked balance.
 
 %%demo/examples/src/appkit/actions/staking#GET_STAKED_BALANCE%%
 
+## Gasless
+
+Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT). The connected wallet must support the `SignMessage` TonConnect feature. See the [gasless guide](./gasless.md) for a regular-send → gasless-send migration.
+
+The high-level flow is:
+1. `getGaslessSupportedAssets` – discover which assets the relayer accepts as fee payment.
+2. `getGaslessQuote` – ask the relayer for fee + wrapped messages (with a `validUntil`).
+3. `sendGaslessTransaction` – sign the wrapped messages via the wallet and submit the signed BoC.
+
+### `getGaslessManager`
+
+Get the `GaslessManager` instance to interact with gasless providers directly.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_MANAGER%%
+
+### `getGaslessProvider`
+
+Get a specific gasless provider by its ID. Uses the default provider when no `id` is supplied.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_PROVIDER%%
+
+### `getGaslessProviders`
+
+Get all registered gasless providers.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_PROVIDERS%%
+
+### `setDefaultGaslessProvider`
+
+Set the default gasless provider. Subsequent quote and send calls will use this provider when none is specified.
+
+%%demo/examples/src/appkit/actions/gasless#SET_DEFAULT_GASLESS_PROVIDER%%
+
+### `watchGaslessProviders`
+
+Watch for new gasless provider registrations and default-provider changes.
+
+%%demo/examples/src/appkit/actions/gasless#WATCH_GASLESS_PROVIDERS%%
+
+### `getGaslessProviderMetadata`
+
+Fetch static metadata (display name, logo, url) for a gasless provider.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_PROVIDER_METADATA%%
+
+### `getGaslessSupportedAssets`
+
+Discover the assets the gasless relayer accepts as fee payment.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_SUPPORTED_ASSETS%%
+
+### `getGaslessQuote`
+
+Ask the relayer for a gasless transaction quote. Returns relayer-wrapped messages, the fee charged in the chosen `feeAsset`, and the bundle validity window (`validUntil`). Omit `feeAsset` for free / sponsored providers — jetton-fee providers (like TonAPI) throw `GaslessError(UNSUPPORTED_OPERATION)` in that case. Quotes are typically valid for ~2 minutes.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_QUOTE%%
+
+### `sendGaslessTransaction`
+
+Sign a previously computed gasless quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` — a strict superset of `SendTransactionResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
+
+Throws:
+- `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the connected wallet does not advertise the `SignMessage` feature.
+- `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
+
+%%demo/examples/src/appkit/actions/gasless#SEND_GASLESS_TRANSACTION%%
+
 ## Transaction
 
 ### `createTransferTonTransaction`
diff --git a/template/packages/appkit/docs/gasless.md b/template/packages/appkit/docs/gasless.md
new file mode 100644
index 000000000..82a952394
--- /dev/null
+++ b/template/packages/appkit/docs/gasless.md
@@ -0,0 +1,68 @@
+---
+target: packages/appkit/docs/gasless.md
+---
+
+# Gasless
+
+AppKit supports gasless transactions: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT) instead of TON. Useful when the user holds jettons but no TON.
+
+Available providers:
+
+- **createTonApiGaslessProvider** – relay via the [TonAPI gasless REST API](https://docs.tonapi.io/tonapi/rest-api/gasless) (no extra dependencies, [provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md))
+
+## Wallet requirements
+
+The connected wallet must advertise the `SignMessage` TonConnect feature. Gasless sends the *internal* message BoC to the relayer instead of an external message, so the wallet needs a different signing capability than `sendTransaction`. Check via `wallet.getSupportedFeatures()` — `sendGaslessTransaction` throws `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the feature is missing.
+
+## Setup
+
+Pass `createTonApiGaslessProvider()` to the `AppKit` constructor. With no arguments, the factory auto-registers every network the kit was configured with:
+
+%%demo/examples/src/appkit/gasless#GASLESS_PROVIDER_INIT%%
+
+To pass per-chain `apiKey` / `endpoint` overrides:
+
+%%demo/examples/src/appkit/gasless#GASLESS_PROVIDER_CHAINS%%
+
+## Regular vs. gasless USDT transfer
+
+Both flows produce the same on-chain outcome — a USDT jetton transfer from the user. The difference is *who pays the TON gas* and *what the wallet signs*.
+
+### Regular jetton transfer (user pays TON gas)
+
+%%demo/examples/src/appkit/gasless#SEND_USDT_REGULAR%%
+
+Cost: the user spends **~0.06 TON** on gas (whatever is unused is refunded). Wallet needs the `SendTransaction` feature (almost all do).
+
+### Gasless jetton transfer (user pays only the jetton fee)
+
+%%demo/examples/src/appkit/gasless#SEND_USDT_GASLESS%%
+
+Cost: the user spends **0 TON** and a small amount of USDT (the relayer fee, shown in `quote.fee`). Wallet needs the `SignMessage` feature.
+
+## Migration recipe
+
+The jetton-transfer payload and the `messages` array are unchanged — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages })` followed by `sendGaslessTransaction(appKit, { quote })`.
+
+To pick a specific fee asset, pass `feeAsset` to `getGaslessQuote`. Discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)` — or hardcode the jetton master you want to charge in.
+
+For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`) — see [hooks reference](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless).
+
+## Error codes
+
+| Code | When it happens |
+|---|---|
+| `UNSUPPORTED_FEE_ASSET` | Relayer does not accept the chosen `feeAsset`. Surfaced from TonAPI's `error_code: 40000`. |
+| `UNSUPPORTED_OPERATION` | Provider does not implement the requested mode (e.g. TonAPI requires `feeAsset`). |
+| `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
+| `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
+| `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
+| `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
+| `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
+
+## Related
+
+- [Gasless API reference (actions)](./actions.md#gasless)
+- [Gasless React hooks](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless)
+- [TonApi gasless provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md)
+- [Gasless Manager (walletkit)](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/README.md)

From 0a971c1cdc310e89708d0f3218794cf4b5c1cadd Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Tue, 26 May 2026 00:20:13 +0400
Subject: [PATCH 17/46] feat(gasless): delete links from doc

---
 packages/appkit/docs/gasless.md          | 11 ++---------
 template/packages/appkit/docs/gasless.md | 11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/packages/appkit/docs/gasless.md b/packages/appkit/docs/gasless.md
index 7c77ea022..721c58276 100644
--- a/packages/appkit/docs/gasless.md
+++ b/packages/appkit/docs/gasless.md
@@ -4,7 +4,7 @@ AppKit supports gasless transactions: a relayer co-signs and broadcasts the tran
 
 Available providers:
 
-- **createTonApiGaslessProvider** – relay via the [TonAPI gasless REST API](https://docs.tonapi.io/tonapi/rest-api/gasless) (no extra dependencies, [provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md))
+- **createTonApiGaslessProvider** – relay via the TonAPI gasless REST API (no extra dependencies)
 
 ## Wallet requirements
 
@@ -120,7 +120,7 @@ The jetton-transfer payload and the `messages` array are unchanged — the relay
 
 To pick a specific fee asset, pass `feeAsset` to `getGaslessQuote`. Discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)` — or hardcode the jetton master you want to charge in.
 
-For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`) — see [hooks reference](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless).
+For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`).
 
 ## Error codes
 
@@ -134,13 +134,6 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
 | `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
 
-## Related
-
-- [Gasless API reference (actions)](./actions.md#gasless)
-- [Gasless React hooks](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless)
-- [TonApi gasless provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md)
-- [Gasless Manager (walletkit)](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/README.md)
-
 <!--
 This file is auto-generated. Do not edit manually.
 Changes will be overwritten when running the docs update script.
diff --git a/template/packages/appkit/docs/gasless.md b/template/packages/appkit/docs/gasless.md
index 82a952394..d1ba6c8cd 100644
--- a/template/packages/appkit/docs/gasless.md
+++ b/template/packages/appkit/docs/gasless.md
@@ -8,7 +8,7 @@ AppKit supports gasless transactions: a relayer co-signs and broadcasts the tran
 
 Available providers:
 
-- **createTonApiGaslessProvider** – relay via the [TonAPI gasless REST API](https://docs.tonapi.io/tonapi/rest-api/gasless) (no extra dependencies, [provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md))
+- **createTonApiGaslessProvider** – relay via the TonAPI gasless REST API (no extra dependencies)
 
 ## Wallet requirements
 
@@ -46,7 +46,7 @@ The jetton-transfer payload and the `messages` array are unchanged — the relay
 
 To pick a specific fee asset, pass `feeAsset` to `getGaslessQuote`. Discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)` — or hardcode the jetton master you want to charge in.
 
-For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`) — see [hooks reference](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless).
+For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`).
 
 ## Error codes
 
@@ -59,10 +59,3 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 | `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
 | `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
-
-## Related
-
-- [Gasless API reference (actions)](./actions.md#gasless)
-- [Gasless React hooks](https://github.com/ton-connect/kit/blob/main/packages/appkit-react/docs/hooks.md#gasless)
-- [TonApi gasless provider README](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/tonapi/README.md)
-- [Gasless Manager (walletkit)](https://github.com/ton-connect/kit/blob/main/packages/walletkit/src/defi/gasless/README.md)

From 75d8b64ad71b7c38e543d617824bdcfa5ec45884 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Tue, 26 May 2026 00:29:02 +0400
Subject: [PATCH 18/46] feat(gasless): reinstall deps

---
 pnpm-lock.yaml | 975 +++----------------------------------------------
 1 file changed, 41 insertions(+), 934 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5d6a1e1be..c762ff6a1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -682,9 +682,6 @@ importers:
       clsx:
         specifier: 2.1.1
         version: 2.1.1
-      radix-ui:
-        specifier: ^1.4.3
-        version: 1.4.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       rosetta:
         specifier: 1.1.0
         version: 1.1.0
@@ -2593,45 +2590,6 @@ packages:
   '@radix-ui/primitive@1.1.3':
     resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==}
 
-  '@radix-ui/react-accessible-icon@1.1.7':
-    resolution: {integrity: sha512-XM+E4WXl0OqUJFovy6GjmxxFyx9opfCAIUku4dlKRd5YEPqt4kALOkQOp0Of6reHuUkJuiPBEc5k0o4z4lTC8A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-accordion@1.2.12':
-    resolution: {integrity: sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-alert-dialog@1.1.15':
-    resolution: {integrity: sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-arrow@1.1.7':
     resolution: {integrity: sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==}
     peerDependencies:
@@ -2645,58 +2603,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-aspect-ratio@1.1.7':
-    resolution: {integrity: sha512-Yq6lvO9HQyPwev1onK1daHCHqXVLzPhSVjmsNjCa2Zcxy2f7uJD2itDtxknv6FzAKCwD1qQkeVDmX/cev13n/g==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-avatar@1.1.10':
-    resolution: {integrity: sha512-V8piFfWapM5OmNCXTzVQY+E1rDa53zY+MQ4Y7356v4fFz6vqCyUtIz2rUD44ZEdwg78/jKmMJHj07+C/Z/rcog==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-checkbox@1.3.3':
-    resolution: {integrity: sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-collapsible@1.1.12':
-    resolution: {integrity: sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-collection@1.1.7':
     resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==}
     peerDependencies:
@@ -2719,19 +2625,6 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-context-menu@2.2.16':
-    resolution: {integrity: sha512-O8morBEW+HsVG28gYDZPTrT9UUovQUlJue5YO836tiTJhuIWBm/zQHc7j388sHWtdH/xUZurK9olD2+pcqx5ww==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-context@1.1.2':
     resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==}
     peerDependencies:
@@ -2776,19 +2669,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-dropdown-menu@2.1.16':
-    resolution: {integrity: sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-focus-guards@1.1.3':
     resolution: {integrity: sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==}
     peerDependencies:
@@ -2811,32 +2691,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-form@0.1.8':
-    resolution: {integrity: sha512-QM70k4Zwjttifr5a4sZFts9fn8FzHYvQ5PiB19O2HsYibaHSVt9fH9rzB0XZo/YcM+b7t/p7lYCT/F5eOeF5yQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-hover-card@1.1.15':
-    resolution: {integrity: sha512-qgTkjNT1CfKMoP0rcasmlH2r1DAiYicWsDsufxl940sT2wHNEWWv6FMWIQXWhVdmC1d/HYfbhQx60KYyAtKxjg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-id@1.1.1':
     resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==}
     peerDependencies:
@@ -2846,84 +2700,6 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-label@2.1.7':
-    resolution: {integrity: sha512-YT1GqPSL8kJn20djelMX7/cTRp/Y9w5IZHvfxQTVHrOqa2yMl7i/UfMqKRU5V7mEyKTrUVgJXhNQPVCG8PBLoQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-menu@2.1.16':
-    resolution: {integrity: sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-menubar@1.1.16':
-    resolution: {integrity: sha512-EB1FktTz5xRRi2Er974AUQZWg2yVBb1yjip38/lgwtCVRd3a+maUoGHN/xs9Yv8SY8QwbSEb+YrxGadVWbEutA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-navigation-menu@1.2.14':
-    resolution: {integrity: sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-one-time-password-field@0.1.8':
-    resolution: {integrity: sha512-ycS4rbwURavDPVjCb5iS3aG4lURFDILi6sKI/WITUMZ13gMmn/xGjpLoqBAalhJaDk8I3UbCM5GzKHrnzwHbvg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-password-toggle-field@0.1.3':
-    resolution: {integrity: sha512-/UuCrDBWravcaMix4TdT+qlNdVwOM1Nck9kWx/vafXsdfj1ChfhOdfi3cy9SGBpWgTXwYCuboT/oYpJy3clqfw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-popover@1.1.15':
     resolution: {integrity: sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==}
     peerDependencies:
@@ -3002,32 +2778,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-progress@1.1.7':
-    resolution: {integrity: sha512-vPdg/tF6YC/ynuBIJlk1mm7Le0VgW6ub6J2UWnTQ7/D23KXcPI1qy+0vBkgKgd38RCMJavBXpB83HPNFMTb0Fg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-radio-group@1.3.8':
-    resolution: {integrity: sha512-VBKYIYImA5zsxACdisNQ3BjCBfmbGH3kQlnFVqlWU4tXwjy7cGX8ta80BcrO+WJXIn5iBylEH3K6ZTlee//lgQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-roving-focus@1.1.11':
     resolution: {integrity: sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==}
     peerDependencies:
@@ -3041,19 +2791,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-scroll-area@1.2.10':
-    resolution: {integrity: sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-select@2.2.6':
     resolution: {integrity: sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==}
     peerDependencies:
@@ -3067,19 +2804,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-separator@1.1.7':
-    resolution: {integrity: sha512-0HEb8R9E8A+jZjvmFCy/J4xhbXy3TV+9XSnGJ3KvTtjlIUy/YQ/p6UYZvi7YbeoeXdyU9+Y3scizK6hkY37baA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-separator@1.1.8':
     resolution: {integrity: sha512-sDvqVY4itsKwwSMEe0jtKgfTh+72Sy3gPmQpjqcQneqQ4PFmr/1I0YA+2/puilhggCe2gJcx5EBAYFkWkdpa5g==}
     peerDependencies:
@@ -3093,19 +2817,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-slider@1.3.6':
-    resolution: {integrity: sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-slot@1.2.0':
     resolution: {integrity: sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==}
     peerDependencies:
@@ -3133,19 +2844,6 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-switch@1.2.6':
-    resolution: {integrity: sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-tabs@1.1.13':
     resolution: {integrity: sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==}
     peerDependencies:
@@ -3159,58 +2857,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-toast@1.2.15':
-    resolution: {integrity: sha512-3OSz3TacUWy4WtOXV38DggwxoqJK4+eDkNMl5Z/MJZaoUPaP4/9lf81xXMe1I2ReTAptverZUpbPY4wWwWyL5g==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-toggle-group@1.1.11':
-    resolution: {integrity: sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-toggle@1.1.10':
-    resolution: {integrity: sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
-  '@radix-ui/react-toolbar@1.1.11':
-    resolution: {integrity: sha512-4ol06/1bLoFu1nwUqzdD4Y5RZ9oDdKeiHIsntug54Hcr1pgaHiPqHFEaXI1IFP/EsOfROQZ8Mig9VTIRza6Tjg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-tooltip@1.2.8':
     resolution: {integrity: sha512-tY7sVt1yL9ozIxvmbtN5qtmH2krXcBCfjEiCgKGLqunJHvgvZG2Pcl2oQ3kbcZARb1BGEHdkLzcYGO8ynVlieg==}
     peerDependencies:
@@ -3260,15 +2906,6 @@ packages:
       '@types/react':
         optional: true
 
-  '@radix-ui/react-use-is-hydrated@0.1.0':
-    resolution: {integrity: sha512-U+UORVEq+cTnRIaostJv9AGdV3G6Y+zbVd+12e18jQ5A3c0xL03IhnHuiU4UV69wolOQp5GfR58NW/EgdQhwOA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-
   '@radix-ui/react-use-layout-effect@1.1.1':
     resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
     peerDependencies:
@@ -8290,22 +7927,9 @@ packages:
   queue@6.0.2:
     resolution: {integrity: sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==}
 
-  quick-format-unescaped@4.0.4:
-    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
-
-  radix-ui@1.4.3:
-    resolution: {integrity: sha512-aWizCQiyeAenIdUbqEpXgRA1ya65P13NKn/W8rWkcN0OPkRDxdBVLWnIEDsS2RpwCK2nobI7oMUSmexzTDyAmA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
+  quick-format-unescaped@4.0.4:
+    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
+
   randombytes@2.1.0:
     resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
 
@@ -12298,46 +11922,6 @@ snapshots:
 
   '@radix-ui/primitive@1.1.3': {}
 
-  '@radix-ui/react-accessible-icon@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-accordion@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-alert-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -12347,60 +11931,6 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-aspect-ratio@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-avatar@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-checkbox@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-collapsible@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
@@ -12437,20 +11967,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.3
 
-  '@radix-ui/react-context-menu@2.2.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.1.0)':
     dependencies:
       react: 19.1.0
@@ -12533,223 +12049,66 @@ snapshots:
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
   '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-dropdown-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.1.0)':
-    dependencies:
-      react: 19.1.0
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.3)(react@19.2.3)':
-    dependencies:
-      react: 19.2.3
-    optionalDependencies:
-      '@types/react': 19.2.3
-
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.1.0)
-      react: 19.1.0
-      react-dom: 19.2.3(react@19.1.0)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-form@0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-label': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-hover-card@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.1.0)':
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.1.0)
-      react: 19.1.0
-    optionalDependencies:
-      '@types/react': 19.2.14
-
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.3)(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-    optionalDependencies:
-      '@types/react': 19.2.3
-
-  '@radix-ui/react-label@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      aria-hidden: 1.2.6
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-      react-remove-scroll: 2.7.2(@types/react@19.2.3)(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-menubar@1.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-navigation-menu@1.2.14(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
       '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.3)(react@19.2.3)
       react: 19.2.3
       react-dom: 19.2.3(react@19.2.3)
     optionalDependencies:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-one-time-password-field@0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.1.0)':
+    dependencies:
+      react: 19.1.0
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.3)(react@19.2.3)':
     dependencies:
-      '@radix-ui/number': 1.1.1
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
       react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
     optionalDependencies:
       '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-password-toggle-field@0.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.1.0)
+      react: 19.1.0
+      react-dom: 19.2.3(react@19.1.0)
+    optionalDependencies:
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
+
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
-      '@radix-ui/primitive': 1.1.3
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
       '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
       react: 19.2.3
       react-dom: 19.2.3(react@19.2.3)
     optionalDependencies:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.1.0)':
+    dependencies:
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.1.0)
+      react: 19.1.0
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.3)(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+    optionalDependencies:
+      '@types/react': 19.2.3
+
   '@radix-ui/react-popover@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -12858,34 +12217,6 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-progress@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-radio-group@1.3.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -12903,40 +12234,6 @@ snapshots:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-scroll-area@1.2.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/number': 1.1.1
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-select@2.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/number': 1.1.1
@@ -12966,15 +12263,6 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-separator@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-separator@1.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -12984,25 +12272,6 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-slider@1.3.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/number': 1.1.1
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-slot@1.2.0(@types/react@19.2.14)(react@19.1.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
@@ -13031,21 +12300,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.3
 
-  '@radix-ui/react-switch@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-tabs@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -13062,83 +12316,6 @@ snapshots:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-tabs@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-toast@1.2.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-toggle-group@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-toggle': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-toggle@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
-  '@radix-ui/react-toolbar@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-separator': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-toggle-group': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   '@radix-ui/react-tooltip@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -13215,13 +12392,6 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.3
 
-  '@radix-ui/react-use-is-hydrated@0.1.0(@types/react@19.2.3)(react@19.2.3)':
-    dependencies:
-      react: 19.2.3
-      use-sync-external-store: 1.6.0(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-
   '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.1.0)':
     dependencies:
       react: 19.1.0
@@ -19114,69 +18284,6 @@ snapshots:
 
   quick-format-unescaped@4.0.4: {}
 
-  radix-ui@1.4.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
-    dependencies:
-      '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-accessible-icon': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-accordion': 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-alert-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-aspect-ratio': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-avatar': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-checkbox': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-context-menu': 2.2.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-dropdown-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-form': 0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-hover-card': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-label': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-menubar': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-navigation-menu': 1.2.14(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-one-time-password-field': 0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-password-toggle-field': 0.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-popover': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-progress': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-radio-group': 1.3.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-scroll-area': 1.2.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-select': 2.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-separator': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-slider': 1.3.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-switch': 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-tabs': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-toast': 1.2.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-toggle': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-toggle-group': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-toolbar': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-tooltip': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
-      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
-      react: 19.2.3
-      react-dom: 19.2.3(react@19.2.3)
-    optionalDependencies:
-      '@types/react': 19.2.3
-      '@types/react-dom': 19.2.3(@types/react@19.2.3)
-
   randombytes@2.1.0:
     dependencies:
       safe-buffer: 5.2.1

From 4b5b940583eaefabca2e74adf4ecf73d46def8fa Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Tue, 26 May 2026 00:53:06 +0400
Subject: [PATCH 19/46] feat(gasless): get radix back

---
 packages/appkit-react/package.json |   1 +
 pnpm-lock.yaml                     | 949 ++++++++++++++++++++++++++++-
 2 files changed, 922 insertions(+), 28 deletions(-)

diff --git a/packages/appkit-react/package.json b/packages/appkit-react/package.json
index fcb3b63f6..82ddcba2a 100644
--- a/packages/appkit-react/package.json
+++ b/packages/appkit-react/package.json
@@ -45,6 +45,7 @@
   "dependencies": {
     "@ton/appkit": "workspace:*",
     "clsx": "2.1.1",
+    "radix-ui": "^1.4.3",
     "rosetta": "1.1.0"
   },
   "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c762ff6a1..5d6a1e1be 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -682,6 +682,9 @@ importers:
       clsx:
         specifier: 2.1.1
         version: 2.1.1
+      radix-ui:
+        specifier: ^1.4.3
+        version: 1.4.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       rosetta:
         specifier: 1.1.0
         version: 1.1.0
@@ -2590,6 +2593,45 @@ packages:
   '@radix-ui/primitive@1.1.3':
     resolution: {integrity: sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==}
 
+  '@radix-ui/react-accessible-icon@1.1.7':
+    resolution: {integrity: sha512-XM+E4WXl0OqUJFovy6GjmxxFyx9opfCAIUku4dlKRd5YEPqt4kALOkQOp0Of6reHuUkJuiPBEc5k0o4z4lTC8A==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-accordion@1.2.12':
+    resolution: {integrity: sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-alert-dialog@1.1.15':
+    resolution: {integrity: sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-arrow@1.1.7':
     resolution: {integrity: sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==}
     peerDependencies:
@@ -2603,6 +2645,58 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-aspect-ratio@1.1.7':
+    resolution: {integrity: sha512-Yq6lvO9HQyPwev1onK1daHCHqXVLzPhSVjmsNjCa2Zcxy2f7uJD2itDtxknv6FzAKCwD1qQkeVDmX/cev13n/g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-avatar@1.1.10':
+    resolution: {integrity: sha512-V8piFfWapM5OmNCXTzVQY+E1rDa53zY+MQ4Y7356v4fFz6vqCyUtIz2rUD44ZEdwg78/jKmMJHj07+C/Z/rcog==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-checkbox@1.3.3':
+    resolution: {integrity: sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-collapsible@1.1.12':
+    resolution: {integrity: sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-collection@1.1.7':
     resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==}
     peerDependencies:
@@ -2625,6 +2719,19 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-context-menu@2.2.16':
+    resolution: {integrity: sha512-O8morBEW+HsVG28gYDZPTrT9UUovQUlJue5YO836tiTJhuIWBm/zQHc7j388sHWtdH/xUZurK9olD2+pcqx5ww==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-context@1.1.2':
     resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==}
     peerDependencies:
@@ -2669,6 +2776,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-dropdown-menu@2.1.16':
+    resolution: {integrity: sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-focus-guards@1.1.3':
     resolution: {integrity: sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==}
     peerDependencies:
@@ -2691,6 +2811,32 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-form@0.1.8':
+    resolution: {integrity: sha512-QM70k4Zwjttifr5a4sZFts9fn8FzHYvQ5PiB19O2HsYibaHSVt9fH9rzB0XZo/YcM+b7t/p7lYCT/F5eOeF5yQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-hover-card@1.1.15':
+    resolution: {integrity: sha512-qgTkjNT1CfKMoP0rcasmlH2r1DAiYicWsDsufxl940sT2wHNEWWv6FMWIQXWhVdmC1d/HYfbhQx60KYyAtKxjg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-id@1.1.1':
     resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==}
     peerDependencies:
@@ -2700,6 +2846,84 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-label@2.1.7':
+    resolution: {integrity: sha512-YT1GqPSL8kJn20djelMX7/cTRp/Y9w5IZHvfxQTVHrOqa2yMl7i/UfMqKRU5V7mEyKTrUVgJXhNQPVCG8PBLoQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-menu@2.1.16':
+    resolution: {integrity: sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-menubar@1.1.16':
+    resolution: {integrity: sha512-EB1FktTz5xRRi2Er974AUQZWg2yVBb1yjip38/lgwtCVRd3a+maUoGHN/xs9Yv8SY8QwbSEb+YrxGadVWbEutA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-navigation-menu@1.2.14':
+    resolution: {integrity: sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-one-time-password-field@0.1.8':
+    resolution: {integrity: sha512-ycS4rbwURavDPVjCb5iS3aG4lURFDILi6sKI/WITUMZ13gMmn/xGjpLoqBAalhJaDk8I3UbCM5GzKHrnzwHbvg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-password-toggle-field@0.1.3':
+    resolution: {integrity: sha512-/UuCrDBWravcaMix4TdT+qlNdVwOM1Nck9kWx/vafXsdfj1ChfhOdfi3cy9SGBpWgTXwYCuboT/oYpJy3clqfw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-popover@1.1.15':
     resolution: {integrity: sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==}
     peerDependencies:
@@ -2778,6 +3002,32 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-progress@1.1.7':
+    resolution: {integrity: sha512-vPdg/tF6YC/ynuBIJlk1mm7Le0VgW6ub6J2UWnTQ7/D23KXcPI1qy+0vBkgKgd38RCMJavBXpB83HPNFMTb0Fg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-radio-group@1.3.8':
+    resolution: {integrity: sha512-VBKYIYImA5zsxACdisNQ3BjCBfmbGH3kQlnFVqlWU4tXwjy7cGX8ta80BcrO+WJXIn5iBylEH3K6ZTlee//lgQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-roving-focus@1.1.11':
     resolution: {integrity: sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==}
     peerDependencies:
@@ -2791,6 +3041,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-scroll-area@1.2.10':
+    resolution: {integrity: sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-select@2.2.6':
     resolution: {integrity: sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==}
     peerDependencies:
@@ -2804,8 +3067,87 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-separator@1.1.8':
-    resolution: {integrity: sha512-sDvqVY4itsKwwSMEe0jtKgfTh+72Sy3gPmQpjqcQneqQ4PFmr/1I0YA+2/puilhggCe2gJcx5EBAYFkWkdpa5g==}
+  '@radix-ui/react-separator@1.1.7':
+    resolution: {integrity: sha512-0HEb8R9E8A+jZjvmFCy/J4xhbXy3TV+9XSnGJ3KvTtjlIUy/YQ/p6UYZvi7YbeoeXdyU9+Y3scizK6hkY37baA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-separator@1.1.8':
+    resolution: {integrity: sha512-sDvqVY4itsKwwSMEe0jtKgfTh+72Sy3gPmQpjqcQneqQ4PFmr/1I0YA+2/puilhggCe2gJcx5EBAYFkWkdpa5g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-slider@1.3.6':
+    resolution: {integrity: sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-slot@1.2.0':
+    resolution: {integrity: sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-slot@1.2.3':
+    resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-slot@1.2.4':
+    resolution: {integrity: sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-switch@1.2.6':
+    resolution: {integrity: sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-tabs@1.1.13':
+    resolution: {integrity: sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -2817,35 +3159,47 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-slot@1.2.0':
-    resolution: {integrity: sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==}
+  '@radix-ui/react-toast@1.2.15':
+    resolution: {integrity: sha512-3OSz3TacUWy4WtOXV38DggwxoqJK4+eDkNMl5Z/MJZaoUPaP4/9lf81xXMe1I2ReTAptverZUpbPY4wWwWyL5g==}
     peerDependencies:
       '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
+      '@types/react-dom':
+        optional: true
 
-  '@radix-ui/react-slot@1.2.3':
-    resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}
+  '@radix-ui/react-toggle-group@1.1.11':
+    resolution: {integrity: sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==}
     peerDependencies:
       '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
+      '@types/react-dom':
+        optional: true
 
-  '@radix-ui/react-slot@1.2.4':
-    resolution: {integrity: sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==}
+  '@radix-ui/react-toggle@1.1.10':
+    resolution: {integrity: sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==}
     peerDependencies:
       '@types/react': '*'
+      '@types/react-dom': '*'
       react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
     peerDependenciesMeta:
       '@types/react':
         optional: true
+      '@types/react-dom':
+        optional: true
 
-  '@radix-ui/react-tabs@1.1.13':
-    resolution: {integrity: sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==}
+  '@radix-ui/react-toolbar@1.1.11':
+    resolution: {integrity: sha512-4ol06/1bLoFu1nwUqzdD4Y5RZ9oDdKeiHIsntug54Hcr1pgaHiPqHFEaXI1IFP/EsOfROQZ8Mig9VTIRza6Tjg==}
     peerDependencies:
       '@types/react': '*'
       '@types/react-dom': '*'
@@ -2906,6 +3260,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-is-hydrated@0.1.0':
+    resolution: {integrity: sha512-U+UORVEq+cTnRIaostJv9AGdV3G6Y+zbVd+12e18jQ5A3c0xL03IhnHuiU4UV69wolOQp5GfR58NW/EgdQhwOA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-layout-effect@1.1.1':
     resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
     peerDependencies:
@@ -7930,6 +8293,19 @@ packages:
   quick-format-unescaped@4.0.4:
     resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
 
+  radix-ui@1.4.3:
+    resolution: {integrity: sha512-aWizCQiyeAenIdUbqEpXgRA1ya65P13NKn/W8rWkcN0OPkRDxdBVLWnIEDsS2RpwCK2nobI7oMUSmexzTDyAmA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   randombytes@2.1.0:
     resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
 
@@ -11922,6 +12298,46 @@ snapshots:
 
   '@radix-ui/primitive@1.1.3': {}
 
+  '@radix-ui/react-accessible-icon@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-accordion@1.2.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-alert-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-arrow@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -11931,6 +12347,60 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
+  '@radix-ui/react-aspect-ratio@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-avatar@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-checkbox@1.3.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-collapsible@1.1.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-collection@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
@@ -11967,6 +12437,20 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.3
 
+  '@radix-ui/react-context-menu@2.2.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.1.0)':
     dependencies:
       react: 19.1.0
@@ -12061,6 +12545,21 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
+  '@radix-ui/react-dropdown-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.1.0)':
     dependencies:
       react: 19.1.0
@@ -12073,41 +12572,183 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.3
 
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.1.0)
-      react: 19.1.0
-      react-dom: 19.2.3(react@19.1.0)
-    optionalDependencies:
-      '@types/react': 19.2.14
-      '@types/react-dom': 19.2.3(@types/react@19.2.14)
-
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.1.0)
+      react: 19.1.0
+      react-dom: 19.2.3(react@19.1.0)
+    optionalDependencies:
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
+
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-form@0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-label': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-hover-card@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.1.0)':
+    dependencies:
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.1.0)
+      react: 19.1.0
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.3)(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+    optionalDependencies:
+      '@types/react': 19.2.3
+
+  '@radix-ui/react-label@2.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-menu@2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      aria-hidden: 1.2.6
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+      react-remove-scroll: 2.7.2(@types/react@19.2.3)(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-menubar@1.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-navigation-menu@1.2.14(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       react: 19.2.3
       react-dom: 19.2.3(react@19.2.3)
     optionalDependencies:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.1.0)':
+  '@radix-ui/react-one-time-password-field@0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.1.0)
-      react: 19.1.0
+      '@radix-ui/number': 1.1.1
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
     optionalDependencies:
-      '@types/react': 19.2.14
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.3)(react@19.2.3)':
+  '@radix-ui/react-password-toggle-field@0.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
       react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
     optionalDependencies:
       '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
   '@radix-ui/react-popover@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
@@ -12217,6 +12858,34 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
+  '@radix-ui/react-progress@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-radio-group@1.3.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -12234,6 +12903,40 @@ snapshots:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
+  '@radix-ui/react-roving-focus@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-scroll-area@1.2.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/number': 1.1.1
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-select@2.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/number': 1.1.1
@@ -12263,6 +12966,15 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
+  '@radix-ui/react-separator@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-separator@1.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -12272,6 +12984,25 @@ snapshots:
       '@types/react': 19.2.3
       '@types/react-dom': 19.2.3(@types/react@19.2.3)
 
+  '@radix-ui/react-slider@1.3.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/number': 1.1.1
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-slot@1.2.0(@types/react@19.2.14)(react@19.1.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.1.0)
@@ -12300,6 +13031,21 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.3
 
+  '@radix-ui/react-switch@1.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-previous': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-tabs@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.1.0))(react@19.1.0)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -12316,6 +13062,83 @@ snapshots:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
+  '@radix-ui/react-tabs@1.1.13(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-toast@1.2.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-toggle-group@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-toggle': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-toggle@1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
+  '@radix-ui/react-toolbar@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-separator': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-toggle-group': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   '@radix-ui/react-tooltip@1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
@@ -12392,6 +13215,13 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.3
 
+  '@radix-ui/react-use-is-hydrated@0.1.0(@types/react@19.2.3)(react@19.2.3)':
+    dependencies:
+      react: 19.2.3
+      use-sync-external-store: 1.6.0(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+
   '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.1.0)':
     dependencies:
       react: 19.1.0
@@ -18284,6 +19114,69 @@ snapshots:
 
   quick-format-unescaped@4.0.4: {}
 
+  radix-ui@1.4.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
+    dependencies:
+      '@radix-ui/primitive': 1.1.3
+      '@radix-ui/react-accessible-icon': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-accordion': 1.2.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-alert-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-arrow': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-aspect-ratio': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-avatar': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-checkbox': 1.3.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-collapsible': 1.1.12(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-context-menu': 2.2.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-direction': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-dropdown-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-form': 0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-hover-card': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-label': 2.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-menu': 2.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-menubar': 1.1.16(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-navigation-menu': 1.2.14(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-one-time-password-field': 0.1.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-password-toggle-field': 0.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-popover': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-popper': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-progress': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-radio-group': 1.3.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-roving-focus': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-scroll-area': 1.2.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-select': 2.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-separator': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-slider': 1.3.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-switch': 1.2.6(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-tabs': 1.1.13(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-toast': 1.2.15(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-toggle': 1.1.10(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-toggle-group': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-toolbar': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-tooltip': 1.2.8(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-is-hydrated': 0.1.0(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-use-size': 1.1.1(@types/react@19.2.3)(react@19.2.3)
+      '@radix-ui/react-visually-hidden': 1.2.3(@types/react-dom@19.2.3(@types/react@19.2.3))(@types/react@19.2.3)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      react: 19.2.3
+      react-dom: 19.2.3(react@19.2.3)
+    optionalDependencies:
+      '@types/react': 19.2.3
+      '@types/react-dom': 19.2.3(@types/react@19.2.3)
+
   randombytes@2.1.0:
     dependencies:
       safe-buffer: 5.2.1

From 935144cd3bc59babc70027ca81f815b690c1e30b Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Wed, 27 May 2026 17:48:39 +0400
Subject: [PATCH 20/46] feat(gasless): polishing

---
 apps/appkit-minter/src/pages/gasless-page.tsx | 36 ++++++-
 .../appkit/actions/gasless/gasless-actions.ts | 22 +++++
 .../appkit/actions/gasless/gasless.test.ts    | 33 +++++++
 .../src/appkit/gasless/send-usdt-gasless.ts   | 41 +++-----
 .../src/appkit/gasless/send-usdt-regular.ts   | 33 +------
 .../src/appkit/hooks/gasless/gasless.test.tsx | 64 +++++++++++-
 .../use-gasless-jetton-transfer-quote.tsx     | 40 ++++++++
 .../use-gasless-ton-transfer-quote.tsx        | 36 +++++++
 packages/appkit-react/docs/hooks.md           | 60 ++++++++++++
 .../use-gasless-jetton-transfer-quote.ts      | 46 +++++++++
 .../gasless/hooks/use-gasless-quote.ts        | 14 ++-
 .../hooks/use-gasless-ton-transfer-quote.ts   | 48 +++++++++
 .../src/features/gasless/index.ts             | 10 ++
 packages/appkit/docs/actions.md               | 30 ++++++
 packages/appkit/docs/gasless.md               | 64 ++++--------
 .../get-gasless-jetton-transfer-quote.ts      | 67 +++++++++++++
 .../gasless/get-gasless-ton-transfer-quote.ts | 65 +++++++++++++
 .../gasless/send-gasless-transaction.test.ts  | 24 +++++
 .../gasless/send-gasless-transaction.ts       | 31 ++++++
 packages/appkit/src/actions/index.ts          | 12 +++
 .../get-gasless-jetton-transfer-quote.ts      | 97 +++++++++++++++++++
 .../src/queries/gasless/get-gasless-quote.ts  | 22 ++++-
 .../gasless/get-gasless-ton-transfer-quote.ts | 89 +++++++++++++++++
 packages/appkit/src/queries/index.ts          | 18 ++++
 packages/walletkit/src/defi/gasless/README.md |  2 +
 packages/walletkit/src/defi/gasless/errors.ts |  2 +
 template/packages/appkit-react/docs/hooks.md  | 14 +++
 template/packages/appkit/docs/actions.md      | 14 +++
 template/packages/appkit/docs/gasless.md      |  8 +-
 29 files changed, 927 insertions(+), 115 deletions(-)
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-jetton-transfer-quote.tsx
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
 create mode 100644 packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
 create mode 100644 packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-jetton-transfer-quote.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts

diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
index 9188c8e08..7f89ee2e9 100644
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ b/apps/appkit-minter/src/pages/gasless-page.tsx
@@ -13,6 +13,7 @@ import {
     useGaslessSupportedAssets,
     useGaslessQuote,
     useJettonBalanceByAddress,
+    useJettonInfo,
     useJettonWalletAddress,
     useSelectedWallet,
     useSendGaslessTransaction,
@@ -88,6 +89,14 @@ export const GaslessPage: FC = () => {
         ownerAddress: address,
     });
 
+    // The relayer fee is denominated in the selected fee asset, so resolve its
+    // decimals/symbol instead of assuming USDT — picking another asset would
+    // otherwise format the fee with the wrong scale.
+    const { data: feeAssetInfo } = useJettonInfo({
+        address: feeAsset ?? undefined,
+        query: { enabled: Boolean(feeAsset) },
+    });
+
     const supportsSignMessage = useMemo(() => {
         const features = selectedWallet?.getSupportedFeatures();
         if (features === undefined) return true;
@@ -132,11 +141,13 @@ export const GaslessPage: FC = () => {
         return formatRelativeTimeFromNow(quote.validUntil);
     }, [quote, now]);
 
+    const feeDecimals = feeAssetInfo?.decimals ?? USDT_DECIMALS;
+    const feeSymbol = feeAssetInfo?.symbol || 'USDT';
     const formattedFee = useMemo(() => {
         if (!quote) return null;
-        const feeWhole = Number(quote.fee) / 10 ** USDT_DECIMALS;
-        return feeWhole.toFixed(USDT_DECIMALS);
-    }, [quote]);
+        const feeWhole = Number(quote.fee) / 10 ** feeDecimals;
+        return feeWhole.toFixed(feeDecimals);
+    }, [quote, feeDecimals]);
 
     const handleSend = async () => {
         if (!quote) {
@@ -213,6 +224,21 @@ export const GaslessPage: FC = () => {
                                     </option>
                                 ))}
                             </select>
+
+                            {feeAssetInfo && (
+                                <div className="flex items-center gap-2 text-xs text-muted-foreground">
+                                    {feeAssetInfo.image && (
+                                        <img
+                                            src={feeAssetInfo.image}
+                                            alt={feeSymbol}
+                                            className="w-4 h-4 rounded-full"
+                                        />
+                                    )}
+                                    <span className="font-medium text-foreground">{feeSymbol}</span>
+                                    {feeAssetInfo.name && <span>· {feeAssetInfo.name}</span>}
+                                    <span>· {feeDecimals} decimals</span>
+                                </div>
+                            )}
                         </div>
 
                         <div className="space-y-2">
@@ -240,7 +266,9 @@ export const GaslessPage: FC = () => {
                         {quote && (
                             <div className="grid grid-cols-2 gap-2 text-xs">
                                 <div className="text-muted-foreground">Relayer fee</div>
-                                <div className="text-right font-mono">{formattedFee} USDT</div>
+                                <div className="text-right font-mono">
+                                    {formattedFee} {feeSymbol}
+                                </div>
                                 <div className="text-muted-foreground">Valid for</div>
                                 <div className="text-right font-mono">{validUntilText}</div>
                             </div>
diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
index d4d01f69a..6e289c3e6 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -8,12 +8,14 @@
 
 import type { AppKit } from '@ton/appkit';
 import {
+    getGaslessJettonTransferQuote,
     getGaslessManager,
     getGaslessProvider,
     getGaslessProviderMetadata,
     getGaslessProviders,
     getGaslessQuote,
     getGaslessSupportedAssets,
+    getGaslessTonTransferQuote,
     sendGaslessTransaction,
     setDefaultGaslessProvider,
     watchGaslessProviders,
@@ -72,6 +74,26 @@ export const gaslessExample = async (appKit: AppKit) => {
     console.log('Relayer fee:', quote.fee, 'valid until:', quote.validUntil);
     // SAMPLE_END: GET_GASLESS_QUOTE
 
+    // SAMPLE_START: GET_GASLESS_JETTON_TRANSFER_QUOTE
+    // Convenience wrapper: builds the jetton transfer messages for you, then quotes.
+    const jettonQuote = await getGaslessJettonTransferQuote(appKit, {
+        jettonAddress: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
+        recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+        amount: '100',
+        feeAsset, // pay the relayer fee in this jetton (here: USDT)
+    });
+    await sendGaslessTransaction(appKit, { quote: jettonQuote });
+    // SAMPLE_END: GET_GASLESS_JETTON_TRANSFER_QUOTE
+
+    // SAMPLE_START: GET_GASLESS_TON_TRANSFER_QUOTE
+    const tonQuote = await getGaslessTonTransferQuote(appKit, {
+        recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+        amount: '1.5',
+        feeAsset, // gas covered by the relayer, fee paid in this jetton
+    });
+    await sendGaslessTransaction(appKit, { quote: tonQuote });
+    // SAMPLE_END: GET_GASLESS_TON_TRANSFER_QUOTE
+
     // SAMPLE_START: SEND_GASLESS_TRANSACTION
     const result = await sendGaslessTransaction(appKit, { quote });
     console.log('Submitted gasless transaction. Hash:', result.normalizedHash, 'BoC:', result.internalBoc);
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index 0972ed96c..73f610ae9 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -7,6 +7,7 @@
  */
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { Address, beginCell } from '@ton/core';
 import { AppKit } from '@ton/appkit';
 import type { WalletInterface } from '@ton/appkit';
 import { Network } from '@ton/walletkit';
@@ -14,8 +15,14 @@ import { Network } from '@ton/walletkit';
 import { gaslessExample } from './gasless-actions';
 
 const TEST_ADDRESS = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+const JETTON_WALLET_ADDRESS = 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c';
 const SIGN_MESSAGE_FEATURE = { name: 'SignMessage', maxMessages: 4 } as const;
 
+// Stack shape returned by TonCenter-style `runGetMethod` for an address result.
+const mockAddressStack = (address: string) => [
+    { type: 'cell', value: beginCell().storeAddress(Address.parse(address)).endCell().toBoc().toString('base64') },
+];
+
 describe('Gasless Actions Examples', () => {
     let appKit: AppKit;
     let consoleSpy: ReturnType<typeof vi.spyOn>;
@@ -65,6 +72,32 @@ describe('Gasless Actions Examples', () => {
         // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'sendTransaction').mockImplementation(mockSend);
         vi.spyOn(appKit.gaslessManager, 'setDefaultProvider').mockImplementation(() => {});
+
+        // The jetton/ton transfer-quote samples build messages via the transfer
+        // builders, which resolve the jetton wallet address and decimals through
+        // the network client.
+        const mockClient = {
+            jettonsByAddress: vi.fn().mockImplementation((params: { address: string }) =>
+                Promise.resolve({
+                    jetton_masters: [{ address: params.address, jetton: params.address }],
+                    metadata: {
+                        [params.address]: {
+                            token_info: [
+                                { valid: true, type: 'jetton_masters', symbol: 'USDT', extra: { decimals: 6 } },
+                            ],
+                        },
+                    },
+                }),
+            ),
+            runGetMethod: vi.fn().mockImplementation((_addr: string, method: string) => {
+                if (method === 'get_wallet_address') {
+                    return Promise.resolve({ exitCode: 0, stack: mockAddressStack(JETTON_WALLET_ADDRESS) });
+                }
+                return Promise.reject(new Error(`Method ${method} not mocked`));
+            }),
+        };
+        // @ts-expect-error - exploiting internal access for testing
+        vi.spyOn(appKit.networkManager, 'getClient').mockReturnValue(mockClient);
     });
 
     afterEach(() => {
diff --git a/demo/examples/src/appkit/gasless/send-usdt-gasless.ts b/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
index 01d4b4c75..f68f9bb4b 100644
--- a/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
+++ b/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
@@ -7,45 +7,26 @@
  */
 
 import type { AppKit } from '@ton/appkit';
-import {
-    asBase64,
-    createJettonTransferPayload,
-    getGaslessQuote,
-    getJettonWalletAddress,
-    getSelectedWallet,
-    parseUnits,
-    sendGaslessTransaction,
-} from '@ton/appkit';
+import { createTransferJettonTransaction, getGaslessQuote, sendGaslessTransaction } from '@ton/appkit';
 
 const USDT_MASTER = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 const USDT_DECIMALS = 6;
 
 export const sendUsdtGaslessExample = async (appKit: AppKit, recipient: string, amount: string) => {
     // SAMPLE_START: SEND_USDT_GASLESS
-    const wallet = getSelectedWallet(appKit);
-    if (!wallet) throw new Error('No wallet connected');
-    const ownerAddress = wallet.getAddress();
-
-    const usdtWallet = await getJettonWalletAddress(appKit, {
+    // Reuse the same builder as a regular jetton transfer: it resolves the
+    // jetton wallet address, builds the payload and attaches the network gas
+    // (which the relayer ends up covering) for us.
+    const { messages } = await createTransferJettonTransaction(appKit, {
         jettonAddress: USDT_MASTER,
-        ownerAddress,
-    });
-
-    const payload = createJettonTransferPayload({
-        amount: parseUnits(amount, USDT_DECIMALS),
-        destination: recipient,
-        responseDestination: ownerAddress,
+        recipientAddress: recipient,
+        amount,
+        jettonDecimals: USDT_DECIMALS,
     });
 
-    const messages = [
-        {
-            address: usdtWallet,
-            amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
-            payload: asBase64(payload.toBoc().toString('base64')),
-        },
-    ];
-
-    const quote = await getGaslessQuote(appKit, { messages });
+    // Pay the relayer's fee in USDT. Quote first so the fee and validity window
+    // can be reviewed before the wallet signs.
+    const quote = await getGaslessQuote(appKit, { messages, feeAsset: USDT_MASTER });
     await sendGaslessTransaction(appKit, { quote });
     // SAMPLE_END: SEND_USDT_GASLESS
 };
diff --git a/demo/examples/src/appkit/gasless/send-usdt-regular.ts b/demo/examples/src/appkit/gasless/send-usdt-regular.ts
index 88bd9f2f1..d71eaef06 100644
--- a/demo/examples/src/appkit/gasless/send-usdt-regular.ts
+++ b/demo/examples/src/appkit/gasless/send-usdt-regular.ts
@@ -7,43 +7,20 @@
  */
 
 import type { AppKit } from '@ton/appkit';
-import {
-    asBase64,
-    createJettonTransferPayload,
-    getJettonWalletAddress,
-    getSelectedWallet,
-    parseUnits,
-    sendTransaction,
-} from '@ton/appkit';
+import { createTransferJettonTransaction, sendTransaction } from '@ton/appkit';
 
 const USDT_MASTER = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 const USDT_DECIMALS = 6;
 
 export const sendUsdtRegularExample = async (appKit: AppKit, recipient: string, amount: string) => {
     // SAMPLE_START: SEND_USDT_REGULAR
-    const wallet = getSelectedWallet(appKit);
-    if (!wallet) throw new Error('No wallet connected');
-    const ownerAddress = wallet.getAddress();
-
-    const usdtWallet = await getJettonWalletAddress(appKit, {
+    const { messages } = await createTransferJettonTransaction(appKit, {
         jettonAddress: USDT_MASTER,
-        ownerAddress,
-    });
-
-    const payload = createJettonTransferPayload({
-        amount: parseUnits(amount, USDT_DECIMALS),
-        destination: recipient,
-        responseDestination: ownerAddress,
+        recipientAddress: recipient,
+        amount,
+        jettonDecimals: USDT_DECIMALS,
     });
 
-    const messages = [
-        {
-            address: usdtWallet,
-            amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
-            payload: asBase64(payload.toBoc().toString('base64')),
-        },
-    ];
-
     await sendTransaction(appKit, { messages });
     // SAMPLE_END: SEND_USDT_REGULAR
 };
diff --git a/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx b/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
index 432a1ae07..65f3a33d4 100644
--- a/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
@@ -6,8 +6,8 @@
  *
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { render, screen, fireEvent, waitFor, cleanup } from '@testing-library/react';
 import * as AppKitReact from '@ton/appkit-react';
 
 import { UseGaslessProvidersExample } from './use-gasless-providers';
@@ -15,6 +15,8 @@ import { UseGaslessProviderExample } from './use-gasless-provider';
 import { UseGaslessProviderMetadataExample } from './use-gasless-provider-metadata';
 import { UseGaslessSupportedAssetsExample } from './use-gasless-supported-assets';
 import { UseGaslessQuoteExample } from './use-gasless-quote';
+import { UseGaslessJettonTransferQuoteExample } from './use-gasless-jetton-transfer-quote';
+import { UseGaslessTonTransferQuoteExample } from './use-gasless-ton-transfer-quote';
 import { UseSendGaslessTransactionExample } from './use-send-gasless-transaction';
 
 vi.mock('@ton/appkit-react', async () => {
@@ -26,6 +28,8 @@ vi.mock('@ton/appkit-react', async () => {
         useGaslessProviderMetadata: vi.fn(),
         useGaslessSupportedAssets: vi.fn(),
         useGaslessQuote: vi.fn(),
+        useGaslessJettonTransferQuote: vi.fn(),
+        useGaslessTonTransferQuote: vi.fn(),
         useSendGaslessTransaction: vi.fn(),
     };
 });
@@ -37,6 +41,10 @@ describe('Gasless Hooks Examples', () => {
         vi.clearAllMocks();
     });
 
+    afterEach(() => {
+        cleanup();
+    });
+
     describe('UseGaslessProvidersExample', () => {
         it('renders the list of provider ids', () => {
             vi.mocked(AppKitReact.useGaslessProviders).mockReturnValue([
@@ -134,6 +142,58 @@ describe('Gasless Hooks Examples', () => {
         });
     });
 
+    describe('UseGaslessJettonTransferQuoteExample', () => {
+        it('renders the quote fee and sends on click', async () => {
+            const mockQuote = { fee: '1234', validUntil: 1735680000 };
+            const mockSend = vi.fn().mockResolvedValue({});
+
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessJettonTransferQuote).mockReturnValue({
+                data: mockQuote,
+                isFetching: false,
+            });
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useSendGaslessTransaction).mockReturnValue({
+                mutateAsync: mockSend,
+                isPending: false,
+            });
+
+            const { getByText } = render(<UseGaslessJettonTransferQuoteExample />);
+            expect(getByText('Fee: 1234')).toBeDefined();
+
+            fireEvent.click(getByText('Send'));
+            await waitFor(() => {
+                expect(mockSend).toHaveBeenCalledWith({ quote: mockQuote });
+            });
+        });
+    });
+
+    describe('UseGaslessTonTransferQuoteExample', () => {
+        it('renders the quote fee and sends on click', async () => {
+            const mockQuote = { fee: '5678', validUntil: 1735680000 };
+            const mockSend = vi.fn().mockResolvedValue({});
+
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useGaslessTonTransferQuote).mockReturnValue({
+                data: mockQuote,
+                isFetching: false,
+            });
+            // @ts-expect-error - mock
+            vi.mocked(AppKitReact.useSendGaslessTransaction).mockReturnValue({
+                mutateAsync: mockSend,
+                isPending: false,
+            });
+
+            const { getByText } = render(<UseGaslessTonTransferQuoteExample />);
+            expect(getByText('Fee: 5678')).toBeDefined();
+
+            fireEvent.click(getByText('Send'));
+            await waitFor(() => {
+                expect(mockSend).toHaveBeenCalledWith({ quote: mockQuote });
+            });
+        });
+    });
+
     describe('UseSendGaslessTransactionExample', () => {
         it('calls sendGasless on click and logs result', async () => {
             const mockQuote = { fee: '1234', validUntil: 1735680000 };
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-jetton-transfer-quote.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-jetton-transfer-quote.tsx
new file mode 100644
index 000000000..834c506c4
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-jetton-transfer-quote.tsx
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { asAddressFriendly } from '@ton/appkit';
+import { useGaslessJettonTransferQuote, useSendGaslessTransaction } from '@ton/appkit-react';
+
+const USDT_MASTER = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+
+export const UseGaslessJettonTransferQuoteExample = () => {
+    // SAMPLE_START: USE_GASLESS_JETTON_TRANSFER_QUOTE
+    // No manual message building — pass the transfer intent, get a quote back.
+    const { data: quote, isFetching } = useGaslessJettonTransferQuote({
+        jettonAddress: USDT_MASTER,
+        recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+        amount: '100',
+        feeAsset: asAddressFriendly(USDT_MASTER),
+    });
+
+    const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
+
+    return (
+        <div>
+            {isFetching && <span>Quoting...</span>}
+            {quote && (
+                <>
+                    <div>Fee: {quote.fee}</div>
+                    <button disabled={isPending} onClick={() => sendGasless({ quote })}>
+                        Send
+                    </button>
+                </>
+            )}
+        </div>
+    );
+    // SAMPLE_END: USE_GASLESS_JETTON_TRANSFER_QUOTE
+};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx
new file mode 100644
index 000000000..1529073d3
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { asAddressFriendly } from '@ton/appkit';
+import { useGaslessTonTransferQuote, useSendGaslessTransaction } from '@ton/appkit-react';
+
+export const UseGaslessTonTransferQuoteExample = () => {
+    // SAMPLE_START: USE_GASLESS_TON_TRANSFER_QUOTE
+    const { data: quote, isFetching } = useGaslessTonTransferQuote({
+        recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+        amount: '1.5',
+        feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'), // USDT
+    });
+
+    const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
+
+    return (
+        <div>
+            {isFetching && <span>Quoting...</span>}
+            {quote && (
+                <>
+                    <div>Fee: {quote.fee}</div>
+                    <button disabled={isPending} onClick={() => sendGasless({ quote })}>
+                        Send
+                    </button>
+                </>
+            )}
+        </div>
+    );
+    // SAMPLE_END: USE_GASLESS_TON_TRANSFER_QUOTE
+};
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index f900c9d57..9c5e59468 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -937,11 +937,71 @@ return (
 );
 ```
 
+### `useGaslessJettonTransferQuote`
+
+Hook to fetch a gasless quote for a jetton transfer from semantic params (`jettonAddress`, `recipientAddress`, `amount`, `feeAsset`) — no manual message building. Auto-refetches as inputs change and on wallet/network switch.
+
+```tsx
+// No manual message building — pass the transfer intent, get a quote back.
+const { data: quote, isFetching } = useGaslessJettonTransferQuote({
+    jettonAddress: USDT_MASTER,
+    recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+    amount: '100',
+    feeAsset: asAddressFriendly(USDT_MASTER),
+});
+
+const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
+
+return (
+    <div>
+        {isFetching && <span>Quoting...</span>}
+        {quote && (
+            <>
+                <div>Fee: {quote.fee}</div>
+                <button disabled={isPending} onClick={() => sendGasless({ quote })}>
+                    Send
+                </button>
+            </>
+        )}
+    </div>
+);
+```
+
+### `useGaslessTonTransferQuote`
+
+Hook to fetch a gasless quote for a TON transfer from `recipientAddress`, `amount`, `feeAsset`. Auto-refetches as inputs change and on wallet/network switch.
+
+```tsx
+const { data: quote, isFetching } = useGaslessTonTransferQuote({
+    recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+    amount: '1.5',
+    feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'), // USDT
+});
+
+const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
+
+return (
+    <div>
+        {isFetching && <span>Quoting...</span>}
+        {quote && (
+            <>
+                <div>Fee: {quote.fee}</div>
+                <button disabled={isPending} onClick={() => sendGasless({ quote })}>
+                    Send
+                </button>
+            </>
+        )}
+    </div>
+);
+```
+
 ### `useSendGaslessTransaction`
 
 Hook to sign a previously computed quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
 
 Throws:
+- `GaslessError(QUOTE_EXPIRED)` if the quote's `validUntil` window has passed (checked before signing).
+- `GaslessError(WALLET_MISMATCH)` if the quote was issued for a different address than the selected wallet.
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the wallet does not advertise `SignMessage`.
 - `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
new file mode 100644
index 000000000..a2ad53e46
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { getGaslessJettonTransferQuoteQueryOptions } from '@ton/appkit/queries';
+import type {
+    GetGaslessJettonTransferQuoteData,
+    GetGaslessJettonTransferQuoteErrorType,
+    GetGaslessJettonTransferQuoteQueryConfig,
+} from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+import { useNetwork } from '../../network';
+
+export type UseGaslessJettonTransferQuoteParameters<selectData = GetGaslessJettonTransferQuoteData> =
+    GetGaslessJettonTransferQuoteQueryConfig<selectData>;
+
+export type UseGaslessJettonTransferQuoteReturnType<selectData = GetGaslessJettonTransferQuoteData> =
+    UseQueryReturnType<selectData, GetGaslessJettonTransferQuoteErrorType>;
+
+/**
+ * Hook to fetch a gasless quote for a jetton transfer.
+ *
+ * Assembles the transfer messages from semantic params (no manual payload
+ * building) and quotes them. Auto-refetches as inputs change; `useNetwork`
+ * subscribes the hook to the selected wallet so switching wallet/network
+ * recomputes the (wallet-bound) query key and refetches.
+ */
+export const useGaslessJettonTransferQuote = <selectData = GetGaslessJettonTransferQuoteData>(
+    parameters: UseGaslessJettonTransferQuoteParameters<selectData> = {},
+): UseGaslessJettonTransferQuoteReturnType<selectData> => {
+    const appKit = useAppKit();
+    // Subscribe to the selected wallet so switching wallet/network re-renders and
+    // recomputes the wallet-bound query key, refetching for the new wallet.
+    useNetwork();
+
+    return useQuery(getGaslessJettonTransferQuoteQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
index e3e549339..f7a9550bd 100644
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
@@ -14,6 +14,7 @@ import type { GetGaslessQuoteData, GetGaslessQuoteErrorType, GetGaslessQuoteQuer
 import { useAppKit } from '../../settings';
 import { useQuery } from '../../../libs/query';
 import type { UseQueryReturnType } from '../../../libs/query';
+import { useNetwork } from '../../network';
 
 export type UseGaslessQuoteParameters<selectData = GetGaslessQuoteData> = GetGaslessQuoteQueryConfig<selectData>;
 
@@ -27,11 +28,22 @@ export type UseGaslessQuoteReturnType<selectData = GetGaslessQuoteData> = UseQue
  *
  * The quote carries a relayer-provided `validUntil` window; cached results
  * become stale after `GASLESS_QUOTE_STALE_TIME_MS` (2 minutes).
+ *
+ * `useNetwork` subscribes the hook to the selected wallet, so switching wallet
+ * (or network) re-renders and recomputes the query key — which is bound to the
+ * wallet address — refetching a quote for the new wallet instead of reusing one
+ * issued for the previous one.
  */
 export const useGaslessQuote = <selectData = GetGaslessQuoteData>(
     parameters: UseGaslessQuoteParameters<selectData> = {},
 ): UseGaslessQuoteReturnType<selectData> => {
     const appKit = useAppKit();
+    const network = useNetwork();
 
-    return useQuery(getGaslessQuoteQueryOptions(appKit, parameters));
+    return useQuery(
+        getGaslessQuoteQueryOptions(appKit, {
+            ...parameters,
+            network: parameters.network ?? network,
+        }),
+    );
 };
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
new file mode 100644
index 000000000..65a6f7b83
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { getGaslessTonTransferQuoteQueryOptions } from '@ton/appkit/queries';
+import type {
+    GetGaslessTonTransferQuoteData,
+    GetGaslessTonTransferQuoteErrorType,
+    GetGaslessTonTransferQuoteQueryConfig,
+} from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+import { useNetwork } from '../../network';
+
+export type UseGaslessTonTransferQuoteParameters<selectData = GetGaslessTonTransferQuoteData> =
+    GetGaslessTonTransferQuoteQueryConfig<selectData>;
+
+export type UseGaslessTonTransferQuoteReturnType<selectData = GetGaslessTonTransferQuoteData> = UseQueryReturnType<
+    selectData,
+    GetGaslessTonTransferQuoteErrorType
+>;
+
+/**
+ * Hook to fetch a gasless quote for a TON transfer.
+ *
+ * Assembles the transfer message from semantic params and quotes it.
+ * Auto-refetches as inputs change; `useNetwork` subscribes the hook to the
+ * selected wallet so switching wallet/network recomputes the (wallet-bound)
+ * query key and refetches.
+ */
+export const useGaslessTonTransferQuote = <selectData = GetGaslessTonTransferQuoteData>(
+    parameters: UseGaslessTonTransferQuoteParameters<selectData> = {},
+): UseGaslessTonTransferQuoteReturnType<selectData> => {
+    const appKit = useAppKit();
+    // Subscribe to the selected wallet so switching wallet/network re-renders and
+    // recomputes the wallet-bound query key, refetching for the new wallet.
+    useNetwork();
+
+    return useQuery(getGaslessTonTransferQuoteQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/index.ts b/packages/appkit-react/src/features/gasless/index.ts
index 9c73bb7f2..9701a8828 100644
--- a/packages/appkit-react/src/features/gasless/index.ts
+++ b/packages/appkit-react/src/features/gasless/index.ts
@@ -21,6 +21,16 @@ export {
     type UseGaslessQuoteParameters,
     type UseGaslessQuoteReturnType,
 } from './hooks/use-gasless-quote';
+export {
+    useGaslessJettonTransferQuote,
+    type UseGaslessJettonTransferQuoteParameters,
+    type UseGaslessJettonTransferQuoteReturnType,
+} from './hooks/use-gasless-jetton-transfer-quote';
+export {
+    useGaslessTonTransferQuote,
+    type UseGaslessTonTransferQuoteParameters,
+    type UseGaslessTonTransferQuoteReturnType,
+} from './hooks/use-gasless-ton-transfer-quote';
 export { useGaslessProvider, type UseGaslessProviderReturnType } from './hooks/use-gasless-provider';
 export { useGaslessProviders, type UseGaslessProvidersReturnType } from './hooks/use-gasless-providers';
 export {
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 76074fe47..9892feb8d 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -725,11 +725,41 @@ const quote = await getGaslessQuote(appKit, {
 console.log('Relayer fee:', quote.fee, 'valid until:', quote.validUntil);
 ```
 
+### `getGaslessJettonTransferQuote`
+
+Convenience wrapper that builds a jetton transfer's messages (resolving the jetton wallet address, decimals and payload) and quotes them in one call. Takes semantic params (`jettonAddress`, `recipientAddress`, `amount`, `feeAsset`) instead of pre-built `messages`. Returns a `GaslessQuote` to pass to `sendGaslessTransaction`.
+
+```ts
+// Convenience wrapper: builds the jetton transfer messages for you, then quotes.
+const jettonQuote = await getGaslessJettonTransferQuote(appKit, {
+    jettonAddress: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
+    recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+    amount: '100',
+    feeAsset, // pay the relayer fee in this jetton (here: USDT)
+});
+await sendGaslessTransaction(appKit, { quote: jettonQuote });
+```
+
+### `getGaslessTonTransferQuote`
+
+Convenience wrapper that builds a TON transfer's message and quotes it in one call. Takes `recipientAddress`, `amount`, `feeAsset` instead of pre-built `messages`. Returns a `GaslessQuote` to pass to `sendGaslessTransaction`.
+
+```ts
+const tonQuote = await getGaslessTonTransferQuote(appKit, {
+    recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
+    amount: '1.5',
+    feeAsset, // gas covered by the relayer, fee paid in this jetton
+});
+await sendGaslessTransaction(appKit, { quote: tonQuote });
+```
+
 ### `sendGaslessTransaction`
 
 Sign a previously computed gasless quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` — a strict superset of `SendTransactionResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
 
 Throws:
+- `GaslessError(QUOTE_EXPIRED)` if the quote's `validUntil` window has passed (checked before signing).
+- `GaslessError(WALLET_MISMATCH)` if the quote was issued for a different address than the selected wallet.
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the connected wallet does not advertise the `SignMessage` feature.
 - `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
diff --git a/packages/appkit/docs/gasless.md b/packages/appkit/docs/gasless.md
index 721c58276..09439122e 100644
--- a/packages/appkit/docs/gasless.md
+++ b/packages/appkit/docs/gasless.md
@@ -54,61 +54,37 @@ Both flows produce the same on-chain outcome — a USDT jetton transfer from the
 ### Regular jetton transfer (user pays TON gas)
 
 ```ts
-const wallet = getSelectedWallet(appKit);
-if (!wallet) throw new Error('No wallet connected');
-const ownerAddress = wallet.getAddress();
-
-const usdtWallet = await getJettonWalletAddress(appKit, {
+const { messages } = await createTransferJettonTransaction(appKit, {
     jettonAddress: USDT_MASTER,
-    ownerAddress,
-});
-
-const payload = createJettonTransferPayload({
-    amount: parseUnits(amount, USDT_DECIMALS),
-    destination: recipient,
-    responseDestination: ownerAddress,
+    recipientAddress: recipient,
+    amount,
+    jettonDecimals: USDT_DECIMALS,
 });
 
-const messages = [
-    {
-        address: usdtWallet,
-        amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
-        payload: asBase64(payload.toBoc().toString('base64')),
-    },
-];
-
 await sendTransaction(appKit, { messages });
 ```
 
-Cost: the user spends **~0.06 TON** on gas (whatever is unused is refunded). Wallet needs the `SendTransaction` feature (almost all do).
+Cost: the user spends **~0.05 TON** on gas (whatever is unused is refunded). Wallet needs the `SendTransaction` feature (almost all do).
 
 ### Gasless jetton transfer (user pays only the jetton fee)
 
 ```ts
-const wallet = getSelectedWallet(appKit);
-if (!wallet) throw new Error('No wallet connected');
-const ownerAddress = wallet.getAddress();
-
-const usdtWallet = await getJettonWalletAddress(appKit, {
+// Reuse the same builder as a regular jetton transfer: it resolves the
+// jetton wallet address, builds the payload and attaches the network gas
+// (which the relayer ends up covering) for us.
+const { messages } = await createTransferJettonTransaction(appKit, {
     jettonAddress: USDT_MASTER,
-    ownerAddress,
+    recipientAddress: recipient,
+    amount,
+    jettonDecimals: USDT_DECIMALS,
 });
 
-const payload = createJettonTransferPayload({
-    amount: parseUnits(amount, USDT_DECIMALS),
-    destination: recipient,
-    responseDestination: ownerAddress,
+// Pay the relayer's fee in USDT. Quote first so the fee and validity window
+// can be reviewed before the wallet signs.
+const quote = await getGaslessQuote(appKit, {
+    messages,
+    feeAsset: USDT_MASTER,
 });
-
-const messages = [
-    {
-        address: usdtWallet,
-        amount: parseUnits('0.06', 9).toString(), // 0.06 TON for gas
-        payload: asBase64(payload.toBoc().toString('base64')),
-    },
-];
-
-const quote = await getGaslessQuote(appKit, { messages });
 await sendGaslessTransaction(appKit, { quote });
 ```
 
@@ -116,9 +92,9 @@ Cost: the user spends **0 TON** and a small amount of USDT (the relayer fee, sho
 
 ## Migration recipe
 
-The jetton-transfer payload and the `messages` array are unchanged — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages })` followed by `sendGaslessTransaction(appKit, { quote })`.
+The `messages` array is built the same way for both flows — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages, feeAsset })` followed by `sendGaslessTransaction(appKit, { quote })`.
 
-To pick a specific fee asset, pass `feeAsset` to `getGaslessQuote`. Discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)` — or hardcode the jetton master you want to charge in.
+`feeAsset` is the jetton master the relayer charges the fee in. The TonAPI provider requires it; discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)`, or hardcode the jetton master you want to charge in.
 
 For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`).
 
@@ -133,6 +109,8 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 | `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
 | `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
+| `QUOTE_EXPIRED` | Quote's `validUntil` window has passed; checked before signing so the wallet is not prompted for a quote the relayer would reject. Fetch a fresh quote. |
+| `WALLET_MISMATCH` | Quote was issued for a different address than the selected wallet (e.g. the active wallet was switched after quoting). |
 
 <!--
 This file is auto-generated. Do not edit manually.
diff --git a/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
new file mode 100644
index 000000000..f9ed5ecd1
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessQuote } from '../../gasless';
+import type { UserFriendlyAddress } from '../../types/primitives';
+import type { AppKit } from '../../core/app-kit';
+import { createTransferJettonTransaction } from '../jettons/create-transfer-jetton-transaction';
+import { getGaslessQuote } from './get-gasless-quote';
+
+export interface GetGaslessJettonTransferQuoteOptions {
+    /** Jetton master address to transfer */
+    jettonAddress: string;
+    /** Recipient address */
+    recipientAddress: string;
+    /** Human-readable amount of jettons to transfer */
+    amount: string;
+    /** Jetton decimals. Auto-fetched from jetton info when omitted. */
+    jettonDecimals?: number;
+    /** Optional text comment attached to the transfer */
+    comment?: string;
+    /**
+     * Asset address used to pay the relayer's fee (jetton master for TonAPI).
+     * Omit only for free / sponsored providers — see {@link getGaslessQuote}.
+     */
+    feeAsset?: UserFriendlyAddress;
+    /** Gasless provider id. Uses the default provider when omitted. */
+    providerId?: string;
+}
+
+export type GetGaslessJettonTransferQuoteReturnType = Promise<GaslessQuote>;
+
+export type GetGaslessJettonTransferQuoteErrorType = Error;
+
+/**
+ * Build a gasless quote for a jetton transfer.
+ *
+ * Convenience wrapper that assembles the transfer messages the same way as
+ * {@link createTransferJettonTransaction} (resolving the jetton wallet address,
+ * decimals and payload) and forwards them to {@link getGaslessQuote}. The result
+ * is passed verbatim to `sendGaslessTransaction`, preserving the quote → send
+ * two-step flow.
+ *
+ * The quote is always bound to the selected wallet's network — the same network
+ * the message builder resolves the jetton wallet on — so there is no `network`
+ * override (a mismatch would build the message on one chain and quote on another).
+ */
+export const getGaslessJettonTransferQuote = async (
+    appKit: AppKit,
+    options: GetGaslessJettonTransferQuoteOptions,
+): GetGaslessJettonTransferQuoteReturnType => {
+    const { jettonAddress, recipientAddress, amount, jettonDecimals, comment, feeAsset, providerId } = options;
+
+    const { messages } = await createTransferJettonTransaction(appKit, {
+        jettonAddress,
+        recipientAddress,
+        amount,
+        jettonDecimals,
+        comment,
+    });
+
+    return getGaslessQuote(appKit, { messages, feeAsset, providerId });
+};
diff --git a/packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts
new file mode 100644
index 000000000..79bf0be76
--- /dev/null
+++ b/packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessQuote } from '../../gasless';
+import type { UserFriendlyAddress } from '../../types/primitives';
+import type { AppKit } from '../../core/app-kit';
+import { createTransferTonTransaction } from '../transaction/create-transfer-ton-transaction';
+import { getGaslessQuote } from './get-gasless-quote';
+
+export interface GetGaslessTonTransferQuoteOptions {
+    /** Recipient address */
+    recipientAddress: string;
+    /** Human-readable amount of TON to transfer */
+    amount: string;
+    /** Human-readable text comment (converted to payload) */
+    comment?: string;
+    /** Message payload encoded in Base64 (overrides comment if provided) */
+    payload?: string;
+    /** Initial state for deploying a new contract, encoded in Base64 */
+    stateInit?: string;
+    /**
+     * Asset address used to pay the relayer's fee (jetton master for TonAPI).
+     * Omit only for free / sponsored providers — see {@link getGaslessQuote}.
+     */
+    feeAsset?: UserFriendlyAddress;
+    /** Gasless provider id. Uses the default provider when omitted. */
+    providerId?: string;
+}
+
+export type GetGaslessTonTransferQuoteReturnType = Promise<GaslessQuote>;
+
+export type GetGaslessTonTransferQuoteErrorType = Error;
+
+/**
+ * Build a gasless quote for a TON transfer.
+ *
+ * Convenience wrapper that assembles the transfer message the same way as
+ * {@link createTransferTonTransaction} and forwards it to {@link getGaslessQuote}.
+ * The result is passed verbatim to `sendGaslessTransaction`, preserving the
+ * quote → send two-step flow.
+ *
+ * The quote is always bound to the selected wallet's network (the message is
+ * built for that wallet), so there is no `network` override.
+ */
+export const getGaslessTonTransferQuote = async (
+    appKit: AppKit,
+    options: GetGaslessTonTransferQuoteOptions,
+): GetGaslessTonTransferQuoteReturnType => {
+    const { recipientAddress, amount, comment, payload, stateInit, feeAsset, providerId } = options;
+
+    const { messages } = createTransferTonTransaction(appKit, {
+        recipientAddress,
+        amount,
+        comment,
+        payload,
+        stateInit,
+    });
+
+    return getGaslessQuote(appKit, { messages, feeAsset, providerId });
+};
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
index d3545f563..d2a7cf1f2 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -106,6 +106,30 @@ describe('sendGaslessTransaction', () => {
         await expect(sendGaslessTransaction(appKit, { quote: makeQuote() })).rejects.toThrow('Wallet not connected');
     });
 
+    it('throws GaslessError(QUOTE_EXPIRED) before signing when the quote validUntil has passed', async () => {
+        const { appKit, sendTransaction } = makeAppKit(wallet);
+        const expiredQuote = makeQuote({ validUntil: Math.floor(Date.now() / 1000) - 1 });
+
+        await expect(sendGaslessTransaction(appKit, { quote: expiredQuote })).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.QuoteExpired,
+        });
+        expect(wallet.signMessage).not.toHaveBeenCalled();
+        expect(sendTransaction).not.toHaveBeenCalled();
+    });
+
+    it('throws GaslessError(WALLET_MISMATCH) before signing when the quote was issued for another wallet', async () => {
+        const { appKit, sendTransaction } = makeAppKit(wallet);
+        const otherWalletQuote = makeQuote({ from: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c' });
+
+        await expect(sendGaslessTransaction(appKit, { quote: otherWalletQuote })).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.WalletMismatch,
+        });
+        expect(wallet.signMessage).not.toHaveBeenCalled();
+        expect(sendTransaction).not.toHaveBeenCalled();
+    });
+
     it('throws GaslessError(SIGN_MESSAGE_NOT_SUPPORTED) when wallet lacks SignMessage feature', async () => {
         const walletWithoutFeature = makeWallet({
             getSupportedFeatures: () => [{ name: 'SignData' } as never],
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index 9cfd5479f..d9b03f53e 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -10,6 +10,7 @@ import { GaslessError, GaslessErrorCode } from '../../gasless';
 import type { GaslessQuote, GaslessSendResponse } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
+import { compareAddress } from '../../utils';
 
 export interface SendGaslessTransactionParameters {
     /** Pre-computed quote obtained via `getGaslessQuote` */
@@ -37,6 +38,12 @@ export type SendGaslessTransactionErrorType = Error;
  * stale quote is submitted anyway, the relayer rejects it and the error
  * surfaces through `gaslessManager.sendTransaction`.
  *
+ * @throws GaslessError(QUOTE_EXPIRED) when the quote's relayer-provided
+ *         `validUntil` window has already passed. Checked before signing so the
+ *         wallet is never prompted for a quote the relayer would reject anyway.
+ * @throws GaslessError(WALLET_MISMATCH) when the quote was issued for a
+ *         different address than the currently selected wallet (e.g. the active
+ *         wallet was switched after the quote was fetched).
  * @throws GaslessError(SIGN_MESSAGE_NOT_SUPPORTED) when the wallet does not
  *         advertise the `SignMessage` feature.
  * @throws GaslessError(TOO_MANY_MESSAGES) when the quote carries more
@@ -56,6 +63,30 @@ export const sendGaslessTransaction = async (
         throw new Error('Wallet not connected');
     }
 
+    // Fail fast on a dead quote before prompting the wallet to sign: the relayer
+    // owns `validUntil`, so a passed deadline means the relayer would reject the
+    // send anyway. Cheaper to surface a typed error here than to round-trip a
+    // signature the relayer discards.
+    if (Math.floor(Date.now() / 1000) > quote.validUntil) {
+        throw new GaslessError(
+            'Gasless quote has expired. Fetch a fresh quote before sending.',
+            GaslessErrorCode.QuoteExpired,
+            { validUntil: quote.validUntil },
+        );
+    }
+
+    // Guard against the active wallet being switched between quote and send: the
+    // quote is bound to the `from` the relayer echoed, and signing with a
+    // different wallet would produce a BoC the relayer rejects. Skip when a
+    // provider does not echo `from` (treat absence as "no claim", not mismatch).
+    if (quote.from && !compareAddress(quote.from, wallet.getAddress())) {
+        throw new GaslessError(
+            'Gasless quote was issued for a different wallet than the selected one.',
+            GaslessErrorCode.WalletMismatch,
+            { quoteFrom: quote.from, wallet: wallet.getAddress() },
+        );
+    }
+
     const features = wallet.getSupportedFeatures();
     if (features !== undefined) {
         const signMessageFeature = features.find((f) => typeof f === 'object' && f.name === 'SignMessage');
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index 7490b7620..bbf03178a 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -144,6 +144,18 @@ export {
     type GetGaslessQuoteReturnType,
     type GetGaslessQuoteErrorType,
 } from './gasless/get-gasless-quote';
+export {
+    getGaslessJettonTransferQuote,
+    type GetGaslessJettonTransferQuoteOptions,
+    type GetGaslessJettonTransferQuoteReturnType,
+    type GetGaslessJettonTransferQuoteErrorType,
+} from './gasless/get-gasless-jetton-transfer-quote';
+export {
+    getGaslessTonTransferQuote,
+    type GetGaslessTonTransferQuoteOptions,
+    type GetGaslessTonTransferQuoteReturnType,
+    type GetGaslessTonTransferQuoteErrorType,
+} from './gasless/get-gasless-ton-transfer-quote';
 export {
     sendGaslessTransaction,
     type SendGaslessTransactionParameters,
diff --git a/packages/appkit/src/queries/gasless/get-gasless-jetton-transfer-quote.ts b/packages/appkit/src/queries/gasless/get-gasless-jetton-transfer-quote.ts
new file mode 100644
index 000000000..2a4ab2b27
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-jetton-transfer-quote.ts
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessJettonTransferQuote } from '../../actions/gasless/get-gasless-jetton-transfer-quote';
+import type {
+    GetGaslessJettonTransferQuoteErrorType,
+    GetGaslessJettonTransferQuoteOptions,
+    GetGaslessJettonTransferQuoteReturnType,
+} from '../../actions/gasless/get-gasless-jetton-transfer-quote';
+import { getSelectedWallet } from '../../actions/wallets/get-selected-wallet';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+import { GASLESS_QUOTE_STALE_TIME_MS } from './get-gasless-quote';
+
+export type { GetGaslessJettonTransferQuoteErrorType };
+
+export type GetGaslessJettonTransferQuoteQueryConfig<selectData = GetGaslessJettonTransferQuoteData> = Compute<
+    ExactPartial<GetGaslessJettonTransferQuoteOptions>
+> &
+    QueryParameter<
+        GetGaslessJettonTransferQuoteQueryFnData,
+        GetGaslessJettonTransferQuoteErrorType,
+        selectData,
+        GetGaslessJettonTransferQuoteQueryKey
+    >;
+
+export const getGaslessJettonTransferQuoteQueryOptions = <selectData = GetGaslessJettonTransferQuoteData>(
+    appKit: AppKit,
+    options: GetGaslessJettonTransferQuoteQueryConfig<selectData> = {},
+): GetGaslessJettonTransferQuoteQueryOptions<selectData> => {
+    // Bind the quote to the selected wallet's address and network so a
+    // wallet/network switch produces a distinct cache entry and refetch
+    // (mirrors `getGaslessQuoteQueryOptions`). The quote is always built for the
+    // selected wallet's network, so the key tracks that — not a caller override.
+    const wallet = getSelectedWallet(appKit);
+    const walletAddress = wallet?.getAddress();
+    const resolvedOptions = { ...options, network: wallet?.getNetwork() };
+
+    return {
+        staleTime: GASLESS_QUOTE_STALE_TIME_MS,
+        ...options.query,
+        // Gate on a connected wallet too: the action resolves the jetton wallet
+        // via the selected wallet and throws without one, so without this the
+        // query would fire into a `Wallet not connected` error instead of idling.
+        enabled: Boolean(
+            options.jettonAddress &&
+            options.recipientAddress &&
+            options.amount &&
+            walletAddress &&
+            (options.query?.enabled ?? true),
+        ),
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [
+                string,
+                GetGaslessJettonTransferQuoteOptions,
+                string | undefined,
+            ];
+            return getGaslessJettonTransferQuote(appKit, parameters);
+        },
+        queryKey: getGaslessJettonTransferQuoteQueryKey(resolvedOptions, walletAddress),
+    };
+};
+
+export type GetGaslessJettonTransferQuoteQueryFnData = Compute<Awaited<GetGaslessJettonTransferQuoteReturnType>>;
+
+export type GetGaslessJettonTransferQuoteData = GetGaslessJettonTransferQuoteQueryFnData;
+
+export const getGaslessJettonTransferQuoteQueryKey = (
+    options: Compute<ExactPartial<GetGaslessJettonTransferQuoteOptions>> = {},
+    walletAddress?: string,
+): GetGaslessJettonTransferQuoteQueryKey => {
+    return [
+        'gaslessJettonTransferQuote',
+        filterQueryOptions(options as unknown as Record<string, unknown>),
+        walletAddress,
+    ] as const;
+};
+
+export type GetGaslessJettonTransferQuoteQueryKey = readonly [
+    'gaslessJettonTransferQuote',
+    Compute<ExactPartial<GetGaslessJettonTransferQuoteOptions>>,
+    string | undefined,
+];
+
+export type GetGaslessJettonTransferQuoteQueryOptions<selectData = GetGaslessJettonTransferQuoteData> = QueryOptions<
+    GetGaslessJettonTransferQuoteQueryFnData,
+    GetGaslessJettonTransferQuoteErrorType,
+    selectData,
+    GetGaslessJettonTransferQuoteQueryKey
+>;
diff --git a/packages/appkit/src/queries/gasless/get-gasless-quote.ts b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
index 80e8932f9..bfdbab3ff 100644
--- a/packages/appkit/src/queries/gasless/get-gasless-quote.ts
+++ b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
@@ -12,6 +12,7 @@ import type {
     GetGaslessQuoteOptions,
     GetGaslessQuoteReturnType,
 } from '../../actions/gasless/get-gasless-quote';
+import { getSelectedWallet } from '../../actions/wallets/get-selected-wallet';
 import type { AppKit } from '../../core/app-kit';
 import type { QueryOptions, QueryParameter } from '../../types/query';
 import type { Compute, ExactPartial } from '../../types/utils';
@@ -35,6 +36,14 @@ export const getGaslessQuoteQueryOptions = <selectData = GetGaslessQuoteData>(
     appKit: AppKit,
     options: GetGaslessQuoteQueryConfig<selectData> = {},
 ): GetGaslessQuoteQueryOptions<selectData> => {
+    // The quote is bound to the selected wallet's address and network, both of
+    // which `getGaslessQuote` resolves internally. Fold them into the key so a
+    // wallet/network switch produces a distinct cache entry and refetch instead
+    // of silently serving a quote issued for a different wallet.
+    const wallet = getSelectedWallet(appKit);
+    const walletAddress = wallet?.getAddress();
+    const resolvedOptions = { ...options, network: options.network ?? wallet?.getNetwork() };
+
     return {
         staleTime: GASLESS_QUOTE_STALE_TIME_MS,
         ...options.query,
@@ -43,7 +52,7 @@ export const getGaslessQuoteQueryOptions = <selectData = GetGaslessQuoteData>(
         // a typed error themselves. We only require messages to send.
         enabled: Boolean(options.messages && options.messages.length > 0 && (options.query?.enabled ?? true)),
         queryFn: async (context) => {
-            const [, parameters] = context.queryKey as [string, GetGaslessQuoteOptions];
+            const [, parameters] = context.queryKey as [string, GetGaslessQuoteOptions, string | undefined];
 
             if (!parameters.messages || parameters.messages.length === 0) {
                 throw new Error('messages is required');
@@ -51,7 +60,7 @@ export const getGaslessQuoteQueryOptions = <selectData = GetGaslessQuoteData>(
 
             return getGaslessQuote(appKit, parameters);
         },
-        queryKey: getGaslessQuoteQueryKey(options),
+        queryKey: getGaslessQuoteQueryKey(resolvedOptions, walletAddress),
     };
 };
 
@@ -61,11 +70,16 @@ export type GetGaslessQuoteData = GetGaslessQuoteQueryFnData;
 
 export const getGaslessQuoteQueryKey = (
     options: Compute<ExactPartial<GetGaslessQuoteOptions>> = {},
+    walletAddress?: string,
 ): GetGaslessQuoteQueryKey => {
-    return ['gaslessQuote', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
+    return ['gaslessQuote', filterQueryOptions(options as unknown as Record<string, unknown>), walletAddress] as const;
 };
 
-export type GetGaslessQuoteQueryKey = readonly ['gaslessQuote', Compute<ExactPartial<GetGaslessQuoteOptions>>];
+export type GetGaslessQuoteQueryKey = readonly [
+    'gaslessQuote',
+    Compute<ExactPartial<GetGaslessQuoteOptions>>,
+    string | undefined,
+];
 
 export type GetGaslessQuoteQueryOptions<selectData = GetGaslessQuoteData> = QueryOptions<
     GetGaslessQuoteQueryFnData,
diff --git a/packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts b/packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts
new file mode 100644
index 000000000..7b91c0dba
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessTonTransferQuote } from '../../actions/gasless/get-gasless-ton-transfer-quote';
+import type {
+    GetGaslessTonTransferQuoteErrorType,
+    GetGaslessTonTransferQuoteOptions,
+    GetGaslessTonTransferQuoteReturnType,
+} from '../../actions/gasless/get-gasless-ton-transfer-quote';
+import { getSelectedWallet } from '../../actions/wallets/get-selected-wallet';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+import { GASLESS_QUOTE_STALE_TIME_MS } from './get-gasless-quote';
+
+export type { GetGaslessTonTransferQuoteErrorType };
+
+export type GetGaslessTonTransferQuoteQueryConfig<selectData = GetGaslessTonTransferQuoteData> = Compute<
+    ExactPartial<GetGaslessTonTransferQuoteOptions>
+> &
+    QueryParameter<
+        GetGaslessTonTransferQuoteQueryFnData,
+        GetGaslessTonTransferQuoteErrorType,
+        selectData,
+        GetGaslessTonTransferQuoteQueryKey
+    >;
+
+export const getGaslessTonTransferQuoteQueryOptions = <selectData = GetGaslessTonTransferQuoteData>(
+    appKit: AppKit,
+    options: GetGaslessTonTransferQuoteQueryConfig<selectData> = {},
+): GetGaslessTonTransferQuoteQueryOptions<selectData> => {
+    // Bind the quote to the selected wallet's address and network so a
+    // wallet/network switch produces a distinct cache entry and refetch
+    // (mirrors `getGaslessQuoteQueryOptions`). The quote is always built for the
+    // selected wallet's network, so the key tracks that — not a caller override.
+    const wallet = getSelectedWallet(appKit);
+    const walletAddress = wallet?.getAddress();
+    const resolvedOptions = { ...options, network: wallet?.getNetwork() };
+
+    return {
+        staleTime: GASLESS_QUOTE_STALE_TIME_MS,
+        ...options.query,
+        // Gate on a connected wallet too: the action builds the transfer via the
+        // selected wallet and throws without one, so without this the query would
+        // fire into a `Wallet not connected` error instead of idling.
+        enabled: Boolean(
+            options.recipientAddress && options.amount && walletAddress && (options.query?.enabled ?? true),
+        ),
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [string, GetGaslessTonTransferQuoteOptions, string | undefined];
+            return getGaslessTonTransferQuote(appKit, parameters);
+        },
+        queryKey: getGaslessTonTransferQuoteQueryKey(resolvedOptions, walletAddress),
+    };
+};
+
+export type GetGaslessTonTransferQuoteQueryFnData = Compute<Awaited<GetGaslessTonTransferQuoteReturnType>>;
+
+export type GetGaslessTonTransferQuoteData = GetGaslessTonTransferQuoteQueryFnData;
+
+export const getGaslessTonTransferQuoteQueryKey = (
+    options: Compute<ExactPartial<GetGaslessTonTransferQuoteOptions>> = {},
+    walletAddress?: string,
+): GetGaslessTonTransferQuoteQueryKey => {
+    return [
+        'gaslessTonTransferQuote',
+        filterQueryOptions(options as unknown as Record<string, unknown>),
+        walletAddress,
+    ] as const;
+};
+
+export type GetGaslessTonTransferQuoteQueryKey = readonly [
+    'gaslessTonTransferQuote',
+    Compute<ExactPartial<GetGaslessTonTransferQuoteOptions>>,
+    string | undefined,
+];
+
+export type GetGaslessTonTransferQuoteQueryOptions<selectData = GetGaslessTonTransferQuoteData> = QueryOptions<
+    GetGaslessTonTransferQuoteQueryFnData,
+    GetGaslessTonTransferQuoteErrorType,
+    selectData,
+    GetGaslessTonTransferQuoteQueryKey
+>;
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index 68d9e53b6..ab64e81a8 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -194,6 +194,24 @@ export {
     type GetGaslessQuoteQueryKey,
     type GetGaslessQuoteQueryOptions,
 } from './gasless/get-gasless-quote';
+export {
+    getGaslessJettonTransferQuoteQueryOptions,
+    getGaslessJettonTransferQuoteQueryKey,
+    type GetGaslessJettonTransferQuoteQueryConfig,
+    type GetGaslessJettonTransferQuoteData,
+    type GetGaslessJettonTransferQuoteErrorType,
+    type GetGaslessJettonTransferQuoteQueryKey,
+    type GetGaslessJettonTransferQuoteQueryOptions,
+} from './gasless/get-gasless-jetton-transfer-quote';
+export {
+    getGaslessTonTransferQuoteQueryOptions,
+    getGaslessTonTransferQuoteQueryKey,
+    type GetGaslessTonTransferQuoteQueryConfig,
+    type GetGaslessTonTransferQuoteData,
+    type GetGaslessTonTransferQuoteErrorType,
+    type GetGaslessTonTransferQuoteQueryKey,
+    type GetGaslessTonTransferQuoteQueryOptions,
+} from './gasless/get-gasless-ton-transfer-quote';
 export {
     sendGaslessTransactionMutationOptions,
     type SendGaslessTransactionMutationConfig,
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index f564622fa..c1674d914 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -85,6 +85,8 @@ The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@to
 | `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not implement the `SignMessage` feature. Surfaced by the higher-level `sendGaslessTransaction` action in `@ton/appkit`. |
 | `TOO_MANY_MESSAGES` | The quote carries more messages than the wallet's advertised `SignMessage.maxMessages` cap. Surfaced by `sendGaslessTransaction` in `@ton/appkit`. |
+| `QUOTE_EXPIRED` | The quote's `validUntil` window has already passed. Surfaced by `sendGaslessTransaction` in `@ton/appkit` before signing, so the wallet is not prompted for a quote the relayer would reject. |
+| `WALLET_MISMATCH` | The quote was issued for a different address than the selected wallet. Surfaced by `sendGaslessTransaction` in `@ton/appkit`. |
 
 ## Creating a Custom Gasless Provider
 
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index 9dd53ecfd..686412d70 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -16,6 +16,8 @@ export enum GaslessErrorCode {
     SupportedAssetsFailed = 'SUPPORTED_ASSETS_FAILED',
     SignMessageNotSupported = 'SIGN_MESSAGE_NOT_SUPPORTED',
     TooManyMessages = 'TOO_MANY_MESSAGES',
+    QuoteExpired = 'QUOTE_EXPIRED',
+    WalletMismatch = 'WALLET_MISMATCH',
 }
 
 export class GaslessError extends DefiError {
diff --git a/template/packages/appkit-react/docs/hooks.md b/template/packages/appkit-react/docs/hooks.md
index 45b10c98b..3ce60b2ee 100644
--- a/template/packages/appkit-react/docs/hooks.md
+++ b/template/packages/appkit-react/docs/hooks.md
@@ -272,11 +272,25 @@ Hook to fetch a gasless quote. Auto-refetches as inputs change; cached results b
 
 %%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_QUOTE%%
 
+### `useGaslessJettonTransferQuote`
+
+Hook to fetch a gasless quote for a jetton transfer from semantic params (`jettonAddress`, `recipientAddress`, `amount`, `feeAsset`) — no manual message building. Auto-refetches as inputs change and on wallet/network switch.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_JETTON_TRANSFER_QUOTE%%
+
+### `useGaslessTonTransferQuote`
+
+Hook to fetch a gasless quote for a TON transfer from `recipientAddress`, `amount`, `feeAsset`. Auto-refetches as inputs change and on wallet/network switch.
+
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_TON_TRANSFER_QUOTE%%
+
 ### `useSendGaslessTransaction`
 
 Hook to sign a previously computed quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
 
 Throws:
+- `GaslessError(QUOTE_EXPIRED)` if the quote's `validUntil` window has passed (checked before signing).
+- `GaslessError(WALLET_MISMATCH)` if the quote was issued for a different address than the selected wallet.
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the wallet does not advertise `SignMessage`.
 - `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
diff --git a/template/packages/appkit/docs/actions.md b/template/packages/appkit/docs/actions.md
index afc0ae64d..b6af3705a 100644
--- a/template/packages/appkit/docs/actions.md
+++ b/template/packages/appkit/docs/actions.md
@@ -375,11 +375,25 @@ Ask the relayer for a gasless transaction quote. Returns relayer-wrapped message
 
 %%demo/examples/src/appkit/actions/gasless#GET_GASLESS_QUOTE%%
 
+### `getGaslessJettonTransferQuote`
+
+Convenience wrapper that builds a jetton transfer's messages (resolving the jetton wallet address, decimals and payload) and quotes them in one call. Takes semantic params (`jettonAddress`, `recipientAddress`, `amount`, `feeAsset`) instead of pre-built `messages`. Returns a `GaslessQuote` to pass to `sendGaslessTransaction`.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_JETTON_TRANSFER_QUOTE%%
+
+### `getGaslessTonTransferQuote`
+
+Convenience wrapper that builds a TON transfer's message and quotes it in one call. Takes `recipientAddress`, `amount`, `feeAsset` instead of pre-built `messages`. Returns a `GaslessQuote` to pass to `sendGaslessTransaction`.
+
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_TON_TRANSFER_QUOTE%%
+
 ### `sendGaslessTransaction`
 
 Sign a previously computed gasless quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` — a strict superset of `SendTransactionResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
 
 Throws:
+- `GaslessError(QUOTE_EXPIRED)` if the quote's `validUntil` window has passed (checked before signing).
+- `GaslessError(WALLET_MISMATCH)` if the quote was issued for a different address than the selected wallet.
 - `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` if the connected wallet does not advertise the `SignMessage` feature.
 - `GaslessError(TOO_MANY_MESSAGES)` if the quote carries more messages than the wallet's `maxMessages` cap.
 
diff --git a/template/packages/appkit/docs/gasless.md b/template/packages/appkit/docs/gasless.md
index d1ba6c8cd..945ef61a3 100644
--- a/template/packages/appkit/docs/gasless.md
+++ b/template/packages/appkit/docs/gasless.md
@@ -32,7 +32,7 @@ Both flows produce the same on-chain outcome — a USDT jetton transfer from the
 
 %%demo/examples/src/appkit/gasless#SEND_USDT_REGULAR%%
 
-Cost: the user spends **~0.06 TON** on gas (whatever is unused is refunded). Wallet needs the `SendTransaction` feature (almost all do).
+Cost: the user spends **~0.05 TON** on gas (whatever is unused is refunded). Wallet needs the `SendTransaction` feature (almost all do).
 
 ### Gasless jetton transfer (user pays only the jetton fee)
 
@@ -42,9 +42,9 @@ Cost: the user spends **0 TON** and a small amount of USDT (the relayer fee, sho
 
 ## Migration recipe
 
-The jetton-transfer payload and the `messages` array are unchanged — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages })` followed by `sendGaslessTransaction(appKit, { quote })`.
+The `messages` array is built the same way for both flows — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages, feeAsset })` followed by `sendGaslessTransaction(appKit, { quote })`.
 
-To pick a specific fee asset, pass `feeAsset` to `getGaslessQuote`. Discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)` — or hardcode the jetton master you want to charge in.
+`feeAsset` is the jetton master the relayer charges the fee in. The TonAPI provider requires it; discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)`, or hardcode the jetton master you want to charge in.
 
 For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`).
 
@@ -59,3 +59,5 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 | `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
 | `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
+| `QUOTE_EXPIRED` | Quote's `validUntil` window has passed; checked before signing so the wallet is not prompted for a quote the relayer would reject. Fetch a fresh quote. |
+| `WALLET_MISMATCH` | Quote was issued for a different address than the selected wallet (e.g. the active wallet was switched after quoting). |

From b677a580ea5795c747af98d45a0b773af7f265d0 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Wed, 27 May 2026 18:02:28 +0400
Subject: [PATCH 21/46] feat(gasless): add error for missing jetton wallet

---
 packages/appkit/docs/gasless.md                 |  5 +++--
 packages/walletkit/src/defi/gasless/README.md   |  5 +++--
 packages/walletkit/src/defi/gasless/errors.ts   |  1 +
 .../walletkit/src/defi/gasless/tonapi/README.md | 12 ++++++++++++
 .../tonapi/TonApiGaslessProvider.spec.ts        | 17 +++++++++++++++++
 .../gasless/tonapi/mappers/map-gasless-error.ts | 13 +++++++++++++
 template/packages/appkit/docs/gasless.md        |  5 +++--
 7 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/packages/appkit/docs/gasless.md b/packages/appkit/docs/gasless.md
index 09439122e..6ad05a7a4 100644
--- a/packages/appkit/docs/gasless.md
+++ b/packages/appkit/docs/gasless.md
@@ -102,8 +102,9 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 
 | Code | When it happens |
 |---|---|
-| `UNSUPPORTED_FEE_ASSET` | Relayer does not accept the chosen `feeAsset`. Surfaced from TonAPI's `error_code: 40000`. |
-| `UNSUPPORTED_OPERATION` | Provider does not implement the requested mode (e.g. TonAPI requires `feeAsset`). |
+| `UNSUPPORTED_FEE_ASSET` | The relayer does not accept the chosen `feeAsset`. |
+| `FEE_ASSET_NOT_OWNED` | The user has never held the chosen `feeAsset`, so the relayer cannot resolve its (uninitialized) jetton wallet. Pick a fee asset the user already owns. |
+| `UNSUPPORTED_OPERATION` | The provider does not implement the requested mode (e.g. a jetton-fee provider called without `feeAsset`). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
 | `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index c1674d914..c56ded029 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -78,8 +78,9 @@ The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@to
 
 | Code | Meaning |
 |---|---|
-| `UNSUPPORTED_FEE_ASSET` | The relayer does not accept the chosen fee asset. The TonAPI provider surfaces this when the server replies with `error_code: 40000`. |
-| `UNSUPPORTED_OPERATION` | Provider does not implement the requested mode (e.g. TonAPI provider called without `feeAsset` — it only supports jetton-fee mode). |
+| `UNSUPPORTED_FEE_ASSET` | The relayer does not accept the chosen fee asset. |
+| `FEE_ASSET_NOT_OWNED` | The user has never held the chosen fee asset, so the relayer cannot resolve its (uninitialized) jetton wallet. |
+| `UNSUPPORTED_OPERATION` | The provider does not implement the requested mode (e.g. a jetton-fee-only provider called without `feeAsset`). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
 | `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index 686412d70..72ab51227 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -18,6 +18,7 @@ export enum GaslessErrorCode {
     TooManyMessages = 'TOO_MANY_MESSAGES',
     QuoteExpired = 'QUOTE_EXPIRED',
     WalletMismatch = 'WALLET_MISMATCH',
+    FeeAssetNotOwned = 'FEE_ASSET_NOT_OWNED',
 }
 
 export class GaslessError extends DefiError {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/README.md b/packages/walletkit/src/defi/gasless/tonapi/README.md
index f856826ab..2b454805e 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/README.md
+++ b/packages/walletkit/src/defi/gasless/tonapi/README.md
@@ -43,6 +43,18 @@ TonAPI accepts and returns BoCs as hex strings; our domain types are base64 (`Ba
 
 The `send` response carries the broadcasted external message as hex; we run it through `getNormalizedExtMessageHash` (TEP-467) to derive `normalizedHash` for explorer / status lookup.
 
+## Error mapping
+
+TonAPI returns a numeric `error_code` in the error body. The provider maps the
+known ones to domain `GaslessErrorCode` values (see `mappers/map-gasless-error.ts`);
+any other code falls back to the call-site's code (`QUOTE_FAILED` / `SEND_FAILED` /
+`SUPPORTED_ASSETS_FAILED`).
+
+| TonAPI `error_code` | Domain `GaslessErrorCode` | Meaning |
+|---|---|---|
+| `40000` | `UNSUPPORTED_FEE_ASSET` | The chosen jetton is not accepted as a fee asset. |
+| `40007` | `FEE_ASSET_NOT_OWNED` | The sender's jetton wallet for the fee asset is uninitialized — they have never held it. |
+
 ## Resources
 
 - [TonAPI gasless REST API docs](https://docs.tonapi.io/tonapi/rest-api/gasless)
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index ebf042704..8b8c613b4 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -293,6 +293,23 @@ describe('TonApiGaslessProvider.getQuote', () => {
         });
     });
 
+    it('maps TonAPI error_code 40007 to GaslessError(FEE_ASSET_NOT_OWNED)', async () => {
+        fetchApi.mockResolvedValueOnce(
+            new Response(
+                JSON.stringify({
+                    error: 'failed to resolve jetton master for jetton wallet 0:7742502c809ab1decdfcb82cd292b92a50be6ef823e6675ea541fce61bd1c88d',
+                    error_code: 40007,
+                }),
+                { status: 400, headers: { 'content-type': 'application/json' } },
+            ),
+        );
+
+        await expect(provider.getQuote(baseQuoteParams)).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.FeeAssetNotOwned,
+        });
+    });
+
     it('throws GaslessError(UnsupportedOperation) when feeAsset is omitted', async () => {
         const fetchApi = makeFetch();
         const provider = makeProvider(fetchApi);
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
index 18e6c191f..1fa05fc67 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-error.ts
@@ -18,6 +18,7 @@ import { GaslessError, GaslessErrorCode } from '../../errors';
  * Wire shape observed in practice:
  *   `{ "error": "Jetton is not supported.", "error_code": 40000 }`
  *   `{ "error": "invalid public key size", "error_code": 40004 }`
+ *   `{ "error": "failed to resolve jetton master for jetton wallet 0:...", "error_code": 40007 }`
  *   `{ "error": "invalid wallet address" }`            (no `error_code`)
  *   `{ "Error": "operation Gasless...: decode ..." }`  (decoder failure, no `error_code`)
  */
@@ -27,6 +28,10 @@ interface TonApiErrorBody {
 }
 
 const TONAPI_UNSUPPORTED_FEE_ASSET_CODE = 40000;
+// The relayer derives the sender's jetton wallet for the chosen fee asset and
+// fails to resolve its master — the wallet is uninitialized because the user has
+// never held that jetton, so they cannot pay the fee in it.
+const TONAPI_FEE_JETTON_UNRESOLVED_CODE = 40007;
 
 export const mapTonApiGaslessError = (
     error: unknown,
@@ -49,6 +54,14 @@ export const mapTonApiGaslessError = (
                 error,
             );
         }
+
+        if (body && typeof body === 'object' && body.error_code === TONAPI_FEE_JETTON_UNRESOLVED_CODE) {
+            return new GaslessError(
+                'You have never held the selected fee asset, so the relayer could not resolve its jetton wallet. Choose a fee asset you already own.',
+                GaslessErrorCode.FeeAssetNotOwned,
+                error,
+            );
+        }
     }
 
     const message = error instanceof Error ? error.message : fallbackMessage;
diff --git a/template/packages/appkit/docs/gasless.md b/template/packages/appkit/docs/gasless.md
index 945ef61a3..c3e37d323 100644
--- a/template/packages/appkit/docs/gasless.md
+++ b/template/packages/appkit/docs/gasless.md
@@ -52,8 +52,9 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 
 | Code | When it happens |
 |---|---|
-| `UNSUPPORTED_FEE_ASSET` | Relayer does not accept the chosen `feeAsset`. Surfaced from TonAPI's `error_code: 40000`. |
-| `UNSUPPORTED_OPERATION` | Provider does not implement the requested mode (e.g. TonAPI requires `feeAsset`). |
+| `UNSUPPORTED_FEE_ASSET` | The relayer does not accept the chosen `feeAsset`. |
+| `FEE_ASSET_NOT_OWNED` | The user has never held the chosen `feeAsset`, so the relayer cannot resolve its (uninitialized) jetton wallet. Pick a fee asset the user already owns. |
+| `UNSUPPORTED_OPERATION` | The provider does not implement the requested mode (e.g. a jetton-fee provider called without `feeAsset`). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
 | `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |

From 16daa49c2bf14556cc13bcf8f5d4602bb65ff34a Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 11:44:08 +0400
Subject: [PATCH 22/46] feat(gasless): polishing

---
 .../hooks/use-gasless-jetton-transfer-quote.ts   | 10 +++++-----
 .../features/gasless/hooks/use-gasless-quote.ts  | 13 ++++++-------
 .../hooks/use-gasless-ton-transfer-quote.ts      | 10 +++++-----
 .../gasless/send-gasless-transaction.test.ts     | 12 ++++++++++++
 .../actions/gasless/send-gasless-transaction.ts  |  8 +++++---
 .../src/queries/gasless/get-gasless-quote.ts     |  9 +++++++--
 .../gasless/tonapi/mappers/map-gasless-quote.ts  | 16 ++++------------
 .../gasless/tonapi/mappers/map-gasless-send.ts   |  9 +++++----
 .../walletkit/src/defi/gasless/tonapi/utils.ts   | 12 +++++++++++-
 9 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
index a2ad53e46..e8aec537e 100644
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
@@ -30,16 +30,16 @@ export type UseGaslessJettonTransferQuoteReturnType<selectData = GetGaslessJetto
  * Hook to fetch a gasless quote for a jetton transfer.
  *
  * Assembles the transfer messages from semantic params (no manual payload
- * building) and quotes them. Auto-refetches as inputs change; `useNetwork`
- * subscribes the hook to the selected wallet so switching wallet/network
- * recomputes the (wallet-bound) query key and refetches.
+ * building) and quotes them. Auto-refetches as inputs change.
+ *
+ * `useNetwork` subscribes the hook to the selected wallet, so switching wallet
+ * (or network) re-renders and recomputes the wallet-bound query key, refetching
+ * for the new wallet instead of serving the previous one's cached quote.
  */
 export const useGaslessJettonTransferQuote = <selectData = GetGaslessJettonTransferQuoteData>(
     parameters: UseGaslessJettonTransferQuoteParameters<selectData> = {},
 ): UseGaslessJettonTransferQuoteReturnType<selectData> => {
     const appKit = useAppKit();
-    // Subscribe to the selected wallet so switching wallet/network re-renders and
-    // recomputes the wallet-bound query key, refetching for the new wallet.
     useNetwork();
 
     return useQuery(getGaslessJettonTransferQuoteQueryOptions(appKit, parameters));
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
index f7a9550bd..a34c2f0de 100644
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
@@ -38,12 +38,11 @@ export const useGaslessQuote = <selectData = GetGaslessQuoteData>(
     parameters: UseGaslessQuoteParameters<selectData> = {},
 ): UseGaslessQuoteReturnType<selectData> => {
     const appKit = useAppKit();
-    const network = useNetwork();
+    // Subscribe to the selected wallet so a wallet/network switch re-renders and
+    // recomputes the wallet-bound query key (the options factory reads the
+    // selected wallet), refetching for the new wallet instead of serving the
+    // previous one's cached quote.
+    useNetwork();
 
-    return useQuery(
-        getGaslessQuoteQueryOptions(appKit, {
-            ...parameters,
-            network: parameters.network ?? network,
-        }),
-    );
+    return useQuery(getGaslessQuoteQueryOptions(appKit, parameters));
 };
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
index 65a6f7b83..bf8c7037d 100644
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
@@ -32,16 +32,16 @@ export type UseGaslessTonTransferQuoteReturnType<selectData = GetGaslessTonTrans
  * Hook to fetch a gasless quote for a TON transfer.
  *
  * Assembles the transfer message from semantic params and quotes it.
- * Auto-refetches as inputs change; `useNetwork` subscribes the hook to the
- * selected wallet so switching wallet/network recomputes the (wallet-bound)
- * query key and refetches.
+ * Auto-refetches as inputs change.
+ *
+ * `useNetwork` subscribes the hook to the selected wallet, so switching wallet
+ * (or network) re-renders and recomputes the wallet-bound query key, refetching
+ * for the new wallet instead of serving the previous one's cached quote.
  */
 export const useGaslessTonTransferQuote = <selectData = GetGaslessTonTransferQuoteData>(
     parameters: UseGaslessTonTransferQuoteParameters<selectData> = {},
 ): UseGaslessTonTransferQuoteReturnType<selectData> => {
     const appKit = useAppKit();
-    // Subscribe to the selected wallet so switching wallet/network re-renders and
-    // recomputes the wallet-bound query key, refetching for the new wallet.
     useNetwork();
 
     return useQuery(getGaslessTonTransferQuoteQueryOptions(appKit, parameters));
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
index d2a7cf1f2..d3cb47f2b 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -118,6 +118,18 @@ describe('sendGaslessTransaction', () => {
         expect(sendTransaction).not.toHaveBeenCalled();
     });
 
+    it('throws GaslessError(QUOTE_EXPIRED) when validUntil is missing/non-finite', async () => {
+        const { appKit, sendTransaction } = makeAppKit(wallet);
+        const quoteWithoutValidUntil = makeQuote({ validUntil: undefined as unknown as number });
+
+        await expect(sendGaslessTransaction(appKit, { quote: quoteWithoutValidUntil })).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.QuoteExpired,
+        });
+        expect(wallet.signMessage).not.toHaveBeenCalled();
+        expect(sendTransaction).not.toHaveBeenCalled();
+    });
+
     it('throws GaslessError(WALLET_MISMATCH) before signing when the quote was issued for another wallet', async () => {
         const { appKit, sendTransaction } = makeAppKit(wallet);
         const otherWalletQuote = makeQuote({ from: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c' });
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index d9b03f53e..22539adbd 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -66,10 +66,12 @@ export const sendGaslessTransaction = async (
     // Fail fast on a dead quote before prompting the wallet to sign: the relayer
     // owns `validUntil`, so a passed deadline means the relayer would reject the
     // send anyway. Cheaper to surface a typed error here than to round-trip a
-    // signature the relayer discards.
-    if (Math.floor(Date.now() / 1000) > quote.validUntil) {
+    // signature the relayer discards. A non-finite `validUntil` (missing/garbled
+    // relayer response) is treated as expired rather than silently bypassing the
+    // check (`n > undefined` is always false).
+    if (!Number.isFinite(quote.validUntil) || Math.floor(Date.now() / 1000) > quote.validUntil) {
         throw new GaslessError(
-            'Gasless quote has expired. Fetch a fresh quote before sending.',
+            'Gasless quote has expired or is missing a validity window. Fetch a fresh quote before sending.',
             GaslessErrorCode.QuoteExpired,
             { validUntil: quote.validUntil },
         );
diff --git a/packages/appkit/src/queries/gasless/get-gasless-quote.ts b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
index bfdbab3ff..9185e215b 100644
--- a/packages/appkit/src/queries/gasless/get-gasless-quote.ts
+++ b/packages/appkit/src/queries/gasless/get-gasless-quote.ts
@@ -49,8 +49,13 @@ export const getGaslessQuoteQueryOptions = <selectData = GetGaslessQuoteData>(
         ...options.query,
         // `feeAsset` is intentionally not part of the gate: free / sponsored
         // providers accept an undefined asset, and jetton-only providers throw
-        // a typed error themselves. We only require messages to send.
-        enabled: Boolean(options.messages && options.messages.length > 0 && (options.query?.enabled ?? true)),
+        // a typed error themselves. We require messages and a connected wallet —
+        // the action resolves the wallet internally and throws without one, so
+        // gating here keeps the query idle instead of erroring (matches the
+        // jetton/ton transfer-quote options).
+        enabled: Boolean(
+            options.messages && options.messages.length > 0 && walletAddress && (options.query?.enabled ?? true),
+        ),
         queryFn: async (context) => {
             const [, parameters] = context.queryKey as [string, GetGaslessQuoteOptions, string | undefined];
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
index e3441957d..f81e52ff7 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-quote.ts
@@ -10,20 +10,10 @@ import { Address } from '@ton/core';
 
 import type { GaslessQuote, GaslessQuoteParams, Network } from '../../../../api/models';
 import { asAddressFriendly } from '../../../../utils/address';
-import { HexToBase64 } from '../../../../utils/base64';
 import { asHex } from '../../../../utils/hex';
-import { buildInternalMessageCell, stripHexPrefix } from '../utils';
+import { buildInternalMessageCell, hexBocToBase64, stripHexPrefix } from '../utils';
 import type { TonApiGaslessEstimateRequest, TonApiGaslessEstimateResponse } from '../types/estimate';
 
-/**
- * TonAPI returns BoCs as bare hex strings (no `0x` prefix); the walletkit
- * domain uses base64 (`Base64String`). Re-encoding is byte-identical.
- */
-const hexBocToBase64 = (hex: string) => {
-    const normalizedHex = asHex(hex.startsWith('0x') ? hex : `0x${hex}`);
-    return HexToBase64(normalizedHex);
-};
-
 /**
  * Domain → wire: build the JSON body for `POST /v2/gasless/estimate/{master_id}`.
  *
@@ -31,7 +21,9 @@ const hexBocToBase64 = (hex: string) => {
  */
 export const buildGaslessQuoteRequest = (params: GaslessQuoteParams): TonApiGaslessEstimateRequest => ({
     wallet_address: Address.parse(params.walletAddress).toRawString(),
-    wallet_public_key: stripHexPrefix(params.walletPublicKey),
+    // `asHex` validates the public key before stripping the prefix, so a
+    // malformed key fails fast instead of flowing to the relayer.
+    wallet_public_key: stripHexPrefix(asHex(params.walletPublicKey)),
     messages: params.messages.map((message) => ({
         boc: buildInternalMessageCell(message).toBoc().toString('hex'),
     })),
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
index 932d6e0e1..82528dade 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
@@ -7,10 +7,10 @@
  */
 
 import type { GaslessSendParams, SendTransactionResponse } from '../../../../api/models';
-import { asBase64 } from '../../../../utils/base64';
+import { asHex } from '../../../../utils/hex';
 import { getNormalizedExtMessageHash } from '../../../../utils/getNormalizedExtMessageHash';
 import { GaslessError, GaslessErrorCode } from '../../errors';
-import { internalBocToExternalMessageBoc, stripHexPrefix } from '../utils';
+import { hexBocToBase64, internalBocToExternalMessageBoc, stripHexPrefix } from '../utils';
 import type { TonApiGaslessSendRequest, TonApiGaslessSendResponse } from '../types/send';
 
 /**
@@ -20,7 +20,8 @@ import type { TonApiGaslessSendRequest, TonApiGaslessSendResponse } from '../typ
  * unwrapped into an external message BoC that the relayer can broadcast.
  */
 export const buildGaslessSendRequest = (params: GaslessSendParams): TonApiGaslessSendRequest => ({
-    wallet_public_key: stripHexPrefix(params.walletPublicKey),
+    // `asHex` validates the public key before stripping the prefix.
+    wallet_public_key: stripHexPrefix(asHex(params.walletPublicKey)),
     boc: internalBocToExternalMessageBoc(params.internalBoc).toBoc().toString('hex'),
 });
 
@@ -41,7 +42,7 @@ export const mapGaslessSend = (raw: TonApiGaslessSendResponse): SendTransactionR
         });
     }
 
-    const boc = asBase64(Buffer.from(raw.external, 'hex').toString('base64'));
+    const boc = hexBocToBase64(raw.external);
     const { hash: normalizedHash, boc: normalizedBoc } = getNormalizedExtMessageHash(boc);
     return { boc, normalizedBoc, normalizedHash };
 };
diff --git a/packages/walletkit/src/defi/gasless/tonapi/utils.ts b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
index f0ae638fd..433b54cfb 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/utils.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/utils.ts
@@ -19,13 +19,23 @@ import {
 } from '@ton/core';
 
 import type { Base64String, TransactionRequestMessage } from '../../../api/models';
-import { asBase64 } from '../../../utils/base64';
+import { asBase64, HexToBase64 } from '../../../utils/base64';
+import { asHex } from '../../../utils/hex';
 import { GaslessError, GaslessErrorCode } from '../errors';
 
 export const stripHexPrefix = (value: string): string => {
     return value.startsWith('0x') ? value.slice(2) : value;
 };
 
+/**
+ * TonAPI returns BoCs as bare hex strings (no `0x` prefix); the walletkit domain
+ * uses base64 (`Base64String`). Re-encoding is byte-identical; `asHex` validates
+ * the hex first. Shared by the quote and send mappers.
+ */
+export const hexBocToBase64 = (hex: string): Base64String => {
+    return HexToBase64(asHex(hex.startsWith('0x') ? hex : `0x${hex}`));
+};
+
 export const cellToBase64 = (cell: Cell): Base64String => {
     return asBase64(cell.toBoc().toString('base64'));
 };

From 1f5dbdc2c43b632fed6b8871a6ff3b8da80e659d Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 11:44:18 +0400
Subject: [PATCH 23/46] feat(gasless): rework minter ui

---
 .../layout/app-router/app-router.tsx          |   4 +-
 .../core/components/layout/layout/layout.tsx  |  20 +-
 .../balances/components/gasless-transfer.tsx  | 162 ++++++++++
 .../components/token-transfer-modal.tsx       | 107 ++++++-
 apps/appkit-minter/src/pages/gasless-page.tsx | 295 ------------------
 apps/appkit-minter/src/pages/index.ts         |   2 -
 .../src/pages/sign-message-page.tsx           |  91 ------
 7 files changed, 267 insertions(+), 414 deletions(-)
 create mode 100644 apps/appkit-minter/src/features/balances/components/gasless-transfer.tsx
 delete mode 100644 apps/appkit-minter/src/pages/gasless-page.tsx
 delete mode 100644 apps/appkit-minter/src/pages/sign-message-page.tsx

diff --git a/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx b/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
index 0046c7fd7..a10a7b60e 100644
--- a/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
+++ b/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
@@ -11,7 +11,7 @@ import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
 import { useWatchBalance, useWatchTransactions, useWatchJettons, useBalance } from '@ton/appkit-react';
 import { toast } from 'sonner';
 
-import { GaslessPage, JettonsPage, MinterPage, NftsPage, SignMessagePage, StakingPage, SwapPage } from '@/pages';
+import { JettonsPage, MinterPage, NftsPage, StakingPage, SwapPage } from '@/pages';
 
 export const AppRouter: React.FC = () => {
     // Set balance refetch interval to 20 seconds
@@ -57,8 +57,6 @@ export const AppRouter: React.FC = () => {
                 <Route path="/nfts" element={<NftsPage />} />
                 <Route path="/swap" element={<SwapPage />} />
                 <Route path="/staking" element={<StakingPage />} />
-                <Route path="/sign" element={<SignMessagePage />} />
-                <Route path="/gasless" element={<GaslessPage />} />
                 <Route path="*" element={<Navigate to="/" replace />} />
             </Routes>
         </BrowserRouter>
diff --git a/apps/appkit-minter/src/core/components/layout/layout/layout.tsx b/apps/appkit-minter/src/core/components/layout/layout/layout.tsx
index fc2c314d6..7bfb7c0f4 100644
--- a/apps/appkit-minter/src/core/components/layout/layout/layout.tsx
+++ b/apps/appkit-minter/src/core/components/layout/layout/layout.tsx
@@ -7,18 +7,7 @@
  */
 
 import { TonConnectButton, useAddress } from '@ton/appkit-react';
-import {
-    ArrowLeftRight,
-    BookOpen,
-    Coins,
-    ExternalLink,
-    Github,
-    ImageIcon,
-    PenLine,
-    Sparkles,
-    Wallet,
-    Zap,
-} from 'lucide-react';
+import { ArrowLeftRight, BookOpen, Coins, ExternalLink, Github, ImageIcon, Sparkles, Wallet } from 'lucide-react';
 import { Link, NavLink } from 'react-router-dom';
 import type { ComponentType, FC, ReactNode } from 'react';
 
@@ -69,13 +58,6 @@ const NAV_GROUPS: readonly { label?: string; links: readonly NavGroupLink[] }[]
             { to: '/staking', label: 'Staking', icon: Coins },
         ],
     },
-    {
-        label: 'Wallet',
-        links: [
-            { to: '/sign', label: 'Sign Message', icon: PenLine },
-            { to: '/gasless', label: 'Gasless', icon: Zap },
-        ],
-    },
 ];
 
 const EXTERNAL_LINKS: readonly { href: string; label: string; icon: ComponentType<{ className?: string }> }[] = [
diff --git a/apps/appkit-minter/src/features/balances/components/gasless-transfer.tsx b/apps/appkit-minter/src/features/balances/components/gasless-transfer.tsx
new file mode 100644
index 000000000..ded02270f
--- /dev/null
+++ b/apps/appkit-minter/src/features/balances/components/gasless-transfer.tsx
@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useCallback, useEffect } from 'react';
+import type { FC } from 'react';
+import {
+    Input,
+    useGaslessJettonTransferQuote,
+    useGaslessSupportedAssets,
+    useGaslessTonTransferQuote,
+    useJettonInfo,
+    useSendGaslessTransaction,
+} from '@ton/appkit-react';
+import { asAddressFriendly, compareAddress, formatUnits } from '@ton/appkit';
+import type { GaslessSendResponse, UserFriendlyAddress } from '@ton/appkit';
+
+const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+
+const truncateAddress = (address: string): string => `${address.slice(0, 6)}…${address.slice(-4)}`;
+
+/**
+ * Renders one fee-asset `<option>`; shows the token's address until its jetton
+ * info loads, then the ticker. Each instance owns its own `useJettonInfo` query
+ * so labels resolve independently — React Query dedupes identical addresses.
+ */
+const FeeAssetOption: FC<{ address: UserFriendlyAddress }> = ({ address }) => {
+    const { data } = useJettonInfo({ address });
+    return <option value={address}>{data?.symbol || truncateAddress(address)}</option>;
+};
+
+interface FeeAssetSelectProps {
+    value: UserFriendlyAddress | null;
+    onChange: (address: UserFriendlyAddress) => void;
+    disabled?: boolean;
+}
+
+/**
+ * Fee-asset picker for gasless transfers. Lists the relayer-accepted assets and
+ * preselects USDT (or the first asset) once they load. Uses a native `<select>`
+ * styled with the app's design tokens — the browser-rendered dropdown handles
+ * its own viewport clamping/scroll.
+ */
+export const FeeAssetSelect: FC<FeeAssetSelectProps> = ({ value, onChange, disabled }) => {
+    const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
+
+    useEffect(() => {
+        if (!value && supportedAssets?.length) {
+            const preferred = supportedAssets.find((asset) => compareAddress(asset.address, USDT_MASTER_MAINNET));
+            onChange(preferred?.address ?? supportedAssets[0].address);
+        }
+    }, [value, supportedAssets, onChange]);
+
+    const isDisabled = disabled || isLoading || !supportedAssets?.length;
+
+    return (
+        <Input size="s" disabled={isDisabled}>
+            <Input.Header>
+                <Input.Title>Fee asset</Input.Title>
+            </Input.Header>
+            <Input.Field>
+                {/* Native select inside `Input.Field`: the container owns the
+                    field background / border / focus state, so the select itself
+                    only needs the transparent inner styling that mirrors
+                    `Input.Input`. */}
+                <select
+                    className="flex-1 min-w-0 w-full bg-transparent border-none outline-none text-foreground p-0 cursor-pointer"
+                    style={{
+                        // Match `Input size="s"` typography exactly — Tailwind's
+                        // text-sm (14px) differs from the design token (16px).
+                        fontFamily: 'var(--ta-font-family)',
+                        fontSize: 'var(--ta-input-s-size)',
+                        fontWeight: 'var(--ta-input-s-weight)',
+                        lineHeight: 'var(--ta-input-s-line-height)',
+                    }}
+                    value={value ?? ''}
+                    onChange={(event) => onChange(asAddressFriendly(event.target.value))}
+                    disabled={isDisabled}
+                >
+                    {!value && (
+                        <option value="" disabled>
+                            Select fee asset
+                        </option>
+                    )}
+                    {supportedAssets?.map((asset) => (
+                        <FeeAssetOption key={asset.address} address={asset.address} />
+                    ))}
+                </select>
+            </Input.Field>
+        </Input>
+    );
+};
+
+interface UseGaslessTransferParams {
+    /** Only quote/send while the gasless toggle is on. */
+    enabled: boolean;
+    tokenType: 'TON' | 'JETTON';
+    jettonAddress?: string;
+    recipientAddress: string;
+    amount: string;
+    comment?: string;
+    feeAsset: UserFriendlyAddress | null;
+}
+
+/**
+ * Drives the gasless quote → send flow for the transfer modal. Quotes the
+ * jetton or TON transfer (depending on `tokenType`) and exposes a formatted fee
+ * plus a `send` that relays the signed quote.
+ */
+export const useGaslessTransfer = ({
+    enabled,
+    tokenType,
+    jettonAddress,
+    recipientAddress,
+    amount,
+    comment,
+    feeAsset,
+}: UseGaslessTransferParams) => {
+    const hasInputs = Boolean(recipientAddress && amount && feeAsset);
+
+    const jettonQuote = useGaslessJettonTransferQuote({
+        jettonAddress: jettonAddress ?? '',
+        recipientAddress,
+        amount,
+        comment,
+        feeAsset: feeAsset ?? undefined,
+        query: { enabled: enabled && tokenType === 'JETTON' && hasInputs && Boolean(jettonAddress) },
+    });
+
+    const tonQuote = useGaslessTonTransferQuote({
+        recipientAddress,
+        amount,
+        comment,
+        feeAsset: feeAsset ?? undefined,
+        query: { enabled: enabled && tokenType === 'TON' && hasInputs },
+    });
+
+    const { data: quote, isFetching: isQuoting, error: quoteError } = tokenType === 'JETTON' ? jettonQuote : tonQuote;
+
+    const { data: feeAssetInfo } = useJettonInfo({
+        address: feeAsset ?? undefined,
+        query: { enabled: enabled && Boolean(feeAsset) },
+    });
+
+    const fee =
+        quote && feeAssetInfo?.decimals != null
+            ? `${formatUnits(quote.fee, feeAssetInfo.decimals)} ${feeAssetInfo.symbol || ''}`.trim()
+            : null;
+
+    const { mutateAsync, isPending: isSending } = useSendGaslessTransaction();
+
+    const send = useCallback(async (): Promise<GaslessSendResponse | undefined> => {
+        if (!quote) return undefined;
+        return mutateAsync({ quote });
+    }, [quote, mutateAsync]);
+
+    return { quote, quoteError, isQuoting, fee, send, isSending };
+};
diff --git a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
index 849181ebc..ab7769972 100644
--- a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
+++ b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
@@ -7,11 +7,21 @@
  */
 
 import React, { useMemo, useState } from 'react';
-import type { Jetton } from '@ton/appkit';
+import type { Jetton, UserFriendlyAddress } from '@ton/appkit';
 import { getFormattedJettonInfo, getErrorMessage } from '@ton/appkit';
-import { SendTonButton, SendJettonButton, Button, Input, Modal } from '@ton/appkit-react';
+import {
+    SendTonButton,
+    SendJettonButton,
+    Button,
+    Input,
+    Modal,
+    useAddress,
+    useSelectedWallet,
+} from '@ton/appkit-react';
 import { Gem } from 'lucide-react';
 
+import { FeeAssetSelect, useGaslessTransfer } from './gasless-transfer';
+
 import { TransactionStatus } from '@/features/transaction';
 
 interface TokenTransferModalProps {
@@ -34,6 +44,26 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
     const [comment, setComment] = useState('');
     const [transferError, setTransferError] = useState<string | null>(null);
     const [txBoc, setTxBoc] = useState<string | null>(null);
+    const [gaslessEnabled, setGaslessEnabled] = useState(false);
+    const [feeAsset, setFeeAsset] = useState<UserFriendlyAddress | null>(null);
+
+    const address = useAddress();
+    const [selectedWallet] = useSelectedWallet();
+    const supportsSignMessage = useMemo(() => {
+        const features = selectedWallet?.getSupportedFeatures();
+        if (features === undefined) return true;
+        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+    }, [selectedWallet]);
+
+    const gasless = useGaslessTransfer({
+        enabled: gaslessEnabled,
+        tokenType,
+        jettonAddress: jetton?.address,
+        recipientAddress,
+        amount,
+        comment,
+        feeAsset,
+    });
 
     const tokenInfo = useMemo(() => {
         if (tokenType === 'TON') {
@@ -69,9 +99,21 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
         setComment('');
         setTransferError(null);
         setTxBoc(null);
+        setGaslessEnabled(false);
+        setFeeAsset(null);
         onClose();
     };
 
+    const handleGaslessSubmit = async () => {
+        setTransferError(null);
+        try {
+            const result = await gasless.send();
+            if (result) setTxBoc(result.boc);
+        } catch (error) {
+            setTransferError(getErrorMessage(error));
+        }
+    };
+
     if (!tokenInfo.decimals) return null;
 
     return (
@@ -109,6 +151,15 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                         <Input size="s">
                             <Input.Header>
                                 <Input.Title>Recipient Address</Input.Title>
+                                {address && (
+                                    <button
+                                        type="button"
+                                        onClick={() => setRecipientAddress(address)}
+                                        className="text-xs text-primary hover:underline"
+                                    >
+                                        Use my address
+                                    </button>
+                                )}
                             </Input.Header>
                             <Input.Field>
                                 <Input.Input
@@ -150,6 +201,36 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                             </Input.Field>
                         </Input>
 
+                        <div className="space-y-2">
+                            <label className="inline-flex items-center gap-2 text-sm text-foreground">
+                                <input
+                                    type="checkbox"
+                                    checked={gaslessEnabled}
+                                    disabled={!supportsSignMessage}
+                                    onChange={(e) => setGaslessEnabled(e.target.checked)}
+                                />
+                                <span>Gasless — pay the gas fee in another token</span>
+                            </label>
+
+                            {!supportsSignMessage && (
+                                <p className="text-xs text-tertiary-foreground">
+                                    Connected wallet does not support gasless (no SignMessage feature).
+                                </p>
+                            )}
+
+                            {gaslessEnabled && (
+                                <>
+                                    <FeeAssetSelect value={feeAsset} onChange={setFeeAsset} />
+                                    {gasless.fee && (
+                                        <p className="text-xs text-tertiary-foreground">Gas fee: {gasless.fee}</p>
+                                    )}
+                                    {gasless.quoteError && (
+                                        <p className="text-xs text-error">{getErrorMessage(gasless.quoteError)}</p>
+                                    )}
+                                </>
+                            )}
+                        </div>
+
                         {transferError && (
                             <div className="p-3 bg-error/10 border border-error/30 rounded-lg">
                                 <p className="text-sm text-error">{transferError}</p>
@@ -158,7 +239,7 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                     </div>
 
                     <div className="flex mt-6 gap-3">
-                        {tokenType === 'TON' && (
+                        {!gaslessEnabled && tokenType === 'TON' && (
                             <SendTonButton
                                 recipientAddress={recipientAddress}
                                 amount={amount}
@@ -179,7 +260,7 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                             </SendTonButton>
                         )}
 
-                        {tokenType === 'JETTON' && jetton?.address && (
+                        {!gaslessEnabled && tokenType === 'JETTON' && jetton?.address && (
                             <SendJettonButton
                                 jetton={{
                                     address: jetton.address,
@@ -205,6 +286,24 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                             </SendJettonButton>
                         )}
 
+                        {gaslessEnabled && (
+                            <Button
+                                loading={gasless.isSending}
+                                onClick={handleGaslessSubmit}
+                                disabled={
+                                    !recipientAddress ||
+                                    !amount ||
+                                    !feeAsset ||
+                                    !gasless.quote ||
+                                    gasless.isQuoting ||
+                                    gasless.isSending
+                                }
+                                className="flex-1"
+                            >
+                                {gasless.isSending ? 'Sending…' : gasless.isQuoting ? 'Quoting…' : 'Send Gasless'}
+                            </Button>
+                        )}
+
                         <Button variant="secondary" onClick={handleClose} className="flex-1">
                             Cancel
                         </Button>
diff --git a/apps/appkit-minter/src/pages/gasless-page.tsx b/apps/appkit-minter/src/pages/gasless-page.tsx
deleted file mode 100644
index 7f89ee2e9..000000000
--- a/apps/appkit-minter/src/pages/gasless-page.tsx
+++ /dev/null
@@ -1,295 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { useState, useEffect, useMemo } from 'react';
-import type { FC } from 'react';
-import {
-    useAddress,
-    useGaslessSupportedAssets,
-    useGaslessQuote,
-    useJettonBalanceByAddress,
-    useJettonInfo,
-    useJettonWalletAddress,
-    useSelectedWallet,
-    useSendGaslessTransaction,
-} from '@ton/appkit-react';
-import {
-    asAddressFriendly,
-    asBase64,
-    compareAddress,
-    createJettonTransferPayload,
-    GaslessError,
-    parseUnits,
-} from '@ton/appkit';
-import type { GaslessSupportedAsset, TransactionRequestMessage, UserFriendlyAddress } from '@ton/appkit';
-import { toast } from 'sonner';
-
-import { Layout } from '@/core/components';
-
-const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
-const USDT_DECIMALS = 6;
-const JETTON_FORWARD_TON = parseUnits('0.06', 9).toString();
-
-const formatRelativeTimeFromNow = (timestampSec: number): string => {
-    const diffSec = timestampSec - Math.floor(Date.now() / 1000);
-    if (diffSec <= 0) return 'expired';
-    const min = Math.floor(diffSec / 60);
-    const sec = diffSec % 60;
-    return min > 0 ? `${min}m ${sec}s` : `${sec}s`;
-};
-
-const useNow = (intervalMs = 1000): number => {
-    const [now, setNow] = useState(() => Date.now());
-
-    useEffect(() => {
-        const id = window.setInterval(() => setNow(Date.now()), intervalMs);
-        return () => window.clearInterval(id);
-    }, [intervalMs]);
-
-    return now;
-};
-
-export const GaslessPage: FC = () => {
-    const address = useAddress();
-    const [selectedWallet] = useSelectedWallet();
-
-    const { data: supportedAssets, isLoading: isAssetsLoading } = useGaslessSupportedAssets();
-    const { mutateAsync: sendGasless, isPending: isSending } = useSendGaslessTransaction();
-
-    const [recipient, setRecipient] = useState('');
-    const [amount, setAmount] = useState('0.1');
-    const [feeAsset, setFeeAsset] = useState<UserFriendlyAddress | null>(null);
-
-    useEffect(() => {
-        if (address && !recipient) setRecipient(address);
-    }, [address, recipient]);
-
-    useEffect(() => {
-        if (!feeAsset && supportedAssets?.length) {
-            const preferred = supportedAssets.find((asset: GaslessSupportedAsset) =>
-                compareAddress(asset.address, USDT_MASTER_MAINNET),
-            );
-            setFeeAsset(preferred?.address ?? supportedAssets[0].address);
-        }
-    }, [feeAsset, supportedAssets]);
-
-    const { data: usdtBalance } = useJettonBalanceByAddress({
-        jettonAddress: USDT_MASTER_MAINNET,
-        ownerAddress: address,
-        jettonDecimals: USDT_DECIMALS,
-    });
-
-    const { data: usdtWalletAddress } = useJettonWalletAddress({
-        jettonAddress: USDT_MASTER_MAINNET,
-        ownerAddress: address,
-    });
-
-    // The relayer fee is denominated in the selected fee asset, so resolve its
-    // decimals/symbol instead of assuming USDT — picking another asset would
-    // otherwise format the fee with the wrong scale.
-    const { data: feeAssetInfo } = useJettonInfo({
-        address: feeAsset ?? undefined,
-        query: { enabled: Boolean(feeAsset) },
-    });
-
-    const supportsSignMessage = useMemo(() => {
-        const features = selectedWallet?.getSupportedFeatures();
-        if (features === undefined) return true;
-        return features.some((f) => typeof f === 'object' && f.name === 'SignMessage');
-    }, [selectedWallet]);
-
-    const messages = useMemo<TransactionRequestMessage[] | null>(() => {
-        if (!address || !usdtWalletAddress || !recipient || !amount) return null;
-        try {
-            const payload = createJettonTransferPayload({
-                amount: parseUnits(amount, USDT_DECIMALS),
-                destination: recipient,
-                responseDestination: address,
-            });
-            return [
-                {
-                    address: usdtWalletAddress,
-                    amount: JETTON_FORWARD_TON,
-                    payload: asBase64(payload.toBoc().toString('base64')),
-                },
-            ];
-        } catch {
-            return null;
-        }
-    }, [address, amount, recipient, usdtWalletAddress]);
-
-    const {
-        data: quote,
-        isFetching: isQuoting,
-        error: quoteError,
-    } = useGaslessQuote({
-        feeAsset: feeAsset ?? undefined,
-        messages: messages ?? undefined,
-        query: { enabled: Boolean(address && feeAsset && messages) },
-    });
-
-    const now = useNow();
-    const validUntilText = useMemo(() => {
-        if (!quote) return null;
-        // `now` is in the dep array so the countdown ticks every second.
-        void now;
-        return formatRelativeTimeFromNow(quote.validUntil);
-    }, [quote, now]);
-
-    const feeDecimals = feeAssetInfo?.decimals ?? USDT_DECIMALS;
-    const feeSymbol = feeAssetInfo?.symbol || 'USDT';
-    const formattedFee = useMemo(() => {
-        if (!quote) return null;
-        const feeWhole = Number(quote.fee) / 10 ** feeDecimals;
-        return feeWhole.toFixed(feeDecimals);
-    }, [quote, feeDecimals]);
-
-    const handleSend = async () => {
-        if (!quote) {
-            toast.error('No quote available yet');
-            return;
-        }
-
-        try {
-            const result = await sendGasless({ quote });
-            const txHash = result.normalizedHash;
-            if (txHash) {
-                const explorerUrl = `https://tonviewer.com/transaction/${txHash}`;
-                toast.success('Gasless transaction submitted!', {
-                    description: txHash.slice(0, 10) + '…',
-                    action: {
-                        label: 'Explorer',
-                        onClick: () => window.open(explorerUrl, '_blank'),
-                    },
-                });
-            } else {
-                toast.success('Gasless transaction submitted!');
-            }
-        } catch (error) {
-            if (error instanceof GaslessError) {
-                toast.error(`${error.code}: ${error.message}`);
-            } else {
-                toast.error(error instanceof Error ? error.message : 'Failed to send gasless transaction');
-            }
-        }
-    };
-
-    return (
-        <Layout title="Gasless Transfer">
-            <div className="w-full max-w-[488px] mx-auto p-6 space-y-6 rounded-2xl border border-border bg-card">
-                <div className="space-y-2">
-                    <h2 className="text-xl font-semibold">Send USDT (Gasless)</h2>
-                    <p className="text-sm text-muted-foreground">
-                        Send USDT without having TON for gas. The fee is paid in the selected jetton.
-                    </p>
-                </div>
-
-                {!address && (
-                    <div className="p-4 bg-yellow-500/10 border border-yellow-500/20 rounded-lg text-yellow-600 text-sm">
-                        Please connect your wallet first.
-                    </div>
-                )}
-
-                {address && !supportsSignMessage && (
-                    <div className="p-4 bg-red-500/10 border border-red-500/20 rounded-lg text-red-600 text-sm">
-                        Your wallet does not support SignMessage, which is required for gasless transactions.
-                    </div>
-                )}
-
-                {address && (
-                    <div className="space-y-4">
-                        <div className="space-y-1">
-                            <label className="text-xs font-medium uppercase text-muted-foreground">USDT Balance</label>
-                            <div className="text-lg font-mono">
-                                {usdtBalance ? Number(usdtBalance).toFixed(2) : '0.00'} USDT
-                            </div>
-                        </div>
-
-                        <div className="space-y-2">
-                            <label className="text-sm font-medium">Fee asset</label>
-                            <select
-                                className="w-full p-2 bg-secondary rounded-md border border-border"
-                                value={feeAsset ?? ''}
-                                onChange={(e) => setFeeAsset(asAddressFriendly(e.target.value))}
-                                disabled={isAssetsLoading || !supportedAssets?.length}
-                            >
-                                {supportedAssets?.map((asset) => (
-                                    <option key={asset.address} value={asset.address}>
-                                        {asset.address.slice(0, 6)}…{asset.address.slice(-4)}
-                                    </option>
-                                ))}
-                            </select>
-
-                            {feeAssetInfo && (
-                                <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                                    {feeAssetInfo.image && (
-                                        <img
-                                            src={feeAssetInfo.image}
-                                            alt={feeSymbol}
-                                            className="w-4 h-4 rounded-full"
-                                        />
-                                    )}
-                                    <span className="font-medium text-foreground">{feeSymbol}</span>
-                                    {feeAssetInfo.name && <span>· {feeAssetInfo.name}</span>}
-                                    <span>· {feeDecimals} decimals</span>
-                                </div>
-                            )}
-                        </div>
-
-                        <div className="space-y-2">
-                            <label className="text-sm font-medium">Recipient Address</label>
-                            <input
-                                className="w-full p-2 bg-secondary rounded-md border border-border"
-                                value={recipient}
-                                onChange={(e) => setRecipient(e.target.value)}
-                                placeholder="Address"
-                            />
-                        </div>
-
-                        <div className="space-y-2">
-                            <label className="text-sm font-medium">Amount (USDT)</label>
-                            <input
-                                className="w-full p-2 bg-secondary rounded-md border border-border"
-                                type="number"
-                                value={amount}
-                                onChange={(e) => setAmount(e.target.value)}
-                            />
-                        </div>
-
-                        {quoteError && <div className="text-xs text-red-500">Quote failed: {quoteError.message}</div>}
-
-                        {quote && (
-                            <div className="grid grid-cols-2 gap-2 text-xs">
-                                <div className="text-muted-foreground">Relayer fee</div>
-                                <div className="text-right font-mono">
-                                    {formattedFee} {feeSymbol}
-                                </div>
-                                <div className="text-muted-foreground">Valid for</div>
-                                <div className="text-right font-mono">{validUntilText}</div>
-                            </div>
-                        )}
-
-                        <button
-                            className="w-full py-3 bg-primary text-primary-foreground rounded-xl font-semibold disabled:opacity-50"
-                            onClick={handleSend}
-                            disabled={isSending || isQuoting || !quote || !supportsSignMessage}
-                        >
-                            {isSending
-                                ? 'Sending…'
-                                : isQuoting
-                                  ? 'Quoting…'
-                                  : !supportsSignMessage
-                                    ? 'SignMessage not supported'
-                                    : 'Send Gasless'}
-                        </button>
-                    </div>
-                )}
-            </div>
-        </Layout>
-    );
-};
diff --git a/apps/appkit-minter/src/pages/index.ts b/apps/appkit-minter/src/pages/index.ts
index ad60f596a..09a13a93d 100644
--- a/apps/appkit-minter/src/pages/index.ts
+++ b/apps/appkit-minter/src/pages/index.ts
@@ -11,5 +11,3 @@ export { JettonsPage } from './jettons-page';
 export { NftsPage } from './nfts-page';
 export { SwapPage } from './swap-page';
 export { StakingPage } from './staking-page';
-export { SignMessagePage } from './sign-message-page';
-export { GaslessPage } from './gasless-page';
diff --git a/apps/appkit-minter/src/pages/sign-message-page.tsx b/apps/appkit-minter/src/pages/sign-message-page.tsx
deleted file mode 100644
index c019853ee..000000000
--- a/apps/appkit-minter/src/pages/sign-message-page.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { useState } from 'react';
-import type { FC } from 'react';
-import { useSignText, useSelectedWallet } from '@ton/appkit-react';
-import { toast } from 'sonner';
-
-import { Layout } from '@/core/components';
-
-export const SignMessagePage: FC = () => {
-    const [message, setMessage] = useState('');
-    const [signature, setSignature] = useState<string | null>(null);
-
-    const [wallet] = useSelectedWallet();
-    const { mutate: signText, isPending } = useSignText({
-        mutation: {
-            onSuccess: (result) => {
-                setSignature(result.signature);
-                toast.success('Message signed successfully!');
-            },
-            onError: (error) => {
-                toast.error(`Signing failed: ${error.message}`);
-            },
-        },
-    });
-
-    const handleSign = () => {
-        if (!wallet || !message.trim()) {
-            toast.error('Please enter a message to sign');
-            return;
-        }
-
-        signText({ text: message });
-    };
-
-    const handleCopySignature = () => {
-        if (signature) {
-            navigator.clipboard.writeText(signature);
-            toast.success('Signature copied to clipboard!');
-        }
-    };
-
-    return (
-        <Layout title="Sign Message">
-            <div className="w-full max-w-[488px] mx-auto p-6 space-y-4 rounded-2xl border border-border bg-card">
-                <h2 className="text-xl font-semibold">Sign Message</h2>
-
-                <div>
-                    <label className="block text-sm font-medium text-foreground mb-2">Message to sign</label>
-                    <textarea
-                        className="w-full p-3 bg-muted border border-border rounded-lg text-foreground placeholder:text-muted-foreground resize-none focus:outline-none focus:ring-2 focus:ring-primary"
-                        rows={3}
-                        placeholder="Enter your message here..."
-                        value={message}
-                        onChange={(e) => setMessage(e.target.value)}
-                        disabled={isPending}
-                    />
-                </div>
-
-                <button
-                    className="w-full py-3 bg-primary text-primary-foreground rounded-xl font-semibold disabled:opacity-50"
-                    onClick={handleSign}
-                    disabled={!wallet || !message.trim() || isPending}
-                >
-                    {isPending ? 'Signing...' : 'Sign Message'}
-                </button>
-
-                {signature && (
-                    <div className="space-y-2">
-                        <label className="block text-sm font-medium text-foreground">Signature</label>
-                        <div className="p-3 bg-muted border border-border rounded-lg break-all text-xs font-mono">
-                            {signature}
-                        </div>
-                        <button
-                            className="w-full py-2 bg-secondary text-secondary-foreground rounded-lg text-sm"
-                            onClick={handleCopySignature}
-                        >
-                            Copy Signature
-                        </button>
-                    </div>
-                )}
-            </div>
-        </Layout>
-    );
-};

From c1b87ac1ba8b39af364f923dc75a0db5e07d9864 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 14:11:37 +0400
Subject: [PATCH 24/46] feat(gasless): update UI

---
 ...less-transfer.tsx => fee-asset-select.tsx} |  91 +------
 .../balances/components/gasless-controls.tsx  |  74 ++++++
 .../balances/components/token-summary.tsx     |  41 +++
 .../components/token-transfer-modal.tsx       | 238 +++++-------------
 .../balances/components/transfer-receipt.tsx  |  30 +++
 .../balances/hooks/use-gasless-transfer.ts    |  83 ++++++
 .../balances/utils/get-token-summary.ts       |  35 +++
 7 files changed, 339 insertions(+), 253 deletions(-)
 rename apps/appkit-minter/src/features/balances/components/{gasless-transfer.tsx => fee-asset-select.tsx} (50%)
 create mode 100644 apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
 create mode 100644 apps/appkit-minter/src/features/balances/components/token-summary.tsx
 create mode 100644 apps/appkit-minter/src/features/balances/components/transfer-receipt.tsx
 create mode 100644 apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts
 create mode 100644 apps/appkit-minter/src/features/balances/utils/get-token-summary.ts

diff --git a/apps/appkit-minter/src/features/balances/components/gasless-transfer.tsx b/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
similarity index 50%
rename from apps/appkit-minter/src/features/balances/components/gasless-transfer.tsx
rename to apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
index ded02270f..031496821 100644
--- a/apps/appkit-minter/src/features/balances/components/gasless-transfer.tsx
+++ b/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
@@ -6,18 +6,11 @@
  *
  */
 
-import { useCallback, useEffect } from 'react';
+import { useEffect } from 'react';
 import type { FC } from 'react';
-import {
-    Input,
-    useGaslessJettonTransferQuote,
-    useGaslessSupportedAssets,
-    useGaslessTonTransferQuote,
-    useJettonInfo,
-    useSendGaslessTransaction,
-} from '@ton/appkit-react';
-import { asAddressFriendly, compareAddress, formatUnits } from '@ton/appkit';
-import type { GaslessSendResponse, UserFriendlyAddress } from '@ton/appkit';
+import { Input, useGaslessSupportedAssets, useJettonInfo } from '@ton/appkit-react';
+import { asAddressFriendly, compareAddress } from '@ton/appkit';
+import type { UserFriendlyAddress } from '@ton/appkit';
 
 const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 
@@ -41,9 +34,9 @@ interface FeeAssetSelectProps {
 
 /**
  * Fee-asset picker for gasless transfers. Lists the relayer-accepted assets and
- * preselects USDT (or the first asset) once they load. Uses a native `<select>`
- * styled with the app's design tokens — the browser-rendered dropdown handles
- * its own viewport clamping/scroll.
+ * preselects USDT (or the first asset) once they load. The native `<select>` is
+ * wrapped in `Input.Container size="s"` so the field background/border/focus
+ * state match the modal's other inputs.
  */
 export const FeeAssetSelect: FC<FeeAssetSelectProps> = ({ value, onChange, disabled }) => {
     const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
@@ -63,10 +56,6 @@ export const FeeAssetSelect: FC<FeeAssetSelectProps> = ({ value, onChange, disab
                 <Input.Title>Fee asset</Input.Title>
             </Input.Header>
             <Input.Field>
-                {/* Native select inside `Input.Field`: the container owns the
-                    field background / border / focus state, so the select itself
-                    only needs the transparent inner styling that mirrors
-                    `Input.Input`. */}
                 <select
                     className="flex-1 min-w-0 w-full bg-transparent border-none outline-none text-foreground p-0 cursor-pointer"
                     style={{
@@ -94,69 +83,3 @@ export const FeeAssetSelect: FC<FeeAssetSelectProps> = ({ value, onChange, disab
         </Input>
     );
 };
-
-interface UseGaslessTransferParams {
-    /** Only quote/send while the gasless toggle is on. */
-    enabled: boolean;
-    tokenType: 'TON' | 'JETTON';
-    jettonAddress?: string;
-    recipientAddress: string;
-    amount: string;
-    comment?: string;
-    feeAsset: UserFriendlyAddress | null;
-}
-
-/**
- * Drives the gasless quote → send flow for the transfer modal. Quotes the
- * jetton or TON transfer (depending on `tokenType`) and exposes a formatted fee
- * plus a `send` that relays the signed quote.
- */
-export const useGaslessTransfer = ({
-    enabled,
-    tokenType,
-    jettonAddress,
-    recipientAddress,
-    amount,
-    comment,
-    feeAsset,
-}: UseGaslessTransferParams) => {
-    const hasInputs = Boolean(recipientAddress && amount && feeAsset);
-
-    const jettonQuote = useGaslessJettonTransferQuote({
-        jettonAddress: jettonAddress ?? '',
-        recipientAddress,
-        amount,
-        comment,
-        feeAsset: feeAsset ?? undefined,
-        query: { enabled: enabled && tokenType === 'JETTON' && hasInputs && Boolean(jettonAddress) },
-    });
-
-    const tonQuote = useGaslessTonTransferQuote({
-        recipientAddress,
-        amount,
-        comment,
-        feeAsset: feeAsset ?? undefined,
-        query: { enabled: enabled && tokenType === 'TON' && hasInputs },
-    });
-
-    const { data: quote, isFetching: isQuoting, error: quoteError } = tokenType === 'JETTON' ? jettonQuote : tonQuote;
-
-    const { data: feeAssetInfo } = useJettonInfo({
-        address: feeAsset ?? undefined,
-        query: { enabled: enabled && Boolean(feeAsset) },
-    });
-
-    const fee =
-        quote && feeAssetInfo?.decimals != null
-            ? `${formatUnits(quote.fee, feeAssetInfo.decimals)} ${feeAssetInfo.symbol || ''}`.trim()
-            : null;
-
-    const { mutateAsync, isPending: isSending } = useSendGaslessTransaction();
-
-    const send = useCallback(async (): Promise<GaslessSendResponse | undefined> => {
-        if (!quote) return undefined;
-        return mutateAsync({ quote });
-    }, [quote, mutateAsync]);
-
-    return { quote, quoteError, isQuoting, fee, send, isSending };
-};
diff --git a/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx b/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
new file mode 100644
index 000000000..ecfcd1e72
--- /dev/null
+++ b/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useMemo } from 'react';
+import type { FC } from 'react';
+import { useSelectedWallet } from '@ton/appkit-react';
+import { getErrorMessage } from '@ton/appkit';
+import type { UserFriendlyAddress } from '@ton/appkit';
+
+import { FeeAssetSelect } from './fee-asset-select';
+
+interface GaslessControlsProps {
+    enabled: boolean;
+    onEnabledChange: (next: boolean) => void;
+    feeAsset: UserFriendlyAddress | null;
+    onFeeAssetChange: (next: UserFriendlyAddress) => void;
+    fee: string | null;
+    quoteError: unknown;
+}
+
+/**
+ * Self-contained gasless UI block for the transfer modal: the enable toggle
+ * (auto-disabled when the wallet lacks `SignMessage`), the fee-asset select,
+ * the formatted fee preview and the quote error. Controlled by the caller —
+ * gasless state lives in the modal so it can also gate the send button.
+ */
+export const GaslessControls: FC<GaslessControlsProps> = ({
+    enabled,
+    onEnabledChange,
+    feeAsset,
+    onFeeAssetChange,
+    fee,
+    quoteError,
+}) => {
+    const [selectedWallet] = useSelectedWallet();
+    const supportsSignMessage = useMemo(() => {
+        const features = selectedWallet?.getSupportedFeatures();
+        if (features === undefined) return true;
+        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+    }, [selectedWallet]);
+
+    return (
+        <div className="space-y-2">
+            <label className="inline-flex items-center gap-2 text-sm text-foreground">
+                <input
+                    type="checkbox"
+                    checked={enabled}
+                    disabled={!supportsSignMessage}
+                    onChange={(event) => onEnabledChange(event.target.checked)}
+                />
+                <span>Gasless — pay the gas fee in another token</span>
+            </label>
+
+            {!supportsSignMessage && (
+                <p className="text-xs text-tertiary-foreground">
+                    Connected wallet does not support gasless (no SignMessage feature).
+                </p>
+            )}
+
+            {enabled && (
+                <>
+                    <FeeAssetSelect value={feeAsset} onChange={onFeeAssetChange} />
+                    {fee && <p className="text-xs text-tertiary-foreground">Gas fee: {fee}</p>}
+                    {quoteError && <p className="text-xs text-error">{getErrorMessage(quoteError)}</p>}
+                </>
+            )}
+        </div>
+    );
+};
diff --git a/apps/appkit-minter/src/features/balances/components/token-summary.tsx b/apps/appkit-minter/src/features/balances/components/token-summary.tsx
new file mode 100644
index 000000000..213a868cd
--- /dev/null
+++ b/apps/appkit-minter/src/features/balances/components/token-summary.tsx
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { FC } from 'react';
+import { Gem } from 'lucide-react';
+
+import type { TokenInfo } from '../utils/get-token-summary';
+
+interface TokenSummaryProps {
+    tokenType: 'TON' | 'JETTON';
+    info: TokenInfo;
+}
+
+/**
+ * Token avatar + available balance — the static header shown above the form in
+ * the transfer modal.
+ */
+export const TokenSummary: FC<TokenSummaryProps> = ({ tokenType, info }) => (
+    <div className="flex items-center space-x-3 mb-6">
+        <div className="w-10 h-10 bg-tertiary rounded-full flex items-center justify-center overflow-hidden">
+            {info.image ? (
+                <img src={info.image} alt={info.name} className="w-full h-full object-cover" />
+            ) : tokenType === 'TON' ? (
+                <Gem className="w-6 h-6 text-primary" />
+            ) : (
+                <span className="text-sm font-bold text-tertiary-foreground">{info.symbol?.slice(0, 2)}</span>
+            )}
+        </div>
+        <div>
+            <p className="text-sm font-medium text-foreground">Available Balance</p>
+            <p className="text-xs text-tertiary-foreground">
+                {info.balance} {info.symbol}
+            </p>
+        </div>
+    </div>
+);
diff --git a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
index ab7769972..35f62b78b 100644
--- a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
+++ b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
@@ -8,21 +8,14 @@
 
 import React, { useMemo, useState } from 'react';
 import type { Jetton, UserFriendlyAddress } from '@ton/appkit';
-import { getFormattedJettonInfo, getErrorMessage } from '@ton/appkit';
-import {
-    SendTonButton,
-    SendJettonButton,
-    Button,
-    Input,
-    Modal,
-    useAddress,
-    useSelectedWallet,
-} from '@ton/appkit-react';
-import { Gem } from 'lucide-react';
+import { getErrorMessage } from '@ton/appkit';
+import { Button, Input, Modal, useAddress, useTransferJetton, useTransferTon } from '@ton/appkit-react';
 
-import { FeeAssetSelect, useGaslessTransfer } from './gasless-transfer';
-
-import { TransactionStatus } from '@/features/transaction';
+import { GaslessControls } from './gasless-controls';
+import { useGaslessTransfer } from '../hooks/use-gasless-transfer';
+import { getTokenSummary } from '../utils/get-token-summary';
+import { TokenSummary } from './token-summary';
+import { TransferReceipt } from './transfer-receipt';
 
 interface TokenTransferModalProps {
     tokenType: 'TON' | 'JETTON';
@@ -48,12 +41,8 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
     const [feeAsset, setFeeAsset] = useState<UserFriendlyAddress | null>(null);
 
     const address = useAddress();
-    const [selectedWallet] = useSelectedWallet();
-    const supportsSignMessage = useMemo(() => {
-        const features = selectedWallet?.getSupportedFeatures();
-        if (features === undefined) return true;
-        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
-    }, [selectedWallet]);
+
+    const tokenInfo = useMemo(() => getTokenSummary(tokenType, tonBalance, jetton), [tokenType, tonBalance, jetton]);
 
     const gasless = useGaslessTransfer({
         enabled: gaslessEnabled,
@@ -65,33 +54,27 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
         feeAsset,
     });
 
-    const tokenInfo = useMemo(() => {
-        if (tokenType === 'TON') {
-            return {
-                name: 'Toncoin',
-                symbol: 'TON',
-                decimals: 9,
-                balance: tonBalance,
-                image: './ton.png',
-                address: null,
-            };
-        }
-
-        if (!jetton) {
-            throw new Error('Jetton not found');
-        }
-
-        const jettonInfo = getFormattedJettonInfo(jetton);
-
-        return {
-            name: jettonInfo.name,
-            symbol: jettonInfo.symbol,
-            decimals: jettonInfo.decimals,
-            balance: jettonInfo.balance,
-            image: jettonInfo.image,
-            address: jettonInfo.address,
-        };
-    }, [tokenType, tonBalance, jetton]);
+    const { mutateAsync: transferTon, isPending: isTransferTonPending } = useTransferTon();
+    const { mutateAsync: transferJetton, isPending: isTransferJettonPending } = useTransferJetton();
+    const isRegularPending = tokenType === 'TON' ? isTransferTonPending : isTransferJettonPending;
+    const isPending = gaslessEnabled ? gasless.isSending : isRegularPending;
+
+    const submitDisabled =
+        isPending ||
+        !recipientAddress ||
+        !amount ||
+        (tokenType === 'JETTON' && !jetton?.address) ||
+        (gaslessEnabled && (!feeAsset || !gasless.quote || gasless.isQuoting));
+
+    const submitText = gaslessEnabled
+        ? gasless.isSending
+            ? 'Sending…'
+            : gasless.isQuoting
+              ? 'Quoting…'
+              : 'Send Gasless'
+        : isPending
+          ? 'Sending…'
+          : `Send ${tokenInfo.symbol ?? 'Jetton'}`;
 
     const handleClose = () => {
         setRecipientAddress('');
@@ -104,11 +87,34 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
         onClose();
     };
 
-    const handleGaslessSubmit = async () => {
+    const handleSubmit = async () => {
         setTransferError(null);
         try {
-            const result = await gasless.send();
-            if (result) setTxBoc(result.boc);
+            if (gaslessEnabled) {
+                const result = await gasless.send();
+                if (result) setTxBoc(result.boc);
+                return;
+            }
+
+            if (tokenType === 'TON') {
+                const { boc } = await transferTon({ recipientAddress, amount, comment });
+                setTxBoc(boc);
+                return;
+            }
+
+            if (jetton?.address) {
+                const { boc } = await transferJetton({
+                    jettonAddress: jetton.address,
+                    recipientAddress,
+                    amount,
+                    comment,
+                    jettonDecimals: tokenInfo.decimals,
+                });
+                setTxBoc(boc);
+                return;
+            }
+
+            throw new Error('Invalid token type or missing jetton address');
         } catch (error) {
             setTransferError(getErrorMessage(error));
         }
@@ -118,33 +124,10 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
 
     return (
         <Modal title={`Transfer ${tokenInfo.name}`} open={isOpen} onOpenChange={(open) => !open && handleClose()}>
-            <div className="flex items-center space-x-3 mb-6">
-                <div className="w-10 h-10 bg-tertiary rounded-full flex items-center justify-center overflow-hidden">
-                    {tokenInfo.image ? (
-                        <img src={tokenInfo.image} alt={tokenInfo.name} className="w-full h-full object-cover" />
-                    ) : tokenType === 'TON' ? (
-                        <Gem className="w-6 h-6 text-primary" />
-                    ) : (
-                        <span className="text-sm font-bold text-tertiary-foreground">
-                            {tokenInfo.symbol?.slice(0, 2)}
-                        </span>
-                    )}
-                </div>
-                <div>
-                    <p className="text-sm font-medium text-foreground">Available Balance</p>
-                    <p className="text-xs text-tertiary-foreground">
-                        {tokenInfo.balance} {tokenInfo.symbol}
-                    </p>
-                </div>
-            </div>
+            <TokenSummary tokenType={tokenType} info={tokenInfo} />
 
             {txBoc ? (
-                <div className="space-y-6">
-                    <TransactionStatus boc={txBoc} />
-                    <Button fullWidth onClick={handleClose}>
-                        Close
-                    </Button>
-                </div>
+                <TransferReceipt boc={txBoc} onClose={handleClose} />
             ) : (
                 <>
                     <div className="space-y-4">
@@ -201,35 +184,14 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                             </Input.Field>
                         </Input>
 
-                        <div className="space-y-2">
-                            <label className="inline-flex items-center gap-2 text-sm text-foreground">
-                                <input
-                                    type="checkbox"
-                                    checked={gaslessEnabled}
-                                    disabled={!supportsSignMessage}
-                                    onChange={(e) => setGaslessEnabled(e.target.checked)}
-                                />
-                                <span>Gasless — pay the gas fee in another token</span>
-                            </label>
-
-                            {!supportsSignMessage && (
-                                <p className="text-xs text-tertiary-foreground">
-                                    Connected wallet does not support gasless (no SignMessage feature).
-                                </p>
-                            )}
-
-                            {gaslessEnabled && (
-                                <>
-                                    <FeeAssetSelect value={feeAsset} onChange={setFeeAsset} />
-                                    {gasless.fee && (
-                                        <p className="text-xs text-tertiary-foreground">Gas fee: {gasless.fee}</p>
-                                    )}
-                                    {gasless.quoteError && (
-                                        <p className="text-xs text-error">{getErrorMessage(gasless.quoteError)}</p>
-                                    )}
-                                </>
-                            )}
-                        </div>
+                        <GaslessControls
+                            enabled={gaslessEnabled}
+                            onEnabledChange={setGaslessEnabled}
+                            feeAsset={feeAsset}
+                            onFeeAssetChange={setFeeAsset}
+                            fee={gasless.fee}
+                            quoteError={gasless.quoteError}
+                        />
 
                         {transferError && (
                             <div className="p-3 bg-error/10 border border-error/30 rounded-lg">
@@ -239,71 +201,9 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                     </div>
 
                     <div className="flex mt-6 gap-3">
-                        {!gaslessEnabled && tokenType === 'TON' && (
-                            <SendTonButton
-                                recipientAddress={recipientAddress}
-                                amount={amount}
-                                comment={comment}
-                                onError={(error) => setTransferError(getErrorMessage(error))}
-                                onSuccess={(data) => setTxBoc(data.boc)}
-                            >
-                                {({ isLoading, onSubmit, disabled, text }) => (
-                                    <Button
-                                        loading={isLoading}
-                                        onClick={onSubmit}
-                                        disabled={disabled}
-                                        className="flex-1"
-                                    >
-                                        {text}
-                                    </Button>
-                                )}
-                            </SendTonButton>
-                        )}
-
-                        {!gaslessEnabled && tokenType === 'JETTON' && jetton?.address && (
-                            <SendJettonButton
-                                jetton={{
-                                    address: jetton.address,
-                                    symbol: jetton.info?.symbol || 'Jetton',
-                                    decimals: tokenInfo.decimals,
-                                }}
-                                recipientAddress={recipientAddress}
-                                amount={amount}
-                                comment={comment}
-                                onError={(error) => setTransferError(getErrorMessage(error))}
-                                onSuccess={(data) => setTxBoc(data.boc)}
-                            >
-                                {({ isLoading, onSubmit, disabled, text }) => (
-                                    <Button
-                                        loading={isLoading}
-                                        onClick={onSubmit}
-                                        disabled={disabled}
-                                        className="flex-1"
-                                    >
-                                        {text}
-                                    </Button>
-                                )}
-                            </SendJettonButton>
-                        )}
-
-                        {gaslessEnabled && (
-                            <Button
-                                loading={gasless.isSending}
-                                onClick={handleGaslessSubmit}
-                                disabled={
-                                    !recipientAddress ||
-                                    !amount ||
-                                    !feeAsset ||
-                                    !gasless.quote ||
-                                    gasless.isQuoting ||
-                                    gasless.isSending
-                                }
-                                className="flex-1"
-                            >
-                                {gasless.isSending ? 'Sending…' : gasless.isQuoting ? 'Quoting…' : 'Send Gasless'}
-                            </Button>
-                        )}
-
+                        <Button loading={isPending} onClick={handleSubmit} disabled={submitDisabled} className="flex-1">
+                            {submitText}
+                        </Button>
                         <Button variant="secondary" onClick={handleClose} className="flex-1">
                             Cancel
                         </Button>
diff --git a/apps/appkit-minter/src/features/balances/components/transfer-receipt.tsx b/apps/appkit-minter/src/features/balances/components/transfer-receipt.tsx
new file mode 100644
index 000000000..9af68f7a1
--- /dev/null
+++ b/apps/appkit-minter/src/features/balances/components/transfer-receipt.tsx
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { FC } from 'react';
+import { Button } from '@ton/appkit-react';
+
+import { TransactionStatus } from '@/features/transaction';
+
+interface TransferReceiptProps {
+    boc: string;
+    onClose: () => void;
+}
+
+/**
+ * Post-submit view in the transfer modal: tracks the transaction status by BoC
+ * and offers a Close button.
+ */
+export const TransferReceipt: FC<TransferReceiptProps> = ({ boc, onClose }) => (
+    <div className="space-y-6">
+        <TransactionStatus boc={boc} />
+        <Button fullWidth onClick={onClose}>
+            Close
+        </Button>
+    </div>
+);
diff --git a/apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts b/apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts
new file mode 100644
index 000000000..2c9cdf6ee
--- /dev/null
+++ b/apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useCallback } from 'react';
+import {
+    useGaslessJettonTransferQuote,
+    useGaslessTonTransferQuote,
+    useJettonInfo,
+    useSendGaslessTransaction,
+} from '@ton/appkit-react';
+import { formatUnits } from '@ton/appkit';
+import type { GaslessSendResponse, UserFriendlyAddress } from '@ton/appkit';
+
+interface UseGaslessTransferParams {
+    /** Only quote/send while the gasless toggle is on. */
+    enabled: boolean;
+    tokenType: 'TON' | 'JETTON';
+    jettonAddress?: string;
+    recipientAddress: string;
+    amount: string;
+    comment?: string;
+    feeAsset: UserFriendlyAddress | null;
+}
+
+/**
+ * Drives the gasless quote → send flow for the transfer modal. Quotes the
+ * jetton or TON transfer (depending on `tokenType`) and exposes a formatted fee
+ * plus a `send` that relays the signed quote.
+ */
+export const useGaslessTransfer = ({
+    enabled,
+    tokenType,
+    jettonAddress,
+    recipientAddress,
+    amount,
+    comment,
+    feeAsset,
+}: UseGaslessTransferParams) => {
+    const hasInputs = Boolean(recipientAddress && amount && feeAsset);
+
+    const jettonQuote = useGaslessJettonTransferQuote({
+        jettonAddress: jettonAddress ?? '',
+        recipientAddress,
+        amount,
+        comment,
+        feeAsset: feeAsset ?? undefined,
+        query: { enabled: enabled && tokenType === 'JETTON' && hasInputs && Boolean(jettonAddress) },
+    });
+
+    const tonQuote = useGaslessTonTransferQuote({
+        recipientAddress,
+        amount,
+        comment,
+        feeAsset: feeAsset ?? undefined,
+        query: { enabled: enabled && tokenType === 'TON' && hasInputs },
+    });
+
+    const { data: quote, isFetching: isQuoting, error: quoteError } = tokenType === 'JETTON' ? jettonQuote : tonQuote;
+
+    const { data: feeAssetInfo } = useJettonInfo({
+        address: feeAsset ?? undefined,
+        query: { enabled: enabled && Boolean(feeAsset) },
+    });
+
+    const fee =
+        quote && feeAssetInfo?.decimals != null
+            ? `${formatUnits(quote.fee, feeAssetInfo.decimals)} ${feeAssetInfo.symbol || ''}`.trim()
+            : null;
+
+    const { mutateAsync, isPending: isSending } = useSendGaslessTransaction();
+
+    const send = useCallback(async (): Promise<GaslessSendResponse | undefined> => {
+        if (!quote) return undefined;
+        return mutateAsync({ quote });
+    }, [quote, mutateAsync]);
+
+    return { quote, quoteError, isQuoting, fee, send, isSending };
+};
diff --git a/apps/appkit-minter/src/features/balances/utils/get-token-summary.ts b/apps/appkit-minter/src/features/balances/utils/get-token-summary.ts
new file mode 100644
index 000000000..a8df41bc7
--- /dev/null
+++ b/apps/appkit-minter/src/features/balances/utils/get-token-summary.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Jetton } from '@ton/appkit';
+import { getFormattedJettonInfo } from '@ton/appkit';
+
+export interface TokenInfo {
+    name?: string;
+    symbol?: string;
+    decimals?: number;
+    balance: string;
+    image?: string | null;
+    address: string | null;
+}
+
+/**
+ * Derive display info for either native TON or a jetton — pure helper feeding
+ * `<TokenSummary>` and the modal's downstream transfer hooks.
+ */
+export const getTokenSummary = (
+    tokenType: 'TON' | 'JETTON',
+    tonBalance: string,
+    jetton: Jetton | undefined,
+): TokenInfo => {
+    if (tokenType === 'TON') {
+        return { name: 'Toncoin', symbol: 'TON', decimals: 9, balance: tonBalance, image: './ton.png', address: null };
+    }
+    if (!jetton) throw new Error('Jetton not found');
+    return getFormattedJettonInfo(jetton);
+};

From 7358cb1288581427473bbd5ee193d2ed5b956138 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 14:24:48 +0400
Subject: [PATCH 25/46] feat(gasless): hide gasless option for TON

---
 .../components/token-transfer-modal.tsx        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
index 35f62b78b..dcedbbcf8 100644
--- a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
+++ b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
@@ -184,14 +184,16 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
                             </Input.Field>
                         </Input>
 
-                        <GaslessControls
-                            enabled={gaslessEnabled}
-                            onEnabledChange={setGaslessEnabled}
-                            feeAsset={feeAsset}
-                            onFeeAssetChange={setFeeAsset}
-                            fee={gasless.fee}
-                            quoteError={gasless.quoteError}
-                        />
+                        {tokenType === 'JETTON' && (
+                            <GaslessControls
+                                enabled={gaslessEnabled}
+                                onEnabledChange={setGaslessEnabled}
+                                feeAsset={feeAsset}
+                                onFeeAssetChange={setFeeAsset}
+                                fee={gasless.fee}
+                                quoteError={gasless.quoteError}
+                            />
+                        )}
 
                         {transferError && (
                             <div className="p-3 bg-error/10 border border-error/30 rounded-lg">

From 0de3202c9b5310f591d7fbbfb0f1e83c28710449 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 19:52:32 +0400
Subject: [PATCH 26/46] feat(gasless): excess to relayer + delete gasless ton

---
 .changeset/gasless-transactions.md            | 27 ++---
 .../balances/components/fee-asset-select.tsx  |  5 +-
 .../components/token-transfer-modal.tsx       |  1 -
 .../balances/hooks/use-gasless-transfer.ts    | 33 ++-----
 .../appkit/actions/gasless/gasless-actions.ts | 24 ++---
 .../appkit/actions/gasless/gasless.test.ts    | 10 +-
 .../src/appkit/gasless/send-usdt-gasless.ts   | 12 ++-
 .../src/appkit/hooks/gasless/gasless.test.tsx | 49 +++------
 .../hooks/gasless/use-gasless-config.tsx      | 30 ++++++
 .../gasless/use-gasless-supported-assets.tsx  | 27 -----
 .../use-gasless-ton-transfer-quote.tsx        | 36 -------
 packages/appkit-react/docs/hooks.md           | 53 +++-------
 .../gasless/hooks/use-gasless-config.ts       | 35 +++++++
 .../hooks/use-gasless-supported-assets.ts     | 39 --------
 .../hooks/use-gasless-ton-transfer-quote.ts   | 48 ---------
 .../src/features/gasless/index.ts             | 13 +--
 packages/appkit/docs/actions.md               | 25 ++---
 packages/appkit/docs/gasless.md               | 14 ++-
 ...ported-assets.ts => get-gasless-config.ts} | 20 ++--
 .../get-gasless-jetton-transfer-quote.ts      |  7 ++
 .../gasless/get-gasless-ton-transfer-quote.ts | 65 ------------
 packages/appkit/src/actions/index.ts          | 16 +--
 .../create-transfer-jetton-transaction.ts     |  5 +-
 packages/appkit/src/gasless/index.ts          |  1 +
 .../src/queries/gasless/get-gasless-config.ts | 58 +++++++++++
 .../gasless/get-gasless-supported-assets.ts   | 66 -------------
 .../gasless/get-gasless-ton-transfer-quote.ts | 89 -----------------
 packages/appkit/src/queries/index.ts          | 25 ++---
 .../src/api/interfaces/DefiProvider.ts        |  7 +-
 .../src/api/interfaces/GaslessAPI.ts          | 13 ++-
 .../walletkit/src/api/interfaces/index.ts     |  2 +-
 .../src/api/models/core/DefiProviderType.ts   | 12 +++
 .../src/api/models/gasless/GaslessConfig.ts   | 26 +++++
 packages/walletkit/src/api/models/index.ts    |  2 +
 .../src/defi/gasless/GaslessManager.spec.ts   | 14 +--
 .../src/defi/gasless/GaslessManager.ts        | 12 +--
 .../src/defi/gasless/GaslessProvider.ts       |  6 +-
 packages/walletkit/src/defi/gasless/README.md | 16 +--
 packages/walletkit/src/defi/gasless/errors.ts |  2 +-
 .../src/defi/gasless/tonapi/README.md         |  4 +-
 .../tonapi/TonApiGaslessProvider.spec.ts      | 99 ++++++++++++++++---
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 54 +++++++---
 .../src/defi/gasless/tonapi/constants.ts      |  7 ++
 .../tonapi/mappers/map-gasless-config.ts      | 23 +++++
 .../mappers/map-gasless-supported-assets.ts   | 16 ---
 .../models/TonApiGaslessProviderConfig.ts     |  5 +
 template/packages/appkit-react/docs/hooks.md  | 12 +--
 template/packages/appkit/docs/actions.md      | 14 +--
 template/packages/appkit/docs/gasless.md      |  9 +-
 49 files changed, 506 insertions(+), 682 deletions(-)
 create mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
 delete mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx
 delete mode 100644 demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx
 create mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
 delete mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts
 delete mode 100644 packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
 rename packages/appkit/src/actions/gasless/{get-gasless-supported-assets.ts => get-gasless-config.ts} (54%)
 delete mode 100644 packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts
 create mode 100644 packages/appkit/src/queries/gasless/get-gasless-config.ts
 delete mode 100644 packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts
 delete mode 100644 packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts
 create mode 100644 packages/walletkit/src/api/models/core/DefiProviderType.ts
 create mode 100644 packages/walletkit/src/api/models/gasless/GaslessConfig.ts
 create mode 100644 packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
 delete mode 100644 packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-supported-assets.ts

diff --git a/.changeset/gasless-transactions.md b/.changeset/gasless-transactions.md
index 29871c856..e1544b510 100644
--- a/.changeset/gasless-transactions.md
+++ b/.changeset/gasless-transactions.md
@@ -4,26 +4,19 @@
 '@ton/appkit-react': patch
 ---
 
-Added gasless transactions support. A relayer pays gas; the user pays a fee in a relayer-accepted asset (e.g. USDT). See [`@ton/appkit/docs/gasless.md`](https://github.com/ton-connect/kit/blob/main/packages/appkit/docs/gasless.md) for a regular-send → gasless-send migration guide.
+Added gasless transactions support. A relayer pays the TON gas; the user pays a fee in a relayer-accepted jetton (e.g. USDT). See [`@ton/appkit/docs/gasless.md`](https://github.com/ton-connect/kit/blob/main/packages/appkit/docs/gasless.md) for the regular-send → gasless-send migration guide.
 
 - `@ton/walletkit`:
-    - New `GaslessManager` and `GaslessProvider` abstract base, parallel to `StakingManager` / `SwapManager`.
-    - `TonApiGaslessProvider` (`createTonApiGaslessProvider`) — multi-network gasless via the public TonAPI REST API. No external SDK dependency; talks to TonAPI via `fetch`. Auto-discovers networks from the kit when `chains` is omitted; per-chain `apiKey`/`endpoint` overrides supported.
-    - Models: `GaslessSupportedAsset`, `GaslessProviderMetadata` (`{ name, logo?, url? }`), `GaslessQuote`, `GaslessQuoteParams` (`feeAsset?: UserFriendlyAddress`), `GaslessSendParams`, `GaslessSendResponse` (strict superset of `SendTransactionResponse` adding `internalBoc`).
-    - `GaslessError` + `GaslessErrorCode` enum: `UnsupportedFeeAsset`, `UnsupportedOperation`, `QuoteFailed`, `SendFailed`, `SupportedAssetsFailed`, `SignMessageNotSupported`, `TooManyMessages`.
-    - Send retry: 3 retries with exponential backoff on transient errors (5xx / 408 / 429 / network); 4xx fails fast. Wallet seqno guard protects against on-chain double-spend on retry.
-    - `WalletAdapter` interface gains `signMessage(request): Promise<SignMessageResponse>` and `getSupportedFeatures(): Feature[] | undefined`.
-    - `asAddressFriendly` now re-exported from the package root.
-    - `Uint8ArrayToBase64` and `HexToBase64` return types tightened from `string` to `Base64String`.
+    - `GaslessManager` and the `GaslessProvider` abstract base — parallel to `StakingManager` / `SwapManager`. Extend `GaslessProvider` to plug in your own relayer.
+    - `TonApiGaslessProvider` / `createTonApiGaslessProvider()` — gasless via the TonAPI relayer. Auto-discovers networks from the kit; per-chain `apiKey` / `endpoint` overrides supported.
+    - `GaslessError` with `GaslessErrorCode`: `UnsupportedFeeAsset`, `FeeAssetNotOwned`, `UnsupportedOperation`, `QuoteFailed`, `SendFailed`, `ConfigFailed`, `SignMessageNotSupported`, `TooManyMessages`, `QuoteExpired`, `WalletMismatch`.
 
 - `@ton/appkit`:
-    - Actions: `getGaslessManager`, `getGaslessProvider`, `getGaslessProviders`, `setDefaultGaslessProvider`, `watchGaslessProviders`, `getGaslessProviderMetadata`, `getGaslessSupportedAssets`, `getGaslessQuote`, `sendGaslessTransaction`.
-    - Queries: `getGaslessProviderMetadataQueryOptions`, `getGaslessSupportedAssetsQueryOptions`, `getGaslessQuoteQueryOptions` (2-min `staleTime` matching the relayer `validUntil`), `sendGaslessTransactionMutationOptions`.
-    - `sendGaslessTransaction` enforces the wallet's `SignMessage` capability and message cap, throwing `GaslessError(SIGN_MESSAGE_NOT_SUPPORTED)` / `GaslessError(TOO_MANY_MESSAGES)` before submission.
-    - New `signMessage` action and `signMessageMutationOptions` (the underlying primitive for gasless signing).
-    - `TonConnectWalletAdapter` now implements `signMessage` and `getSupportedFeatures`.
-    - `WalletInterface` gains `signMessage` and `getSupportedFeatures`.
-    - `asAddressFriendly` re-exported from `@ton/appkit/utils`.
+    - Actions: `getGaslessConfig`, `getGaslessQuote`, `getGaslessJettonTransferQuote`, `sendGaslessTransaction`, `getGaslessProviderMetadata`, plus provider management (`getGaslessManager`, `getGaslessProvider(s)`, `setDefaultGaslessProvider`, `watchGaslessProviders`).
+    - `getGaslessJettonTransferQuote` is the recommended entry point: takes `jettonAddress`/`recipientAddress`/`amount`/`feeAsset` and builds the transfer messages for you, routing the jetton `excess` back to the relayer. The two-step quote → `sendGaslessTransaction` flow is preserved.
+    - `sendGaslessTransaction` runs fail-fast guards before prompting the wallet — throws `GaslessError(QUOTE_EXPIRED)`, `WALLET_MISMATCH`, `SIGN_MESSAGE_NOT_SUPPORTED`, or `TOO_MANY_MESSAGES` so the user is not asked to sign a quote the relayer would reject.
+    - Quote queries are wallet- and network-bound: switching wallet or network refetches a fresh quote instead of serving one issued for the previous wallet.
+    - New `signMessage` action (the primitive gasless uses to sign the relayer-wrapped BoC). `TonConnectWalletAdapter` now implements `signMessage` and `getSupportedFeatures`.
 
 - `@ton/appkit-react`:
-    - Hooks: `useGaslessProviderMetadata`, `useGaslessSupportedAssets`, `useGaslessProvider`, `useGaslessProviders`, `useGaslessQuote`, `useSendGaslessTransaction`, `useSignMessage`.
+    - Hooks: `useGaslessConfig`, `useGaslessQuote`, `useGaslessJettonTransferQuote`, `useSendGaslessTransaction`, `useGaslessProviderMetadata`, `useGaslessProvider(s)`, `useSignMessage`. Quote hooks auto-refetch on wallet/network switch.
diff --git a/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx b/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
index 031496821..e2a202dcb 100644
--- a/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
+++ b/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
@@ -8,7 +8,7 @@
 
 import { useEffect } from 'react';
 import type { FC } from 'react';
-import { Input, useGaslessSupportedAssets, useJettonInfo } from '@ton/appkit-react';
+import { Input, useGaslessConfig, useJettonInfo } from '@ton/appkit-react';
 import { asAddressFriendly, compareAddress } from '@ton/appkit';
 import type { UserFriendlyAddress } from '@ton/appkit';
 
@@ -39,7 +39,8 @@ interface FeeAssetSelectProps {
  * state match the modal's other inputs.
  */
 export const FeeAssetSelect: FC<FeeAssetSelectProps> = ({ value, onChange, disabled }) => {
-    const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
+    const { data: config, isLoading } = useGaslessConfig();
+    const supportedAssets = config?.supportedAssets;
 
     useEffect(() => {
         if (!value && supportedAssets?.length) {
diff --git a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
index dcedbbcf8..0d07e151c 100644
--- a/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
+++ b/apps/appkit-minter/src/features/balances/components/token-transfer-modal.tsx
@@ -46,7 +46,6 @@ export const TokenTransferModal: React.FC<TokenTransferModalProps> = ({
 
     const gasless = useGaslessTransfer({
         enabled: gaslessEnabled,
-        tokenType,
         jettonAddress: jetton?.address,
         recipientAddress,
         amount,
diff --git a/apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts b/apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts
index 2c9cdf6ee..6b5354a7c 100644
--- a/apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts
+++ b/apps/appkit-minter/src/features/balances/hooks/use-gasless-transfer.ts
@@ -7,19 +7,13 @@
  */
 
 import { useCallback } from 'react';
-import {
-    useGaslessJettonTransferQuote,
-    useGaslessTonTransferQuote,
-    useJettonInfo,
-    useSendGaslessTransaction,
-} from '@ton/appkit-react';
+import { useGaslessJettonTransferQuote, useJettonInfo, useSendGaslessTransaction } from '@ton/appkit-react';
 import { formatUnits } from '@ton/appkit';
 import type { GaslessSendResponse, UserFriendlyAddress } from '@ton/appkit';
 
 interface UseGaslessTransferParams {
     /** Only quote/send while the gasless toggle is on. */
     enabled: boolean;
-    tokenType: 'TON' | 'JETTON';
     jettonAddress?: string;
     recipientAddress: string;
     amount: string;
@@ -28,40 +22,33 @@ interface UseGaslessTransferParams {
 }
 
 /**
- * Drives the gasless quote → send flow for the transfer modal. Quotes the
- * jetton or TON transfer (depending on `tokenType`) and exposes a formatted fee
+ * Drives the gasless quote → send flow for the transfer modal. Gasless is
+ * jetton-only here: quotes the jetton transfer and exposes a formatted fee
  * plus a `send` that relays the signed quote.
  */
 export const useGaslessTransfer = ({
     enabled,
-    tokenType,
     jettonAddress,
     recipientAddress,
     amount,
     comment,
     feeAsset,
 }: UseGaslessTransferParams) => {
-    const hasInputs = Boolean(recipientAddress && amount && feeAsset);
+    const hasInputs = Boolean(jettonAddress && recipientAddress && amount && feeAsset);
 
-    const jettonQuote = useGaslessJettonTransferQuote({
+    const {
+        data: quote,
+        isFetching: isQuoting,
+        error: quoteError,
+    } = useGaslessJettonTransferQuote({
         jettonAddress: jettonAddress ?? '',
         recipientAddress,
         amount,
         comment,
         feeAsset: feeAsset ?? undefined,
-        query: { enabled: enabled && tokenType === 'JETTON' && hasInputs && Boolean(jettonAddress) },
+        query: { enabled: enabled && hasInputs },
     });
 
-    const tonQuote = useGaslessTonTransferQuote({
-        recipientAddress,
-        amount,
-        comment,
-        feeAsset: feeAsset ?? undefined,
-        query: { enabled: enabled && tokenType === 'TON' && hasInputs },
-    });
-
-    const { data: quote, isFetching: isQuoting, error: quoteError } = tokenType === 'JETTON' ? jettonQuote : tonQuote;
-
     const { data: feeAssetInfo } = useJettonInfo({
         address: feeAsset ?? undefined,
         query: { enabled: enabled && Boolean(feeAsset) },
diff --git a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
index 6e289c3e6..3caff765f 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless-actions.ts
@@ -8,14 +8,13 @@
 
 import type { AppKit } from '@ton/appkit';
 import {
+    getGaslessConfig,
     getGaslessJettonTransferQuote,
     getGaslessManager,
     getGaslessProvider,
     getGaslessProviderMetadata,
     getGaslessProviders,
     getGaslessQuote,
-    getGaslessSupportedAssets,
-    getGaslessTonTransferQuote,
     sendGaslessTransaction,
     setDefaultGaslessProvider,
     watchGaslessProviders,
@@ -54,11 +53,11 @@ export const gaslessExample = async (appKit: AppKit) => {
     console.log('Gasless provider:', metadata.name, metadata.url);
     // SAMPLE_END: GET_GASLESS_PROVIDER_METADATA
 
-    // SAMPLE_START: GET_GASLESS_SUPPORTED_ASSETS
-    const supportedAssets = await getGaslessSupportedAssets(appKit);
-    const feeAsset = supportedAssets[0].address;
-    console.log('Supported fee assets:', supportedAssets.length);
-    // SAMPLE_END: GET_GASLESS_SUPPORTED_ASSETS
+    // SAMPLE_START: GET_GASLESS_CONFIG
+    const config = await getGaslessConfig(appKit);
+    const feeAsset = config.supportedAssets[0].address;
+    console.log('Relay address:', config.relayAddress, '— supported fee assets:', config.supportedAssets.length);
+    // SAMPLE_END: GET_GASLESS_CONFIG
 
     // SAMPLE_START: GET_GASLESS_QUOTE
     const quote = await getGaslessQuote(appKit, {
@@ -85,19 +84,10 @@ export const gaslessExample = async (appKit: AppKit) => {
     await sendGaslessTransaction(appKit, { quote: jettonQuote });
     // SAMPLE_END: GET_GASLESS_JETTON_TRANSFER_QUOTE
 
-    // SAMPLE_START: GET_GASLESS_TON_TRANSFER_QUOTE
-    const tonQuote = await getGaslessTonTransferQuote(appKit, {
-        recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
-        amount: '1.5',
-        feeAsset, // gas covered by the relayer, fee paid in this jetton
-    });
-    await sendGaslessTransaction(appKit, { quote: tonQuote });
-    // SAMPLE_END: GET_GASLESS_TON_TRANSFER_QUOTE
-
     // SAMPLE_START: SEND_GASLESS_TRANSACTION
     const result = await sendGaslessTransaction(appKit, { quote });
     console.log('Submitted gasless transaction. Hash:', result.normalizedHash, 'BoC:', result.internalBoc);
     // SAMPLE_END: SEND_GASLESS_TRANSACTION
 
-    return { gaslessManager, provider, supportedAssets, quote };
+    return { gaslessManager, provider, config, quote };
 };
diff --git a/demo/examples/src/appkit/actions/gasless/gasless.test.ts b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
index 73f610ae9..eeed4340c 100644
--- a/demo/examples/src/appkit/actions/gasless/gasless.test.ts
+++ b/demo/examples/src/appkit/actions/gasless/gasless.test.ts
@@ -27,7 +27,7 @@ describe('Gasless Actions Examples', () => {
     let appKit: AppKit;
     let consoleSpy: ReturnType<typeof vi.spyOn>;
     let mockGetMetadata: ReturnType<typeof vi.fn>;
-    let mockGetSupportedAssets: ReturnType<typeof vi.fn>;
+    let mockGetConfig: ReturnType<typeof vi.fn>;
     let mockGetQuote: ReturnType<typeof vi.fn>;
     let mockSend: ReturnType<typeof vi.fn>;
     let mockSignMessage: ReturnType<typeof vi.fn>;
@@ -43,7 +43,9 @@ describe('Gasless Actions Examples', () => {
         });
 
         mockGetMetadata = vi.fn().mockResolvedValue({ name: 'TonAPI', url: 'https://tonapi.io' });
-        mockGetSupportedAssets = vi.fn().mockResolvedValue([{ address: TEST_ADDRESS }]);
+        mockGetConfig = vi
+            .fn()
+            .mockResolvedValue({ relayAddress: TEST_ADDRESS, supportedAssets: [{ address: TEST_ADDRESS }] });
         mockGetQuote = vi.fn().mockResolvedValue({
             messages: [{ address: TEST_ADDRESS, amount: '60000000' }],
             fee: '1234',
@@ -66,7 +68,7 @@ describe('Gasless Actions Examples', () => {
         // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'getMetadata').mockImplementation(mockGetMetadata);
         // @ts-expect-error - internal mock access
-        vi.spyOn(appKit.gaslessManager, 'getSupportedAssets').mockImplementation(mockGetSupportedAssets);
+        vi.spyOn(appKit.gaslessManager, 'getConfig').mockImplementation(mockGetConfig);
         // @ts-expect-error - internal mock access
         vi.spyOn(appKit.gaslessManager, 'getQuote').mockImplementation(mockGetQuote);
         // @ts-expect-error - internal mock access
@@ -127,7 +129,7 @@ describe('Gasless Actions Examples', () => {
         await gaslessExample(appKit);
 
         expect(mockGetMetadata).toHaveBeenCalled();
-        expect(mockGetSupportedAssets).toHaveBeenCalled();
+        expect(mockGetConfig).toHaveBeenCalled();
         expect(mockGetQuote).toHaveBeenCalled();
         expect(mockSignMessage).toHaveBeenCalled();
         expect(mockSend).toHaveBeenCalled();
diff --git a/demo/examples/src/appkit/gasless/send-usdt-gasless.ts b/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
index f68f9bb4b..c8c6e16e0 100644
--- a/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
+++ b/demo/examples/src/appkit/gasless/send-usdt-gasless.ts
@@ -7,13 +7,22 @@
  */
 
 import type { AppKit } from '@ton/appkit';
-import { createTransferJettonTransaction, getGaslessQuote, sendGaslessTransaction } from '@ton/appkit';
+import {
+    createTransferJettonTransaction,
+    getGaslessConfig,
+    getGaslessQuote,
+    sendGaslessTransaction,
+} from '@ton/appkit';
 
 const USDT_MASTER = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
 const USDT_DECIMALS = 6;
 
 export const sendUsdtGaslessExample = async (appKit: AppKit, recipient: string, amount: string) => {
     // SAMPLE_START: SEND_USDT_GASLESS
+    // Resolve the relayer's address so unspent gas (the jetton `excess`) goes
+    // back to the relayer that paid it, not to the user's wallet.
+    const { relayAddress } = await getGaslessConfig(appKit);
+
     // Reuse the same builder as a regular jetton transfer: it resolves the
     // jetton wallet address, builds the payload and attaches the network gas
     // (which the relayer ends up covering) for us.
@@ -22,6 +31,7 @@ export const sendUsdtGaslessExample = async (appKit: AppKit, recipient: string,
         recipientAddress: recipient,
         amount,
         jettonDecimals: USDT_DECIMALS,
+        responseDestination: relayAddress,
     });
 
     // Pay the relayer's fee in USDT. Quote first so the fee and validity window
diff --git a/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx b/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
index 65f3a33d4..0b07690ce 100644
--- a/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
+++ b/demo/examples/src/appkit/hooks/gasless/gasless.test.tsx
@@ -13,10 +13,9 @@ import * as AppKitReact from '@ton/appkit-react';
 import { UseGaslessProvidersExample } from './use-gasless-providers';
 import { UseGaslessProviderExample } from './use-gasless-provider';
 import { UseGaslessProviderMetadataExample } from './use-gasless-provider-metadata';
-import { UseGaslessSupportedAssetsExample } from './use-gasless-supported-assets';
+import { UseGaslessConfigExample } from './use-gasless-config';
 import { UseGaslessQuoteExample } from './use-gasless-quote';
 import { UseGaslessJettonTransferQuoteExample } from './use-gasless-jetton-transfer-quote';
-import { UseGaslessTonTransferQuoteExample } from './use-gasless-ton-transfer-quote';
 import { UseSendGaslessTransactionExample } from './use-send-gasless-transaction';
 
 vi.mock('@ton/appkit-react', async () => {
@@ -26,10 +25,9 @@ vi.mock('@ton/appkit-react', async () => {
         useGaslessProviders: vi.fn(),
         useGaslessProvider: vi.fn(),
         useGaslessProviderMetadata: vi.fn(),
-        useGaslessSupportedAssets: vi.fn(),
+        useGaslessConfig: vi.fn(),
         useGaslessQuote: vi.fn(),
         useGaslessJettonTransferQuote: vi.fn(),
-        useGaslessTonTransferQuote: vi.fn(),
         useSendGaslessTransaction: vi.fn(),
     };
 });
@@ -94,26 +92,27 @@ describe('Gasless Hooks Examples', () => {
         });
     });
 
-    describe('UseGaslessSupportedAssetsExample', () => {
+    describe('UseGaslessConfigExample', () => {
         it('renders loading state', () => {
             // @ts-expect-error - mock
-            vi.mocked(AppKitReact.useGaslessSupportedAssets).mockReturnValue({
+            vi.mocked(AppKitReact.useGaslessConfig).mockReturnValue({
                 isLoading: true,
                 data: undefined,
             });
 
-            render(<UseGaslessSupportedAssetsExample />);
-            expect(screen.getByText('Loading fee assets...')).toBeDefined();
+            render(<UseGaslessConfigExample />);
+            expect(screen.getByText('Loading gasless config...')).toBeDefined();
         });
 
-        it('renders supported asset options', () => {
+        it('renders relay address and supported asset options', () => {
             // @ts-expect-error - mock
-            vi.mocked(AppKitReact.useGaslessSupportedAssets).mockReturnValue({
+            vi.mocked(AppKitReact.useGaslessConfig).mockReturnValue({
                 isLoading: false,
-                data: [{ address: TEST_ADDRESS }],
+                data: { relayAddress: TEST_ADDRESS, supportedAssets: [{ address: TEST_ADDRESS }] },
             });
 
-            render(<UseGaslessSupportedAssetsExample />);
+            render(<UseGaslessConfigExample />);
+            expect(screen.getByText(`Relay: ${TEST_ADDRESS}`)).toBeDefined();
             expect(screen.getByRole('option', { name: TEST_ADDRESS })).toBeDefined();
         });
     });
@@ -168,32 +167,6 @@ describe('Gasless Hooks Examples', () => {
         });
     });
 
-    describe('UseGaslessTonTransferQuoteExample', () => {
-        it('renders the quote fee and sends on click', async () => {
-            const mockQuote = { fee: '5678', validUntil: 1735680000 };
-            const mockSend = vi.fn().mockResolvedValue({});
-
-            // @ts-expect-error - mock
-            vi.mocked(AppKitReact.useGaslessTonTransferQuote).mockReturnValue({
-                data: mockQuote,
-                isFetching: false,
-            });
-            // @ts-expect-error - mock
-            vi.mocked(AppKitReact.useSendGaslessTransaction).mockReturnValue({
-                mutateAsync: mockSend,
-                isPending: false,
-            });
-
-            const { getByText } = render(<UseGaslessTonTransferQuoteExample />);
-            expect(getByText('Fee: 5678')).toBeDefined();
-
-            fireEvent.click(getByText('Send'));
-            await waitFor(() => {
-                expect(mockSend).toHaveBeenCalledWith({ quote: mockQuote });
-            });
-        });
-    });
-
     describe('UseSendGaslessTransactionExample', () => {
         it('calls sendGasless on click and logs result', async () => {
             const mockQuote = { fee: '1234', validUntil: 1735680000 };
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
new file mode 100644
index 000000000..3ba9923bd
--- /dev/null
+++ b/demo/examples/src/appkit/hooks/gasless/use-gasless-config.tsx
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useGaslessConfig } from '@ton/appkit-react';
+
+export const UseGaslessConfigExample = () => {
+    // SAMPLE_START: USE_GASLESS_CONFIG
+    const { data: config, isLoading } = useGaslessConfig();
+
+    if (isLoading) return <div>Loading gasless config...</div>;
+
+    return (
+        <div>
+            <p>Relay: {config?.relayAddress}</p>
+            <select>
+                {config?.supportedAssets.map((asset) => (
+                    <option key={asset.address} value={asset.address}>
+                        {asset.address}
+                    </option>
+                ))}
+            </select>
+        </div>
+    );
+    // SAMPLE_END: USE_GASLESS_CONFIG
+};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx
deleted file mode 100644
index adc9a6a49..000000000
--- a/demo/examples/src/appkit/hooks/gasless/use-gasless-supported-assets.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { useGaslessSupportedAssets } from '@ton/appkit-react';
-
-export const UseGaslessSupportedAssetsExample = () => {
-    // SAMPLE_START: USE_GASLESS_SUPPORTED_ASSETS
-    const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
-
-    if (isLoading) return <div>Loading fee assets...</div>;
-
-    return (
-        <select>
-            {supportedAssets?.map((asset) => (
-                <option key={asset.address} value={asset.address}>
-                    {asset.address}
-                </option>
-            ))}
-        </select>
-    );
-    // SAMPLE_END: USE_GASLESS_SUPPORTED_ASSETS
-};
diff --git a/demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx b/demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx
deleted file mode 100644
index 1529073d3..000000000
--- a/demo/examples/src/appkit/hooks/gasless/use-gasless-ton-transfer-quote.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { asAddressFriendly } from '@ton/appkit';
-import { useGaslessTonTransferQuote, useSendGaslessTransaction } from '@ton/appkit-react';
-
-export const UseGaslessTonTransferQuoteExample = () => {
-    // SAMPLE_START: USE_GASLESS_TON_TRANSFER_QUOTE
-    const { data: quote, isFetching } = useGaslessTonTransferQuote({
-        recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
-        amount: '1.5',
-        feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'), // USDT
-    });
-
-    const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
-
-    return (
-        <div>
-            {isFetching && <span>Quoting...</span>}
-            {quote && (
-                <>
-                    <div>Fee: {quote.fee}</div>
-                    <button disabled={isPending} onClick={() => sendGasless({ quote })}>
-                        Send
-                    </button>
-                </>
-            )}
-        </div>
-    );
-    // SAMPLE_END: USE_GASLESS_TON_TRANSFER_QUOTE
-};
diff --git a/packages/appkit-react/docs/hooks.md b/packages/appkit-react/docs/hooks.md
index 9c5e59468..21541be96 100644
--- a/packages/appkit-react/docs/hooks.md
+++ b/packages/appkit-react/docs/hooks.md
@@ -888,23 +888,26 @@ return (
 );
 ```
 
-### `useGaslessSupportedAssets`
+### `useGaslessConfig`
 
-Hook to discover the assets the gasless relayer accepts as fee payment.
+Hook to fetch the gasless relayer's configuration — relay address (e.g. for jetton-transfer `responseDestination`) and accepted fee assets.
 
 ```tsx
-const { data: supportedAssets, isLoading } = useGaslessSupportedAssets();
+const { data: config, isLoading } = useGaslessConfig();
 
-if (isLoading) return <div>Loading fee assets...</div>;
+if (isLoading) return <div>Loading gasless config...</div>;
 
 return (
-    <select>
-        {supportedAssets?.map((asset) => (
-            <option key={asset.address} value={asset.address}>
-                {asset.address}
-            </option>
-        ))}
-    </select>
+    <div>
+        <p>Relay: {config?.relayAddress}</p>
+        <select>
+            {config?.supportedAssets.map((asset) => (
+                <option key={asset.address} value={asset.address}>
+                    {asset.address}
+                </option>
+            ))}
+        </select>
+    </div>
 );
 ```
 
@@ -967,34 +970,6 @@ return (
 );
 ```
 
-### `useGaslessTonTransferQuote`
-
-Hook to fetch a gasless quote for a TON transfer from `recipientAddress`, `amount`, `feeAsset`. Auto-refetches as inputs change and on wallet/network switch.
-
-```tsx
-const { data: quote, isFetching } = useGaslessTonTransferQuote({
-    recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
-    amount: '1.5',
-    feeAsset: asAddressFriendly('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'), // USDT
-});
-
-const { mutateAsync: sendGasless, isPending } = useSendGaslessTransaction();
-
-return (
-    <div>
-        {isFetching && <span>Quoting...</span>}
-        {quote && (
-            <>
-                <div>Fee: {quote.fee}</div>
-                <button disabled={isPending} onClick={() => sendGasless({ quote })}>
-                    Send
-                </button>
-            </>
-        )}
-    </div>
-);
-```
-
 ### `useSendGaslessTransaction`
 
 Hook to sign a previously computed quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
new file mode 100644
index 000000000..b8e769f5f
--- /dev/null
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-config.ts
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+'use client';
+
+import { getGaslessConfigQueryOptions } from '@ton/appkit/queries';
+import type { GetGaslessConfigData, GetGaslessConfigErrorType, GetGaslessConfigQueryConfig } from '@ton/appkit/queries';
+
+import { useAppKit } from '../../settings';
+import { useQuery } from '../../../libs/query';
+import type { UseQueryReturnType } from '../../../libs/query';
+
+export type UseGaslessConfigParameters<selectData = GetGaslessConfigData> = GetGaslessConfigQueryConfig<selectData>;
+
+export type UseGaslessConfigReturnType<selectData = GetGaslessConfigData> = UseQueryReturnType<
+    selectData,
+    GetGaslessConfigErrorType
+>;
+
+/**
+ * Hook to fetch the gasless relayer's configuration — relay address and
+ * accepted fee assets.
+ */
+export const useGaslessConfig = <selectData = GetGaslessConfigData>(
+    parameters: UseGaslessConfigParameters<selectData> = {},
+): UseGaslessConfigReturnType<selectData> => {
+    const appKit = useAppKit();
+
+    return useQuery(getGaslessConfigQueryOptions(appKit, parameters));
+};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts
deleted file mode 100644
index 703da56a5..000000000
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-supported-assets.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-'use client';
-
-import { getGaslessSupportedAssetsQueryOptions } from '@ton/appkit/queries';
-import type {
-    GetGaslessSupportedAssetsData,
-    GetGaslessSupportedAssetsErrorType,
-    GetGaslessSupportedAssetsQueryConfig,
-} from '@ton/appkit/queries';
-
-import { useAppKit } from '../../settings';
-import { useQuery } from '../../../libs/query';
-import type { UseQueryReturnType } from '../../../libs/query';
-
-export type UseGaslessSupportedAssetsParameters<selectData = GetGaslessSupportedAssetsData> =
-    GetGaslessSupportedAssetsQueryConfig<selectData>;
-
-export type UseGaslessSupportedAssetsReturnType<selectData = GetGaslessSupportedAssetsData> = UseQueryReturnType<
-    selectData,
-    GetGaslessSupportedAssetsErrorType
->;
-
-/**
- * Hook to discover the assets the gasless relayer accepts as fee payment.
- */
-export const useGaslessSupportedAssets = <selectData = GetGaslessSupportedAssetsData>(
-    parameters: UseGaslessSupportedAssetsParameters<selectData> = {},
-): UseGaslessSupportedAssetsReturnType<selectData> => {
-    const appKit = useAppKit();
-
-    return useQuery(getGaslessSupportedAssetsQueryOptions(appKit, parameters));
-};
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
deleted file mode 100644
index bf8c7037d..000000000
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-ton-transfer-quote.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-'use client';
-
-import { getGaslessTonTransferQuoteQueryOptions } from '@ton/appkit/queries';
-import type {
-    GetGaslessTonTransferQuoteData,
-    GetGaslessTonTransferQuoteErrorType,
-    GetGaslessTonTransferQuoteQueryConfig,
-} from '@ton/appkit/queries';
-
-import { useAppKit } from '../../settings';
-import { useQuery } from '../../../libs/query';
-import type { UseQueryReturnType } from '../../../libs/query';
-import { useNetwork } from '../../network';
-
-export type UseGaslessTonTransferQuoteParameters<selectData = GetGaslessTonTransferQuoteData> =
-    GetGaslessTonTransferQuoteQueryConfig<selectData>;
-
-export type UseGaslessTonTransferQuoteReturnType<selectData = GetGaslessTonTransferQuoteData> = UseQueryReturnType<
-    selectData,
-    GetGaslessTonTransferQuoteErrorType
->;
-
-/**
- * Hook to fetch a gasless quote for a TON transfer.
- *
- * Assembles the transfer message from semantic params and quotes it.
- * Auto-refetches as inputs change.
- *
- * `useNetwork` subscribes the hook to the selected wallet, so switching wallet
- * (or network) re-renders and recomputes the wallet-bound query key, refetching
- * for the new wallet instead of serving the previous one's cached quote.
- */
-export const useGaslessTonTransferQuote = <selectData = GetGaslessTonTransferQuoteData>(
-    parameters: UseGaslessTonTransferQuoteParameters<selectData> = {},
-): UseGaslessTonTransferQuoteReturnType<selectData> => {
-    const appKit = useAppKit();
-    useNetwork();
-
-    return useQuery(getGaslessTonTransferQuoteQueryOptions(appKit, parameters));
-};
diff --git a/packages/appkit-react/src/features/gasless/index.ts b/packages/appkit-react/src/features/gasless/index.ts
index 9701a8828..0da6a1bb2 100644
--- a/packages/appkit-react/src/features/gasless/index.ts
+++ b/packages/appkit-react/src/features/gasless/index.ts
@@ -7,10 +7,10 @@
  */
 
 export {
-    useGaslessSupportedAssets,
-    type UseGaslessSupportedAssetsParameters,
-    type UseGaslessSupportedAssetsReturnType,
-} from './hooks/use-gasless-supported-assets';
+    useGaslessConfig,
+    type UseGaslessConfigParameters,
+    type UseGaslessConfigReturnType,
+} from './hooks/use-gasless-config';
 export {
     useGaslessProviderMetadata,
     type UseGaslessProviderMetadataParameters,
@@ -26,11 +26,6 @@ export {
     type UseGaslessJettonTransferQuoteParameters,
     type UseGaslessJettonTransferQuoteReturnType,
 } from './hooks/use-gasless-jetton-transfer-quote';
-export {
-    useGaslessTonTransferQuote,
-    type UseGaslessTonTransferQuoteParameters,
-    type UseGaslessTonTransferQuoteReturnType,
-} from './hooks/use-gasless-ton-transfer-quote';
 export { useGaslessProvider, type UseGaslessProviderReturnType } from './hooks/use-gasless-provider';
 export { useGaslessProviders, type UseGaslessProvidersReturnType } from './hooks/use-gasless-providers';
 export {
diff --git a/packages/appkit/docs/actions.md b/packages/appkit/docs/actions.md
index 9892feb8d..d06a86036 100644
--- a/packages/appkit/docs/actions.md
+++ b/packages/appkit/docs/actions.md
@@ -637,7 +637,7 @@ console.log('Staked Balance:', balance);
 Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT). The connected wallet must support the `SignMessage` TonConnect feature. See the [gasless guide](./gasless.md) for a regular-send → gasless-send migration.
 
 The high-level flow is:
-1. `getGaslessSupportedAssets` – discover which assets the relayer accepts as fee payment.
+1. `getGaslessConfig` – discover the relay address and assets the relayer accepts as fee payment.
 2. `getGaslessQuote` – ask the relayer for fee + wrapped messages (with a `validUntil`).
 3. `sendGaslessTransaction` – sign the wrapped messages via the wallet and submit the signed BoC.
 
@@ -697,14 +697,14 @@ const metadata = await getGaslessProviderMetadata(appKit);
 console.log('Gasless provider:', metadata.name, metadata.url);
 ```
 
-### `getGaslessSupportedAssets`
+### `getGaslessConfig`
 
-Discover the assets the gasless relayer accepts as fee payment.
+Fetch the relayer's configuration on a network — the relay address (e.g. for jetton-transfer `responseDestination`) and the assets it accepts as fee payment.
 
 ```ts
-const supportedAssets = await getGaslessSupportedAssets(appKit);
-const feeAsset = supportedAssets[0].address;
-console.log('Supported fee assets:', supportedAssets.length);
+const config = await getGaslessConfig(appKit);
+const feeAsset = config.supportedAssets[0].address;
+console.log('Relay address:', config.relayAddress, '— supported fee assets:', config.supportedAssets.length);
 ```
 
 ### `getGaslessQuote`
@@ -740,19 +740,6 @@ const jettonQuote = await getGaslessJettonTransferQuote(appKit, {
 await sendGaslessTransaction(appKit, { quote: jettonQuote });
 ```
 
-### `getGaslessTonTransferQuote`
-
-Convenience wrapper that builds a TON transfer's message and quotes it in one call. Takes `recipientAddress`, `amount`, `feeAsset` instead of pre-built `messages`. Returns a `GaslessQuote` to pass to `sendGaslessTransaction`.
-
-```ts
-const tonQuote = await getGaslessTonTransferQuote(appKit, {
-    recipientAddress: 'EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c',
-    amount: '1.5',
-    feeAsset, // gas covered by the relayer, fee paid in this jetton
-});
-await sendGaslessTransaction(appKit, { quote: tonQuote });
-```
-
 ### `sendGaslessTransaction`
 
 Sign a previously computed gasless quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` — a strict superset of `SendTransactionResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
diff --git a/packages/appkit/docs/gasless.md b/packages/appkit/docs/gasless.md
index 6ad05a7a4..e828a9c9e 100644
--- a/packages/appkit/docs/gasless.md
+++ b/packages/appkit/docs/gasless.md
@@ -69,6 +69,10 @@ Cost: the user spends **~0.05 TON** on gas (whatever is unused is refunded). Wal
 ### Gasless jetton transfer (user pays only the jetton fee)
 
 ```ts
+// Resolve the relayer's address so unspent gas (the jetton `excess`) goes
+// back to the relayer that paid it, not to the user's wallet.
+const { relayAddress } = await getGaslessConfig(appKit);
+
 // Reuse the same builder as a regular jetton transfer: it resolves the
 // jetton wallet address, builds the payload and attaches the network gas
 // (which the relayer ends up covering) for us.
@@ -77,6 +81,7 @@ const { messages } = await createTransferJettonTransaction(appKit, {
     recipientAddress: recipient,
     amount,
     jettonDecimals: USDT_DECIMALS,
+    responseDestination: relayAddress,
 });
 
 // Pay the relayer's fee in USDT. Quote first so the fee and validity window
@@ -92,9 +97,12 @@ Cost: the user spends **0 TON** and a small amount of USDT (the relayer fee, sho
 
 ## Migration recipe
 
-The `messages` array is built the same way for both flows — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages, feeAsset })` followed by `sendGaslessTransaction(appKit, { quote })`.
+The `messages` array is built the same way for both flows — the relayer wraps your messages on its end and adds the fee transfer. Two changes versus a regular send:
+
+1. Set the jetton transfer's `responseDestination` to the relayer's `relayAddress` (from `getGaslessConfig`) so the unspent TON gas returns to the relayer that paid it instead of the user's wallet.
+2. Replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages, feeAsset })` followed by `sendGaslessTransaction(appKit, { quote })`.
 
-`feeAsset` is the jetton master the relayer charges the fee in. The TonAPI provider requires it; discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)`, or hardcode the jetton master you want to charge in.
+`feeAsset` is the jetton master the relayer charges the fee in. The TonAPI provider requires it; discover the relayer-accepted assets via `getGaslessConfig(appKit)` (returns `{ relayAddress, supportedAssets }`), or hardcode the jetton master you want to charge in. The `getGaslessJettonTransferQuote` convenience wrapper handles both points above for you.
 
 For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`).
 
@@ -107,7 +115,7 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 | `UNSUPPORTED_OPERATION` | The provider does not implement the requested mode (e.g. a jetton-fee provider called without `feeAsset`). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
-| `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
+| `CONFIG_FAILED` | Failed to fetch the relayer's configuration (relay address + accepted fee assets). |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
 | `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
 | `QUOTE_EXPIRED` | Quote's `validUntil` window has passed; checked before signing so the wallet is not prompted for a quote the relayer would reject. Fetch a fresh quote. |
diff --git a/packages/appkit/src/actions/gasless/get-gasless-supported-assets.ts b/packages/appkit/src/actions/gasless/get-gasless-config.ts
similarity index 54%
rename from packages/appkit/src/actions/gasless/get-gasless-supported-assets.ts
rename to packages/appkit/src/actions/gasless/get-gasless-config.ts
index 439afb03b..4ac58939f 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-supported-assets.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-config.ts
@@ -6,29 +6,31 @@
  *
  */
 
-import type { GaslessSupportedAsset } from '../../gasless';
+import type { GaslessConfig } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 import type { Network } from '../../types/network';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
 
-export interface GetGaslessSupportedAssetsOptions {
+export interface GetGaslessConfigOptions {
     /** Network to query. Defaults to the selected wallet's network, then provider's first supported. */
     network?: Network;
     /** Gasless provider id. Uses the default provider when omitted. */
     providerId?: string;
 }
 
-export type GetGaslessSupportedAssetsReturnType = Promise<GaslessSupportedAsset[]>;
+export type GetGaslessConfigReturnType = Promise<GaslessConfig>;
 
-export type GetGaslessSupportedAssetsErrorType = Error;
+export type GetGaslessConfigErrorType = Error;
 
 /**
- * Discover the assets the gasless relayer accepts as fee payment.
+ * Fetch the gasless relayer's configuration on a network — the relay address
+ * (e.g. for jetton-transfer `responseDestination`) and the assets it accepts
+ * as fee payment.
  */
-export const getGaslessSupportedAssets = async (
+export const getGaslessConfig = async (
     appKit: AppKit,
-    options: GetGaslessSupportedAssetsOptions = {},
-): GetGaslessSupportedAssetsReturnType => {
+    options: GetGaslessConfigOptions = {},
+): GetGaslessConfigReturnType => {
     const network = options.network ?? getSelectedWallet(appKit)?.getNetwork();
-    return appKit.gaslessManager.getSupportedAssets(network, options.providerId);
+    return appKit.gaslessManager.getConfig(network, options.providerId);
 };
diff --git a/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
index f9ed5ecd1..0cbc2e694 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
@@ -10,6 +10,7 @@ import type { GaslessQuote } from '../../gasless';
 import type { UserFriendlyAddress } from '../../types/primitives';
 import type { AppKit } from '../../core/app-kit';
 import { createTransferJettonTransaction } from '../jettons/create-transfer-jetton-transaction';
+import { getGaslessConfig } from './get-gasless-config';
 import { getGaslessQuote } from './get-gasless-quote';
 
 export interface GetGaslessJettonTransferQuoteOptions {
@@ -45,6 +46,10 @@ export type GetGaslessJettonTransferQuoteErrorType = Error;
  * is passed verbatim to `sendGaslessTransaction`, preserving the quote → send
  * two-step flow.
  *
+ * The jetton `responseDestination` (excess receiver) is set to the relayer's
+ * address — the relayer paid the gas, so the unspent TON goes back to it rather
+ * than to the user's wallet.
+ *
  * The quote is always bound to the selected wallet's network — the same network
  * the message builder resolves the jetton wallet on — so there is no `network`
  * override (a mismatch would build the message on one chain and quote on another).
@@ -55,12 +60,14 @@ export const getGaslessJettonTransferQuote = async (
 ): GetGaslessJettonTransferQuoteReturnType => {
     const { jettonAddress, recipientAddress, amount, jettonDecimals, comment, feeAsset, providerId } = options;
 
+    const { relayAddress } = await getGaslessConfig(appKit, { providerId });
     const { messages } = await createTransferJettonTransaction(appKit, {
         jettonAddress,
         recipientAddress,
         amount,
         jettonDecimals,
         comment,
+        responseDestination: relayAddress,
     });
 
     return getGaslessQuote(appKit, { messages, feeAsset, providerId });
diff --git a/packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts
deleted file mode 100644
index 79bf0be76..000000000
--- a/packages/appkit/src/actions/gasless/get-gasless-ton-transfer-quote.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import type { GaslessQuote } from '../../gasless';
-import type { UserFriendlyAddress } from '../../types/primitives';
-import type { AppKit } from '../../core/app-kit';
-import { createTransferTonTransaction } from '../transaction/create-transfer-ton-transaction';
-import { getGaslessQuote } from './get-gasless-quote';
-
-export interface GetGaslessTonTransferQuoteOptions {
-    /** Recipient address */
-    recipientAddress: string;
-    /** Human-readable amount of TON to transfer */
-    amount: string;
-    /** Human-readable text comment (converted to payload) */
-    comment?: string;
-    /** Message payload encoded in Base64 (overrides comment if provided) */
-    payload?: string;
-    /** Initial state for deploying a new contract, encoded in Base64 */
-    stateInit?: string;
-    /**
-     * Asset address used to pay the relayer's fee (jetton master for TonAPI).
-     * Omit only for free / sponsored providers — see {@link getGaslessQuote}.
-     */
-    feeAsset?: UserFriendlyAddress;
-    /** Gasless provider id. Uses the default provider when omitted. */
-    providerId?: string;
-}
-
-export type GetGaslessTonTransferQuoteReturnType = Promise<GaslessQuote>;
-
-export type GetGaslessTonTransferQuoteErrorType = Error;
-
-/**
- * Build a gasless quote for a TON transfer.
- *
- * Convenience wrapper that assembles the transfer message the same way as
- * {@link createTransferTonTransaction} and forwards it to {@link getGaslessQuote}.
- * The result is passed verbatim to `sendGaslessTransaction`, preserving the
- * quote → send two-step flow.
- *
- * The quote is always bound to the selected wallet's network (the message is
- * built for that wallet), so there is no `network` override.
- */
-export const getGaslessTonTransferQuote = async (
-    appKit: AppKit,
-    options: GetGaslessTonTransferQuoteOptions,
-): GetGaslessTonTransferQuoteReturnType => {
-    const { recipientAddress, amount, comment, payload, stateInit, feeAsset, providerId } = options;
-
-    const { messages } = createTransferTonTransaction(appKit, {
-        recipientAddress,
-        amount,
-        comment,
-        payload,
-        stateInit,
-    });
-
-    return getGaslessQuote(appKit, { messages, feeAsset, providerId });
-};
diff --git a/packages/appkit/src/actions/index.ts b/packages/appkit/src/actions/index.ts
index bbf03178a..110df25c8 100644
--- a/packages/appkit/src/actions/index.ts
+++ b/packages/appkit/src/actions/index.ts
@@ -127,11 +127,11 @@ export {
     type WatchGaslessProvidersReturnType,
 } from './gasless/watch-gasless-providers';
 export {
-    getGaslessSupportedAssets,
-    type GetGaslessSupportedAssetsOptions,
-    type GetGaslessSupportedAssetsReturnType,
-    type GetGaslessSupportedAssetsErrorType,
-} from './gasless/get-gasless-supported-assets';
+    getGaslessConfig,
+    type GetGaslessConfigOptions,
+    type GetGaslessConfigReturnType,
+    type GetGaslessConfigErrorType,
+} from './gasless/get-gasless-config';
 export {
     getGaslessProviderMetadata,
     type GetGaslessProviderMetadataOptions,
@@ -150,12 +150,6 @@ export {
     type GetGaslessJettonTransferQuoteReturnType,
     type GetGaslessJettonTransferQuoteErrorType,
 } from './gasless/get-gasless-jetton-transfer-quote';
-export {
-    getGaslessTonTransferQuote,
-    type GetGaslessTonTransferQuoteOptions,
-    type GetGaslessTonTransferQuoteReturnType,
-    type GetGaslessTonTransferQuoteErrorType,
-} from './gasless/get-gasless-ton-transfer-quote';
 export {
     sendGaslessTransaction,
     type SendGaslessTransactionParameters,
diff --git a/packages/appkit/src/actions/jettons/create-transfer-jetton-transaction.ts b/packages/appkit/src/actions/jettons/create-transfer-jetton-transaction.ts
index bdb6a2d2a..d1f62d3b7 100644
--- a/packages/appkit/src/actions/jettons/create-transfer-jetton-transaction.ts
+++ b/packages/appkit/src/actions/jettons/create-transfer-jetton-transaction.ts
@@ -26,6 +26,7 @@ export interface CreateTransferJettonTransactionParameters {
     amount: string;
     jettonDecimals?: number;
     comment?: string;
+    responseDestination?: string;
 }
 
 export type CreateTransferJettonTransactionReturnType = TransactionRequest;
@@ -37,7 +38,7 @@ export const createTransferJettonTransaction = async (
     appKit: AppKit,
     parameters: CreateTransferJettonTransactionParameters,
 ): Promise<CreateTransferJettonTransactionReturnType> => {
-    const { jettonAddress, recipientAddress, amount, jettonDecimals, comment } = parameters;
+    const { jettonAddress, recipientAddress, amount, jettonDecimals, comment, responseDestination } = parameters;
 
     const wallet = getSelectedWallet(appKit);
 
@@ -69,7 +70,7 @@ export const createTransferJettonTransaction = async (
     const jettonPayload = createJettonTransferPayload({
         amount: parseUnits(amount, decimals),
         destination: recipientAddress,
-        responseDestination: ownerAddress,
+        responseDestination: responseDestination ?? ownerAddress,
         comment,
     });
 
diff --git a/packages/appkit/src/gasless/index.ts b/packages/appkit/src/gasless/index.ts
index 1e57cd664..6aef0c43d 100644
--- a/packages/appkit/src/gasless/index.ts
+++ b/packages/appkit/src/gasless/index.ts
@@ -11,6 +11,7 @@ export { GaslessProvider, GaslessError, GaslessErrorCode, GaslessManager } from
 export type {
     GaslessAPI,
     GaslessProviderInterface,
+    GaslessConfig,
     GaslessSupportedAsset,
     GaslessProviderMetadata,
     GaslessProviderMetadataOverride,
diff --git a/packages/appkit/src/queries/gasless/get-gasless-config.ts b/packages/appkit/src/queries/gasless/get-gasless-config.ts
new file mode 100644
index 000000000..815d4af38
--- /dev/null
+++ b/packages/appkit/src/queries/gasless/get-gasless-config.ts
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getGaslessConfig } from '../../actions/gasless/get-gasless-config';
+import type {
+    GetGaslessConfigErrorType,
+    GetGaslessConfigOptions,
+    GetGaslessConfigReturnType,
+} from '../../actions/gasless/get-gasless-config';
+import type { AppKit } from '../../core/app-kit';
+import type { QueryOptions, QueryParameter } from '../../types/query';
+import type { Compute, ExactPartial } from '../../types/utils';
+import { filterQueryOptions } from '../../utils';
+
+export type { GetGaslessConfigErrorType };
+
+export type GetGaslessConfigQueryConfig<selectData = GetGaslessConfigData> = Compute<
+    ExactPartial<GetGaslessConfigOptions>
+> &
+    QueryParameter<GetGaslessConfigQueryFnData, GetGaslessConfigErrorType, selectData, GetGaslessConfigQueryKey>;
+
+export const getGaslessConfigQueryOptions = <selectData = GetGaslessConfigData>(
+    appKit: AppKit,
+    options: GetGaslessConfigQueryConfig<selectData> = {},
+): GetGaslessConfigQueryOptions<selectData> => {
+    return {
+        ...options.query,
+        queryFn: async (context) => {
+            const [, parameters] = context.queryKey as [string, GetGaslessConfigOptions];
+            return getGaslessConfig(appKit, parameters);
+        },
+        queryKey: getGaslessConfigQueryKey(options),
+    };
+};
+
+export type GetGaslessConfigQueryFnData = Compute<Awaited<GetGaslessConfigReturnType>>;
+
+export type GetGaslessConfigData = GetGaslessConfigQueryFnData;
+
+export const getGaslessConfigQueryKey = (
+    options: Compute<ExactPartial<GetGaslessConfigOptions>> = {},
+): GetGaslessConfigQueryKey => {
+    return ['gaslessConfig', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
+};
+
+export type GetGaslessConfigQueryKey = readonly ['gaslessConfig', Compute<ExactPartial<GetGaslessConfigOptions>>];
+
+export type GetGaslessConfigQueryOptions<selectData = GetGaslessConfigData> = QueryOptions<
+    GetGaslessConfigQueryFnData,
+    GetGaslessConfigErrorType,
+    selectData,
+    GetGaslessConfigQueryKey
+>;
diff --git a/packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts b/packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts
deleted file mode 100644
index 166f4ea92..000000000
--- a/packages/appkit/src/queries/gasless/get-gasless-supported-assets.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { getGaslessSupportedAssets } from '../../actions/gasless/get-gasless-supported-assets';
-import type {
-    GetGaslessSupportedAssetsErrorType,
-    GetGaslessSupportedAssetsOptions,
-    GetGaslessSupportedAssetsReturnType,
-} from '../../actions/gasless/get-gasless-supported-assets';
-import type { AppKit } from '../../core/app-kit';
-import type { QueryOptions, QueryParameter } from '../../types/query';
-import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions } from '../../utils';
-
-export type { GetGaslessSupportedAssetsErrorType };
-
-export type GetGaslessSupportedAssetsQueryConfig<selectData = GetGaslessSupportedAssetsData> = Compute<
-    ExactPartial<GetGaslessSupportedAssetsOptions>
-> &
-    QueryParameter<
-        GetGaslessSupportedAssetsQueryFnData,
-        GetGaslessSupportedAssetsErrorType,
-        selectData,
-        GetGaslessSupportedAssetsQueryKey
-    >;
-
-export const getGaslessSupportedAssetsQueryOptions = <selectData = GetGaslessSupportedAssetsData>(
-    appKit: AppKit,
-    options: GetGaslessSupportedAssetsQueryConfig<selectData> = {},
-): GetGaslessSupportedAssetsQueryOptions<selectData> => {
-    return {
-        ...options.query,
-        queryFn: async (context) => {
-            const [, parameters] = context.queryKey as [string, GetGaslessSupportedAssetsOptions];
-            return getGaslessSupportedAssets(appKit, parameters);
-        },
-        queryKey: getGaslessSupportedAssetsQueryKey(options),
-    };
-};
-
-export type GetGaslessSupportedAssetsQueryFnData = Compute<Awaited<GetGaslessSupportedAssetsReturnType>>;
-
-export type GetGaslessSupportedAssetsData = GetGaslessSupportedAssetsQueryFnData;
-
-export const getGaslessSupportedAssetsQueryKey = (
-    options: Compute<ExactPartial<GetGaslessSupportedAssetsOptions>> = {},
-): GetGaslessSupportedAssetsQueryKey => {
-    return ['gaslessSupportedAssets', filterQueryOptions(options as unknown as Record<string, unknown>)] as const;
-};
-
-export type GetGaslessSupportedAssetsQueryKey = readonly [
-    'gaslessSupportedAssets',
-    Compute<ExactPartial<GetGaslessSupportedAssetsOptions>>,
-];
-
-export type GetGaslessSupportedAssetsQueryOptions<selectData = GetGaslessSupportedAssetsData> = QueryOptions<
-    GetGaslessSupportedAssetsQueryFnData,
-    GetGaslessSupportedAssetsErrorType,
-    selectData,
-    GetGaslessSupportedAssetsQueryKey
->;
diff --git a/packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts b/packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts
deleted file mode 100644
index 7b91c0dba..000000000
--- a/packages/appkit/src/queries/gasless/get-gasless-ton-transfer-quote.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { getGaslessTonTransferQuote } from '../../actions/gasless/get-gasless-ton-transfer-quote';
-import type {
-    GetGaslessTonTransferQuoteErrorType,
-    GetGaslessTonTransferQuoteOptions,
-    GetGaslessTonTransferQuoteReturnType,
-} from '../../actions/gasless/get-gasless-ton-transfer-quote';
-import { getSelectedWallet } from '../../actions/wallets/get-selected-wallet';
-import type { AppKit } from '../../core/app-kit';
-import type { QueryOptions, QueryParameter } from '../../types/query';
-import type { Compute, ExactPartial } from '../../types/utils';
-import { filterQueryOptions } from '../../utils';
-import { GASLESS_QUOTE_STALE_TIME_MS } from './get-gasless-quote';
-
-export type { GetGaslessTonTransferQuoteErrorType };
-
-export type GetGaslessTonTransferQuoteQueryConfig<selectData = GetGaslessTonTransferQuoteData> = Compute<
-    ExactPartial<GetGaslessTonTransferQuoteOptions>
-> &
-    QueryParameter<
-        GetGaslessTonTransferQuoteQueryFnData,
-        GetGaslessTonTransferQuoteErrorType,
-        selectData,
-        GetGaslessTonTransferQuoteQueryKey
-    >;
-
-export const getGaslessTonTransferQuoteQueryOptions = <selectData = GetGaslessTonTransferQuoteData>(
-    appKit: AppKit,
-    options: GetGaslessTonTransferQuoteQueryConfig<selectData> = {},
-): GetGaslessTonTransferQuoteQueryOptions<selectData> => {
-    // Bind the quote to the selected wallet's address and network so a
-    // wallet/network switch produces a distinct cache entry and refetch
-    // (mirrors `getGaslessQuoteQueryOptions`). The quote is always built for the
-    // selected wallet's network, so the key tracks that — not a caller override.
-    const wallet = getSelectedWallet(appKit);
-    const walletAddress = wallet?.getAddress();
-    const resolvedOptions = { ...options, network: wallet?.getNetwork() };
-
-    return {
-        staleTime: GASLESS_QUOTE_STALE_TIME_MS,
-        ...options.query,
-        // Gate on a connected wallet too: the action builds the transfer via the
-        // selected wallet and throws without one, so without this the query would
-        // fire into a `Wallet not connected` error instead of idling.
-        enabled: Boolean(
-            options.recipientAddress && options.amount && walletAddress && (options.query?.enabled ?? true),
-        ),
-        queryFn: async (context) => {
-            const [, parameters] = context.queryKey as [string, GetGaslessTonTransferQuoteOptions, string | undefined];
-            return getGaslessTonTransferQuote(appKit, parameters);
-        },
-        queryKey: getGaslessTonTransferQuoteQueryKey(resolvedOptions, walletAddress),
-    };
-};
-
-export type GetGaslessTonTransferQuoteQueryFnData = Compute<Awaited<GetGaslessTonTransferQuoteReturnType>>;
-
-export type GetGaslessTonTransferQuoteData = GetGaslessTonTransferQuoteQueryFnData;
-
-export const getGaslessTonTransferQuoteQueryKey = (
-    options: Compute<ExactPartial<GetGaslessTonTransferQuoteOptions>> = {},
-    walletAddress?: string,
-): GetGaslessTonTransferQuoteQueryKey => {
-    return [
-        'gaslessTonTransferQuote',
-        filterQueryOptions(options as unknown as Record<string, unknown>),
-        walletAddress,
-    ] as const;
-};
-
-export type GetGaslessTonTransferQuoteQueryKey = readonly [
-    'gaslessTonTransferQuote',
-    Compute<ExactPartial<GetGaslessTonTransferQuoteOptions>>,
-    string | undefined,
-];
-
-export type GetGaslessTonTransferQuoteQueryOptions<selectData = GetGaslessTonTransferQuoteData> = QueryOptions<
-    GetGaslessTonTransferQuoteQueryFnData,
-    GetGaslessTonTransferQuoteErrorType,
-    selectData,
-    GetGaslessTonTransferQuoteQueryKey
->;
diff --git a/packages/appkit/src/queries/index.ts b/packages/appkit/src/queries/index.ts
index ab64e81a8..0d195b4b7 100644
--- a/packages/appkit/src/queries/index.ts
+++ b/packages/appkit/src/queries/index.ts
@@ -167,14 +167,14 @@ export {
 
 // Gasless
 export {
-    getGaslessSupportedAssetsQueryOptions,
-    getGaslessSupportedAssetsQueryKey,
-    type GetGaslessSupportedAssetsQueryConfig,
-    type GetGaslessSupportedAssetsData,
-    type GetGaslessSupportedAssetsErrorType,
-    type GetGaslessSupportedAssetsQueryKey,
-    type GetGaslessSupportedAssetsQueryOptions,
-} from './gasless/get-gasless-supported-assets';
+    getGaslessConfigQueryOptions,
+    getGaslessConfigQueryKey,
+    type GetGaslessConfigQueryConfig,
+    type GetGaslessConfigData,
+    type GetGaslessConfigErrorType,
+    type GetGaslessConfigQueryKey,
+    type GetGaslessConfigQueryOptions,
+} from './gasless/get-gasless-config';
 export {
     getGaslessProviderMetadataQueryOptions,
     getGaslessProviderMetadataQueryKey,
@@ -203,15 +203,6 @@ export {
     type GetGaslessJettonTransferQuoteQueryKey,
     type GetGaslessJettonTransferQuoteQueryOptions,
 } from './gasless/get-gasless-jetton-transfer-quote';
-export {
-    getGaslessTonTransferQuoteQueryOptions,
-    getGaslessTonTransferQuoteQueryKey,
-    type GetGaslessTonTransferQuoteQueryConfig,
-    type GetGaslessTonTransferQuoteData,
-    type GetGaslessTonTransferQuoteErrorType,
-    type GetGaslessTonTransferQuoteQueryKey,
-    type GetGaslessTonTransferQuoteQueryOptions,
-} from './gasless/get-gasless-ton-transfer-quote';
 export {
     sendGaslessTransactionMutationOptions,
     type SendGaslessTransactionMutationConfig,
diff --git a/packages/walletkit/src/api/interfaces/DefiProvider.ts b/packages/walletkit/src/api/interfaces/DefiProvider.ts
index a3eb7ec49..8986459fe 100644
--- a/packages/walletkit/src/api/interfaces/DefiProvider.ts
+++ b/packages/walletkit/src/api/interfaces/DefiProvider.ts
@@ -6,12 +6,7 @@
  *
  */
 
-import type { Network, BaseProvider } from '../models';
-
-/**
- * Type of provider
- */
-export type DefiProviderType = 'swap' | 'staking' | 'gasless';
+import type { Network, BaseProvider, DefiProviderType } from '../models';
 
 /**
  * Base interface for all DeFi providers
diff --git a/packages/walletkit/src/api/interfaces/GaslessAPI.ts b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
index e052335d8..3d6636a97 100644
--- a/packages/walletkit/src/api/interfaces/GaslessAPI.ts
+++ b/packages/walletkit/src/api/interfaces/GaslessAPI.ts
@@ -7,12 +7,12 @@
  */
 
 import type {
+    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
-    GaslessSupportedAsset,
     Network,
 } from '../models';
 import type { DefiManagerAPI } from './DefiManagerAPI';
@@ -32,11 +32,13 @@ export interface GaslessAPI extends DefiManagerAPI<GaslessProviderInterface> {
     getMetadata(providerId?: string): Promise<GaslessProviderMetadata>;
 
     /**
-     * Discover the assets the relayer accepts as fee payment.
+     * Fetch the relayer's configuration on a given network — the relay address
+     * (e.g. for jetton-transfer `responseDestination`) and the assets it
+     * accepts as fee payment.
      * @param network Network to query (optional, falls back to the provider's first supported network)
      * @param providerId Provider identifier (optional, uses default if not specified)
      */
-    getSupportedAssets(network?: Network, providerId?: string): Promise<GaslessSupportedAsset[]>;
+    getConfig(network?: Network, providerId?: string): Promise<GaslessConfig>;
 
     /**
      * Quote fees and obtain relayer-wrapped messages for signing.
@@ -79,9 +81,10 @@ export interface GaslessProviderInterface extends DefiProvider {
     getMetadata(): Promise<GaslessProviderMetadata>;
 
     /**
-     * Discover the assets the relayer accepts as fee payment for the requested network.
+     * Fetch the relayer's configuration (relay address + accepted fee assets)
+     * for the requested network.
      */
-    getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]>;
+    getConfig(network: Network): Promise<GaslessConfig>;
 
     /**
      * Quote fees and return relayer-wrapped messages for signing.
diff --git a/packages/walletkit/src/api/interfaces/index.ts b/packages/walletkit/src/api/interfaces/index.ts
index aee441303..9a78d4b31 100644
--- a/packages/walletkit/src/api/interfaces/index.ts
+++ b/packages/walletkit/src/api/interfaces/index.ts
@@ -12,7 +12,7 @@ export type { WalletSigner, ISigner } from './WalletSigner';
 
 // Defi interfaces
 export type { DefiManagerAPI } from './DefiManagerAPI';
-export type { DefiProvider, DefiProviderType } from './DefiProvider';
+export type { DefiProvider } from './DefiProvider';
 export type { SwapAPI, SwapProviderInterface } from './SwapAPI';
 export type { StakingAPI, StakingProviderInterface } from './StakingAPI';
 export type { GaslessAPI, GaslessProviderInterface } from './GaslessAPI';
diff --git a/packages/walletkit/src/api/models/core/DefiProviderType.ts b/packages/walletkit/src/api/models/core/DefiProviderType.ts
new file mode 100644
index 000000000..3273928fc
--- /dev/null
+++ b/packages/walletkit/src/api/models/core/DefiProviderType.ts
@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/**
+ * Discriminator for DeFi-style providers (swap quotes, staking, gasless relayers).
+ */
+export type DefiProviderType = 'swap' | 'staking' | 'gasless';
diff --git a/packages/walletkit/src/api/models/gasless/GaslessConfig.ts b/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
new file mode 100644
index 000000000..691bbbb11
--- /dev/null
+++ b/packages/walletkit/src/api/models/gasless/GaslessConfig.ts
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { UserFriendlyAddress } from '../core/Primitives';
+import type { GaslessSupportedAsset } from './GaslessSupportedAsset';
+
+/**
+ * Provider-level configuration for a gasless relayer on a given network.
+ *
+ * Bundles every piece of provider state a consumer needs to drive a gasless
+ * transfer end-to-end:
+ *  - `relayAddress` — where the relayer wants residual TON (e.g. jetton-transfer
+ *    `responseDestination`) returned to.
+ *  - `supportedAssets` — what the relayer accepts as fee payment.
+ */
+export interface GaslessConfig {
+    /** Relayer address — for jetton-transfer `responseDestination` and similar. */
+    relayAddress: UserFriendlyAddress;
+    /** Assets the relayer accepts as fee payment. */
+    supportedAssets: GaslessSupportedAsset[];
+}
diff --git a/packages/walletkit/src/api/models/index.ts b/packages/walletkit/src/api/models/index.ts
index 2e300b48c..947f62c16 100644
--- a/packages/walletkit/src/api/models/index.ts
+++ b/packages/walletkit/src/api/models/index.ts
@@ -18,6 +18,7 @@ export type { AddressBook, AddressBookEntry } from './core/AddressBook';
 export type { ManifestFetchResult } from './core/ManifestFetchResult';
 export { AssetType } from './core/AssetType';
 export type { BaseProvider, BaseProviderEvents, BaseProviderUpdate } from './core/BaseProvider';
+export type { DefiProviderType } from './core/DefiProviderType';
 export type { DAppInfo } from './core/DAppInfo';
 export type { ExtraCurrencies } from './core/ExtraCurrencies';
 export { Network } from './core/Network';
@@ -140,6 +141,7 @@ export { UnstakeMode } from './staking/UnstakeMode';
 
 // Gasless models
 export type { GaslessSupportedAsset } from './gasless/GaslessSupportedAsset';
+export type { GaslessConfig } from './gasless/GaslessConfig';
 export type { GaslessProviderMetadata, GaslessProviderMetadataOverride } from './gasless/GaslessProviderMetadata';
 export type { GaslessQuoteParams } from './gasless/GaslessQuoteParams';
 export type { GaslessQuote } from './gasless/GaslessQuote';
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
index d6afe252d..591a15aaa 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.spec.ts
@@ -11,11 +11,11 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
 import type { GaslessProviderInterface } from '../../api/interfaces';
 import type {
     Base64String,
+    GaslessConfig,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
-    GaslessSupportedAsset,
     Hex,
 } from '../../api/models';
 import { Network } from '../../api/models';
@@ -31,9 +31,9 @@ const makeProvider = (providerId: string): GaslessProviderInterface => ({
     providerId,
     getSupportedNetworks: () => [Network.mainnet()],
     getMetadata: vi.fn().mockResolvedValue({ name: 'Test', url: 'https://test.example' }),
-    getSupportedAssets: vi
-        .fn<(n: Network) => Promise<GaslessSupportedAsset[]>>()
-        .mockResolvedValue([{ address: TEST_ADDRESS }]),
+    getConfig: vi
+        .fn<(n: Network) => Promise<GaslessConfig>>()
+        .mockResolvedValue({ relayAddress: TEST_ADDRESS, supportedAssets: [{ address: TEST_ADDRESS }] }),
     getQuote: vi.fn<(p: GaslessQuoteParams) => Promise<GaslessQuote>>().mockResolvedValue({
         network: Network.mainnet(),
         messages: [],
@@ -127,14 +127,14 @@ describe('GaslessManager delegation', () => {
         expect(provider.getMetadata).toHaveBeenCalledTimes(1);
     });
 
-    it('forwards getSupportedAssets to the default provider', async () => {
+    it('forwards getConfig to the default provider', async () => {
         const { manager } = makeManager();
         const provider = makeProvider('one');
         manager.registerProvider(provider);
 
-        await manager.getSupportedAssets();
+        await manager.getConfig();
 
-        expect(provider.getSupportedAssets).toHaveBeenCalledTimes(1);
+        expect(provider.getConfig).toHaveBeenCalledTimes(1);
     });
 
     it('forwards getQuote to the named provider', async () => {
diff --git a/packages/walletkit/src/defi/gasless/GaslessManager.ts b/packages/walletkit/src/defi/gasless/GaslessManager.ts
index a5806a764..550a579ae 100644
--- a/packages/walletkit/src/defi/gasless/GaslessManager.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessManager.ts
@@ -8,12 +8,12 @@
 
 import type { GaslessAPI, GaslessProviderInterface } from '../../api/interfaces';
 import type {
+    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
-    GaslessSupportedAsset,
     Network,
 } from '../../api/models';
 import { globalLogger } from '../../core/Logger';
@@ -51,22 +51,22 @@ export class GaslessManager extends DefiManager<GaslessProviderInterface> implem
     }
 
     /**
-     * Discover the assets the relayer accepts as fee payment.
+     * Fetch the relayer's configuration (relay address + accepted fee assets).
      *
      * `network` defaults to the provider's first supported network.
      */
-    async getSupportedAssets(network?: Network, providerId?: string): Promise<GaslessSupportedAsset[]> {
+    async getConfig(network?: Network, providerId?: string): Promise<GaslessConfig> {
         const provider = this.getProvider(providerId ?? this.defaultProviderId);
         const targetNetwork = network ?? provider.getSupportedNetworks()[0];
-        log.debug('Getting gasless supported assets', {
+        log.debug('Getting gasless config', {
             network: targetNetwork?.chainId,
             providerId: providerId ?? this.defaultProviderId,
         });
 
         try {
-            return await provider.getSupportedAssets(targetNetwork);
+            return await provider.getConfig(targetNetwork);
         } catch (error) {
-            log.error('Failed to get gasless supported assets', { error });
+            log.error('Failed to get gasless config', { error });
             throw error;
         }
     }
diff --git a/packages/walletkit/src/defi/gasless/GaslessProvider.ts b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
index 0d757998a..3d389c728 100644
--- a/packages/walletkit/src/defi/gasless/GaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/GaslessProvider.ts
@@ -8,12 +8,12 @@
 
 import type { GaslessProviderInterface } from '../../api/interfaces';
 import type {
+    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
-    GaslessSupportedAsset,
     Network,
 } from '../../api/models';
 
@@ -29,7 +29,7 @@ import type {
  *   readonly providerId = 'my-relayer';
  *
  *   async getMetadata(): Promise<GaslessProviderMetadata> { ... }
- *   async getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]> { ... }
+ *   async getConfig(network: Network): Promise<GaslessConfig> { ... }
  *   async getQuote(params): Promise<GaslessQuote> { ... }
  *   async sendTransaction(params): Promise<GaslessSendResponse> { ... }
  * }
@@ -41,7 +41,7 @@ export abstract class GaslessProvider implements GaslessProviderInterface {
 
     abstract getSupportedNetworks(): Network[];
     abstract getMetadata(): Promise<GaslessProviderMetadata>;
-    abstract getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]>;
+    abstract getConfig(network: Network): Promise<GaslessConfig>;
     abstract getQuote(params: GaslessQuoteParams): Promise<GaslessQuote>;
     abstract sendTransaction(params: GaslessSendParams): Promise<GaslessSendResponse>;
 }
diff --git a/packages/walletkit/src/defi/gasless/README.md b/packages/walletkit/src/defi/gasless/README.md
index c56ded029..b1c55527d 100644
--- a/packages/walletkit/src/defi/gasless/README.md
+++ b/packages/walletkit/src/defi/gasless/README.md
@@ -4,7 +4,7 @@
 
 ## Flow
 
-1. **Discover** – call `getSupportedAssets` to learn which assets the relayer accepts as fee payment (omit if the dApp already knows which asset it wants to charge).
+1. **Discover** – call `getConfig` to fetch the relay address and the assets the relayer accepts as fee payment (omit if the dApp already knows which asset it wants to charge).
 2. **Quote** – call `getQuote` with your messages and chosen fee asset. The relayer returns *wrapped* messages, a fee, and a `validUntil` window.
 3. **Sign** – pass the wrapped messages to `wallet.signMessage` (TonConnect `SignMessage` feature). The wallet returns a signed *internal-message* BoC.
 4. **Send** – submit the signed BoC via `sendTransaction`; the relayer converts it to an external message, pays the gas, and broadcasts.
@@ -42,8 +42,8 @@ The connected wallet must expose the `SignMessage` feature (advertised via TonCo
 import { Address } from '@ton/core';
 import { Network } from '@ton/walletkit';
 
-const supportedAssets = await kit.gasless.getSupportedAssets();
-const feeAsset = supportedAssets[0].address;
+const config = await kit.gasless.getConfig();
+const feeAsset = config.supportedAssets[0].address;
 
 const quote = await kit.gasless.getQuote({
     feeAsset,
@@ -83,7 +83,7 @@ The `validUntil` timestamp is set by the relayer (typically ~2 minutes). In `@to
 | `UNSUPPORTED_OPERATION` | The provider does not implement the requested mode (e.g. a jetton-fee-only provider called without `feeAsset`). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
-| `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
+| `CONFIG_FAILED` | Failed to fetch the relayer's configuration (relay address + accepted fee assets). |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not implement the `SignMessage` feature. Surfaced by the higher-level `sendGaslessTransaction` action in `@ton/appkit`. |
 | `TOO_MANY_MESSAGES` | The quote carries more messages than the wallet's advertised `SignMessage.maxMessages` cap. Surfaced by `sendGaslessTransaction` in `@ton/appkit`. |
 | `QUOTE_EXPIRED` | The quote's `validUntil` window has already passed. Surfaced by `sendGaslessTransaction` in `@ton/appkit` before signing, so the wallet is not prompted for a quote the relayer would reject. |
@@ -101,7 +101,7 @@ import {
     type GaslessQuote,
     type GaslessSendParams,
     type GaslessSendResponse,
-    type GaslessSupportedAsset,
+    type GaslessConfig,
     type Network,
 } from '@ton/walletkit';
 
@@ -116,7 +116,7 @@ export class MyGaslessProvider extends GaslessProvider {
         return { name: 'My Relayer', url: 'https://my-relayer.example' };
     }
 
-    async getSupportedAssets(): Promise<GaslessSupportedAsset[]> {
+    async getConfig(): Promise<GaslessConfig> {
         // …
     }
 
@@ -141,8 +141,8 @@ export class MyGaslessProvider extends GaslessProvider {
 #### `getMetadata(providerId?)`
 Static metadata for the gasless provider: `{ name, logo?, url? }`. Useful for rendering provider info in the UI.
 
-#### `getSupportedAssets(network?, providerId?)`
-Discover the assets the relayer accepts as fee payment. `network` defaults to the provider's first supported network.
+#### `getConfig(network?, providerId?)`
+Fetch the relayer's configuration on a network: `{ relayAddress, supportedAssets }`. `network` defaults to the provider's first supported network.
 
 #### `getQuote(params, providerId?)`
 Wrap caller's messages with relayer fee-collection logic. Returns wrapped messages, fee, and `validUntil`. Pass `feeAsset` to choose a jetton master (omit for free / sponsored providers).
diff --git a/packages/walletkit/src/defi/gasless/errors.ts b/packages/walletkit/src/defi/gasless/errors.ts
index 72ab51227..b64cf4bc2 100644
--- a/packages/walletkit/src/defi/gasless/errors.ts
+++ b/packages/walletkit/src/defi/gasless/errors.ts
@@ -13,7 +13,7 @@ export enum GaslessErrorCode {
     UnsupportedOperation = 'UNSUPPORTED_OPERATION',
     QuoteFailed = 'QUOTE_FAILED',
     SendFailed = 'SEND_FAILED',
-    SupportedAssetsFailed = 'SUPPORTED_ASSETS_FAILED',
+    ConfigFailed = 'CONFIG_FAILED',
     SignMessageNotSupported = 'SIGN_MESSAGE_NOT_SUPPORTED',
     TooManyMessages = 'TOO_MANY_MESSAGES',
     QuoteExpired = 'QUOTE_EXPIRED',
diff --git a/packages/walletkit/src/defi/gasless/tonapi/README.md b/packages/walletkit/src/defi/gasless/tonapi/README.md
index 2b454805e..cd1f1dae8 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/README.md
+++ b/packages/walletkit/src/defi/gasless/tonapi/README.md
@@ -35,7 +35,7 @@ If no chain ends up configured, the factory throws.
 
 `sendTransaction` retries on transient failures only (HTTP 5xx, 408, 429, network errors) with exponential backoff (`sendRetryDelayMs * 2 ** attempt`, starting at 2000ms). 4xx responses fail fast. The wallet's seqno guard protects against on-chain double-spend if a retry duplicates an accepted BoC.
 
-`getQuote` and `getSupportedAssets` do not retry — quotes are short-lived (~2 min `validUntil`), and the asset list is cached at the React Query layer.
+`getQuote` and `getConfig` do not retry — quotes are short-lived (~2 min `validUntil`), and the config is cached at the React Query layer.
 
 ## BoC encoding
 
@@ -48,7 +48,7 @@ The `send` response carries the broadcasted external message as hex; we run it t
 TonAPI returns a numeric `error_code` in the error body. The provider maps the
 known ones to domain `GaslessErrorCode` values (see `mappers/map-gasless-error.ts`);
 any other code falls back to the call-site's code (`QUOTE_FAILED` / `SEND_FAILED` /
-`SUPPORTED_ASSETS_FAILED`).
+`CONFIG_FAILED`).
 
 | TonAPI `error_code` | Domain `GaslessErrorCode` | Meaning |
 |---|---|---|
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 8b8c613b4..1d2f50a58 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -120,7 +120,7 @@ describe('TonApiGaslessProvider.getMetadata', () => {
     });
 });
 
-describe('TonApiGaslessProvider.getSupportedAssets', () => {
+describe('TonApiGaslessProvider.getConfig', () => {
     let fetchApi: ReturnType<typeof makeFetch>;
     let provider: TonApiGaslessProvider;
 
@@ -135,19 +135,20 @@ describe('TonApiGaslessProvider.getSupportedAssets', () => {
         ...overrides,
     });
 
-    it('maps the TonApi response to GaslessSupportedAsset[]', async () => {
+    it('maps the TonApi response to GaslessConfig (relayAddress + supportedAssets)', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig()));
 
-        const assets = await provider.getSupportedAssets(Network.mainnet());
+        const config = await provider.getConfig(Network.mainnet());
 
-        expect(assets).toHaveLength(1);
-        expect(assets[0].address).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
+        expect(config.relayAddress).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
+        expect(config.supportedAssets).toHaveLength(1);
+        expect(config.supportedAssets[0].address).toBe(Address.parse(TEST_ADDRESS).toString({ bounceable: true }));
     });
 
     it('hits /v2/gasless/config on the mainnet endpoint when called for mainnet', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await provider.getSupportedAssets(Network.mainnet());
+        await provider.getConfig(Network.mainnet());
 
         expect((fetchApi.mock.calls[0][0] as URL).toString()).toBe('https://tonapi.io/v2/gasless/config');
     });
@@ -155,7 +156,7 @@ describe('TonApiGaslessProvider.getSupportedAssets', () => {
     it('uses the testnet endpoint when called for testnet', async () => {
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await provider.getSupportedAssets(Network.testnet());
+        await provider.getConfig(Network.testnet());
 
         expect((fetchApi.mock.calls[0][0] as URL).origin).toBe('https://testnet.tonapi.io');
     });
@@ -166,7 +167,7 @@ describe('TonApiGaslessProvider.getSupportedAssets', () => {
         });
         fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig({ gas_jettons: [] })));
 
-        await authedProvider.getSupportedAssets(Network.mainnet());
+        await authedProvider.getConfig(Network.mainnet());
 
         const init = fetchApi.mock.calls[0][1] as RequestInit;
         const headers = init.headers as Headers;
@@ -176,20 +177,94 @@ describe('TonApiGaslessProvider.getSupportedAssets', () => {
     it('throws GaslessError(UNSUPPORTED_OPERATION) when called for a non-configured chain', async () => {
         const mainnetOnly = makeProvider(fetchApi, { networks: [Network.mainnet()] });
 
-        await expect(mainnetOnly.getSupportedAssets(Network.testnet())).rejects.toMatchObject({
+        await expect(mainnetOnly.getConfig(Network.testnet())).rejects.toMatchObject({
             name: 'GaslessError',
             code: GaslessErrorCode.UnsupportedOperation,
         });
     });
 
-    it('wraps fetch errors in GaslessError(SUPPORTED_ASSETS_FAILED)', async () => {
+    it('wraps fetch errors in GaslessError(CONFIG_FAILED)', async () => {
         fetchApi.mockResolvedValueOnce(new Response('boom', { status: 500 }));
 
-        await expect(provider.getSupportedAssets(Network.mainnet())).rejects.toMatchObject({
+        await expect(provider.getConfig(Network.mainnet())).rejects.toMatchObject({
             name: 'GaslessError',
-            code: GaslessErrorCode.SupportedAssetsFailed,
+            code: GaslessErrorCode.ConfigFailed,
         });
     });
+
+    it('serves repeated calls from the in-memory cache within TTL', async () => {
+        fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig()));
+
+        const first = await provider.getConfig(Network.mainnet());
+        const second = await provider.getConfig(Network.mainnet());
+
+        expect(fetchApi).toHaveBeenCalledTimes(1);
+        expect(second).toBe(first);
+    });
+
+    it('refetches after the cache TTL expires', async () => {
+        const shortTtl = makeProvider(fetchApi, { configCacheTtlMs: 5 });
+        fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig())).mockResolvedValueOnce(jsonResponse(rawConfig()));
+
+        await shortTtl.getConfig(Network.mainnet());
+        await new Promise((resolve) => setTimeout(resolve, 20));
+        await shortTtl.getConfig(Network.mainnet());
+
+        expect(fetchApi).toHaveBeenCalledTimes(2);
+    });
+
+    it('deduplicates concurrent calls into one fetch', async () => {
+        let resolveFetch: (response: Response) => void = () => {};
+        fetchApi.mockImplementationOnce(
+            () =>
+                new Promise<Response>((resolve) => {
+                    resolveFetch = resolve;
+                }),
+        );
+
+        const a = provider.getConfig(Network.mainnet());
+        const b = provider.getConfig(Network.mainnet());
+
+        resolveFetch(jsonResponse(rawConfig()));
+
+        const [resA, resB] = await Promise.all([a, b]);
+        expect(fetchApi).toHaveBeenCalledTimes(1);
+        expect(resA).toBe(resB);
+    });
+
+    it('does not cache failures — retries on the next call', async () => {
+        fetchApi
+            .mockResolvedValueOnce(new Response('boom', { status: 500 }))
+            .mockResolvedValueOnce(jsonResponse(rawConfig()));
+
+        await expect(provider.getConfig(Network.mainnet())).rejects.toMatchObject({
+            code: GaslessErrorCode.ConfigFailed,
+        });
+        await expect(provider.getConfig(Network.mainnet())).resolves.toBeDefined();
+
+        expect(fetchApi).toHaveBeenCalledTimes(2);
+    });
+
+    it('skips caching when configCacheTtlMs is 0', async () => {
+        const noCache = makeProvider(fetchApi, { configCacheTtlMs: 0 });
+        fetchApi.mockImplementation(async () => jsonResponse(rawConfig()));
+
+        await noCache.getConfig(Network.mainnet());
+        await noCache.getConfig(Network.mainnet());
+
+        expect(fetchApi).toHaveBeenCalledTimes(2);
+    });
+
+    it('caches per-chain — mainnet and testnet have independent entries', async () => {
+        fetchApi.mockResolvedValueOnce(jsonResponse(rawConfig())).mockResolvedValueOnce(jsonResponse(rawConfig()));
+
+        await provider.getConfig(Network.mainnet());
+        await provider.getConfig(Network.testnet());
+        await provider.getConfig(Network.mainnet());
+        await provider.getConfig(Network.testnet());
+
+        expect(fetchApi).toHaveBeenCalledTimes(2);
+    });
 });
 
 describe('TonApiGaslessProvider.getQuote', () => {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index c72e088c7..1094fa97d 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -7,14 +7,15 @@
  */
 
 import { Address } from '@ton/core';
+import { LRUCache } from 'lru-cache';
 
 import type {
+    GaslessConfig,
     GaslessProviderMetadata,
     GaslessQuote,
     GaslessQuoteParams,
     GaslessSendParams,
     GaslessSendResponse,
-    GaslessSupportedAsset,
     Network,
 } from '../../../api/models';
 import { ApiClientTonApi } from '../../../clients/tonapi/ApiClientTonApi';
@@ -23,9 +24,15 @@ import type { ProviderFactoryContext } from '../../../types/factory';
 import { delay } from '../../../utils/delay';
 import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
-import { DEFAULT_METADATA, DEFAULT_PROVIDER_ID, DEFAULT_SEND_RETRIES, DEFAULT_SEND_RETRY_DELAY_MS } from './constants';
+import {
+    DEFAULT_CONFIG_CACHE_TTL_MS,
+    DEFAULT_METADATA,
+    DEFAULT_PROVIDER_ID,
+    DEFAULT_SEND_RETRIES,
+    DEFAULT_SEND_RETRY_DELAY_MS,
+} from './constants';
 import { isTransientError, networkFromChainId } from './helpers';
-import { mapGaslessSupportedAssets } from './mappers/map-gasless-supported-assets';
+import { mapGaslessConfig } from './mappers/map-gasless-config';
 import { mapTonApiGaslessError } from './mappers/map-gasless-error';
 import { buildGaslessQuoteRequest, mapGaslessQuote } from './mappers/map-gasless-quote';
 import { buildGaslessSendRequest, mapGaslessSend } from './mappers/map-gasless-send';
@@ -63,6 +70,8 @@ export class TonApiGaslessProvider extends GaslessProvider {
     private readonly clients: Record<string, ApiClientTonApi> = {};
     private readonly sendRetries: number;
     private readonly sendRetryDelayMs: number;
+    private readonly configCacheTtlMs: number;
+    private readonly configCache?: LRUCache<string, GaslessConfig, Network>;
 
     /**
      * @internal Use {@link createTonApiGaslessProvider} (AppKit) or {@link TonApiGaslessProvider.createFromContext}.
@@ -74,6 +83,18 @@ export class TonApiGaslessProvider extends GaslessProvider {
         this.providerId = options.providerId ?? DEFAULT_PROVIDER_ID;
         this.sendRetries = options.sendRetries ?? DEFAULT_SEND_RETRIES;
         this.sendRetryDelayMs = options.sendRetryDelayMs ?? DEFAULT_SEND_RETRY_DELAY_MS;
+        this.configCacheTtlMs = options.configCacheTtlMs ?? DEFAULT_CONFIG_CACHE_TTL_MS;
+
+        if (this.configCacheTtlMs > 0) {
+            // LRUCache's `fetchMethod` joins concurrent calls into one fetch and
+            // drops the entry on rejection — exactly the dedup+no-cache-failures
+            // semantics we want. Network is threaded via `context` per call.
+            this.configCache = new LRUCache<string, GaslessConfig, Network>({
+                max: Math.max(1, Object.keys(chainConfig).length),
+                ttl: this.configCacheTtlMs,
+                fetchMethod: (_chainId, _stale, { context }) => this.fetchConfig(context),
+            });
+        }
 
         log.info('TonApiGaslessProvider initialized', {
             providerId: this.providerId,
@@ -126,18 +147,29 @@ export class TonApiGaslessProvider extends GaslessProvider {
         return DEFAULT_METADATA;
     }
 
-    async getSupportedAssets(network: Network): Promise<GaslessSupportedAsset[]> {
+    async getConfig(network: Network): Promise<GaslessConfig> {
+        if (!this.configCache) {
+            return this.fetchConfig(network);
+        }
+        // `fetch` returns the cached value when fresh, otherwise runs `fetchMethod`.
+        // The result is `undefined` only if `fetchMethod` is undefined or the
+        // cache returns `forceRefresh: true` on a stale-while-revalidate path —
+        // neither applies here.
+        const value = await this.configCache.fetch(network.chainId, { context: network });
+        if (!value) {
+            throw new GaslessError('Gasless config cache returned no value', GaslessErrorCode.ConfigFailed);
+        }
+        return value;
+    }
+
+    private async fetchConfig(network: Network): Promise<GaslessConfig> {
         try {
             const http = this.getClient(network);
             const raw = await http.getJson<TonApiGaslessConfig>('/v2/gasless/config');
-            return mapGaslessSupportedAssets(raw);
+            return mapGaslessConfig(raw);
         } catch (error) {
-            log.error('Failed to fetch gasless supported assets', { error, chainId: network.chainId });
-            throw mapTonApiGaslessError(
-                error,
-                GaslessErrorCode.SupportedAssetsFailed,
-                'Failed to fetch gasless supported assets',
-            );
+            log.error('Failed to fetch gasless config', { error, chainId: network.chainId });
+            throw mapTonApiGaslessError(error, GaslessErrorCode.ConfigFailed, 'Failed to fetch gasless config');
         }
     }
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/constants.ts b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
index aa1f245a5..d55627b0b 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/constants.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
@@ -22,3 +22,10 @@ export const DEFAULT_SEND_RETRIES = 3;
 
 /** Base delay between send retries (ms). Subsequent retries use exponential backoff (2× per attempt). */
 export const DEFAULT_SEND_RETRY_DELAY_MS = 2000;
+
+/**
+ * Default TTL for the in-memory `/v2/gasless/config` cache (ms). The relayer
+ * config (relay address + supported fee jettons) is essentially static, so a
+ * coarse TTL avoids hammering TonAPI when `getConfig` runs on every quote.
+ */
+export const DEFAULT_CONFIG_CACHE_TTL_MS = 5 * 60 * 1000;
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
new file mode 100644
index 000000000..4db193a4a
--- /dev/null
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-config.ts
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { GaslessConfig } from '../../../../api/models';
+import { asAddressFriendly } from '../../../../utils/address';
+import type { TonApiGaslessConfig } from '../types/config';
+
+/**
+ * Wire → domain: map TonAPI's `/v2/gasless/config` response to `GaslessConfig`.
+ * Bundles both the relay address (for jetton-transfer `responseDestination`)
+ * and the assets the relayer accepts as fee payment.
+ */
+export const mapGaslessConfig = (raw: TonApiGaslessConfig): GaslessConfig => ({
+    relayAddress: asAddressFriendly(raw.relay_address),
+    supportedAssets: raw.gas_jettons.map((jetton) => ({
+        address: asAddressFriendly(jetton.master_id),
+    })),
+});
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-supported-assets.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-supported-assets.ts
deleted file mode 100644
index c5f29f71c..000000000
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-supported-assets.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import type { GaslessSupportedAsset } from '../../../../api/models';
-import { asAddressFriendly } from '../../../../utils/address';
-import type { TonApiGaslessConfig } from '../types/config';
-
-export const mapGaslessSupportedAssets = (raw: TonApiGaslessConfig): GaslessSupportedAsset[] =>
-    raw.gas_jettons.map((jetton) => ({
-        address: asAddressFriendly(jetton.master_id),
-    }));
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
index 55753a364..f9f6ab2f8 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
@@ -35,4 +35,9 @@ export interface TonApiGaslessProviderConfig {
     sendRetries?: number;
     /** Delay between send retries in ms. Defaults to 2000. */
     sendRetryDelayMs?: number;
+    /**
+     * TTL for the in-memory `/v2/gasless/config` cache (ms). Defaults to
+     * 5 minutes. Set to `0` to disable caching.
+     */
+    configCacheTtlMs?: number;
 }
diff --git a/template/packages/appkit-react/docs/hooks.md b/template/packages/appkit-react/docs/hooks.md
index 3ce60b2ee..02ad1a5d5 100644
--- a/template/packages/appkit-react/docs/hooks.md
+++ b/template/packages/appkit-react/docs/hooks.md
@@ -260,11 +260,11 @@ Hook to fetch static metadata (display name, logo, url) for a gasless provider.
 
 %%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_PROVIDER_METADATA%%
 
-### `useGaslessSupportedAssets`
+### `useGaslessConfig`
 
-Hook to discover the assets the gasless relayer accepts as fee payment.
+Hook to fetch the gasless relayer's configuration — relay address (e.g. for jetton-transfer `responseDestination`) and accepted fee assets.
 
-%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_SUPPORTED_ASSETS%%
+%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_CONFIG%%
 
 ### `useGaslessQuote`
 
@@ -278,12 +278,6 @@ Hook to fetch a gasless quote for a jetton transfer from semantic params (`jetto
 
 %%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_JETTON_TRANSFER_QUOTE%%
 
-### `useGaslessTonTransferQuote`
-
-Hook to fetch a gasless quote for a TON transfer from `recipientAddress`, `amount`, `feeAsset`. Auto-refetches as inputs change and on wallet/network switch.
-
-%%demo/examples/src/appkit/hooks/gasless#USE_GASLESS_TON_TRANSFER_QUOTE%%
-
 ### `useSendGaslessTransaction`
 
 Hook to sign a previously computed quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
diff --git a/template/packages/appkit/docs/actions.md b/template/packages/appkit/docs/actions.md
index b6af3705a..2f03550b4 100644
--- a/template/packages/appkit/docs/actions.md
+++ b/template/packages/appkit/docs/actions.md
@@ -323,7 +323,7 @@ Get the user's staked balance.
 Gasless lets a dApp submit on-chain transactions without the user holding TON for gas: a relayer co-signs and broadcasts the transaction, charging the user a fee in a relayer-accepted asset (e.g. USDT). The connected wallet must support the `SignMessage` TonConnect feature. See the [gasless guide](./gasless.md) for a regular-send → gasless-send migration.
 
 The high-level flow is:
-1. `getGaslessSupportedAssets` – discover which assets the relayer accepts as fee payment.
+1. `getGaslessConfig` – discover the relay address and assets the relayer accepts as fee payment.
 2. `getGaslessQuote` – ask the relayer for fee + wrapped messages (with a `validUntil`).
 3. `sendGaslessTransaction` – sign the wrapped messages via the wallet and submit the signed BoC.
 
@@ -363,11 +363,11 @@ Fetch static metadata (display name, logo, url) for a gasless provider.
 
 %%demo/examples/src/appkit/actions/gasless#GET_GASLESS_PROVIDER_METADATA%%
 
-### `getGaslessSupportedAssets`
+### `getGaslessConfig`
 
-Discover the assets the gasless relayer accepts as fee payment.
+Fetch the relayer's configuration on a network — the relay address (e.g. for jetton-transfer `responseDestination`) and the assets it accepts as fee payment.
 
-%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_SUPPORTED_ASSETS%%
+%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_CONFIG%%
 
 ### `getGaslessQuote`
 
@@ -381,12 +381,6 @@ Convenience wrapper that builds a jetton transfer's messages (resolving the jett
 
 %%demo/examples/src/appkit/actions/gasless#GET_GASLESS_JETTON_TRANSFER_QUOTE%%
 
-### `getGaslessTonTransferQuote`
-
-Convenience wrapper that builds a TON transfer's message and quotes it in one call. Takes `recipientAddress`, `amount`, `feeAsset` instead of pre-built `messages`. Returns a `GaslessQuote` to pass to `sendGaslessTransaction`.
-
-%%demo/examples/src/appkit/actions/gasless#GET_GASLESS_TON_TRANSFER_QUOTE%%
-
 ### `sendGaslessTransaction`
 
 Sign a previously computed gasless quote and submit the resulting BoC to the relayer. Returns a `GaslessSendResponse` — a strict superset of `SendTransactionResponse` (`{ boc, normalizedBoc, normalizedHash, internalBoc }`).
diff --git a/template/packages/appkit/docs/gasless.md b/template/packages/appkit/docs/gasless.md
index c3e37d323..b405a9937 100644
--- a/template/packages/appkit/docs/gasless.md
+++ b/template/packages/appkit/docs/gasless.md
@@ -42,9 +42,12 @@ Cost: the user spends **0 TON** and a small amount of USDT (the relayer fee, sho
 
 ## Migration recipe
 
-The `messages` array is built the same way for both flows — the relayer wraps your messages on its end and adds the fee transfer. The only difference between the two snippets above: replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages, feeAsset })` followed by `sendGaslessTransaction(appKit, { quote })`.
+The `messages` array is built the same way for both flows — the relayer wraps your messages on its end and adds the fee transfer. Two changes versus a regular send:
 
-`feeAsset` is the jetton master the relayer charges the fee in. The TonAPI provider requires it; discover the relayer-accepted assets with `getGaslessSupportedAssets(appKit)`, or hardcode the jetton master you want to charge in.
+1. Set the jetton transfer's `responseDestination` to the relayer's `relayAddress` (from `getGaslessConfig`) so the unspent TON gas returns to the relayer that paid it instead of the user's wallet.
+2. Replace `sendTransaction(appKit, { messages })` with `getGaslessQuote(appKit, { messages, feeAsset })` followed by `sendGaslessTransaction(appKit, { quote })`.
+
+`feeAsset` is the jetton master the relayer charges the fee in. The TonAPI provider requires it; discover the relayer-accepted assets via `getGaslessConfig(appKit)` (returns `{ relayAddress, supportedAssets }`), or hardcode the jetton master you want to charge in. The `getGaslessJettonTransferQuote` convenience wrapper handles both points above for you.
 
 For React projects, the same flow is available as hooks (`useSendTransaction` / `useGaslessQuote` + `useSendGaslessTransaction`).
 
@@ -57,7 +60,7 @@ For React projects, the same flow is available as hooks (`useSendTransaction` /
 | `UNSUPPORTED_OPERATION` | The provider does not implement the requested mode (e.g. a jetton-fee provider called without `feeAsset`). |
 | `QUOTE_FAILED` | Relayer rejected the quote (insufficient liquidity, malformed messages, …). |
 | `SEND_FAILED` | Relayer rejected the signed BoC, or all retries were exhausted. |
-| `SUPPORTED_ASSETS_FAILED` | Failed to discover relayer-accepted fee assets. |
+| `CONFIG_FAILED` | Failed to fetch the relayer's configuration (relay address + accepted fee assets). |
 | `SIGN_MESSAGE_NOT_SUPPORTED` | Connected wallet does not advertise the `SignMessage` feature. |
 | `TOO_MANY_MESSAGES` | Quote carries more messages than the wallet's `SignMessage.maxMessages` cap. |
 | `QUOTE_EXPIRED` | Quote's `validUntil` window has passed; checked before signing so the wallet is not prompted for a quote the relayer would reject. Fetch a fresh quote. |

From 74c458774dfcca5bd2b33c1b7f271a7be9b5c9c3 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 20:15:14 +0400
Subject: [PATCH 27/46] feat(appkit): small ui improvements

---
 .../components/layout/app-router/app-router.tsx   |  3 ++-
 apps/appkit-minter/src/core/constants/tokens.ts   | 10 ++++++++++
 apps/appkit-minter/src/core/lib/utils.ts          |  5 -----
 .../balances/components/fee-asset-select.tsx      | 15 ++++++++-------
 .../balances/components/gasless-controls.tsx      |  4 +++-
 .../balances/components/token-summary.tsx         |  4 ++--
 apps/appkit-minter/src/pages/swap-page.tsx        |  3 ++-
 .../tonapi/models/TonApiGaslessProviderConfig.ts  |  4 +---
 8 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 apps/appkit-minter/src/core/constants/tokens.ts

diff --git a/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx b/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
index a10a7b60e..b9e578436 100644
--- a/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
+++ b/apps/appkit-minter/src/core/components/layout/app-router/app-router.tsx
@@ -9,6 +9,7 @@
 import type React from 'react';
 import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
 import { useWatchBalance, useWatchTransactions, useWatchJettons, useBalance } from '@ton/appkit-react';
+import { middleEllipsis } from '@ton/appkit';
 import { toast } from 'sonner';
 
 import { JettonsPage, MinterPage, NftsPage, StakingPage, SwapPage } from '@/pages';
@@ -26,7 +27,7 @@ export const AppRouter: React.FC = () => {
         onChange: (update) => {
             if (update.traceHash) {
                 const hash = update.traceHash;
-                const shortHash = `${hash.slice(0, 6)}...${hash.slice(-4)}`;
+                const shortHash = middleEllipsis(hash);
 
                 if (update.status === 'invalidated') {
                     toast.error(`Transaction invalidated`, { id: hash, description: shortHash });
diff --git a/apps/appkit-minter/src/core/constants/tokens.ts b/apps/appkit-minter/src/core/constants/tokens.ts
new file mode 100644
index 000000000..35a0ae659
--- /dev/null
+++ b/apps/appkit-minter/src/core/constants/tokens.ts
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/** USDT (Tether USD) jetton master on TON mainnet — bounceable form. */
+export const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
diff --git a/apps/appkit-minter/src/core/lib/utils.ts b/apps/appkit-minter/src/core/lib/utils.ts
index 4045d4f25..5ba043973 100644
--- a/apps/appkit-minter/src/core/lib/utils.ts
+++ b/apps/appkit-minter/src/core/lib/utils.ts
@@ -12,9 +12,4 @@ import { twMerge } from 'tailwind-merge';
 
 export const cn = (...inputs: ClassValue[]) => twMerge(clsx(inputs));
 
-export const formatAddress = (address: string): string => {
-    if (address.length <= 10) return address;
-    return `${address.slice(0, 6)}...${address.slice(-4)}`;
-};
-
 export const generateId = (): string => `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
diff --git a/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx b/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
index e2a202dcb..e5e1d1438 100644
--- a/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
+++ b/apps/appkit-minter/src/features/balances/components/fee-asset-select.tsx
@@ -6,15 +6,13 @@
  *
  */
 
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 import type { FC } from 'react';
 import { Input, useGaslessConfig, useJettonInfo } from '@ton/appkit-react';
-import { asAddressFriendly, compareAddress } from '@ton/appkit';
+import { asAddressFriendly, compareAddress, middleEllipsis } from '@ton/appkit';
 import type { UserFriendlyAddress } from '@ton/appkit';
 
-const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
-
-const truncateAddress = (address: string): string => `${address.slice(0, 6)}…${address.slice(-4)}`;
+import { USDT_MASTER_MAINNET } from '../../../core/constants/tokens';
 
 /**
  * Renders one fee-asset `<option>`; shows the token's address until its jetton
@@ -23,7 +21,7 @@ const truncateAddress = (address: string): string => `${address.slice(0, 6)}…$
  */
 const FeeAssetOption: FC<{ address: UserFriendlyAddress }> = ({ address }) => {
     const { data } = useJettonInfo({ address });
-    return <option value={address}>{data?.symbol || truncateAddress(address)}</option>;
+    return <option value={address}>{data?.symbol || middleEllipsis(address)}</option>;
 };
 
 interface FeeAssetSelectProps {
@@ -40,7 +38,10 @@ interface FeeAssetSelectProps {
  */
 export const FeeAssetSelect: FC<FeeAssetSelectProps> = ({ value, onChange, disabled }) => {
     const { data: config, isLoading } = useGaslessConfig();
-    const supportedAssets = config?.supportedAssets;
+    const supportedAssets = useMemo(
+        () => config?.supportedAssets && [...config.supportedAssets].sort((a, b) => a.address.localeCompare(b.address)),
+        [config?.supportedAssets],
+    );
 
     useEffect(() => {
         if (!value && supportedAssets?.length) {
diff --git a/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx b/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
index ecfcd1e72..439e63c22 100644
--- a/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
+++ b/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
@@ -65,7 +65,9 @@ export const GaslessControls: FC<GaslessControlsProps> = ({
             {enabled && (
                 <>
                     <FeeAssetSelect value={feeAsset} onChange={onFeeAssetChange} />
-                    {fee && <p className="text-xs text-tertiary-foreground">Gas fee: {fee}</p>}
+                    {!quoteError && (
+                        <p className="px-1 text-xs text-tertiary-foreground">Gas fee: {fee || 'Loading...'}</p>
+                    )}
                     {quoteError && <p className="text-xs text-error">{getErrorMessage(quoteError)}</p>}
                 </>
             )}
diff --git a/apps/appkit-minter/src/features/balances/components/token-summary.tsx b/apps/appkit-minter/src/features/balances/components/token-summary.tsx
index 213a868cd..bff2d8c4b 100644
--- a/apps/appkit-minter/src/features/balances/components/token-summary.tsx
+++ b/apps/appkit-minter/src/features/balances/components/token-summary.tsx
@@ -7,7 +7,7 @@
  */
 
 import type { FC } from 'react';
-import { Gem } from 'lucide-react';
+import { TonIconCircle } from '@ton/appkit-react';
 
 import type { TokenInfo } from '../utils/get-token-summary';
 
@@ -26,7 +26,7 @@ export const TokenSummary: FC<TokenSummaryProps> = ({ tokenType, info }) => (
             {info.image ? (
                 <img src={info.image} alt={info.name} className="w-full h-full object-cover" />
             ) : tokenType === 'TON' ? (
-                <Gem className="w-6 h-6 text-primary" />
+                <TonIconCircle size={40} />
             ) : (
                 <span className="text-sm font-bold text-tertiary-foreground">{info.symbol?.slice(0, 2)}</span>
             )}
diff --git a/apps/appkit-minter/src/pages/swap-page.tsx b/apps/appkit-minter/src/pages/swap-page.tsx
index ae2b7ad17..8c3069e8b 100644
--- a/apps/appkit-minter/src/pages/swap-page.tsx
+++ b/apps/appkit-minter/src/pages/swap-page.tsx
@@ -12,6 +12,7 @@ import { SwapWidget } from '@ton/appkit-react';
 import type { AppkitUIToken } from '@ton/appkit-react';
 
 import { Layout } from '@/core/components';
+import { USDT_MASTER_MAINNET } from '@/core/constants/tokens';
 
 const TOKENS: AppkitUIToken[] = [
     {
@@ -29,7 +30,7 @@ const TOKENS: AppkitUIToken[] = [
         address: 'UQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_p0p',
         network: Network.mainnet(),
         rate: '1',
-        logo: 'https://asset.ston.fi/img/EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs/1a87edfee9a28b05578853952e5effb8cc30af1e0fb90043aa2ce19dce490849',
+        logo: `https://asset.ston.fi/img/${USDT_MASTER_MAINNET}/1a87edfee9a28b05578853952e5effb8cc30af1e0fb90043aa2ce19dce490849`,
     },
     {
         symbol: 'STON',
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
index f9f6ab2f8..7dd35b483 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
@@ -26,9 +26,7 @@ import type { TonApiGaslessChainConfig } from './TonApiGaslessChainConfig';
  */
 export interface TonApiGaslessProviderConfig {
     /** Per-chain settings keyed by `Network#chainId`. */
-    chains?: Record<string, TonApiGaslessChainConfig>;
-    /** Custom fetch implementation (testing / SSR). Applies to every chain. */
-    fetchApi?: typeof fetch;
+    chains?: { [chainId: number]: TonApiGaslessChainConfig };
     /** Provider id. Defaults to `tonapi`. */
     providerId?: string;
     /** Number of send retries on transient errors. Defaults to 5. */

From ae0d89e4619374f5240eeee6b907b573134f349d Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 22:47:12 +0400
Subject: [PATCH 28/46] feat(appkit): add checkSignMessageSupport

---
 .../gasless/send-gasless-transaction.test.ts  |  15 ++-
 .../gasless/send-gasless-transaction.ts       |  42 ++++---
 packages/appkit/src/utils/index.ts            |   4 +
 .../tonapi/TonApiGaslessProvider.spec.ts      |   9 +-
 .../gasless/tonapi/TonApiGaslessProvider.ts   |   3 -
 packages/walletkit/src/index.ts               |   2 +
 .../src/utils/checkSignMessageSupport.ts      | 103 ++++++++++++++++++
 packages/walletkit/src/utils/index.ts         |   1 +
 8 files changed, 152 insertions(+), 27 deletions(-)
 create mode 100644 packages/walletkit/src/utils/checkSignMessageSupport.ts

diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
index d3cb47f2b..551cbba79 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.test.ts
@@ -174,14 +174,19 @@ describe('sendGaslessTransaction', () => {
         expect(walletWithCap.signMessage).not.toHaveBeenCalled();
     });
 
-    it('proceeds when wallet returns undefined features (unknown capabilities)', async () => {
+    it('throws GaslessError(SIGN_MESSAGE_NOT_SUPPORTED) when wallet does not advertise any features', async () => {
+        // Treat undefined features the same as missing SignMessage — gasless
+        // requires SignMessage, so unknown capabilities fail closed instead of
+        // attempting to sign and surfacing an uglier bridge-level error.
         const walletWithUnknown = makeWallet({ getSupportedFeatures: () => undefined });
         const { appKit, sendTransaction } = makeAppKit(walletWithUnknown);
 
-        await sendGaslessTransaction(appKit, { quote: makeQuote() });
-
-        expect(walletWithUnknown.signMessage).toHaveBeenCalled();
-        expect(sendTransaction).toHaveBeenCalled();
+        await expect(sendGaslessTransaction(appKit, { quote: makeQuote() })).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.SignMessageNotSupported,
+        });
+        expect(walletWithUnknown.signMessage).not.toHaveBeenCalled();
+        expect(sendTransaction).not.toHaveBeenCalled();
     });
 
     it('propagates errors from gaslessManager.sendTransaction', async () => {
diff --git a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
index 22539adbd..e0a1905c2 100644
--- a/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
+++ b/packages/appkit/src/actions/gasless/send-gasless-transaction.ts
@@ -10,7 +10,7 @@ import { GaslessError, GaslessErrorCode } from '../../gasless';
 import type { GaslessQuote, GaslessSendResponse } from '../../gasless';
 import type { AppKit } from '../../core/app-kit';
 import { getSelectedWallet } from '../wallets/get-selected-wallet';
-import { compareAddress } from '../../utils';
+import { checkSignMessageSupport, compareAddress, SupportError, SupportErrorCode } from '../../utils';
 
 export interface SendGaslessTransactionParameters {
     /** Pre-computed quote obtained via `getGaslessQuote` */
@@ -89,23 +89,31 @@ export const sendGaslessTransaction = async (
         );
     }
 
-    const features = wallet.getSupportedFeatures();
-    if (features !== undefined) {
-        const signMessageFeature = features.find((f) => typeof f === 'object' && f.name === 'SignMessage');
-        if (!signMessageFeature) {
-            throw new GaslessError(
-                'Connected wallet does not support the SignMessage feature required for gasless transactions.',
-                GaslessErrorCode.SignMessageNotSupported,
-            );
-        }
-        const { maxMessages } = signMessageFeature as { maxMessages: number };
-        if (quote.messages.length > maxMessages) {
-            throw new GaslessError(
-                `Quote has ${quote.messages.length} messages but the wallet only supports up to ${maxMessages}.`,
-                GaslessErrorCode.TooManyMessages,
-                { messages: quote.messages.length, maxMessages },
-            );
+    try {
+        checkSignMessageSupport(wallet.getSupportedFeatures() ?? [], {
+            requiredMessagesNumber: quote.messages.length,
+        });
+    } catch (error) {
+        if (error instanceof SupportError) {
+            if (error.code === SupportErrorCode.NotSupported) {
+                throw new GaslessError(
+                    'Connected wallet does not support the SignMessage feature required for gasless transactions.',
+                    GaslessErrorCode.SignMessageNotSupported,
+                );
+            }
+
+            if (error.code === SupportErrorCode.TooManyMessages) {
+                const maxMessages = error.feature?.maxMessages;
+                throw new GaslessError(
+                    `Quote has ${quote.messages.length} messages but the wallet only supports up to ${maxMessages}.`,
+                    GaslessErrorCode.TooManyMessages,
+                    { messages: quote.messages.length, maxMessages },
+                );
+            }
+
+            throw new GaslessError(error.message, GaslessErrorCode.SignMessageNotSupported, { code: error.code });
         }
+        throw error;
     }
 
     const { internalBoc } = await wallet.signMessage({
diff --git a/packages/appkit/src/utils/index.ts b/packages/appkit/src/utils/index.ts
index 7b1c0d1b8..a22964ebf 100644
--- a/packages/appkit/src/utils/index.ts
+++ b/packages/appkit/src/utils/index.ts
@@ -14,6 +14,10 @@ export {
     asAddressFriendly,
     asBase64,
     asHex,
+    checkSignMessageSupport,
+    SupportError,
+    SupportErrorCode,
+    type CheckSignMessageSupportOptions,
 } from '@ton/walletkit';
 
 export * from './address/is-valid-address';
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 1d2f50a58..714897b37 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { Address, beginCell, Cell, internal, storeMessageRelaxed } from '@ton/core';
 
 import type { Base64String } from '../../../api/models';
@@ -51,14 +51,19 @@ const makeProvider = (
     options: Partial<Parameters<typeof createTonApiGaslessProvider>[0]> & { networks?: Network[] } = {},
 ): TonApiGaslessProvider => {
     const { networks = [Network.mainnet()], ...config } = options;
+    // BaseApiClient falls back to `globalThis.fetch` — install the mock there.
+    vi.stubGlobal('fetch', fetchApi);
     return TonApiGaslessProvider.createFromContext(ctxWith(networks), {
-        fetchApi,
         sendRetries: 1,
         sendRetryDelayMs: 0,
         ...config,
     });
 };
 
+afterEach(() => {
+    vi.unstubAllGlobals();
+});
+
 describe('TonApiGaslessProvider configuration', () => {
     it('defaults providerId to "tonapi"', () => {
         const provider = makeProvider(makeFetch());
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 1094fa97d..168aa6cac 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -66,7 +66,6 @@ export class TonApiGaslessProvider extends GaslessProvider {
     readonly providerId: string;
 
     private readonly chainConfig: Record<string, TonApiGaslessChainConfig>;
-    private readonly fetchApi?: typeof fetch;
     private readonly clients: Record<string, ApiClientTonApi> = {};
     private readonly sendRetries: number;
     private readonly sendRetryDelayMs: number;
@@ -79,7 +78,6 @@ export class TonApiGaslessProvider extends GaslessProvider {
     private constructor(chainConfig: Record<string, TonApiGaslessChainConfig>, options: TonApiGaslessProviderConfig) {
         super();
         this.chainConfig = chainConfig;
-        this.fetchApi = options.fetchApi;
         this.providerId = options.providerId ?? DEFAULT_PROVIDER_ID;
         this.sendRetries = options.sendRetries ?? DEFAULT_SEND_RETRIES;
         this.sendRetryDelayMs = options.sendRetryDelayMs ?? DEFAULT_SEND_RETRY_DELAY_MS;
@@ -245,7 +243,6 @@ export class TonApiGaslessProvider extends GaslessProvider {
                 network,
                 endpoint: perChain.endpoint,
                 apiKey: perChain.apiKey,
-                fetchApi: this.fetchApi,
             });
         }
 
diff --git a/packages/walletkit/src/index.ts b/packages/walletkit/src/index.ts
index a073c2e1c..35c19f499 100644
--- a/packages/walletkit/src/index.ts
+++ b/packages/walletkit/src/index.ts
@@ -103,6 +103,8 @@ export type { NftTransferParamsHuman, NftTransferParamsRaw } from './types/nfts'
 export { isValidAddress, compareAddress, asAddressFriendly } from './utils/address';
 export { validateTransactionMessage } from './validation';
 export { createDeviceInfo, createWalletManifest, getMaxOutgoingMessages } from './utils/getDefaultWalletConfig';
+export { checkSignMessageSupport, SupportError, SupportErrorCode } from './utils/checkSignMessageSupport';
+export type { CheckSignMessageSupportOptions } from './utils/checkSignMessageSupport';
 export { Signer } from './utils/Signer';
 export { ParseStack, SerializeStack } from './utils/tvmStack';
 export { Transport } from './bridge/transport/Transport';
diff --git a/packages/walletkit/src/utils/checkSignMessageSupport.ts b/packages/walletkit/src/utils/checkSignMessageSupport.ts
new file mode 100644
index 000000000..1564c5997
--- /dev/null
+++ b/packages/walletkit/src/utils/checkSignMessageSupport.ts
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { Feature, SignMessageFeature, StructuredItemType } from '@tonconnect/protocol';
+
+import { globalLogger } from '../core/Logger';
+
+const log = globalLogger.createChild('checkSignMessageSupport');
+
+export interface CheckSignMessageSupportOptions {
+    /** Number of messages the caller intends to sign. */
+    requiredMessagesNumber: number;
+    /** Set when the request carries extra-currency transfers. */
+    requireExtraCurrencies?: boolean;
+    /** Set when the request carries structured items (ton / jetton / nft). */
+    requiredItemTypes?: StructuredItemType[];
+}
+
+/** Discrete failure modes of {@link checkSignMessageSupport}. */
+export enum SupportErrorCode {
+    /** Wallet did not advertise the `SignMessage` feature at all. */
+    NotSupported = 'NOT_SUPPORTED',
+    /** Wallet's `maxMessages` cap is lower than `requiredMessagesNumber`. */
+    TooManyMessages = 'TOO_MANY_MESSAGES',
+    /** Request includes extra-currency transfers, wallet's feature flag is not set. */
+    ExtraCurrencyNotSupported = 'EXTRA_CURRENCY_NOT_SUPPORTED',
+    /** Request requires structured item types the wallet did not list. */
+    ItemTypesNotSupported = 'ITEM_TYPES_NOT_SUPPORTED',
+}
+
+/**
+ * Thrown by {@link checkSignMessageSupport}. The `code` discriminates the
+ * specific failure so callers can map it to their own typed errors without
+ * parsing the message string.
+ */
+export class SupportError extends Error {
+    public readonly code: SupportErrorCode;
+    public readonly feature?: SignMessageFeature;
+    public readonly unsupportedItemTypes?: StructuredItemType[];
+
+    constructor(message: string, code: SupportErrorCode) {
+        super(message);
+        this.name = 'SupportError';
+        this.code = code;
+    }
+}
+
+/**
+ * Throws {@link SupportError} (with a `code` discriminating the
+ * specific failure) when the connected wallet's advertised `Feature[]` cannot
+ * satisfy a SignMessage request — feature missing, `maxMessages` too low,
+ * missing extra-currency / item-type support. Logs a warning when the wallet
+ * didn't declare `maxMessages` (request may still be rejected by the wallet).
+ */
+export function checkSignMessageSupport(features: Feature[], options: CheckSignMessageSupportOptions): never | void {
+    const signMessageFeature = features.find(
+        (feature): feature is SignMessageFeature =>
+            !!feature && typeof feature === 'object' && feature.name === 'SignMessage',
+    );
+
+    if (!signMessageFeature) {
+        throw new SupportError("Wallet doesn't support SignMessage feature.", SupportErrorCode.NotSupported);
+    }
+
+    if (options.requireExtraCurrencies && !signMessageFeature.extraCurrencySupported) {
+        throw new SupportError(
+            'Wallet is not able to handle such SignMessage request. Extra currencies support is required.',
+            SupportErrorCode.ExtraCurrencyNotSupported,
+        );
+    }
+
+    if (options.requiredItemTypes?.length) {
+        const supportedTypes = signMessageFeature.itemTypes ?? [];
+        const unsupportedTypes = options.requiredItemTypes.filter((type) => !supportedTypes.includes(type));
+        if (unsupportedTypes.length) {
+            throw new SupportError(
+                signMessageFeature.itemTypes
+                    ? `Wallet doesn't support item types: ${unsupportedTypes.join(', ')} in SignMessage.`
+                    : "Wallet doesn't support structured items in SignMessage.",
+                SupportErrorCode.ItemTypesNotSupported,
+            );
+        }
+    }
+
+    if (signMessageFeature.maxMessages !== undefined) {
+        if (signMessageFeature.maxMessages < options.requiredMessagesNumber) {
+            throw new SupportError(
+                `Wallet is not able to handle such SignMessage request. Max support messages number is ${signMessageFeature.maxMessages}, but ${options.requiredMessagesNumber} is required.`,
+                SupportErrorCode.TooManyMessages,
+            );
+        }
+        return;
+    }
+
+    log.warn(
+        "Connected wallet didn't provide information about max allowed messages in the SignMessage request. Request may be rejected by the wallet.",
+    );
+}
diff --git a/packages/walletkit/src/utils/index.ts b/packages/walletkit/src/utils/index.ts
index 8d83a4cc3..88655e3c1 100644
--- a/packages/walletkit/src/utils/index.ts
+++ b/packages/walletkit/src/utils/index.ts
@@ -32,3 +32,4 @@ export * from './assetHelpers';
 export * from './toncenter';
 export * from './getNormalizedExtMessageHash';
 export * from './manifest';
+export * from './checkSignMessageSupport';

From 321ab582890bdb6f72224a41d2aeb79f8195e8ae Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 28 May 2026 23:58:45 +0400
Subject: [PATCH 29/46] feat(appkit): pass networks from hooks

---
 .../gasless/hooks/use-gasless-jetton-transfer-quote.ts |  9 +++++++--
 .../src/features/gasless/hooks/use-gasless-quote.ts    | 10 ++++------
 .../gasless/get-gasless-jetton-transfer-quote.ts       |  9 ++++++---
 .../tonapi/models/TonApiGaslessProviderConfig.ts       |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
index e8aec537e..988c613b4 100644
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-jetton-transfer-quote.ts
@@ -40,7 +40,12 @@ export const useGaslessJettonTransferQuote = <selectData = GetGaslessJettonTrans
     parameters: UseGaslessJettonTransferQuoteParameters<selectData> = {},
 ): UseGaslessJettonTransferQuoteReturnType<selectData> => {
     const appKit = useAppKit();
-    useNetwork();
+    const walletNetwork = useNetwork();
 
-    return useQuery(getGaslessJettonTransferQuoteQueryOptions(appKit, parameters));
+    return useQuery(
+        getGaslessJettonTransferQuoteQueryOptions(appKit, {
+            ...parameters,
+            network: parameters.network ?? walletNetwork,
+        }),
+    );
 };
diff --git a/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
index a34c2f0de..4981a370b 100644
--- a/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
+++ b/packages/appkit-react/src/features/gasless/hooks/use-gasless-quote.ts
@@ -38,11 +38,9 @@ export const useGaslessQuote = <selectData = GetGaslessQuoteData>(
     parameters: UseGaslessQuoteParameters<selectData> = {},
 ): UseGaslessQuoteReturnType<selectData> => {
     const appKit = useAppKit();
-    // Subscribe to the selected wallet so a wallet/network switch re-renders and
-    // recomputes the wallet-bound query key (the options factory reads the
-    // selected wallet), refetching for the new wallet instead of serving the
-    // previous one's cached quote.
-    useNetwork();
+    const walletNetwork = useNetwork();
 
-    return useQuery(getGaslessQuoteQueryOptions(appKit, parameters));
+    return useQuery(
+        getGaslessQuoteQueryOptions(appKit, { ...parameters, network: parameters.network ?? walletNetwork }),
+    );
 };
diff --git a/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts b/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
index 0cbc2e694..584dea0b3 100644
--- a/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
+++ b/packages/appkit/src/actions/gasless/get-gasless-jetton-transfer-quote.ts
@@ -12,6 +12,7 @@ import type { AppKit } from '../../core/app-kit';
 import { createTransferJettonTransaction } from '../jettons/create-transfer-jetton-transaction';
 import { getGaslessConfig } from './get-gasless-config';
 import { getGaslessQuote } from './get-gasless-quote';
+import type { Network } from '../../types/network';
 
 export interface GetGaslessJettonTransferQuoteOptions {
     /** Jetton master address to transfer */
@@ -29,6 +30,8 @@ export interface GetGaslessJettonTransferQuoteOptions {
      * Omit only for free / sponsored providers — see {@link getGaslessQuote}.
      */
     feeAsset?: UserFriendlyAddress;
+    /** Network to query the quote for. Defaults to the selected wallet's network. */
+    network?: Network;
     /** Gasless provider id. Uses the default provider when omitted. */
     providerId?: string;
 }
@@ -58,9 +61,9 @@ export const getGaslessJettonTransferQuote = async (
     appKit: AppKit,
     options: GetGaslessJettonTransferQuoteOptions,
 ): GetGaslessJettonTransferQuoteReturnType => {
-    const { jettonAddress, recipientAddress, amount, jettonDecimals, comment, feeAsset, providerId } = options;
+    const { jettonAddress, recipientAddress, amount, jettonDecimals, comment, feeAsset, network, providerId } = options;
 
-    const { relayAddress } = await getGaslessConfig(appKit, { providerId });
+    const { relayAddress } = await getGaslessConfig(appKit, { providerId, network });
     const { messages } = await createTransferJettonTransaction(appKit, {
         jettonAddress,
         recipientAddress,
@@ -70,5 +73,5 @@ export const getGaslessJettonTransferQuote = async (
         responseDestination: relayAddress,
     });
 
-    return getGaslessQuote(appKit, { messages, feeAsset, providerId });
+    return getGaslessQuote(appKit, { messages, feeAsset, providerId, network });
 };
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
index 7dd35b483..f06245d54 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
@@ -26,7 +26,7 @@ import type { TonApiGaslessChainConfig } from './TonApiGaslessChainConfig';
  */
 export interface TonApiGaslessProviderConfig {
     /** Per-chain settings keyed by `Network#chainId`. */
-    chains?: { [chainId: number]: TonApiGaslessChainConfig };
+    chains?: { [chainId: string]: TonApiGaslessChainConfig };
     /** Provider id. Defaults to `tonapi`. */
     providerId?: string;
     /** Number of send retries on transient errors. Defaults to 5. */

From 465ca9bbdebd62d975cc18922da9644e7c3a9336 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Fri, 29 May 2026 00:10:56 +0400
Subject: [PATCH 30/46] feat(appkit): save token icons locally

---
 apps/appkit-minter/public/tokens/gemston.png  | Bin 0 -> 1856 bytes
 apps/appkit-minter/public/tokens/ston.png     | Bin 0 -> 4449 bytes
 apps/appkit-minter/public/tokens/ton.png      | Bin 0 -> 1725 bytes
 apps/appkit-minter/public/tokens/tston.svg    |   1 +
 apps/appkit-minter/public/tokens/usde.png     | Bin 0 -> 5751 bytes
 apps/appkit-minter/public/tokens/usdt.png     | Bin 0 -> 4187 bytes
 apps/appkit-minter/public/tokens/utya.png     | Bin 0 -> 3594 bytes
 apps/appkit-minter/public/tokens/weth.png     | Bin 0 -> 3080 bytes
 apps/appkit-minter/public/tokens/xaut0.png    | Bin 0 -> 3512 bytes
 apps/appkit-minter/src/pages/swap-page.tsx    |  34 +++++++++---------
 .../.storybook/public/tokens/gemston.png      | Bin 0 -> 1856 bytes
 .../.storybook/public/tokens/ston.png         | Bin 0 -> 4449 bytes
 .../.storybook/public/tokens/ton.png          | Bin 0 -> 1725 bytes
 .../.storybook/public/tokens/tston.svg        |   1 +
 .../.storybook/public/tokens/usde.png         | Bin 0 -> 5751 bytes
 .../.storybook/public/tokens/usdt.png         | Bin 0 -> 4187 bytes
 .../.storybook/public/tokens/utya.png         | Bin 0 -> 3594 bytes
 .../.storybook/public/tokens/weth.png         | Bin 0 -> 3080 bytes
 .../.storybook/public/tokens/xaut0.png        | Bin 0 -> 3512 bytes
 .../staking-balance-block.stories.tsx         |   2 +-
 .../staking-info/staking-info.stories.tsx     |   2 +-
 .../src/storybook/fixtures/tokens.ts          |  18 +++++-----
 packages/walletkit/src/core/JettonsManager.ts |   1 -
 23 files changed, 30 insertions(+), 29 deletions(-)
 create mode 100644 apps/appkit-minter/public/tokens/gemston.png
 create mode 100644 apps/appkit-minter/public/tokens/ston.png
 create mode 100644 apps/appkit-minter/public/tokens/ton.png
 create mode 100644 apps/appkit-minter/public/tokens/tston.svg
 create mode 100644 apps/appkit-minter/public/tokens/usde.png
 create mode 100644 apps/appkit-minter/public/tokens/usdt.png
 create mode 100644 apps/appkit-minter/public/tokens/utya.png
 create mode 100644 apps/appkit-minter/public/tokens/weth.png
 create mode 100644 apps/appkit-minter/public/tokens/xaut0.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/gemston.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/ston.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/ton.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/tston.svg
 create mode 100644 packages/appkit-react/.storybook/public/tokens/usde.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/usdt.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/utya.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/weth.png
 create mode 100644 packages/appkit-react/.storybook/public/tokens/xaut0.png

diff --git a/apps/appkit-minter/public/tokens/gemston.png b/apps/appkit-minter/public/tokens/gemston.png
new file mode 100644
index 0000000000000000000000000000000000000000..3421dc9cce75cc37f85ab4f57e5852be9e0269c0
GIT binary patch
literal 1856
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

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/public/tokens/ston.png b/apps/appkit-minter/public/tokens/ston.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8f37b44cb8cb9417e45bc0940aea321f02a49a5
GIT binary patch
literal 4449
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

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/public/tokens/ton.png b/apps/appkit-minter/public/tokens/ton.png
new file mode 100644
index 0000000000000000000000000000000000000000..109900c3c8213a2a8f263fe419042beaea3d2f25
GIT binary patch
literal 1725
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
TL)vg*00000NkvXXu0mjfVh%i>

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/public/tokens/tston.svg b/apps/appkit-minter/public/tokens/tston.svg
new file mode 100644
index 000000000..15412f661
--- /dev/null
+++ b/apps/appkit-minter/public/tokens/tston.svg
@@ -0,0 +1 @@
+<svg width="251" height="251" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_349_2665)"><rect x=".465" y=".845" width="250" height="250" rx="125" fill="#000"/><ellipse cx="52.03" cy="76.514" rx="52.03" ry="76.514" transform="rotate(30 -7.456 262.753)" fill="#D8FAFF"/><ellipse cx="16.909" cy="24.866" rx="16.909" ry="24.866" transform="rotate(30 -72.453 154.137)" fill="#D8FAFF"/></g><defs><clipPath id="clip0_349_2665"><path fill="#fff" transform="translate(.465 .845)" d="M0 0H250V250H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/appkit-minter/public/tokens/usde.png b/apps/appkit-minter/public/tokens/usde.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c9bce7c0d4a139ad628f7a4647c1616fb1c86a5
GIT binary patch
literal 5751
zcmV--7KrJIP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000&~Nkl<Zc-qCA
z3D{NB8pqcenhd2RB4Zj&QMg6qq70Fta%Bi*s?2klDcoyHWQ_2Ln>ijbr$Uh-nNkW#
zsU%d2Gu;1g-Tj_tweLRX`|5Vx^*p=tb@twCc!&S{f8VuE)~%(M&1O@%TrQ(ObNoM@
zPP<~U==%2UyNz1gV~;(yO_L@~n(5Z2x*F=Lud9}>g05e6Ez>nm*Q|#gdT7SHdGn^t
zoH=vy{rBI$xKJqAFzPm)QY+;1`QqA`cWP}fymjl=?%;zDZr`U*pMy5uc;hbXufKka
zMT-{I{qVyN-8bKS<9_(z2lvxYKe=VgmN_lL_fexp4X5Yah8u3^Hr;en--oW^I_s>n
zaOu*eQ=WL@i5Jvfe)7pDXP7WFZbpCS1L6F+0?1@CDGi>Mmi;Pv_wL<j(4axRn>KCQ
zOIm94^2;x~@#Dw4$&)9$xpU{b-+uco|HmJH`1jBv7Q*;yMJ$DdNRVi?SgTeox88c|
zWn?*S&pr2a2OMw!0$K6PFTcF;?6c3_d&L!3JTrUt?4k)m@8$ng0Z3yREyfSpt5>gv
zmtA&Qzm_dq_Iv;R_cwn0@yFd8Z@l3aELf0}hSOS1O3$Y>Q5Nsrf-72msZYMM|6>^l
z1A(nvxw25RW=$tyWDYsx5O>Tm$G8R!8cZEAV#MDE4<0<~>#x7&y$o)lR{Wm|fC=i#
zYM|Wan{V!}z4qGv#~*+E<<fGad+xahjptUZSdo_LrZj1<W!|wxCoMb_Kx~}S{}G7#
zEg}rLN$Su;4^5wO#u=_*!-ntNeDlp0oqzuM6V}ukQmbR~Xq5RJcGzLf1y1)ZU%tHK
z<(FUX-hA`T-0#2to{`z6(6UV)4a)TW|FM8Nb?Q_(PPAD6NngBUfJ)OiPPmZYXrqnX
z2`8M85!SfxzWZ*dEOFpRAAPi3&t~;(E);0RbyXAS(h=$w@4WNQJ~!TY;}{`z(=*RJ
zGymzQpEAjeu9PhtfMenH>(_T3I&^R+o_L}=@W2DzYp=cL7Zqwc{F{ZhYSqeJdg-NZ
zi!HYBxFA<@@_n0!7ly`4V`<~Yjmzsw|3&SB3obZRKsr%l%;!-(SE!B<Qq}PHv@}_0
z)25BP`|i7k38e?f=iMu>ypq#IviPSpX~s`*_uY4QGE=|!t+v|A-}~{$A6@(Q?Y%~m
zT!FuNpJyI^_~DYar%#{m091jWk0Oi*NLn8fc2R=K4Hz(>#@T0|z2c5L?l?|=KY?-)
zLRGkssm|he+;K<u(n~LmlF9cu<&;wj@4fe4v0lA;8S`;8hsO8bdvAC3)mJ-B#O<`x
zPHuw@Ht_w-pFiKd{`%{<iq~Qi4)A|8&f>P+c3Yx=TX)@cokFP>WY?};-6orC;%3d7
z<-Y&^dmlP^2Y_WA>OZG@HP1Wmyq@A43luirm5?%_`>d7)$W$@=!uH#5j|QIl{PWKb
zKkKZsazFq4v-fpFZT;UhZ{FMqh=~8C_Z9oS=7<Q>rcLt}5MqFVqY1+P7Kr%^%h_d@
zUEDzj9pq%;e!<r7z4zYh<bq!C^oihD=#nK%3hmmpOW$?ZUGAx;p6V~493ELhS-y~}
z0C+_-KW5CBhrj&t%VQ<kKYso7*BZ5J*DfKtEW#aq^wI8;OD^&LPMb4lj-MQhCqzX)
z>leTzY{4PYhY`XWi^B!57_6yh&z|ncBabXu(3B}t+`xeY9T+5QEP*CM(7e+MlTIP|
z^mEQR=Ps6{vGPflkVy)4nke5FM~xaaOpEL*pUT<d4c+Msb4T+mkO?R<cwu1fOdb=)
zq~qGQMI(@;N%0*5V>}j&P+xrUMfdKz?|N{QiF?M_ty?!DfcyC4kNvas2N(-03KC38
zbLmQ`eD&2=XGYPXP^AE(2lF@FaKlNG{9rAxAYSfcy8#paIdteycf=7#_;<eg>MPf;
zUq26C2m)G*=0md!HO~S8GX%$HD2UJ+?0b7w><^3dcmvS#9c~ABPMkQgqzHsCW5$d;
z^S<b!i@J)SJ*GMS6w&8mSpmTC)Iq*WmoBZO-RCa8_~NWMd{GO6@_Nl9X%-4arD5s<
zMyCNi=oy%m3w3BzX6jBo^;9PzdvL>yL3p%Y&LRvT=|iE<YkiMB_VCI8d~wIO-g>KK
z3HnUy86wrXn%~YMX(JU<i_q|JjC7#+6!aFP9WrFd-C}mNAUG_Z4$XgWy6Gmj^Ugc_
zca)sC(@#I$$vwQ*0k62JCs_bmg2<5k!1oQv$~EiLp5Z;fwMUO0-uh?|GDs1^1q&i~
z$SQQ_1e|+|y9|o@T1DyUU=V*p$T>j7qoaT<C$rDm;7ItYtFH2dhW7N+PrGx^J=bd#
z&9L}#pvL#OM4TlW^E2Vbp9%Rw*dJp7x>${pFdrIe*IaXr+kgN4ePp5^<|dwyx#gBy
z+?HEzIcUHA_G<=9gxIYj08pPB%DNg!sslwPU|(rEuuumIE2sA_i3EA@W8n<MBI1*b
zhdZof@#4kaf58#cCif9WL~;EyEYLVcD2Pz7yo1#dX|O`(NRy^LP!dIW7CaC|&Iv^8
zh+z(aS6Kfg42ZN}l<8lkc;8v*kMCrR<ZQk5){fYUsp9MSJl`9Dl}lm}4wl1U`0G(e
z9pwcHc<#2_ZXPq3q_pFt9k<tBdwGNh*%3s@_>#y|Wai!yxX2d41p0tE8h1d^q|ds)
zUER8M1qb72lR=V)XCOR;hkf?hr?DnC;<npvt1Ynb*_@f1(oXO9X!^9%PV@AXflTvB
z0$|Z-RK&#Hdh4xTOS|s6t83P*nP+;&5_z7GraFQzgmmiE$tl_L?|$&X2VTgPm>fco
zt2$}f;|i3W{>5GVca}^E2MP+yX;JOEk3Rb7Kh-A_^;8i_6lD5+^~GVMM~}`+@@ZRu
z1mg(@?Y{f&a}PZ50Qq>SniCg*X`X}#jXwC`gI*&c!GX$RvbY7G02i*oLKv6NefQnh
zfA`Ki?|4fHEiFkPxU0gQQv~z)fDj0oxRw=P7A{<v60>Y7Uh$+XVj;@UY9TrKOsaF|
z&L@o=ITDShER@ixYI-F;4+X{VSbRCOXD}9tAEJ3nmT;Zn!-u<1KKaB8C%y>YW8xG%
zV3#yV6`CaML8?sXaUmFSB6DO+S+P@r#=9DG#@euGxmHeAQBz~|5?Q;9ik26R%(T5E
zwL@fbDMNiSGh!_5kw+eJ-+udT$t2?d75=Tlg*Rg?g@$Ijckk}QCZL6XQx^;`a)mFx
z_`)fzb%3xn2v!KN<=nvt*z?an?-?Tv>KwW%3!X4x0)>>LH`{Ep+5kT#R?O`HWq6n(
zAtGfc3)SR4h0Mnud(4}rX(4Ihp$ov&tf3VaP5j23v8<$v{^9k*h7I$=ppj^C;SPq}
z<*G^CM{&%RMlwYrg~ib*&q2DhhNc4HcBL>VDRpK*ZxZSRziHgKu}5wig$$56j>_?c
zhhd6^(ByaiUBJk4h;kQzYmozLYyA)<m{X<2hkyu4VoVy*#VmkuFI>x!oyxL1dhQ|A
zZK@ls5kP4EpuQC|NJJ{JyCkzT(83+K!rEX`Y!CTAN+8mR%X{qMUa0+YZeV!>APa8L
z0Aiv8!lw@jgFL}09Cq^kiWsyL8m|u$hdde6vGf+;3XwR;3gVMWN_(q%Cyec5$By;2
z0GKD%5V~I_!5cnNlBdC8TC`~4UC7FNBvler8(Db0w9vIB<{~ZSErY`!jqiW<*=Jr8
zanh4Cfh5Mp#N%PCI@M=1h9z>93xP?lXAyxM!SVtkf(eiR<Cb!_dJ4}i(u(t506c&I
z@Iy>SDCu7SG(yQ%r_jhV2#rQ)gY_9dH?AMA4aD6c^4Ubww=}t&1t4&kA+BJ%RaP3q
z$EEC|fW4O1+B_`@H(_#^zo9<@kdKt&cR0aH;V(2}6(LIhS6b}}3X#A_j{zbRvubY=
z)lG7jB;kbuq%TMo?n?v9LYJh@Nu^o9+9a)i8WAQ^|8Cv_h~FWKR~j(MhaoM`JoAia
zaWsesB`TOC2^HZ9%dkWX4#0##dio4A!b+}IRWkvw9&_O+9WTN?R61*r)u8La+-yKA
zJQ#voGE>!{p^F$BBx8h?wQbwhPk=o>F2<m^$pkS~*dCUq-C!?pCI=f$!j5tZNSdGR
zC(sv4VJ%o2c>n^JBI;+Q@pYm>QlSPd5ef^LNmbl(g$o8Hgh6eOJMK77Z$V_s`x`ZC
z<S&F{4c7p?Kz$`FKF_zgRHwy-U<AmBR@_o`zZSVbDhzLi!0~uqNefAvoV;gdr`;sK
zAgatDGCqkgV0gHK<qL#A%J5v;bMy?-((p>!u2fh};u_%wECN_6jnpgt`)<l=05+jY
zAuJvl;s9yy0jT&lnx$gQbMSU}I)F<mZ1I}#%f>6=lPr|+spy1BSalX};~KDsWGwhx
zjsO-*1Dl0e8K#5zV>UK$IgKX?Bq>qhd(4^sc#iMzQT!dQ!6eZb`GPh*{q7P?`w?!^
zq)GmYXM|O83HqYp?_3Bq!l)uHDtB8#!E<3$jrB&rqCsWC70vj->iS{aErLT3rA06n
z6TuQdYCaLZw%vW|Z0+#F4^LcpB|v0+EQtmuF)WMjQRau?&ZipmWh9v*4<QU*uo@e?
zwdMGGxm_L8uoXPZP27aSWzRD{f*^IKAVUK;;*qG_-xkW1^7?&6+qbZJL~BfgJ9>6b
zTDkLVfCz1HlNgL?5|)fbg)y|c=4a*}W{^pOiwiJ_)g}IJAelspl5!9*j0}>Z3~lPv
zso}fDXrpDh#+aU#Z%h+d6xkHvrVWnI(Wv2p+6E$VO~zRwgH!9*!6pxQaDhs>e5E|X
z-l>%RCC!KVQ-8#oaAhpO3ONWEg-glvC779MJuq1}7GicrJ+T5dA2B6>gw7B^b;6=O
zLmiNTFyEvsvO0?iOXsV@0<mUliZsX-)@)@y4h%3aeN2+_SEhx)i>09{gd?`Y830UR
z>xnd&MmZ~DQ2&wF#}|&IVRuGDLkluLj+=hcCrYr*Sle-`gaO7tv9|5D+pd(&l9Sjm
z9qShYruxTt{|^61LSv}_>1NRi5&#f<o<?~KD*&M@m8EO|%#Qk^ZDYazEvi_CXIGf@
z*(Vr8B?k<l!3aYXuY^6gARDF@QK%~z4v_<J{7wp9sru%)Qb|l2dx0-?lM`S*93p)x
zLBwf%>Ex47u69y_wWz#a`ac_?yiY7f5D3>UzGK1s%~;%rJ`?}V1$5dYahoiD^31By
zIxtn*!HUi>nM)Oj46=wx66$nbV@D{hkhfUju7e(GrqXhOdO3?GpJua^%?;Sv+i$<^
zx2WT_!8i-#KEB7m)B?Dtvb(n=w2BD=l=R8P-<U1WaQsc@5lYs82BE~^25OQbEP7pd
z;e~#4g{A|Qz6x!-&K%0rI@414V7cfA9QlL#`eS9<?(U%-n$bG*$8i#NjJ)4MCUic?
zr?jNE;DKd}Nqc}+>@YNDR|$=-Nu#WVFyJKdt@Bm3xFeV4BnfVdu-Ft~3(vGKrdbr(
zO39TM3Kv>R0E?-Cu>a?KQn6x&xOg{l_Qo2J@^H$mfCaHXfG|iYZKEQI8-#@iJ3oLm
z5SL+lA%-NOJUIha#wI5xP;3vf67fOMxE)CsfQu!tg@-#Ccys7O$rlBn;fio$fFrnH
zD(Zy)<Ynr;6~0Ca!1Cb<D+b^QEE^>tGCoF(C!B=a;z_$i#>EjB8e+=|-j5}5$b$YU
zmQV$zFN8&f8m;3l@dFo0V}Kpn*!5ULV;i3nELg3bK~{k$rEK&U9inJ0?aze{hXU{?
zmf1X1>1u)wH+RrOd5)A=Xd#|+CV)j_6)XUPLB>^12;oMFF*_Dao#6J{Z+HFs_xBTo
z>tiWYp?KD|-7B3Tvgko!g>wp=U9_-A)Um@{(epVmT3r2VjdMk`E1oY!frtTS6gCP9
zi5J5O6czmGP}^*P7l6z(c5^u<gIQy4fti(MW;Cn-0m9P_M-U#G<~uZo&zf16TfBu(
z7SEQuPO1BQSdLDGt#TTbv%~5;D|enLb~_|eOd;un2(!#+*JOfBcBotd!^qhJm>hfV
zCTY-H=LkH}q1b7MDU$eoC<re69HAP|XEC^iB~O*8uUQjjucNx&?@bu^J=SGWijdB+
zT0)<!^-L*irJV~%JS1f%tIppP;B`~SjU|j6`(?%r*j$8Qux$>gu?fnisqN*5XkD&+
zW@R@70p+Go78GhOsm{oK@C0FBdF7Qp&)`0b2bZu?TrxOzlb4ld<a#&iu-9<Ix~k3z
zW)%K@*I*M>3phb2TuWEMc8$;+;fV<&1Qx<3D*np`E7pJ@;%*TZT@fUc1z3smgs||;
zaeTwm_A7BWcm=fr&LYz&s8Vl)@Yq2uvwm@ytgPWJZHXVF_lrq5m2_5^2eT@Q%-145
zRVROw1UW%gh``bd0j=>fn2sGg`hlU!RD9tMOv*wK77?e<W=*_DU-43vE!qxLARr1e
zI`ikQyY9MDnhS7pG7Jl}ZSY9QIZ^Pel=HQ==J(b6%Ocb-R`;+pAb}7*(*hQVxgD(d
z$?@5e5YRjeWj`LiPu+k|gaD7HvEzh!A{47O#k0MnvNzGfD!LS8V24zR;3D*aK(4?3
zdVj1Q0fqa9EM9`mYA#DPeit#@S$6nyO^(a^a3QMNUr2g8i;*d@hnTVO#sn}sPGc}p
zD6KU#Lm`xl^E&)?s8U_PD!BkF<#LX^LBkC&0ZIf8HO7T-JBt_=?pVA4d#S2g`-uim
zHm19#zZXbFks>dKb(*AlC#Efp=IGdblu6*9m^6664<tCO6gEzYaEdD_j|dMpkjCny
z_bMmL0Y2h8$6Yx6VTUP#P{}`e7B4KBqs^5=B<!hJvHhCuzxl~bNeGGzf0ZRXF7s?4
zGtEU7k}^_)C19Qi0<dCh8}^796P{RHNKoPe;9W3<dLRPD#bBJzJ@=evidJe14_af|
zBySwySDUDC*Ije_p(@R<$&aSIJ1ER-BO)|H19U=T9I}djwUr84Uv$so0vjR_9n$M0
z7YH|GAX!)si-#7|4_0Fq5oCm3>v9>8o_BAO*3XZMAJtm?n*40en^aW4KUcnXtuUcZ
zw3D=oMVM<~6-I$U>ZF~dcwz$p5*D!*%SYl1XOU55_jBb9{RDR7qCV0|$Ku!8?*=0>
z!2ncOnn?(QrGXyC@*+W`BSECXq^P=wB<%Nv!9mQTjfoPXa|TN!{C{Yl|5kl2kCc;-
zp7~RLI$Hu5`DI(V#)Z;IcMe(w&*UN@Sk943`l(F9F<4tfA=<DB0e7AjJW?2Ohb(1o
zn9aIB`?tf9xuq<#5;C`uFnUTm-E}ofs1X#SM5LH7w$I5(!{dcl4t2;HCJ7Hl%iTun
zb5Wp#)z<o2{qb}Fkj02VVV*VQ7JJBtJ4tIDbnT!;G|*MEs={V;Z<(-z-~YWQp7FLm
z$4cunf?exX#&iGAUysM5S=47fER)GHI2qka*S2zz#sbksiscO=)5a>6Yr#u&Ez;k!
p^!*p&8ng85%Gg{p|E<R3?O#SUcBDpD-rE2G002ovPDHLkV1h{K3eo@o

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/public/tokens/usdt.png b/apps/appkit-minter/public/tokens/usdt.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b68af9af405edd72bdae7470052222447b43bfd
GIT binary patch
literal 4187
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%0A$9v
z8KIIrKpyLn6y@W)i%51%m}*kMYX%Slu@I9r0_cxDC&-KFAxlfQAZ9j~8*V62<EKfO
z4Q8x2(b1_!N;@0f;}i&EHJT=q(IKuz3hl;k{^V>05;gabp6-z)OWu)X%VsD{5lq?@
zXH+&QQ>V_Cyu68W`gGDpWmQj+Qr0g$;V2FJeSea`R|9;CtY5!CKKkgM&^Db2kuCPH
zG#OA>xInJEZV(2LdnQX0^t2aEg6{`|b*aM>lY9zhg#Rrce)zkv{SI{+m%lV+{o{{w
z(KpPM?Cd@$nEbJZkLzj@Ns~HF*BbURA^G_Le^;%k_j+uY2s$)jA(Dw^n8z;wmtD%9
zF4x|m`h+?+ylK;>24ek8c>Jk}fKP14$R#G=b<580&`8(|$9TJntyNWCdrtpqZJ7xu
z@J*X~)Tr2}pFW68Z>DYYMj{ccew(J+w(TMhJn#v$VK|!^Y83TqY??|*@d(@HJ9ey=
zIddkX&Aq>_o2K0LNGv>R)O7v&kLA><qnNT7ir37|lv((EKILsM7b7f*qwi+Av0u@R
z=bw-T3!cPgsmJjax*{~{FIRHoWNK=2x#^}q$nfFQBr`MPifo)@QL}pW`?6xi47}Yr
zb7eP9M%y}@mX?8hVG4#2e~;0VUaIdFdF!l1VM;Khwvo2Z@;;@dJJ8JdhtfV4HCJux
zY^=@GT-n)q(!2L>rALpORQOCyZK7U8I5$oct2R^1Y-(<v<~fy>7hu;rW%uqCvTfVH
zWbfYfVcUAH^5*GCd-%eo(Y9^2+B$z}`+R3;ODm{y8f@9hEPcLen9VszmD}eJhPKc1
lICgArEv=)fCu#fq{{ZU2XkeJtGkgF5002ovPDHLkV1hu&<^TWy

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/public/tokens/utya.png b/apps/appkit-minter/public/tokens/utya.png
new file mode 100644
index 0000000000000000000000000000000000000000..42be5f51ece05fab84d81f0783455158567dcc05
GIT binary patch
literal 3594
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
Q@c;k-07*qoM6N<$f;~{$p#T5?

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/public/tokens/weth.png b/apps/appkit-minter/public/tokens/weth.png
new file mode 100644
index 0000000000000000000000000000000000000000..75c851d075a61051b6671843225186a17710e569
GIT binary patch
literal 3080
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
WhwNRNtba)W0000<MNUMnLSTYGmgJNG

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/public/tokens/xaut0.png b/apps/appkit-minter/public/tokens/xaut0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f9b4c2c76556f686ec62c4abf7b0a97da19837c
GIT binary patch
literal 3512
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

literal 0
HcmV?d00001

diff --git a/apps/appkit-minter/src/pages/swap-page.tsx b/apps/appkit-minter/src/pages/swap-page.tsx
index 8c3069e8b..191d80110 100644
--- a/apps/appkit-minter/src/pages/swap-page.tsx
+++ b/apps/appkit-minter/src/pages/swap-page.tsx
@@ -21,73 +21,73 @@ const TOKENS: AppkitUIToken[] = [
         decimals: 9,
         address: 'ton',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c/c8d21a3d93f9b574381e0a8d8f16d48b325dd8f54ce172f599c1e9d6c62f03f7',
+        logo: './tokens/ton.png',
     },
     {
         symbol: 'USD₮',
         name: 'Tether USD',
         decimals: 6,
-        address: 'UQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_p0p',
+        address: USDT_MASTER_MAINNET,
         network: Network.mainnet(),
         rate: '1',
-        logo: `https://asset.ston.fi/img/${USDT_MASTER_MAINNET}/1a87edfee9a28b05578853952e5effb8cc30af1e0fb90043aa2ce19dce490849`,
+        logo: `./tokens/usdt.png`,
     },
     {
         symbol: 'STON',
         name: 'STON',
         decimals: 9,
-        address: 'UQA2kCVNwVsil2EM2mB0SkXytxCqQjS4mttjDpnXmwG9T_sL',
+        address: 'EQA2kCVNwVsil2EM2mB0SkXytxCqQjS4mttjDpnXmwG9T6bO',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQA2kCVNwVsil2EM2mB0SkXytxCqQjS4mttjDpnXmwG9T6bO/7c9798ce1e64707fb4cb8f025d4060f66b386ed381b50498e3b88731cedeffe8',
+        logo: './tokens/ston.png',
     },
     {
         symbol: 'XAUt0',
         name: 'Tether Gold',
         decimals: 6,
-        address: 'UQA1R_LuQCLHlMgOo1S4G7Y7W1cd0FrAkbA10Zq7rddKxnKh',
+        address: 'EQA1R_LuQCLHlMgOo1S4G7Y7W1cd0FrAkbA10Zq7rddKxi9k',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQA1R_LuQCLHlMgOo1S4G7Y7W1cd0FrAkbA10Zq7rddKxi9k/4aaaa7c30d7811bced81ded6bc116dcc82a78c6aea53d6012fd586a5826963ad',
+        logo: './tokens/xaut0.png',
     },
     {
         symbol: 'USDe',
         name: 'Ethena USDe',
         decimals: 6,
-        address: 'UQAIb6KmdfdDR7CN1GBqVJuP25iCnLKCvBlJ07Evuu2dzKOa',
+        address: 'EQAIb6KmdfdDR7CN1GBqVJuP25iCnLKCvBlJ07Evuu2dzP5f',
         network: Network.mainnet(),
         rate: '1',
-        logo: 'https://asset.ston.fi/img/EQAIb6KmdfdDR7CN1GBqVJuP25iCnLKCvBlJ07Evuu2dzP5f/dbcc67993cd4aad4845a97a4a9722c6cb618123997c8112c29d4932b2739c4cd',
+        logo: './tokens/usde.png',
     },
     {
         symbol: 'tsTON',
         name: 'Tonstakers TON',
         decimals: 9,
-        address: 'UQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAMtq',
+        address: 'EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav/38f530facb209e4696b8aef17af51df94d16bd879926c517b07d25841da287b7',
+        logo: './tokens/tston.svg',
     },
     {
         symbol: 'GEMSTON',
         name: 'GEMSTON',
         decimals: 9,
-        address: 'UQBX6K9aXVl3nXINCyPPL86C4ONVmQ8vK360u6dykFKXpC1f',
+        address: 'EQBX6K9aXVl3nXINCyPPL86C4ONVmQ8vK360u6dykFKXpHCa',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQBX6K9aXVl3nXINCyPPL86C4ONVmQ8vK360u6dykFKXpHCa/c6ab1e58e3b9b58a7429d38b7feab731afae2f66dc301a6c42041fdf7e9d7c9c',
+        logo: './tokens/gemston.png',
     },
     {
         symbol: 'UTYA',
         name: 'Utya',
         decimals: 9,
-        address: 'UQBaCgUwOoc6gHCNln_oJzb0mVs79YG7wYoavh-o1Itanb8F',
+        address: 'EQBaCgUwOoc6gHCNln_oJzb0mVs79YG7wYoavh-o1ItaneLA',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQBaCgUwOoc6gHCNln_oJzb0mVs79YG7wYoavh-o1ItaneLA/727e6cc971afdfa8ed9c698d0909eee9de344a0b6766ff5e4ddcc3323449d6f6',
+        logo: './tokens/utya.png',
     },
     {
         symbol: 'WETH',
         name: 'Wrapped Ether',
         decimals: 18,
-        address: 'UQBTkLAhEteZCRgRe_xMs5ZE0bMrduYxKbyzGCpXXW8dRT5W',
+        address: 'EQBTkLAhEteZCRgRe_xMs5ZE0bMrduYxKbyzGCpXXW8dRWOT',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQBTkLAhEteZCRgRe_xMs5ZE0bMrduYxKbyzGCpXXW8dRWOT/6267787665c30c2500dbde048e2f8a6a6d7ec58633ea038723f4ce1fab337ccb',
+        logo: './tokens/weth.png',
     },
 ];
 
diff --git a/packages/appkit-react/.storybook/public/tokens/gemston.png b/packages/appkit-react/.storybook/public/tokens/gemston.png
new file mode 100644
index 0000000000000000000000000000000000000000..3421dc9cce75cc37f85ab4f57e5852be9e0269c0
GIT binary patch
literal 1856
zcmV-G2fz4<P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000LENkl<Zc-rk+
zTW?fV6khvWW;)ZE(kTOoG$_FfRHG3vni!rGLnI~|jryQsh!2?fgwYqD`~w=F0DbX7
zKnxm!7&ItFqzWY>Xh1{c5-#NuKx~JZ&h2c!wbwbFDQ&>CbD{Q}=43ACoIU&d*0;X3
z&OUW$Wl7T{-YlBrTS!1iKuADHKuADHKuADHKuADHKuADHKuADHz$Dz9dJL*~2en$u
z`|)nPVx#p0AwU7K_ORzfUuNR!I>?Bw&r)!`I{^r=Fj22e6v1SdFI7|q8>2;zNh*P)
zxGnewagA+_j52?8aZcYQqObROa;;TcH8{1Dy_r{m=-m~H9$#S5mcv9*rxNJkyfUyv
z0BmkjjvX7oW%$lk!_VapOxDa4(bb%yo%?moU8`mUa0E*kqPLz?wBjK}r?Z-LNzvt;
zC?nWBEkL`b0$*7exg|n$=u$=P)f<y_;U7&8+@UB3a`*nG$%@K2H%%2_nU)a6mzF4c
zXPHHRW1{I8fF&UBA|~qzkWyJ*yV5uw$90Ze%kP<xVySWtzcR>tK^p?|80V2LMfcpP
z$jf8m)=feH11JLgV-G4?{h~!#Ox%TTqu6h6V^Eq(*clv0kipMNN~oi@qyo#lvrUfi
zIp!LSQ!EN_CV&AK@!gUIif-$y9SP$a!eQ`NiS9*IHm<bHU^b!_wIqM%v;!dC=K(%5
zsHtlj(cNj0dW$0pi1<5yHxI|>r}<n_K)$G{To#~qRc<`_u%a{+;}wRdS3?OfIiH1m
zG3hO@TQtR$h&eo2l4>xG)1VbO429g4R<v-I$eLBd=ebooD}j$K>V!FVD7pd<;nd;Z
zF=JYC9dB`Xz%z?2N<c|oNfgvj6XYK(<A<kq5cRxan@IE4HcG9&Z<?Zkyrw7SNp5rG
zD<xxO+2e>Vn<swo#|5a#9a;7UaV*|Kv=nLg<!)`r9&5+tjJ4jEA-|^=DeA}Mw*0A4
z?o<^fQ~<3^id;q{=R($p&%*~iU$S~+FErFdX^Hl1l)h9_%ILL@&*v3D!lUyQwc!1_
zZ()>iG24a^z>y@#@ROf4UBc|zTiKxWHB!_D49mB(L-L*Ue^VEOn*s1o-Cw1as@JmL
zM4h@q)cw0QUE)}qqcQgZ+>sUF0ecR4^z35GOiqu|9C63TMwSX9q;A|$vEi|57}Q{K
zxN3ql$zZG%Ydku08s{hcpfu71d2$w*KYNa7#{q5HUvHFFmK~fy1n*5r^LM3&e-6HD
z!C0N`GJvau5ZgCG<|2j0>Fv)n9Ym+;B*zYZ++~mfE2P4qzclT~o{0H_T9w^Y3%{{p
zPq3=MI92Bb-!rjkL^KtX@eMKlMA_`7<M&o~YufOgCOawPHn$Vha;Me}6`VLP?i|Q8
zh%j&5-~{E&@}nBO1`+1te9i23DT@JcbCU%Ur(*2yk4W?>UYmB<ss(=K=jc}4vGr#~
z!lbHH05G|tZ#n@9Rz(Rz^2RlB$a_|s01m+O?R5f?KMB)&^+SB{M!$P(+P#4B1Axrp
zX6P%vZB@R!eH8?0Q1H{h9tFH3K1yj+lqpevOhc?fql6OcDS$`SxrlS4<IDTHEQy(X
z#l+6^5pDlPQ!E<v49WmxQijq%jZOjszBNe(F#lOTyX~k|Z*K6Y7bVYW9e>`}ZB5X~
z7QhdnG1_-TQ!*w=qKqOGW&LWvDN&vKfgi+NCO{3{GINxtM{tw1OVh{OYh!wKUli58
zDSp$d>9{dPaY5UbPLR{Ut&Y5^l7CF(&mY+F(*VEYsHRoxxreUZ8bEys2uu-k{^CcE
z26AYVU6C~ZW%Ar2s}UwBx5Ubj!%9lP3{UkFz5D^!P*IK66J%LDXp%AjuxXd}jZhm9
zoCcnjl&~%F2kt6c5$zeRB74_wc$UNQ&qGB{OYKarVb28uKR9_x)3$w{Nd^8fP6J*a
zaQ&vpF;=h4t#eyM+U9l~TeZ=no`ag)MD6pwVGl+O35Z@V*75ej7?W{PN2V~+{bwem
z-giJbYktzScAJ=9u}n0fpA4C_1*pwE9vwR?m0=(+-v^yv+?D=5fynPZq3N|x>t}k6
zCqVmacZlTr9Uf(J(i3D0m8Gy0Qe_4JpTqLn^J@XVSU=Ni%CkYwH^qLmvKzWRV|peH
z{7!LZT+Vv|j^B5-zNXi-hofeF55SHd*XAjYr=%x{Ir4yH)h3UA__h9~*VL!O990Dp
zdhmp2C)(N~NSKe+-F0Z1-rL$3(`(4n;Tvu+ywBkW3+LFB!cy8RA9-epP3!;3<MA7s
zqW=)}{mo@l26=(ijy5juo2~$3icmq{ML!QC%>m!M6bP2noXUHmNk#xsb8<fXAEA(d
ukbsbYkbsbYkbsbYkbsbYkbsZ?-u?x8fS2)DjDQ;e0000<MNUMnLSTX$Pkspi

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/.storybook/public/tokens/ston.png b/packages/appkit-react/.storybook/public/tokens/ston.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8f37b44cb8cb9417e45bc0940aea321f02a49a5
GIT binary patch
literal 4449
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

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/.storybook/public/tokens/ton.png b/packages/appkit-react/.storybook/public/tokens/ton.png
new file mode 100644
index 0000000000000000000000000000000000000000..109900c3c8213a2a8f263fe419042beaea3d2f25
GIT binary patch
literal 1725
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
TL)vg*00000NkvXXu0mjfVh%i>

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/.storybook/public/tokens/tston.svg b/packages/appkit-react/.storybook/public/tokens/tston.svg
new file mode 100644
index 000000000..15412f661
--- /dev/null
+++ b/packages/appkit-react/.storybook/public/tokens/tston.svg
@@ -0,0 +1 @@
+<svg width="251" height="251" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_349_2665)"><rect x=".465" y=".845" width="250" height="250" rx="125" fill="#000"/><ellipse cx="52.03" cy="76.514" rx="52.03" ry="76.514" transform="rotate(30 -7.456 262.753)" fill="#D8FAFF"/><ellipse cx="16.909" cy="24.866" rx="16.909" ry="24.866" transform="rotate(30 -72.453 154.137)" fill="#D8FAFF"/></g><defs><clipPath id="clip0_349_2665"><path fill="#fff" transform="translate(.465 .845)" d="M0 0H250V250H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/appkit-react/.storybook/public/tokens/usde.png b/packages/appkit-react/.storybook/public/tokens/usde.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c9bce7c0d4a139ad628f7a4647c1616fb1c86a5
GIT binary patch
literal 5751
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

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/.storybook/public/tokens/usdt.png b/packages/appkit-react/.storybook/public/tokens/usdt.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b68af9af405edd72bdae7470052222447b43bfd
GIT binary patch
literal 4187
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%0A$9v
z8KIIrKpyLn6y@W)i%51%m}*kMYX%Slu@I9r0_cxDC&-KFAxlfQAZ9j~8*V62<EKfO
z4Q8x2(b1_!N;@0f;}i&EHJT=q(IKuz3hl;k{^V>05;gabp6-z)OWu)X%VsD{5lq?@
zXH+&QQ>V_Cyu68W`gGDpWmQj+Qr0g$;V2FJeSea`R|9;CtY5!CKKkgM&^Db2kuCPH
zG#OA>xInJEZV(2LdnQX0^t2aEg6{`|b*aM>lY9zhg#Rrce)zkv{SI{+m%lV+{o{{w
z(KpPM?Cd@$nEbJZkLzj@Ns~HF*BbURA^G_Le^;%k_j+uY2s$)jA(Dw^n8z;wmtD%9
zF4x|m`h+?+ylK;>24ek8c>Jk}fKP14$R#G=b<580&`8(|$9TJntyNWCdrtpqZJ7xu
z@J*X~)Tr2}pFW68Z>DYYMj{ccew(J+w(TMhJn#v$VK|!^Y83TqY??|*@d(@HJ9ey=
zIddkX&Aq>_o2K0LNGv>R)O7v&kLA><qnNT7ir37|lv((EKILsM7b7f*qwi+Av0u@R
z=bw-T3!cPgsmJjax*{~{FIRHoWNK=2x#^}q$nfFQBr`MPifo)@QL}pW`?6xi47}Yr
zb7eP9M%y}@mX?8hVG4#2e~;0VUaIdFdF!l1VM;Khwvo2Z@;;@dJJ8JdhtfV4HCJux
zY^=@GT-n)q(!2L>rALpORQOCyZK7U8I5$oct2R^1Y-(<v<~fy>7hu;rW%uqCvTfVH
zWbfYfVcUAH^5*GCd-%eo(Y9^2+B$z}`+R3;ODm{y8f@9hEPcLen9VszmD}eJhPKc1
lICgArEv=)fCu#fq{{ZU2XkeJtGkgF5002ovPDHLkV1hu&<^TWy

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/.storybook/public/tokens/utya.png b/packages/appkit-react/.storybook/public/tokens/utya.png
new file mode 100644
index 0000000000000000000000000000000000000000..42be5f51ece05fab84d81f0783455158567dcc05
GIT binary patch
literal 3594
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
Q@c;k-07*qoM6N<$f;~{$p#T5?

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/.storybook/public/tokens/weth.png b/packages/appkit-react/.storybook/public/tokens/weth.png
new file mode 100644
index 0000000000000000000000000000000000000000..75c851d075a61051b6671843225186a17710e569
GIT binary patch
literal 3080
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
WhwNRNtba)W0000<MNUMnLSTYGmgJNG

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/.storybook/public/tokens/xaut0.png b/packages/appkit-react/.storybook/public/tokens/xaut0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f9b4c2c76556f686ec62c4abf7b0a97da19837c
GIT binary patch
literal 3512
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

literal 0
HcmV?d00001

diff --git a/packages/appkit-react/src/features/staking/components/staking-balance-block/staking-balance-block.stories.tsx b/packages/appkit-react/src/features/staking/components/staking-balance-block/staking-balance-block.stories.tsx
index d9597a820..949150bf5 100644
--- a/packages/appkit-react/src/features/staking/components/staking-balance-block/staking-balance-block.stories.tsx
+++ b/packages/appkit-react/src/features/staking/components/staking-balance-block/staking-balance-block.stories.tsx
@@ -23,7 +23,7 @@ const mockMetadata = {
     providerId: 'tonstakers',
     name: 'Tonstakers',
     description: 'Staking provider',
-    image: 'https://asset.ston.fi/img/EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav/38f530facb209e4696b8aef17af51df94d16bd879926c517b07d25841da287b7',
+    logo: './tokens/tston.svg',
     stakeToken: {
         symbol: 'TON',
         ticker: 'TON',
diff --git a/packages/appkit-react/src/features/staking/components/staking-info/staking-info.stories.tsx b/packages/appkit-react/src/features/staking/components/staking-info/staking-info.stories.tsx
index 5c58f499a..0c3e0293c 100644
--- a/packages/appkit-react/src/features/staking/components/staking-info/staking-info.stories.tsx
+++ b/packages/appkit-react/src/features/staking/components/staking-info/staking-info.stories.tsx
@@ -23,7 +23,7 @@ const mockMetadata = {
     providerId: 'tonstakers',
     name: 'Tonstakers',
     description: 'Staking provider',
-    image: 'https://asset.ston.fi/img/EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav/38f530facb209e4696b8aef17af51df94d16bd879926c517b07d25841da287b7',
+    logo: './tokens/tston.svg',
     stakeToken: {
         symbol: 'TON',
         ticker: 'TON',
diff --git a/packages/appkit-react/src/storybook/fixtures/tokens.ts b/packages/appkit-react/src/storybook/fixtures/tokens.ts
index 7dca8e3a5..860b69100 100644
--- a/packages/appkit-react/src/storybook/fixtures/tokens.ts
+++ b/packages/appkit-react/src/storybook/fixtures/tokens.ts
@@ -17,7 +17,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         decimals: 9,
         address: 'ton',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c/c8d21a3d93f9b574381e0a8d8f16d48b325dd8f54ce172f599c1e9d6c62f03f7',
+        logo: './tokens/ton.png',
     },
     {
         symbol: 'USD₮',
@@ -26,7 +26,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         address: 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs',
         network: Network.mainnet(),
         rate: '1',
-        logo: 'https://asset.ston.fi/img/EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs/1a87edfee9a28b05578853952e5effb8cc30af1e0fb90043aa2ce19dce490849',
+        logo: `./tokens/usdt.png`,
     },
     {
         symbol: 'STON',
@@ -34,7 +34,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         decimals: 9,
         address: 'EQA2kCVNwVsil2EM2mB0SkXytxCqQjS4mttjDpnXmwG9T6bO',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQA2kCVNwVsil2EM2mB0SkXytxCqQjS4mttjDpnXmwG9T6bO/7c9798ce1e64707fb4cb8f025d4060f66b386ed381b50498e3b88731cedeffe8',
+        logo: './tokens/ston.png',
     },
     {
         symbol: 'XAUt0',
@@ -42,7 +42,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         decimals: 6,
         address: 'EQA1R_LuQCLHlMgOo1S4G7Y7W1cd0FrAkbA10Zq7rddKxi9k',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQA1R_LuQCLHlMgOo1S4G7Y7W1cd0FrAkbA10Zq7rddKxi9k/4aaaa7c30d7811bced81ded6bc116dcc82a78c6aea53d6012fd586a5826963ad',
+        logo: './tokens/xaut0.png',
     },
     {
         symbol: 'USDe',
@@ -51,7 +51,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         address: 'EQAIb6KmdfdDR7CN1GBqVJuP25iCnLKCvBlJ07Evuu2dzP5f',
         network: Network.mainnet(),
         rate: '1',
-        logo: 'https://asset.ston.fi/img/EQAIb6KmdfdDR7CN1GBqVJuP25iCnLKCvBlJ07Evuu2dzP5f/dbcc67993cd4aad4845a97a4a9722c6cb618123997c8112c29d4932b2739c4cd',
+        logo: './tokens/usde.png',
     },
     {
         symbol: 'tsTON',
@@ -59,7 +59,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         decimals: 9,
         address: 'EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav/38f530facb209e4696b8aef17af51df94d16bd879926c517b07d25841da287b7',
+        logo: './tokens/tston.svg',
     },
     {
         symbol: 'GEMSTON',
@@ -67,7 +67,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         decimals: 9,
         address: 'EQBX6K9aXVl3nXINCyPPL86C4ONVmQ8vK360u6dykFKXpHCa',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQBX6K9aXVl3nXINCyPPL86C4ONVmQ8vK360u6dykFKXpHCa/c6ab1e58e3b9b58a7429d38b7feab731afae2f66dc301a6c42041fdf7e9d7c9c',
+        logo: './tokens/gemston.png',
     },
     {
         symbol: 'UTYA',
@@ -75,7 +75,7 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         decimals: 9,
         address: 'EQBaCgUwOoc6gHCNln_oJzb0mVs79YG7wYoavh-o1ItaneLA',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQBaCgUwOoc6gHCNln_oJzb0mVs79YG7wYoavh-o1ItaneLA/727e6cc971afdfa8ed9c698d0909eee9de344a0b6766ff5e4ddcc3323449d6f6',
+        logo: './tokens/utya.png',
     },
     {
         symbol: 'WETH',
@@ -83,6 +83,6 @@ export const STORY_TOKENS: AppkitUIToken[] = [
         decimals: 18,
         address: 'EQBTkLAhEteZCRgRe_xMs5ZE0bMrduYxKbyzGCpXXW8dRWOT',
         network: Network.mainnet(),
-        logo: 'https://asset.ston.fi/img/EQBTkLAhEteZCRgRe_xMs5ZE0bMrduYxKbyzGCpXXW8dRWOT/6267787665c30c2500dbde048e2f8a6a6d7ec58633ea038723f4ce1fab337ccb',
+        logo: './tokens/weth.png',
     },
 ];
diff --git a/packages/walletkit/src/core/JettonsManager.ts b/packages/walletkit/src/core/JettonsManager.ts
index 378347f2c..6067985ca 100644
--- a/packages/walletkit/src/core/JettonsManager.ts
+++ b/packages/walletkit/src/core/JettonsManager.ts
@@ -35,7 +35,6 @@ const TON_INFO: JettonInfo = {
     description: 'The Open Network native token',
     decimals: 9,
     totalSupply: '5000000000000000000',
-    // image: 'https://asset.ston.fi/img/EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c/ee9fb21d17bc8d75c2a5f7b5f5f62d2bacec6b128f58b63cb841e98f7b74c4fc',
     verification: {
         verified: true,
         source: 'manual' as const,

From 3e112aeed55c5f6bdbb21735d8e2033de719e8ba Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 1 Jun 2026 10:52:43 +0400
Subject: [PATCH 31/46] feat(gasless): add switch

---
 .../src/components/ui/switch/index.ts         |  9 +++
 .../components/ui/switch/switch.module.css    | 57 ++++++++++++++
 .../components/ui/switch/switch.stories.tsx   | 74 +++++++++++++++++++
 .../src/components/ui/switch/switch.tsx       | 72 ++++++++++++++++++
 packages/appkit-react/src/index.ts            |  1 +
 5 files changed, 213 insertions(+)
 create mode 100644 packages/appkit-react/src/components/ui/switch/index.ts
 create mode 100644 packages/appkit-react/src/components/ui/switch/switch.module.css
 create mode 100644 packages/appkit-react/src/components/ui/switch/switch.stories.tsx
 create mode 100644 packages/appkit-react/src/components/ui/switch/switch.tsx

diff --git a/packages/appkit-react/src/components/ui/switch/index.ts b/packages/appkit-react/src/components/ui/switch/index.ts
new file mode 100644
index 000000000..d04937e80
--- /dev/null
+++ b/packages/appkit-react/src/components/ui/switch/index.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export * from './switch';
diff --git a/packages/appkit-react/src/components/ui/switch/switch.module.css b/packages/appkit-react/src/components/ui/switch/switch.module.css
new file mode 100644
index 000000000..d3bd62082
--- /dev/null
+++ b/packages/appkit-react/src/components/ui/switch/switch.module.css
@@ -0,0 +1,57 @@
+.root {
+  /* Sizes — overridden by [data-size='sm']. The thumb starts at left padding
+     and translates by (track_w − thumb − 2 × padding) when checked. */
+  --switch-track-w: 32px;
+  --switch-track-h: 20px;
+  --switch-thumb-size: 16px;
+  --switch-padding: 2px;
+
+  display: inline-flex;
+  align-items: center;
+  flex-shrink: 0;
+  box-sizing: border-box;
+  width: var(--switch-track-w);
+  height: var(--switch-track-h);
+  padding: 0 var(--switch-padding);
+  border: 0;
+  border-radius: var(--ta-border-radius-full);
+  background-color: var(--ta-color-background-tertiary);
+  cursor: pointer;
+  transition: background-color 150ms ease;
+  outline: none;
+}
+
+.root[data-size='sm'] {
+  --switch-track-w: 24px;
+  --switch-track-h: 16px;
+  --switch-thumb-size: 12px;
+}
+
+.root[data-state='checked'] {
+  background-color: var(--ta-color-primary);
+}
+
+.root[data-disabled] {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.root:focus-visible {
+  outline: 2px solid var(--ta-color-primary);
+  outline-offset: 2px;
+}
+
+.thumb {
+  display: block;
+  width: var(--switch-thumb-size);
+  height: var(--switch-thumb-size);
+  border-radius: var(--ta-border-radius-full);
+  background-color: var(--ta-color-white);
+  transform: translateX(0);
+  transition: transform 150ms ease;
+  will-change: transform;
+}
+
+.thumb[data-state='checked'] {
+  transform: translateX(calc(var(--switch-track-w) - var(--switch-thumb-size) - var(--switch-padding) * 2));
+}
diff --git a/packages/appkit-react/src/components/ui/switch/switch.stories.tsx b/packages/appkit-react/src/components/ui/switch/switch.stories.tsx
new file mode 100644
index 000000000..e6d60deab
--- /dev/null
+++ b/packages/appkit-react/src/components/ui/switch/switch.stories.tsx
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useState } from 'react';
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { Switch } from './switch';
+
+const meta: Meta<typeof Switch> = {
+    title: 'Components/UI/Switch',
+    component: Switch,
+    tags: ['autodocs'],
+    argTypes: {
+        size: {
+            control: 'radio',
+            options: ['sm', 'default'],
+        },
+        disabled: {
+            control: 'boolean',
+        },
+    },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof Switch>;
+
+export const DefaultUnchecked: Story = {
+    args: {
+        size: 'default',
+    },
+};
+
+export const DefaultChecked: Story = {
+    args: {
+        size: 'default',
+        defaultChecked: true,
+    },
+};
+
+export const Controlled: Story = {
+    render: (args) => {
+        const ControlledExample = () => {
+            const [checked, setChecked] = useState(false);
+            return (
+                <div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}>
+                    <Switch {...args} checked={checked} onCheckedChange={setChecked} />
+                    <span style={{ color: 'var(--ta-color-text-secondary)' }}>{checked ? 'On' : 'Off'}</span>
+                </div>
+            );
+        };
+        return <ControlledExample />;
+    },
+};
+
+export const Disabled: Story = {
+    args: {
+        size: 'default',
+        defaultChecked: true,
+        disabled: true,
+    },
+};
+
+export const Small: Story = {
+    args: {
+        size: 'sm',
+        defaultChecked: true,
+    },
+};
diff --git a/packages/appkit-react/src/components/ui/switch/switch.tsx b/packages/appkit-react/src/components/ui/switch/switch.tsx
new file mode 100644
index 000000000..736256e1b
--- /dev/null
+++ b/packages/appkit-react/src/components/ui/switch/switch.tsx
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useState } from 'react';
+import type { ButtonHTMLAttributes, FC, MouseEventHandler } from 'react';
+import clsx from 'clsx';
+
+import styles from './switch.module.css';
+
+export interface SwitchProps extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'type' | 'onChange'> {
+    /** Controlled checked state. Omit to use uncontrolled mode with `defaultChecked`. */
+    checked?: boolean;
+    /** Initial checked state for uncontrolled mode. */
+    defaultChecked?: boolean;
+    /** Fires whenever the checked state changes (both controlled and uncontrolled). */
+    onCheckedChange?: (checked: boolean) => void;
+    /** Visual size. `default` is 32×20 with a 16px thumb; `sm` is 24×16 with a 12px thumb. */
+    size?: 'sm' | 'default';
+}
+
+/**
+ * Custom Switch primitive — independently controllable, no radix dependency.
+ * Renders as a native `<button role="switch">` so screen readers and keyboard
+ * activation (Enter/Space) work out of the box. The state lives in `data-state`
+ * (`checked` | `unchecked`) so the stylesheet can react without reading `aria-`
+ * attributes.
+ */
+export const Switch: FC<SwitchProps> = ({
+    checked: controlledChecked,
+    defaultChecked = false,
+    onCheckedChange,
+    disabled,
+    size = 'default',
+    className,
+    onClick,
+    ...rest
+}) => {
+    const [uncontrolledChecked, setUncontrolledChecked] = useState(defaultChecked);
+    const isControlled = controlledChecked !== undefined;
+    const checked = isControlled ? controlledChecked : uncontrolledChecked;
+
+    const handleClick: MouseEventHandler<HTMLButtonElement> = (event) => {
+        const next = !checked;
+        if (!isControlled) setUncontrolledChecked(next);
+        onCheckedChange?.(next);
+        onClick?.(event);
+    };
+
+    const state = checked ? 'checked' : 'unchecked';
+
+    return (
+        <button
+            type="button"
+            role="switch"
+            aria-checked={checked}
+            data-state={state}
+            data-disabled={disabled ? '' : undefined}
+            data-size={size}
+            disabled={disabled}
+            onClick={handleClick}
+            className={clsx(styles.root, className)}
+            {...rest}
+        >
+            <span className={styles.thumb} data-state={state} />
+        </button>
+    );
+};
diff --git a/packages/appkit-react/src/index.ts b/packages/appkit-react/src/index.ts
index a82b9c3ef..b7899ef09 100644
--- a/packages/appkit-react/src/index.ts
+++ b/packages/appkit-react/src/index.ts
@@ -18,6 +18,7 @@ export * from './components/ui/logo';
 export * from './components/ui/modal';
 export * from './components/ui/skeleton';
 export * from './components/ui/input';
+export * from './components/ui/switch';
 export * from './components/shared/token-select-modal';
 export * from './components/ui/tabs';
 export * from './components/ui/centered-amount-input';

From 05048b3b2e48e605816b7fa31a387d5033e3f8f8 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 1 Jun 2026 10:58:16 +0400
Subject: [PATCH 32/46] feat(gasless): extend mint store

---
 .../src/features/mint/constants/index.ts      |   9 ++
 .../features/mint/constants/mint-forward.ts   |  40 ++++++
 .../mint/hooks/use-mint-forward-message.ts    | 120 ++++++++++++++++
 .../src/features/mint/hooks/use-mint-nft.ts   | 132 ++++++++++++++++++
 .../mint/store/actions/set-gasless-enabled.ts |  13 ++
 .../store/actions/set-gasless-fee-asset.ts    |  15 ++
 .../src/features/mint/store/index.ts          |   2 +
 .../src/features/mint/store/minter-store.ts   |  11 ++
 8 files changed, 342 insertions(+)
 create mode 100644 apps/appkit-minter/src/features/mint/constants/index.ts
 create mode 100644 apps/appkit-minter/src/features/mint/constants/mint-forward.ts
 create mode 100644 apps/appkit-minter/src/features/mint/hooks/use-mint-forward-message.ts
 create mode 100644 apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
 create mode 100644 apps/appkit-minter/src/features/mint/store/actions/set-gasless-enabled.ts
 create mode 100644 apps/appkit-minter/src/features/mint/store/actions/set-gasless-fee-asset.ts

diff --git a/apps/appkit-minter/src/features/mint/constants/index.ts b/apps/appkit-minter/src/features/mint/constants/index.ts
new file mode 100644
index 000000000..b212cae5e
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/constants/index.ts
@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+export * from './mint-forward';
diff --git a/apps/appkit-minter/src/features/mint/constants/mint-forward.ts b/apps/appkit-minter/src/features/mint/constants/mint-forward.ts
new file mode 100644
index 000000000..edfb96fcb
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/constants/mint-forward.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { toNano } from '@ton/core';
+import type { UserFriendlyAddress } from '@ton/appkit';
+
+/**
+ * Pre-deployed forwarder contract on mainnet. Receives a TEP-74 jetton-transfer
+ * with the NFT deploy spec in `forward_payload` and emits the actual NFT deploy
+ * message itself — so TonAPI gasless only ever sees a plain jetton transfer.
+ */
+export const MINT_FORWARD_ADDRESS = 'EQD_fO0VDlkmjRFcpiyOAFz8CWhLDoyOM9jFN4Gw7tP86YgR' as UserFriendlyAddress;
+
+/** TEP-74 jetton transfer opcode. */
+export const JETTON_TRANSFER_OP = 0x0f8a7ea5;
+
+/** Symbolic jetton amount in the transfer. MintForward doesn't inspect it. */
+export const USDT_FORWARD_JETTON_AMOUNT = 1n;
+
+/**
+ * TON budget for the jetton-transfer. Splits into:
+ * - ~0.0099 TON gas at the user's jetton-wallet
+ * - ~0.0099 TON gas at MintForward's jetton-wallet
+ * - `FORWARD_TON_AMOUNT` forwarded to MintForward as the deploy-funding payload
+ * - remaining excess routed to `response_destination` (relayer)
+ */
+export const JETTON_GAS_BUDGET = toNano('0.02');
+
+/**
+ * TON delivered to MintForward with the transfer notification — must cover the
+ * contract's own gas + the inner 0.001 TON NFT-deploy value. Lower than this
+ * (currently 0.0015) relies on accumulated balance from prior mints; safer
+ * floor for cold-start funding is ~0.015 TON.
+ */
+export const FORWARD_TON_AMOUNT = toNano('0.0015');
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-forward-message.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-forward-message.ts
new file mode 100644
index 000000000..dbb48f70c
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-forward-message.ts
@@ -0,0 +1,120 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useEffect, useState } from 'react';
+import { Address, beginCell, Cell } from '@ton/core';
+import { useGaslessConfig, useJettonWalletAddress, useSelectedWallet } from '@ton/appkit-react';
+import { asBase64 } from '@ton/appkit';
+import type { Base64String, TransactionRequestMessage } from '@ton/appkit';
+
+import { useMinterStore } from '../store/minter-store';
+import {
+    FORWARD_TON_AMOUNT,
+    JETTON_GAS_BUDGET,
+    JETTON_TRANSFER_OP,
+    MINT_FORWARD_ADDRESS,
+    USDT_FORWARD_JETTON_AMOUNT,
+} from '../constants';
+import { useNftMintTransaction } from './use-nft-mint-transaction';
+
+export interface UseMintForwardMessageReturn {
+    /** Single TEP-74 jetton-transfer message ready to be quoted via TonAPI gasless. */
+    message: TransactionRequestMessage | undefined;
+    /** All inputs (card, wallet, relayer config, fee-asset, jetton-wallet) are resolved. */
+    isReady: boolean;
+}
+
+/**
+ * Builds the user-signed gasless mint message: a TEP-74 jetton transfer of the
+ * selected fee-asset to `MintForward`, with the NFT deploy spec (address, body,
+ * stateInit, amount) packed into `forward_payload`. The contract unwraps it on
+ * receipt and emits the NFT deploy itself — so the relayer never sees a
+ * top-level `stateInit` in the user-signed batch.
+ *
+ * The hook is dormant until card + wallet + relayer config + fee-asset are all
+ * present. Returns `undefined` for `message` in that case, leaving consumers
+ * (e.g. `useGaslessQuote({ query: { enabled: !!message } })`) cleanly gated.
+ */
+export const useMintForwardMessage = (): UseMintForwardMessageReturn => {
+    const [wallet] = useSelectedWallet();
+    const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
+    const { createMintTransaction, canMint } = useNftMintTransaction();
+
+    const { data: gaslessConfig } = useGaslessConfig();
+    const relayAddress = gaslessConfig?.relayAddress;
+
+    const { data: usdtWalletAddress } = useJettonWalletAddress({
+        jettonAddress: gaslessFeeAsset ?? undefined,
+        ownerAddress: wallet?.getAddress() ?? undefined,
+        query: { enabled: !!gaslessFeeAsset && !!wallet },
+    });
+
+    const [message, setMessage] = useState<TransactionRequestMessage | undefined>(undefined);
+
+    useEffect(() => {
+        if (!canMint || !wallet || !usdtWalletAddress || !relayAddress) {
+            setMessage(undefined);
+            return;
+        }
+
+        let cancelled = false;
+        createMintTransaction()
+            .then((req) => {
+                const nftMsg = req.messages[0];
+                if (!nftMsg.stateInit) throw new Error('mint message has no stateInit');
+
+                const nftAddress = Address.parse(nftMsg.address);
+                const nftStateInit = Cell.fromBase64(nftMsg.stateInit);
+                const nftAmount = BigInt(nftMsg.amount);
+                const emptyBody = beginCell().endCell();
+
+                // forward_payload per MintForward.tolk:
+                //   address(toAddress), ref(body), ref(stateInit), coins(amount)
+                const forwardPayload = beginCell()
+                    .storeAddress(nftAddress)
+                    .storeRef(emptyBody)
+                    .storeRef(nftStateInit)
+                    .storeCoins(nftAmount)
+                    .endCell();
+
+                // TEP-74 jetton transfer body. `response_destination = relayer`
+                // mirrors the standard gasless pattern — relayer pays compute,
+                // captures the jetton-wallet TON excess.
+                const transferBody = beginCell()
+                    .storeUint(JETTON_TRANSFER_OP, 32)
+                    .storeUint(0, 64) // query_id
+                    .storeCoins(USDT_FORWARD_JETTON_AMOUNT)
+                    .storeAddress(Address.parse(MINT_FORWARD_ADDRESS))
+                    .storeAddress(Address.parse(relayAddress))
+                    .storeBit(0) // custom_payload: none
+                    .storeCoins(FORWARD_TON_AMOUNT)
+                    .storeBit(1) // forward_payload: ref
+                    .storeRef(forwardPayload)
+                    .endCell();
+
+                if (cancelled) return;
+                setMessage({
+                    address: usdtWalletAddress,
+                    amount: JETTON_GAS_BUDGET.toString(),
+                    payload: asBase64(transferBody.toBoc().toString('base64')) as Base64String,
+                });
+            })
+            .catch(() => {
+                if (cancelled) return;
+                // Build failures are surfaced indirectly: `message` stays undefined,
+                // which keeps the gasless flow gated until inputs become valid again.
+                setMessage(undefined);
+            });
+
+        return () => {
+            cancelled = true;
+        };
+    }, [canMint, createMintTransaction, relayAddress, usdtWalletAddress, wallet]);
+
+    return { message, isReady: !!message };
+};
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
new file mode 100644
index 000000000..43649b1d0
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
@@ -0,0 +1,132 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useCallback } from 'react';
+import {
+    useGaslessQuote,
+    useJettonInfo,
+    useSelectedWallet,
+    useSendGaslessTransaction,
+    useSendTransaction,
+} from '@ton/appkit-react';
+import { formatUnits } from '@ton/appkit';
+import type { GaslessQuote } from '@ton/appkit';
+
+import { useMinterStore } from '../store/minter-store';
+import { useMintForwardMessage } from './use-mint-forward-message';
+import { useNftMintTransaction } from './use-nft-mint-transaction';
+
+export interface UseMintNftReturn {
+    /** Trigger the mint — picks the right flow based on `gaslessEnabled` in store. */
+    send: () => Promise<void>;
+    /** True while either the gasless or the regular send mutation is in flight. */
+    isSending: boolean;
+    /** Latest send error from either flow. */
+    error: Error | undefined;
+    /** Wallet + card + (when gasless) quote are all ready. */
+    canSend: boolean;
+
+    gasless: {
+        /** Derived from the store flag — convenience for UI gating. */
+        enabled: boolean;
+        /** Latest gasless quote; `undefined` while quoting or before inputs are ready. */
+        quote: GaslessQuote | undefined;
+        /** Quote refetch in progress. */
+        isLoadingQuote: boolean;
+        /** Formatted relayer commission, e.g. `"0.219 USDT"`. */
+        fee: string | undefined;
+        /** Quote-side error — kept distinct from send-side error for UI nuance. */
+        quoteError: Error | undefined;
+    };
+}
+
+/**
+ * Single entry-point for the mint flow. Reads `gaslessEnabled` and
+ * `gaslessFeeAsset` from `minter-store` and dispatches to either:
+ *
+ * - **Gasless**: builds the MintForward jetton-transfer via
+ *   {@link useMintForwardMessage}, quotes it via {@link useGaslessQuote},
+ *   sends through TonAPI via {@link useSendGaslessTransaction}.
+ * - **Regular**: emits the raw NFT deploy via {@link useSendTransaction}.
+ *
+ * Common state lives on the top-level return shape (`send`, `isSending`,
+ * `error`, `canSend`); gasless-only state hangs off the `gasless` block.
+ */
+export const useMintNft = (): UseMintNftReturn => {
+    const [wallet] = useSelectedWallet();
+    const gaslessEnabled = useMinterStore((state) => state.gaslessEnabled);
+    const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
+
+    const { createMintTransaction, canMint } = useNftMintTransaction();
+
+    // Gasless path
+    const { message } = useMintForwardMessage();
+    const {
+        data: quote,
+        isFetching: isLoadingQuote,
+        error: quoteError,
+    } = useGaslessQuote({
+        messages: message ? [message] : [],
+        feeAsset: gaslessFeeAsset ?? undefined,
+        query: { enabled: gaslessEnabled && !!message },
+    });
+
+    const { data: feeAssetInfo } = useJettonInfo({
+        address: gaslessFeeAsset ?? undefined,
+        query: { enabled: gaslessEnabled && !!gaslessFeeAsset },
+    });
+
+    const fee =
+        quote && feeAssetInfo?.decimals != null
+            ? `${formatUnits(quote.fee, feeAssetInfo.decimals)} ${feeAssetInfo.symbol ?? ''}`.trim()
+            : undefined;
+
+    const {
+        mutateAsync: sendGasless,
+        isPending: isSendingGasless,
+        error: gaslessSendError,
+    } = useSendGaslessTransaction();
+
+    // Regular path
+    const { mutateAsync: sendRegular, isPending: isSendingRegular, error: regularSendError } = useSendTransaction();
+
+    const isSending = isSendingGasless || isSendingRegular;
+    const error = gaslessSendError ?? regularSendError ?? undefined;
+
+    const canSendGasless = canMint && !!message && !!quote && !isLoadingQuote && !quoteError && !isSending;
+    const canSendRegular = canMint && !isSending;
+    const canSend = gaslessEnabled ? canSendGasless : canSendRegular;
+
+    const send = useCallback(async (): Promise<void> => {
+        if (!wallet) throw new Error('Wallet not connected');
+
+        if (gaslessEnabled) {
+            if (!quote) throw new Error('Gasless quote not ready');
+            await sendGasless({ quote });
+            return;
+        }
+
+        const request = await createMintTransaction();
+        if (!request) throw new Error('Failed to build mint transaction');
+        await sendRegular(request);
+    }, [wallet, gaslessEnabled, quote, sendGasless, createMintTransaction, sendRegular]);
+
+    return {
+        send,
+        isSending,
+        error,
+        canSend,
+        gasless: {
+            enabled: gaslessEnabled,
+            quote: quote ?? undefined,
+            isLoadingQuote,
+            fee,
+            quoteError: quoteError ?? undefined,
+        },
+    };
+};
diff --git a/apps/appkit-minter/src/features/mint/store/actions/set-gasless-enabled.ts b/apps/appkit-minter/src/features/mint/store/actions/set-gasless-enabled.ts
new file mode 100644
index 000000000..6aeeefdfe
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/store/actions/set-gasless-enabled.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useMinterStore } from '../minter-store';
+
+export const setGaslessEnabled = (gaslessEnabled: boolean): void => {
+    useMinterStore.setState({ gaslessEnabled });
+};
diff --git a/apps/appkit-minter/src/features/mint/store/actions/set-gasless-fee-asset.ts b/apps/appkit-minter/src/features/mint/store/actions/set-gasless-fee-asset.ts
new file mode 100644
index 000000000..cdde5d221
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/store/actions/set-gasless-fee-asset.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { UserFriendlyAddress } from '@ton/appkit';
+
+import { useMinterStore } from '../minter-store';
+
+export const setGaslessFeeAsset = (gaslessFeeAsset: UserFriendlyAddress | null): void => {
+    useMinterStore.setState({ gaslessFeeAsset });
+};
diff --git a/apps/appkit-minter/src/features/mint/store/index.ts b/apps/appkit-minter/src/features/mint/store/index.ts
index 50559a19e..7f26e7929 100644
--- a/apps/appkit-minter/src/features/mint/store/index.ts
+++ b/apps/appkit-minter/src/features/mint/store/index.ts
@@ -14,3 +14,5 @@ export { mintCard } from './actions/mint-card';
 export { clearCard } from './actions/clear-card';
 export { setMinting } from './actions/set-minting';
 export { setMintError } from './actions/set-mint-error';
+export { setGaslessEnabled } from './actions/set-gasless-enabled';
+export { setGaslessFeeAsset } from './actions/set-gasless-fee-asset';
diff --git a/apps/appkit-minter/src/features/mint/store/minter-store.ts b/apps/appkit-minter/src/features/mint/store/minter-store.ts
index 4e220a751..312401a1d 100644
--- a/apps/appkit-minter/src/features/mint/store/minter-store.ts
+++ b/apps/appkit-minter/src/features/mint/store/minter-store.ts
@@ -7,6 +7,7 @@
  */
 
 import { create } from 'zustand';
+import type { UserFriendlyAddress } from '@ton/appkit';
 
 import { createRandomCard } from '../lib/card-data';
 import type { CardData } from '../types/card';
@@ -17,6 +18,14 @@ interface MinterState {
     isGenerating: boolean;
     isMinting: boolean;
     mintError: string | null;
+    /** When true, the mint flow routes through TonAPI gasless via MintForward. */
+    gaslessEnabled: boolean;
+    /**
+     * Fee asset the relayer charges its commission in. Persists across mints so the
+     * user's last choice is remembered when re-enabling gasless. `null` only on
+     * first run, before the user has ever opened mint settings.
+     */
+    gaslessFeeAsset: UserFriendlyAddress | null;
 }
 
 export const useMinterStore = create<MinterState>(() => ({
@@ -25,4 +34,6 @@ export const useMinterStore = create<MinterState>(() => ({
     isGenerating: false,
     isMinting: false,
     mintError: null,
+    gaslessEnabled: false,
+    gaslessFeeAsset: null,
 }));

From bacddd95eb75cc9ea8c3c647f0b4d0000c28e223 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 1 Jun 2026 12:53:01 +0400
Subject: [PATCH 33/46] feat(gasless): add confirm and settings modals for mint

---
 .../mint/components/card-generator.tsx        |  85 ++++++-----
 .../mint/components/mint-confirm-modal.tsx    | 137 ++++++++++++++++++
 .../mint/components/mint-settings-modal.tsx   | 102 +++++++++++++
 packages/appkit-react/src/index.ts            |   1 +
 4 files changed, 290 insertions(+), 35 deletions(-)
 create mode 100644 apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx
 create mode 100644 apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx

diff --git a/apps/appkit-minter/src/features/mint/components/card-generator.tsx b/apps/appkit-minter/src/features/mint/components/card-generator.tsx
index c866f99cf..6f64bcff0 100644
--- a/apps/appkit-minter/src/features/mint/components/card-generator.tsx
+++ b/apps/appkit-minter/src/features/mint/components/card-generator.tsx
@@ -6,16 +6,17 @@
  *
  */
 
-import { useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import type React from 'react';
 import { AlertCircle, Coins, Sparkles } from 'lucide-react';
-import { Button, Send, useSelectedWallet } from '@ton/appkit-react';
+import { Button, ButtonWithConnect, SettingsButton, useSelectedWallet } from '@ton/appkit-react';
 import { getErrorMessage } from '@ton/appkit';
-import { toast } from 'sonner';
 
 import { CardPreview } from './card-preview';
+import { MintConfirmModal } from './mint-confirm-modal';
+import { MintSettingsModal } from './mint-settings-modal';
 import { useCardGenerator } from '../hooks/use-card-generator';
-import { useNftMintTransaction } from '../hooks/use-nft-mint-transaction';
+import { useMintNft } from '../hooks/use-mint-nft';
 import { mintCard } from '../store/actions/mint-card';
 import { setMintError } from '../store/actions/set-mint-error';
 
@@ -34,10 +35,35 @@ interface CardGeneratorProps {
 
 export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
     const { currentCard, isGenerating, generate } = useCardGenerator();
-    const { createMintTransaction, canMint } = useNftMintTransaction();
     const [wallet] = useSelectedWallet();
+    const mint = useMintNft();
+
     const [mintErrorLocal, setMintErrorLocal] = useState<string | null>(null);
-    const isConnected = !!wallet;
+    const [isSettingsOpen, setIsSettingsOpen] = useState(false);
+    const [isConfirmOpen, setIsConfirmOpen] = useState(false);
+
+    // Wallet disconnect closes any open mint-flow modals so the user can't
+    // confirm a quote whose `from` no longer matches the active wallet.
+    useEffect(() => {
+        if (!wallet) {
+            setIsSettingsOpen(false);
+            setIsConfirmOpen(false);
+        }
+    }, [wallet]);
+
+    const handleConfirm = useCallback(async () => {
+        setIsConfirmOpen(false);
+        try {
+            await mint.send();
+            mintCard();
+            setMintErrorLocal(null);
+            setMintError(null);
+        } catch (error) {
+            const msg = getErrorMessage(error);
+            setMintErrorLocal(msg);
+            setMintError(msg);
+        }
+    }, [mint]);
 
     return (
         <div className={cn('mx-auto flex w-full max-w-[434px] flex-col gap-4', className)}>
@@ -84,37 +110,26 @@ export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
                     {currentCard ? 'Generate new card' : 'Generate card'}
                 </Button>
 
-                {isConnected && canMint && (
-                    <Send
-                        request={createMintTransaction}
-                        onSuccess={() => {
-                            mintCard();
-                            setMintErrorLocal(null);
-                            setMintError(null);
-                            toast.success('NFT minted successfully!');
-                        }}
-                        onError={(error: Error) => {
-                            const msg = getErrorMessage(error);
-                            setMintErrorLocal(msg);
-                            setMintError(msg);
-                        }}
-                        disabled={!canMint}
-                    >
-                        {({ isLoading, onSubmit, disabled }) => (
-                            <Button
-                                size="l"
-                                onClick={onSubmit}
-                                disabled={disabled}
-                                loading={isLoading}
-                                fullWidth
-                                icon={<Coins className="h-4 w-4" />}
-                            >
-                                Mint NFT
-                            </Button>
-                        )}
-                    </Send>
+                {currentCard && (
+                    <div className="flex gap-2">
+                        <ButtonWithConnect
+                            size="l"
+                            variant="fill"
+                            fullWidth
+                            disabled={mint.isSending}
+                            loading={mint.isSending}
+                            onClick={() => setIsConfirmOpen(true)}
+                            icon={<Coins className="h-4 w-4" />}
+                        >
+                            Mint NFT
+                        </ButtonWithConnect>
+                        <SettingsButton onClick={() => setIsSettingsOpen(true)} />
+                    </div>
                 )}
             </div>
+
+            <MintSettingsModal open={isSettingsOpen} onClose={() => setIsSettingsOpen(false)} />
+            <MintConfirmModal open={isConfirmOpen} onClose={() => setIsConfirmOpen(false)} onConfirm={handleConfirm} />
         </div>
     );
 };
diff --git a/apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx b/apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx
new file mode 100644
index 000000000..bd19a6de1
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx
@@ -0,0 +1,137 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { FC, ReactNode } from 'react';
+import { ChevronDown } from 'lucide-react';
+import {
+    Button,
+    Modal,
+    useGaslessConfig,
+    useGaslessProviderMetadata,
+    useJettonInfo,
+    useSelectedWallet,
+} from '@ton/appkit-react';
+import { asAddressFriendly, middleEllipsis } from '@ton/appkit';
+import type { UserFriendlyAddress } from '@ton/appkit';
+
+import { useMinterStore } from '../store/minter-store';
+import { setGaslessFeeAsset } from '../store/actions/set-gasless-fee-asset';
+import { useMintNft } from '../hooks/use-mint-nft';
+import { CardPreview } from './card-preview';
+
+interface MintConfirmModalProps {
+    open: boolean;
+    onClose: () => void;
+    onConfirm: () => void;
+}
+
+const InfoRow: FC<{ label: string; value: ReactNode }> = ({ label, value }) => (
+    <div className="flex items-center justify-between gap-3 text-sm">
+        <span className="text-tertiary-foreground">{label}</span>
+        <span className="text-foreground text-right">{value}</span>
+    </div>
+);
+
+/**
+ * Renders one fee-asset `<option>`; shows the address until `useJettonInfo`
+ * resolves, then swaps to the ticker. React Query dedupes concurrent queries
+ * by address — the selected option and its match in the dropdown share one fetch.
+ */
+const FeeAssetOption: FC<{ address: UserFriendlyAddress }> = ({ address }) => {
+    const { data } = useJettonInfo({ address });
+    return <option value={address}>{data?.symbol || middleEllipsis(address)}</option>;
+};
+
+/**
+ * Confirms the mint. The regular flow shows only the Owner row; the gasless
+ * flow adds Provider, an inline fee-asset selector styled to match the other
+ * info-row values (right-aligned text + chevron, native `<select>` under the
+ * hood — so the dropdown is rendered by the browser and never overflows the
+ * modal), and the live commission. The Confirm button is gated on a fresh
+ * quote in gasless mode.
+ */
+export const MintConfirmModal: FC<MintConfirmModalProps> = ({ open, onClose, onConfirm }) => {
+    const [wallet] = useSelectedWallet();
+    const currentCard = useMinterStore((state) => state.currentCard);
+    const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
+
+    const mint = useMintNft();
+    const { data: providerMetadata } = useGaslessProviderMetadata({
+        query: { enabled: mint.gasless.enabled },
+    });
+    const { data: gaslessConfig } = useGaslessConfig({
+        query: { enabled: mint.gasless.enabled },
+    });
+    const supportedAssets = gaslessConfig?.supportedAssets ?? [];
+
+    const ownerAddress = wallet?.getAddress();
+    const confirmDisabled =
+        mint.isSending ||
+        (mint.gasless.enabled && (mint.gasless.isLoadingQuote || !mint.gasless.quote || !!mint.gasless.quoteError));
+
+    const feeText = mint.gasless.fee ?? (mint.gasless.isLoadingQuote ? 'Loading…' : '—');
+
+    return (
+        <Modal title="Confirm mint" open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
+            {currentCard && (
+                <div className="mx-auto mb-4 w-40">
+                    <CardPreview card={currentCard} />
+                </div>
+            )}
+
+            <div className="space-y-3">
+                <InfoRow label="Owner" value={ownerAddress ? middleEllipsis(ownerAddress) : '—'} />
+
+                {mint.gasless.enabled && (
+                    <>
+                        <InfoRow label="Provider" value={providerMetadata?.name ?? 'TonAPI'} />
+
+                        <div className="flex items-center justify-between gap-3 text-sm">
+                            <span className="text-tertiary-foreground">Fee asset</span>
+                            <div className="relative inline-flex items-center">
+                                <select
+                                    value={gaslessFeeAsset ?? ''}
+                                    onChange={(event) => setGaslessFeeAsset(asAddressFriendly(event.target.value))}
+                                    disabled={supportedAssets.length === 0}
+                                    className="appearance-none bg-transparent border-0 outline-none cursor-pointer text-foreground text-sm text-right pr-5 disabled:cursor-default disabled:text-tertiary-foreground"
+                                >
+                                    {!gaslessFeeAsset && (
+                                        <option value="" disabled>
+                                            Select
+                                        </option>
+                                    )}
+                                    {supportedAssets.map((asset) => (
+                                        <FeeAssetOption key={asset.address} address={asset.address} />
+                                    ))}
+                                </select>
+                                <ChevronDown className="absolute right-0 h-4 w-4 pointer-events-none text-tertiary-foreground" />
+                            </div>
+                        </div>
+
+                        <InfoRow
+                            label="Gas fee"
+                            value={mint.gasless.quoteError ? <span className="text-error">Quote failed</span> : feeText}
+                        />
+                    </>
+                )}
+            </div>
+
+            <Button
+                className="mt-6 w-full"
+                variant="fill"
+                size="l"
+                fullWidth
+                onClick={onConfirm}
+                disabled={confirmDisabled}
+                loading={mint.isSending}
+            >
+                Confirm
+            </Button>
+        </Modal>
+    );
+};
diff --git a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
new file mode 100644
index 000000000..7d64726a7
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useEffect, useMemo, useState } from 'react';
+import type { FC } from 'react';
+import { Button, Modal, Switch, useGaslessConfig, useNetwork, useSelectedWallet } from '@ton/appkit-react';
+import { compareAddress, Network } from '@ton/appkit';
+import type { UserFriendlyAddress } from '@ton/appkit';
+
+import { useMinterStore } from '../store/minter-store';
+import { setGaslessEnabled } from '../store/actions/set-gasless-enabled';
+import { setGaslessFeeAsset } from '../store/actions/set-gasless-fee-asset';
+import { USDT_MASTER_MAINNET } from '../../../core/constants/tokens';
+
+interface MintSettingsModalProps {
+    open: boolean;
+    onClose: () => void;
+}
+
+/**
+ * Gasless toggle for the mint flow. The fee-asset selection itself lives in
+ * `MintConfirmModal` — this dialog only flips the on/off bit. On enabling we
+ * pre-seed `gaslessFeeAsset` (USDT preferred, falling back to the first
+ * relayer-supported asset) so the confirm modal always has a valid default.
+ *
+ * Disabled when the wallet lacks `SignMessage` or the active network isn't
+ * mainnet — the supporting hint surfaces the exact reason.
+ */
+export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose }) => {
+    const gaslessEnabled = useMinterStore((state) => state.gaslessEnabled);
+    const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
+
+    const [wallet] = useSelectedWallet();
+    const network = useNetwork();
+    const { data: gaslessConfig } = useGaslessConfig();
+
+    const supportsSignMessage = useMemo(() => {
+        const features = wallet?.getSupportedFeatures();
+        if (features === undefined) return true;
+        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+    }, [wallet]);
+
+    const isMainnet = network?.chainId === Network.mainnet().chainId;
+    const canEnableGasless = supportsSignMessage && isMainnet;
+
+    const [stagedEnabled, setStagedEnabled] = useState(gaslessEnabled);
+
+    // Reset staged value to the live one whenever the modal opens — drops any
+    // unsaved tweaks from a previously dismissed session.
+    useEffect(() => {
+        if (open) setStagedEnabled(gaslessEnabled);
+    }, [open, gaslessEnabled]);
+
+    const handleSave = () => {
+        if (stagedEnabled !== gaslessEnabled) {
+            setGaslessEnabled(stagedEnabled);
+
+            // Auto-seed fee-asset on first enable so the confirm modal renders
+            // with a valid selection. Pick USDT when the relayer accepts it,
+            // otherwise fall back to the first listed asset.
+            if (stagedEnabled && !gaslessFeeAsset && gaslessConfig?.supportedAssets?.length) {
+                const preferred = gaslessConfig.supportedAssets.find((asset) =>
+                    compareAddress(asset.address, USDT_MASTER_MAINNET),
+                );
+                const seed: UserFriendlyAddress = preferred?.address ?? gaslessConfig.supportedAssets[0].address;
+                setGaslessFeeAsset(seed);
+            }
+        }
+        onClose();
+    };
+
+    const hint = !supportsSignMessage
+        ? 'Connected wallet does not support gasless (no SignMessage feature).'
+        : !isMainnet
+          ? 'Gasless is available on mainnet only.'
+          : null;
+
+    return (
+        <Modal title="Mint settings" open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
+            <div className="space-y-4">
+                <div className="flex items-center justify-between">
+                    <div>
+                        <div className="text-base text-foreground">Gasless</div>
+                        <div className="text-xs text-tertiary-foreground">Pay the fee in a jetton instead of TON.</div>
+                    </div>
+                    <Switch checked={stagedEnabled} onCheckedChange={setStagedEnabled} disabled={!canEnableGasless} />
+                </div>
+
+                {hint && <p className="text-xs text-tertiary-foreground">{hint}</p>}
+            </div>
+
+            <Button className="mt-6 w-full" variant="fill" size="l" fullWidth onClick={handleSave}>
+                Save
+            </Button>
+        </Modal>
+    );
+};
diff --git a/packages/appkit-react/src/index.ts b/packages/appkit-react/src/index.ts
index b7899ef09..c9b9bc891 100644
--- a/packages/appkit-react/src/index.ts
+++ b/packages/appkit-react/src/index.ts
@@ -28,6 +28,7 @@ export * from './components/ui/select';
 export * from './components/shared/low-balance-modal';
 export * from './components/shared/settings-button';
 export * from './components/shared/option-switcher';
+export * from './components/shared/button-with-connect';
 export * from './components/ui/icons';
 
 export * from './features/balances';

From 025328eaceee898da0a66acf30793566c789e2d6 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 1 Jun 2026 13:35:59 +0400
Subject: [PATCH 34/46] feat(gasless): rework mint hooks

---
 .../mint/components/mint-confirm-modal.tsx    | 57 +++++++++++--------
 ...message.ts => use-gasless-mint-message.ts} | 50 ++++++++--------
 .../src/features/mint/hooks/use-mint-nft.ts   | 27 +++++----
 ...transaction.ts => use-mint-transaction.ts} | 50 ++++++----------
 apps/appkit-minter/src/features/mint/index.ts |  4 +-
 5 files changed, 91 insertions(+), 97 deletions(-)
 rename apps/appkit-minter/src/features/mint/hooks/{use-mint-forward-message.ts => use-gasless-mint-message.ts} (64%)
 rename apps/appkit-minter/src/features/mint/hooks/{use-nft-mint-transaction.ts => use-mint-transaction.ts} (57%)

diff --git a/apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx b/apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx
index bd19a6de1..a9bcb7b21 100644
--- a/apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx
+++ b/apps/appkit-minter/src/features/mint/components/mint-confirm-modal.tsx
@@ -6,10 +6,11 @@
  *
  */
 
-import type { FC, ReactNode } from 'react';
+import type { FC } from 'react';
 import { ChevronDown } from 'lucide-react';
 import {
     Button,
+    InfoBlock,
     Modal,
     useGaslessConfig,
     useGaslessProviderMetadata,
@@ -30,13 +31,6 @@ interface MintConfirmModalProps {
     onConfirm: () => void;
 }
 
-const InfoRow: FC<{ label: string; value: ReactNode }> = ({ label, value }) => (
-    <div className="flex items-center justify-between gap-3 text-sm">
-        <span className="text-tertiary-foreground">{label}</span>
-        <span className="text-foreground text-right">{value}</span>
-    </div>
-);
-
 /**
  * Renders one fee-asset `<option>`; shows the address until `useJettonInfo`
  * resolves, then swaps to the ticker. React Query dedupes concurrent queries
@@ -50,9 +44,9 @@ const FeeAssetOption: FC<{ address: UserFriendlyAddress }> = ({ address }) => {
 /**
  * Confirms the mint. The regular flow shows only the Owner row; the gasless
  * flow adds Provider, an inline fee-asset selector styled to match the other
- * info-row values (right-aligned text + chevron, native `<select>` under the
- * hood — so the dropdown is rendered by the browser and never overflows the
- * modal), and the live commission. The Confirm button is gated on a fresh
+ * `InfoBlock.Value`s (right-aligned text + chevron, native `<select>` under
+ * the hood — so the dropdown is rendered by the browser and never overflows
+ * the modal), and the live commission. The Confirm button is gated on a fresh
  * quote in gasless mode.
  */
 export const MintConfirmModal: FC<MintConfirmModalProps> = ({ open, onClose, onConfirm }) => {
@@ -74,8 +68,6 @@ export const MintConfirmModal: FC<MintConfirmModalProps> = ({ open, onClose, onC
         mint.isSending ||
         (mint.gasless.enabled && (mint.gasless.isLoadingQuote || !mint.gasless.quote || !!mint.gasless.quoteError));
 
-    const feeText = mint.gasless.fee ?? (mint.gasless.isLoadingQuote ? 'Loading…' : '—');
-
     return (
         <Modal title="Confirm mint" open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
             {currentCard && (
@@ -84,21 +76,30 @@ export const MintConfirmModal: FC<MintConfirmModalProps> = ({ open, onClose, onC
                 </div>
             )}
 
-            <div className="space-y-3">
-                <InfoRow label="Owner" value={ownerAddress ? middleEllipsis(ownerAddress) : '—'} />
+            <InfoBlock.Container>
+                <InfoBlock.Row>
+                    <InfoBlock.Label>Owner</InfoBlock.Label>
+                    <InfoBlock.Value>{ownerAddress ? middleEllipsis(ownerAddress) : '—'}</InfoBlock.Value>
+                </InfoBlock.Row>
 
                 {mint.gasless.enabled && (
                     <>
-                        <InfoRow label="Provider" value={providerMetadata?.name ?? 'TonAPI'} />
+                        <InfoBlock.Row>
+                            <InfoBlock.Label>Provider</InfoBlock.Label>
+                            <InfoBlock.Value>{providerMetadata?.name ?? 'TonAPI'}</InfoBlock.Value>
+                        </InfoBlock.Row>
 
-                        <div className="flex items-center justify-between gap-3 text-sm">
-                            <span className="text-tertiary-foreground">Fee asset</span>
+                        <InfoBlock.Row>
+                            <InfoBlock.Label>Fee asset</InfoBlock.Label>
                             <div className="relative inline-flex items-center">
                                 <select
                                     value={gaslessFeeAsset ?? ''}
                                     onChange={(event) => setGaslessFeeAsset(asAddressFriendly(event.target.value))}
                                     disabled={supportedAssets.length === 0}
-                                    className="appearance-none bg-transparent border-0 outline-none cursor-pointer text-foreground text-sm text-right pr-5 disabled:cursor-default disabled:text-tertiary-foreground"
+                                    // `font-[inherit]` so the select picks up `bodyMedium` from `InfoBlock.Row`;
+                                    // `text-foreground` matches `InfoBlock.Value` color exactly.
+                                    style={{ font: 'inherit' }}
+                                    className="appearance-none bg-transparent border-0 outline-none cursor-pointer text-foreground text-right pr-5 disabled:cursor-default disabled:text-tertiary-foreground"
                                 >
                                     {!gaslessFeeAsset && (
                                         <option value="" disabled>
@@ -111,15 +112,21 @@ export const MintConfirmModal: FC<MintConfirmModalProps> = ({ open, onClose, onC
                                 </select>
                                 <ChevronDown className="absolute right-0 h-4 w-4 pointer-events-none text-tertiary-foreground" />
                             </div>
-                        </div>
+                        </InfoBlock.Row>
 
-                        <InfoRow
-                            label="Gas fee"
-                            value={mint.gasless.quoteError ? <span className="text-error">Quote failed</span> : feeText}
-                        />
+                        <InfoBlock.Row>
+                            <InfoBlock.Label>Gas fee</InfoBlock.Label>
+                            {mint.gasless.quoteError ? (
+                                <InfoBlock.Value className="text-error">Quote failed</InfoBlock.Value>
+                            ) : mint.gasless.isLoadingQuote ? (
+                                <InfoBlock.ValueSkeleton />
+                            ) : (
+                                <InfoBlock.Value>{mint.gasless.fee ?? '—'}</InfoBlock.Value>
+                            )}
+                        </InfoBlock.Row>
                     </>
                 )}
-            </div>
+            </InfoBlock.Container>
 
             <Button
                 className="mt-6 w-full"
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-forward-message.ts b/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-message.ts
similarity index 64%
rename from apps/appkit-minter/src/features/mint/hooks/use-mint-forward-message.ts
rename to apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-message.ts
index dbb48f70c..3af58c11c 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-forward-message.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-message.ts
@@ -20,35 +20,35 @@ import {
     MINT_FORWARD_ADDRESS,
     USDT_FORWARD_JETTON_AMOUNT,
 } from '../constants';
-import { useNftMintTransaction } from './use-nft-mint-transaction';
+import { useMintTransaction } from './use-mint-transaction';
 
-export interface UseMintForwardMessageReturn {
-    /** Single TEP-74 jetton-transfer message ready to be quoted via TonAPI gasless. */
+export interface UseGaslessMintMessageReturn {
+    /** TEP-74 jetton-transfer message ready for the TonAPI gasless quote, or `undefined` while inputs are unresolved. */
     message: TransactionRequestMessage | undefined;
-    /** All inputs (card, wallet, relayer config, fee-asset, jetton-wallet) are resolved. */
+    /** `message` is non-undefined — all inputs are resolved. */
     isReady: boolean;
 }
 
 /**
- * Builds the user-signed gasless mint message: a TEP-74 jetton transfer of the
- * selected fee-asset to `MintForward`, with the NFT deploy spec (address, body,
- * stateInit, amount) packed into `forward_payload`. The contract unwraps it on
- * receipt and emits the NFT deploy itself — so the relayer never sees a
- * top-level `stateInit` in the user-signed batch.
+ * Builder for the gasless mint message. Wraps the NFT deploy spec (address,
+ * body, stateInit, amount) into a TEP-74 jetton-transfer's `forward_payload`
+ * addressed to the on-chain forwarder contract — so the relayer's user-signed
+ * batch contains only a plain jetton transfer and never sees a top-level
+ * `stateInit`.
  *
- * The hook is dormant until card + wallet + relayer config + fee-asset are all
- * present. Returns `undefined` for `message` in that case, leaving consumers
- * (e.g. `useGaslessQuote({ query: { enabled: !!message } })`) cleanly gated.
+ * Dormant until card + wallet + relayer config + fee-asset are all resolved;
+ * `message` stays `undefined` to keep consumers (e.g. `useGaslessQuote`)
+ * cleanly gated.
  */
-export const useMintForwardMessage = (): UseMintForwardMessageReturn => {
+export const useGaslessMintMessage = (): UseGaslessMintMessageReturn => {
     const [wallet] = useSelectedWallet();
     const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
-    const { createMintTransaction, canMint } = useNftMintTransaction();
+    const { build, isReady: isMintReady } = useMintTransaction();
 
     const { data: gaslessConfig } = useGaslessConfig();
     const relayAddress = gaslessConfig?.relayAddress;
 
-    const { data: usdtWalletAddress } = useJettonWalletAddress({
+    const { data: feeAssetWalletAddress } = useJettonWalletAddress({
         jettonAddress: gaslessFeeAsset ?? undefined,
         ownerAddress: wallet?.getAddress() ?? undefined,
         query: { enabled: !!gaslessFeeAsset && !!wallet },
@@ -57,16 +57,16 @@ export const useMintForwardMessage = (): UseMintForwardMessageReturn => {
     const [message, setMessage] = useState<TransactionRequestMessage | undefined>(undefined);
 
     useEffect(() => {
-        if (!canMint || !wallet || !usdtWalletAddress || !relayAddress) {
+        if (!isMintReady || !wallet || !feeAssetWalletAddress || !relayAddress) {
             setMessage(undefined);
             return;
         }
 
         let cancelled = false;
-        createMintTransaction()
+        build()
             .then((req) => {
                 const nftMsg = req.messages[0];
-                if (!nftMsg.stateInit) throw new Error('mint message has no stateInit');
+                if (!nftMsg.stateInit) throw new Error('Mint message has no stateInit');
 
                 const nftAddress = Address.parse(nftMsg.address);
                 const nftStateInit = Cell.fromBase64(nftMsg.stateInit);
@@ -82,9 +82,9 @@ export const useMintForwardMessage = (): UseMintForwardMessageReturn => {
                     .storeCoins(nftAmount)
                     .endCell();
 
-                // TEP-74 jetton transfer body. `response_destination = relayer`
-                // mirrors the standard gasless pattern — relayer pays compute,
-                // captures the jetton-wallet TON excess.
+                // `response_destination = relayer` mirrors the standard gasless
+                // jetton-transfer pattern — relayer paid compute, captures the
+                // jetton-wallet's TON excess.
                 const transferBody = beginCell()
                     .storeUint(JETTON_TRANSFER_OP, 32)
                     .storeUint(0, 64) // query_id
@@ -99,22 +99,22 @@ export const useMintForwardMessage = (): UseMintForwardMessageReturn => {
 
                 if (cancelled) return;
                 setMessage({
-                    address: usdtWalletAddress,
+                    address: feeAssetWalletAddress,
                     amount: JETTON_GAS_BUDGET.toString(),
                     payload: asBase64(transferBody.toBoc().toString('base64')) as Base64String,
                 });
             })
             .catch(() => {
                 if (cancelled) return;
-                // Build failures are surfaced indirectly: `message` stays undefined,
-                // which keeps the gasless flow gated until inputs become valid again.
+                // Build failures keep `message` undefined; consumers stay gated
+                // until the failing input becomes valid again.
                 setMessage(undefined);
             });
 
         return () => {
             cancelled = true;
         };
-    }, [canMint, createMintTransaction, relayAddress, usdtWalletAddress, wallet]);
+    }, [build, feeAssetWalletAddress, isMintReady, relayAddress, wallet]);
 
     return { message, isReady: !!message };
 };
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
index 43649b1d0..130407e66 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
@@ -18,8 +18,8 @@ import { formatUnits } from '@ton/appkit';
 import type { GaslessQuote } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
-import { useMintForwardMessage } from './use-mint-forward-message';
-import { useNftMintTransaction } from './use-nft-mint-transaction';
+import { useGaslessMintMessage } from './use-gasless-mint-message';
+import { useMintTransaction } from './use-mint-transaction';
 
 export interface UseMintNftReturn {
     /** Trigger the mint — picks the right flow based on `gaslessEnabled` in store. */
@@ -28,7 +28,7 @@ export interface UseMintNftReturn {
     isSending: boolean;
     /** Latest send error from either flow. */
     error: Error | undefined;
-    /** Wallet + card + (when gasless) quote are all ready. */
+    /** Inputs are resolved and (when gasless) a fresh quote is in hand. */
     canSend: boolean;
 
     gasless: {
@@ -49,10 +49,10 @@ export interface UseMintNftReturn {
  * Single entry-point for the mint flow. Reads `gaslessEnabled` and
  * `gaslessFeeAsset` from `minter-store` and dispatches to either:
  *
- * - **Gasless**: builds the MintForward jetton-transfer via
- *   {@link useMintForwardMessage}, quotes it via {@link useGaslessQuote},
- *   sends through TonAPI via {@link useSendGaslessTransaction}.
- * - **Regular**: emits the raw NFT deploy via {@link useSendTransaction}.
+ * - **Gasless**: builds the jetton-transfer wrapper via {@link useGaslessMintMessage},
+ *   quotes it via {@link useGaslessQuote}, sends through TonAPI via {@link useSendGaslessTransaction}.
+ * - **Regular**: emits the raw NFT deploy via {@link useSendTransaction}, building
+ *   the request lazily at click-time via {@link useMintTransaction}.
  *
  * Common state lives on the top-level return shape (`send`, `isSending`,
  * `error`, `canSend`); gasless-only state hangs off the `gasless` block.
@@ -62,10 +62,10 @@ export const useMintNft = (): UseMintNftReturn => {
     const gaslessEnabled = useMinterStore((state) => state.gaslessEnabled);
     const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
 
-    const { createMintTransaction, canMint } = useNftMintTransaction();
+    const { build: buildMintTransaction, isReady: isMintReady } = useMintTransaction();
 
     // Gasless path
-    const { message } = useMintForwardMessage();
+    const { message } = useGaslessMintMessage();
     const {
         data: quote,
         isFetching: isLoadingQuote,
@@ -98,8 +98,8 @@ export const useMintNft = (): UseMintNftReturn => {
     const isSending = isSendingGasless || isSendingRegular;
     const error = gaslessSendError ?? regularSendError ?? undefined;
 
-    const canSendGasless = canMint && !!message && !!quote && !isLoadingQuote && !quoteError && !isSending;
-    const canSendRegular = canMint && !isSending;
+    const canSendGasless = isMintReady && !!message && !!quote && !isLoadingQuote && !quoteError && !isSending;
+    const canSendRegular = isMintReady && !isSending;
     const canSend = gaslessEnabled ? canSendGasless : canSendRegular;
 
     const send = useCallback(async (): Promise<void> => {
@@ -111,10 +111,9 @@ export const useMintNft = (): UseMintNftReturn => {
             return;
         }
 
-        const request = await createMintTransaction();
-        if (!request) throw new Error('Failed to build mint transaction');
+        const request = await buildMintTransaction();
         await sendRegular(request);
-    }, [wallet, gaslessEnabled, quote, sendGasless, createMintTransaction, sendRegular]);
+    }, [wallet, gaslessEnabled, quote, sendGasless, buildMintTransaction, sendRegular]);
 
     return {
         send,
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-nft-mint-transaction.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
similarity index 57%
rename from apps/appkit-minter/src/features/mint/hooks/use-nft-mint-transaction.ts
rename to apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
index 94680b74e..85286f318 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-nft-mint-transaction.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
@@ -7,45 +7,44 @@
  */
 
 import { useCallback } from 'react';
-import { toNano, Address, beginCell, storeStateInit } from '@ton/core';
+import { Address, beginCell, storeStateInit, toNano } from '@ton/core';
 import { useSelectedWallet } from '@ton/appkit-react';
 import type { Base64String, TransactionRequest } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
 import { buildSingleNftStateInit, encodeOnChainContent } from '../contracts';
 
-type UseNftTransactionType =
-    | {
-          canMint: true;
-          createMintTransaction: () => Promise<TransactionRequest>;
-      }
-    | {
-          canMint: false;
-          createMintTransaction: () => Promise<null>;
-      };
+export interface UseMintTransactionReturn {
+    /** Builds a fresh NFT deploy `TransactionRequest`. Throws when inputs aren't ready. */
+    build: () => Promise<TransactionRequest>;
+    /** Current card and connected wallet are both present. */
+    isReady: boolean;
+}
 
 /**
- * Hook to create NFT mint transaction request
+ * Builder for the regular (non-gasless) NFT deploy message. Returns an async
+ * `build()` rather than pre-computed state so the request's `validUntil`
+ * window starts at click-time, not at hook-mount-time.
  */
-export const useNftMintTransaction = (): UseNftTransactionType => {
+export const useMintTransaction = (): UseMintTransactionReturn => {
     const currentCard = useMinterStore((state) => state.currentCard);
     const [wallet] = useSelectedWallet();
 
-    const createMintTransaction = useCallback(async (): Promise<TransactionRequest> => {
+    const isReady = !!currentCard && !!wallet;
+
+    const build = useCallback(async (): Promise<TransactionRequest> => {
         if (!currentCard || !wallet) {
-            throw new Error('Cannot mint NFT: No current card or wallet');
+            throw new Error('Cannot build mint transaction: no current card or wallet');
         }
 
         const walletAddress = Address.parse(wallet.getAddress());
 
-        // Build on-chain NFT metadata content cell
         const contentCell = encodeOnChainContent({
             name: currentCard.name,
             description: currentCard.description,
             image: currentCard.imageUrl,
         });
 
-        // Build NFT StateInit
         const { stateInit, address: nftAddress } = buildSingleNftStateInit({
             ownerAddress: walletAddress,
             editorAddress: walletAddress,
@@ -57,32 +56,19 @@ export const useNftMintTransaction = (): UseNftTransactionType => {
             },
         });
 
-        // Create deployment message
         const stateInitCell = beginCell().store(storeStateInit(stateInit)).endCell();
 
         return {
-            validUntil: Math.floor(Date.now() / 1000) + 600, // 10 minutes
+            validUntil: Math.floor(Date.now() / 1000) + 600,
             messages: [
                 {
                     address: nftAddress.toString(),
-                    amount: toNano('0.001').toString(), // 0.001 TON for deployment
+                    amount: toNano('0.001').toString(),
                     stateInit: stateInitCell.toBoc().toString('base64') as Base64String,
                 },
             ],
         };
     }, [currentCard, wallet]);
 
-    const canMint = !!currentCard && !!wallet;
-
-    if (canMint) {
-        return {
-            createMintTransaction,
-            canMint: true,
-        };
-    } else {
-        return {
-            createMintTransaction: () => Promise.reject(new Error('Cannot mint NFT: No current card or wallet')),
-            canMint: false,
-        };
-    }
+    return { build, isReady };
 };
diff --git a/apps/appkit-minter/src/features/mint/index.ts b/apps/appkit-minter/src/features/mint/index.ts
index 734b90a1e..cd5597e04 100644
--- a/apps/appkit-minter/src/features/mint/index.ts
+++ b/apps/appkit-minter/src/features/mint/index.ts
@@ -13,7 +13,9 @@ export { RarityBadge } from './components/rarity-badge';
 
 // Hooks
 export { useCardGenerator } from './hooks/use-card-generator';
-export { useNftMintTransaction } from './hooks/use-nft-mint-transaction';
+export { useMintNft } from './hooks/use-mint-nft';
+export { useMintTransaction } from './hooks/use-mint-transaction';
+export { useGaslessMintMessage } from './hooks/use-gasless-mint-message';
 
 // Store
 export { useMinterStore } from './store/minter-store';

From 76cc340c9008a283210703df892d1c0c3f322b5a Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Wed, 3 Jun 2026 13:53:26 +0400
Subject: [PATCH 35/46] feat(gasless): rework mint hooks

---
 .../mint/components/mint-settings-modal.tsx   |  15 +-
 .../features/mint/constants/mint-forward.ts   |  11 +-
 .../features/mint/hooks/use-card-generator.ts |  17 +--
 .../mint/hooks/use-gasless-mint-fee.ts        |  32 ++++
 .../mint/hooks/use-gasless-mint-message.ts    | 137 ++++++------------
 .../src/features/mint/hooks/use-mint-nft.ts   |  80 ++++------
 .../mint/hooks/use-mint-transaction.ts        |  81 +++++------
 .../mint/lib/build-gasless-mint-message.ts    |  66 +++++++++
 .../mint/lib/build-mint-message-data.ts       |  66 +++++++++
 9 files changed, 289 insertions(+), 216 deletions(-)
 create mode 100644 apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-fee.ts
 create mode 100644 apps/appkit-minter/src/features/mint/lib/build-gasless-mint-message.ts
 create mode 100644 apps/appkit-minter/src/features/mint/lib/build-mint-message-data.ts

diff --git a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
index 7d64726a7..06bcc6445 100644
--- a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
+++ b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
@@ -9,12 +9,13 @@
 import { useEffect, useMemo, useState } from 'react';
 import type { FC } from 'react';
 import { Button, Modal, Switch, useGaslessConfig, useNetwork, useSelectedWallet } from '@ton/appkit-react';
-import { compareAddress, Network } from '@ton/appkit';
+import { compareAddress } from '@ton/appkit';
 import type { UserFriendlyAddress } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
 import { setGaslessEnabled } from '../store/actions/set-gasless-enabled';
 import { setGaslessFeeAsset } from '../store/actions/set-gasless-fee-asset';
+import { getMintForwardAddress } from '../constants';
 import { USDT_MASTER_MAINNET } from '../../../core/constants/tokens';
 
 interface MintSettingsModalProps {
@@ -28,8 +29,8 @@ interface MintSettingsModalProps {
  * pre-seed `gaslessFeeAsset` (USDT preferred, falling back to the first
  * relayer-supported asset) so the confirm modal always has a valid default.
  *
- * Disabled when the wallet lacks `SignMessage` or the active network isn't
- * mainnet — the supporting hint surfaces the exact reason.
+ * Disabled when the wallet lacks `SignMessage` or the active network has no
+ * deployed mint-forwarder — the supporting hint surfaces the exact reason.
  */
 export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose }) => {
     const gaslessEnabled = useMinterStore((state) => state.gaslessEnabled);
@@ -45,8 +46,8 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
         return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
     }, [wallet]);
 
-    const isMainnet = network?.chainId === Network.mainnet().chainId;
-    const canEnableGasless = supportsSignMessage && isMainnet;
+    const isNetworkSupported = network ? !!getMintForwardAddress(network.chainId) : false;
+    const canEnableGasless = supportsSignMessage && isNetworkSupported;
 
     const [stagedEnabled, setStagedEnabled] = useState(gaslessEnabled);
 
@@ -76,8 +77,8 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
 
     const hint = !supportsSignMessage
         ? 'Connected wallet does not support gasless (no SignMessage feature).'
-        : !isMainnet
-          ? 'Gasless is available on mainnet only.'
+        : !isNetworkSupported
+          ? 'Gasless is not available on this network.'
           : null;
 
     return (
diff --git a/apps/appkit-minter/src/features/mint/constants/mint-forward.ts b/apps/appkit-minter/src/features/mint/constants/mint-forward.ts
index edfb96fcb..441354b3a 100644
--- a/apps/appkit-minter/src/features/mint/constants/mint-forward.ts
+++ b/apps/appkit-minter/src/features/mint/constants/mint-forward.ts
@@ -7,14 +7,21 @@
  */
 
 import { toNano } from '@ton/core';
+import { Network } from '@ton/appkit';
 import type { UserFriendlyAddress } from '@ton/appkit';
 
 /**
- * Pre-deployed forwarder contract on mainnet. Receives a TEP-74 jetton-transfer
+ * Pre-deployed forwarder contract per network. Receives a TEP-74 jetton-transfer
  * with the NFT deploy spec in `forward_payload` and emits the actual NFT deploy
  * message itself — so TonAPI gasless only ever sees a plain jetton transfer.
  */
-export const MINT_FORWARD_ADDRESS = 'EQD_fO0VDlkmjRFcpiyOAFz8CWhLDoyOM9jFN4Gw7tP86YgR' as UserFriendlyAddress;
+const MINT_FORWARD_ADDRESS_BY_CHAIN_ID: Record<string, UserFriendlyAddress> = {
+    [Network.mainnet().chainId]: 'EQD_fO0VDlkmjRFcpiyOAFz8CWhLDoyOM9jFN4Gw7tP86YgR' as UserFriendlyAddress,
+    // [Network.testnet().chainId]: 'kQD_fO0VDlkmjRFcpiyOAFz8CWhLDoyOM9jFN4Gw7tP86TOb' as UserFriendlyAddress,
+};
+
+export const getMintForwardAddress = (chainId: string): UserFriendlyAddress | undefined =>
+    MINT_FORWARD_ADDRESS_BY_CHAIN_ID[chainId];
 
 /** TEP-74 jetton transfer opcode. */
 export const JETTON_TRANSFER_OP = 0x0f8a7ea5;
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-card-generator.ts b/apps/appkit-minter/src/features/mint/hooks/use-card-generator.ts
index 19291614c..7b860b7f4 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-card-generator.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-card-generator.ts
@@ -6,8 +6,6 @@
  *
  */
 
-import { useCallback } from 'react';
-
 import { generateCard } from '../store/actions/generate-card';
 import { clearCard } from '../store/actions/clear-card';
 import { useMinterStore } from '../store/minter-store';
@@ -16,18 +14,5 @@ export const useCardGenerator = () => {
     const currentCard = useMinterStore((state) => state.currentCard);
     const isGenerating = useMinterStore((state) => state.isGenerating);
 
-    const generate = useCallback(() => {
-        generateCard();
-    }, []);
-
-    const clear = useCallback(() => {
-        clearCard();
-    }, []);
-
-    return {
-        currentCard,
-        isGenerating,
-        generate,
-        clear,
-    };
+    return { currentCard, isGenerating, generate: generateCard, clear: clearCard };
 };
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-fee.ts b/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-fee.ts
new file mode 100644
index 000000000..b17b1824e
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-fee.ts
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useJettonInfo } from '@ton/appkit-react';
+import { formatUnits } from '@ton/appkit';
+import type { GaslessQuote, UserFriendlyAddress } from '@ton/appkit';
+
+/**
+ * Formats a gasless quote's fee against the selected fee-asset's metadata
+ * (decimals + symbol). Returns `undefined` until the jetton info resolves or
+ * if the quote isn't available — callers render a skeleton/placeholder.
+ *
+ * Lives in its own hook because it's a presentation concern (a formatted
+ * display string), not part of the mint orchestration.
+ */
+export const useGaslessMintFee = (
+    quote: GaslessQuote | undefined,
+    feeAsset: UserFriendlyAddress | null | undefined,
+): string | undefined => {
+    const { data: feeAssetInfo } = useJettonInfo({
+        address: feeAsset ?? undefined,
+        query: { enabled: !!feeAsset },
+    });
+
+    if (!quote || feeAssetInfo?.decimals == null) return undefined;
+    return `${formatUnits(quote.fee, feeAssetInfo.decimals)} ${feeAssetInfo.symbol ?? ''}`.trim();
+};
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-message.ts b/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-message.ts
index 3af58c11c..8b45abd26 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-message.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-gasless-mint-message.ts
@@ -6,115 +6,68 @@
  *
  */
 
-import { useEffect, useState } from 'react';
-import { Address, beginCell, Cell } from '@ton/core';
-import { useGaslessConfig, useJettonWalletAddress, useSelectedWallet } from '@ton/appkit-react';
-import { asBase64 } from '@ton/appkit';
-import type { Base64String, TransactionRequestMessage } from '@ton/appkit';
+import { useQuery } from '@tanstack/react-query';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useAddress, useGaslessConfig, useJettonWalletAddress, useNetwork } from '@ton/appkit-react';
+import type { TransactionRequestMessage } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
-import {
-    FORWARD_TON_AMOUNT,
-    JETTON_GAS_BUDGET,
-    JETTON_TRANSFER_OP,
-    MINT_FORWARD_ADDRESS,
-    USDT_FORWARD_JETTON_AMOUNT,
-} from '../constants';
-import { useMintTransaction } from './use-mint-transaction';
+import { getMintForwardAddress } from '../constants';
+import { buildGaslessMintMessage } from '../lib/build-gasless-mint-message';
 
-export interface UseGaslessMintMessageReturn {
-    /** TEP-74 jetton-transfer message ready for the TonAPI gasless quote, or `undefined` while inputs are unresolved. */
-    message: TransactionRequestMessage | undefined;
-    /** `message` is non-undefined — all inputs are resolved. */
-    isReady: boolean;
-}
+export type UseGaslessMintMessageReturn = UseQueryResult<TransactionRequestMessage>;
 
 /**
- * Builder for the gasless mint message. Wraps the NFT deploy spec (address,
- * body, stateInit, amount) into a TEP-74 jetton-transfer's `forward_payload`
- * addressed to the on-chain forwarder contract — so the relayer's user-signed
- * batch contains only a plain jetton transfer and never sees a top-level
- * `stateInit`.
+ * Wraps the NFT deploy spec into a TEP-74 jetton-transfer addressed to the
+ * on-chain forwarder, so the relayer's user-signed batch contains only a
+ * plain jetton transfer and never sees a top-level `stateInit`.
  *
- * Dormant until card + wallet + relayer config + fee-asset are all resolved;
- * `message` stays `undefined` to keep consumers (e.g. `useGaslessQuote`)
- * cleanly gated.
+ * Returns the raw `useQuery` result — consumers read `data` / `isFetching` /
+ * `error` directly, same as other React Query hooks in the SDK.
  */
 export const useGaslessMintMessage = (): UseGaslessMintMessageReturn => {
-    const [wallet] = useSelectedWallet();
+    const network = useNetwork();
+    const walletAddress = useAddress();
+
+    const currentCard = useMinterStore((state) => state.currentCard);
     const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
-    const { build, isReady: isMintReady } = useMintTransaction();
 
     const { data: gaslessConfig } = useGaslessConfig();
     const relayAddress = gaslessConfig?.relayAddress;
+    const forwardAddress = network ? getMintForwardAddress(network.chainId) : undefined;
 
     const { data: feeAssetWalletAddress } = useJettonWalletAddress({
         jettonAddress: gaslessFeeAsset ?? undefined,
-        ownerAddress: wallet?.getAddress() ?? undefined,
-        query: { enabled: !!gaslessFeeAsset && !!wallet },
+        ownerAddress: walletAddress,
+        query: { enabled: !!gaslessFeeAsset && !!walletAddress },
     });
 
-    const [message, setMessage] = useState<TransactionRequestMessage | undefined>(undefined);
-
-    useEffect(() => {
-        if (!isMintReady || !wallet || !feeAssetWalletAddress || !relayAddress) {
-            setMessage(undefined);
-            return;
-        }
-
-        let cancelled = false;
-        build()
-            .then((req) => {
-                const nftMsg = req.messages[0];
-                if (!nftMsg.stateInit) throw new Error('Mint message has no stateInit');
-
-                const nftAddress = Address.parse(nftMsg.address);
-                const nftStateInit = Cell.fromBase64(nftMsg.stateInit);
-                const nftAmount = BigInt(nftMsg.amount);
-                const emptyBody = beginCell().endCell();
-
-                // forward_payload per MintForward.tolk:
-                //   address(toAddress), ref(body), ref(stateInit), coins(amount)
-                const forwardPayload = beginCell()
-                    .storeAddress(nftAddress)
-                    .storeRef(emptyBody)
-                    .storeRef(nftStateInit)
-                    .storeCoins(nftAmount)
-                    .endCell();
+    return useQuery({
+        queryKey: [
+            'gasless-mint-message',
+            currentCard?.id,
+            walletAddress,
+            gaslessFeeAsset,
+            feeAssetWalletAddress,
+            relayAddress,
+            forwardAddress,
+        ],
+        queryFn: (): TransactionRequestMessage => {
+            if (!currentCard || !walletAddress || !feeAssetWalletAddress || !relayAddress || !forwardAddress) {
+                throw new Error('Gasless mint message inputs are not ready');
+            }
 
-                // `response_destination = relayer` mirrors the standard gasless
-                // jetton-transfer pattern — relayer paid compute, captures the
-                // jetton-wallet's TON excess.
-                const transferBody = beginCell()
-                    .storeUint(JETTON_TRANSFER_OP, 32)
-                    .storeUint(0, 64) // query_id
-                    .storeCoins(USDT_FORWARD_JETTON_AMOUNT)
-                    .storeAddress(Address.parse(MINT_FORWARD_ADDRESS))
-                    .storeAddress(Address.parse(relayAddress))
-                    .storeBit(0) // custom_payload: none
-                    .storeCoins(FORWARD_TON_AMOUNT)
-                    .storeBit(1) // forward_payload: ref
-                    .storeRef(forwardPayload)
-                    .endCell();
-
-                if (cancelled) return;
-                setMessage({
-                    address: feeAssetWalletAddress,
-                    amount: JETTON_GAS_BUDGET.toString(),
-                    payload: asBase64(transferBody.toBoc().toString('base64')) as Base64String,
-                });
-            })
-            .catch(() => {
-                if (cancelled) return;
-                // Build failures keep `message` undefined; consumers stay gated
-                // until the failing input becomes valid again.
-                setMessage(undefined);
+            return buildGaslessMintMessage({
+                card: currentCard,
+                walletAddress,
+                feeAssetWalletAddress,
+                relayAddress,
+                forwardAddress,
             });
-
-        return () => {
-            cancelled = true;
-        };
-    }, [build, feeAssetWalletAddress, isMintReady, relayAddress, wallet]);
-
-    return { message, isReady: !!message };
+        },
+        enabled: !!currentCard && !!walletAddress && !!feeAssetWalletAddress && !!relayAddress && !!forwardAddress,
+        // Pure derivation of inputs — no need to refetch on focus/window-resume,
+        // and the outer gasless quote owns its own `validUntil` window.
+        staleTime: Infinity,
+    });
 };
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
index 130407e66..d55679aeb 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
@@ -6,27 +6,21 @@
  *
  */
 
-import { useCallback } from 'react';
-import {
-    useGaslessQuote,
-    useJettonInfo,
-    useSelectedWallet,
-    useSendGaslessTransaction,
-    useSendTransaction,
-} from '@ton/appkit-react';
-import { formatUnits } from '@ton/appkit';
+import { useMutation } from '@tanstack/react-query';
+import { useGaslessQuote, useSendGaslessTransaction, useSendTransaction } from '@ton/appkit-react';
 import type { GaslessQuote } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
+import { useGaslessMintFee } from './use-gasless-mint-fee';
 import { useGaslessMintMessage } from './use-gasless-mint-message';
 import { useMintTransaction } from './use-mint-transaction';
 
 export interface UseMintNftReturn {
     /** Trigger the mint — picks the right flow based on `gaslessEnabled` in store. */
     send: () => Promise<void>;
-    /** True while either the gasless or the regular send mutation is in flight. */
+    /** Send mutation is in flight. */
     isSending: boolean;
-    /** Latest send error from either flow. */
+    /** Latest send error. */
     error: Error | undefined;
     /** Inputs are resolved and (when gasless) a fresh quote is in hand. */
     canSend: boolean;
@@ -54,18 +48,17 @@ export interface UseMintNftReturn {
  * - **Regular**: emits the raw NFT deploy via {@link useSendTransaction}, building
  *   the request lazily at click-time via {@link useMintTransaction}.
  *
- * Common state lives on the top-level return shape (`send`, `isSending`,
- * `error`, `canSend`); gasless-only state hangs off the `gasless` block.
+ * The `send` action is itself a `useMutation` so its state is tracked
+ * end-to-end (covering both the inner build and the inner send call).
  */
 export const useMintNft = (): UseMintNftReturn => {
-    const [wallet] = useSelectedWallet();
     const gaslessEnabled = useMinterStore((state) => state.gaslessEnabled);
     const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
 
     const { build: buildMintTransaction, isReady: isMintReady } = useMintTransaction();
 
     // Gasless path
-    const { message } = useGaslessMintMessage();
+    const { data: message } = useGaslessMintMessage();
     const {
         data: quote,
         isFetching: isLoadingQuote,
@@ -76,49 +69,30 @@ export const useMintNft = (): UseMintNftReturn => {
         query: { enabled: gaslessEnabled && !!message },
     });
 
-    const { data: feeAssetInfo } = useJettonInfo({
-        address: gaslessFeeAsset ?? undefined,
-        query: { enabled: gaslessEnabled && !!gaslessFeeAsset },
-    });
-
-    const fee =
-        quote && feeAssetInfo?.decimals != null
-            ? `${formatUnits(quote.fee, feeAssetInfo.decimals)} ${feeAssetInfo.symbol ?? ''}`.trim()
-            : undefined;
-
-    const {
-        mutateAsync: sendGasless,
-        isPending: isSendingGasless,
-        error: gaslessSendError,
-    } = useSendGaslessTransaction();
-
-    // Regular path
-    const { mutateAsync: sendRegular, isPending: isSendingRegular, error: regularSendError } = useSendTransaction();
+    const fee = useGaslessMintFee(quote, gaslessFeeAsset);
 
-    const isSending = isSendingGasless || isSendingRegular;
-    const error = gaslessSendError ?? regularSendError ?? undefined;
+    const { mutateAsync: sendGasless } = useSendGaslessTransaction();
+    const { mutateAsync: sendRegular } = useSendTransaction();
 
-    const canSendGasless = isMintReady && !!message && !!quote && !isLoadingQuote && !quoteError && !isSending;
-    const canSendRegular = isMintReady && !isSending;
-    const canSend = gaslessEnabled ? canSendGasless : canSendRegular;
-
-    const send = useCallback(async (): Promise<void> => {
-        if (!wallet) throw new Error('Wallet not connected');
-
-        if (gaslessEnabled) {
-            if (!quote) throw new Error('Gasless quote not ready');
-            await sendGasless({ quote });
-            return;
-        }
+    const sendMutation = useMutation({
+        mutationFn: async (): Promise<void> => {
+            if (gaslessEnabled) {
+                if (!quote) throw new Error('Gasless quote not ready');
+                await sendGasless({ quote });
+                return;
+            }
+            const request = await buildMintTransaction();
+            await sendRegular(request);
+        },
+    });
 
-        const request = await buildMintTransaction();
-        await sendRegular(request);
-    }, [wallet, gaslessEnabled, quote, sendGasless, buildMintTransaction, sendRegular]);
+    const canSend =
+        isMintReady && !sendMutation.isPending && (!gaslessEnabled || (!!quote && !isLoadingQuote && !quoteError));
 
     return {
-        send,
-        isSending,
-        error,
+        send: sendMutation.mutateAsync,
+        isSending: sendMutation.isPending,
+        error: sendMutation.error ?? undefined,
         canSend,
         gasless: {
             enabled: gaslessEnabled,
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
index 85286f318..d5f1034e1 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
@@ -6,25 +6,32 @@
  *
  */
 
-import { useCallback } from 'react';
-import { Address, beginCell, storeStateInit, toNano } from '@ton/core';
+import { useMutation } from '@tanstack/react-query';
 import { useSelectedWallet } from '@ton/appkit-react';
-import type { Base64String, TransactionRequest } from '@ton/appkit';
+import type { TransactionRequest } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
-import { buildSingleNftStateInit, encodeOnChainContent } from '../contracts';
+import { buildMintMessageData } from '../lib/build-mint-message-data';
+
+/** TonConnect transaction validity window — relayer rejects after expiry. */
+const VALID_UNTIL_SECONDS = 600;
 
 export interface UseMintTransactionReturn {
     /** Builds a fresh NFT deploy `TransactionRequest`. Throws when inputs aren't ready. */
     build: () => Promise<TransactionRequest>;
     /** Current card and connected wallet are both present. */
     isReady: boolean;
+    /** Build is in flight (negligible — build is sync; tracked for parity with other mutations). */
+    isBuilding: boolean;
+    /** Latest build error from the mutation. */
+    buildError: Error | undefined;
 }
 
 /**
- * Builder for the regular (non-gasless) NFT deploy message. Returns an async
- * `build()` rather than pre-computed state so the request's `validUntil`
- * window starts at click-time, not at hook-mount-time.
+ * Builder for the regular (non-gasless) NFT deploy `TransactionRequest`.
+ * Wraps the build in a `useMutation` so the request is constructed lazily at
+ * `build()`-time — `validUntil` is computed from `Date.now()` and would be
+ * stale if pre-computed at mount.
  */
 export const useMintTransaction = (): UseMintTransactionReturn => {
     const currentCard = useMinterStore((state) => state.currentCard);
@@ -32,43 +39,25 @@ export const useMintTransaction = (): UseMintTransactionReturn => {
 
     const isReady = !!currentCard && !!wallet;
 
-    const build = useCallback(async (): Promise<TransactionRequest> => {
-        if (!currentCard || !wallet) {
-            throw new Error('Cannot build mint transaction: no current card or wallet');
-        }
-
-        const walletAddress = Address.parse(wallet.getAddress());
-
-        const contentCell = encodeOnChainContent({
-            name: currentCard.name,
-            description: currentCard.description,
-            image: currentCard.imageUrl,
-        });
-
-        const { stateInit, address: nftAddress } = buildSingleNftStateInit({
-            ownerAddress: walletAddress,
-            editorAddress: walletAddress,
-            contentCell,
-            royaltyParams: {
-                royaltyFactor: 0,
-                royaltyBase: 1000,
-                royaltyAddress: walletAddress,
-            },
-        });
-
-        const stateInitCell = beginCell().store(storeStateInit(stateInit)).endCell();
-
-        return {
-            validUntil: Math.floor(Date.now() / 1000) + 600,
-            messages: [
-                {
-                    address: nftAddress.toString(),
-                    amount: toNano('0.001').toString(),
-                    stateInit: stateInitCell.toBoc().toString('base64') as Base64String,
-                },
-            ],
-        };
-    }, [currentCard, wallet]);
-
-    return { build, isReady };
+    const mutation = useMutation<TransactionRequest>({
+        mutationFn: async () => {
+            if (!currentCard || !wallet) {
+                throw new Error('Cannot build mint transaction: no current card or wallet');
+            }
+
+            const data = buildMintMessageData({ card: currentCard, ownerAddress: wallet.getAddress() });
+
+            return {
+                validUntil: Math.floor(Date.now() / 1000) + VALID_UNTIL_SECONDS,
+                messages: [data],
+            };
+        },
+    });
+
+    return {
+        build: mutation.mutateAsync,
+        isReady,
+        isBuilding: mutation.isPending,
+        buildError: mutation.error ?? undefined,
+    };
 };
diff --git a/apps/appkit-minter/src/features/mint/lib/build-gasless-mint-message.ts b/apps/appkit-minter/src/features/mint/lib/build-gasless-mint-message.ts
new file mode 100644
index 000000000..556d5ab54
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/lib/build-gasless-mint-message.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { Address, beginCell, Cell } from '@ton/core';
+import { asBase64 } from '@ton/appkit';
+import type { Base64String, TransactionRequestMessage, UserFriendlyAddress } from '@ton/appkit';
+
+import type { CardData } from '../types/card';
+import { FORWARD_TON_AMOUNT, JETTON_GAS_BUDGET, JETTON_TRANSFER_OP, USDT_FORWARD_JETTON_AMOUNT } from '../constants';
+import { buildMintMessageData } from './build-mint-message-data';
+
+export interface BuildGaslessMintMessageParams {
+    card: CardData;
+    walletAddress: UserFriendlyAddress;
+    feeAssetWalletAddress: UserFriendlyAddress;
+    relayAddress: UserFriendlyAddress;
+    forwardAddress: UserFriendlyAddress;
+}
+
+/**
+ * Pure builder for the gasless mint message. Wraps the NFT deploy spec into
+ * a TEP-74 jetton-transfer's `forward_payload` addressed to the on-chain
+ * forwarder contract. `response_destination = relayer` mirrors the standard
+ * gasless pattern — relayer paid compute, captures the jetton-wallet's TON
+ * excess.
+ */
+export const buildGaslessMintMessage = (params: BuildGaslessMintMessageParams): TransactionRequestMessage => {
+    const { card, walletAddress, feeAssetWalletAddress, relayAddress, forwardAddress } = params;
+
+    const nftData = buildMintMessageData({ card, ownerAddress: walletAddress });
+    const nftAddress = Address.parse(nftData.address);
+    const nftStateInit = Cell.fromBase64(nftData.stateInit);
+    const nftAmount = BigInt(nftData.amount);
+
+    // forward_payload per MintForward.tolk:
+    //   address(toAddress), ref(body), ref(stateInit), coins(amount)
+    const forwardPayload = beginCell()
+        .storeAddress(nftAddress)
+        .storeRef(beginCell().endCell())
+        .storeRef(nftStateInit)
+        .storeCoins(nftAmount)
+        .endCell();
+
+    const transferBody = beginCell()
+        .storeUint(JETTON_TRANSFER_OP, 32)
+        .storeUint(0, 64) // query_id
+        .storeCoins(USDT_FORWARD_JETTON_AMOUNT)
+        .storeAddress(Address.parse(forwardAddress))
+        .storeAddress(Address.parse(relayAddress))
+        .storeBit(0) // custom_payload: none
+        .storeCoins(FORWARD_TON_AMOUNT)
+        .storeBit(1) // forward_payload: ref
+        .storeRef(forwardPayload)
+        .endCell();
+
+    return {
+        address: feeAssetWalletAddress,
+        amount: JETTON_GAS_BUDGET.toString(),
+        payload: asBase64(transferBody.toBoc().toString('base64')) as Base64String,
+    };
+};
diff --git a/apps/appkit-minter/src/features/mint/lib/build-mint-message-data.ts b/apps/appkit-minter/src/features/mint/lib/build-mint-message-data.ts
new file mode 100644
index 000000000..ef7acde54
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/lib/build-mint-message-data.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { Address, beginCell, storeStateInit, toNano } from '@ton/core';
+import type { Base64String } from '@ton/appkit';
+
+import type { CardData } from '../types/card';
+import { buildSingleNftStateInit, encodeOnChainContent } from '../contracts';
+
+/** TON value sent with the NFT deploy message — funds the new contract. */
+const NFT_DEPLOY_AMOUNT = toNano('0.001');
+/** TEP-66 royalty config — zero royalty, owner address as receiver. */
+const ROYALTY_BASE = 1000;
+const ROYALTY_FACTOR = 0;
+
+export interface MintMessageData {
+    /** Future NFT contract address — deterministic from `stateInit`. */
+    address: string;
+    /** TON amount sent with the deploy (`NFT_DEPLOY_AMOUNT`). */
+    amount: string;
+    /** Serialized `StateInit` cell (BoC, base64). */
+    stateInit: Base64String;
+}
+
+/**
+ * Pure builder for the NFT deploy message data shared by both mint flows.
+ *
+ * - The regular flow (`useMintTransaction`) wraps it into a `TransactionRequest` with `validUntil`.
+ * - The gasless flow (`useGaslessMintMessage`) re-packs it into a TEP-74 jetton-transfer's `forward_payload`.
+ *
+ * No side effects, no React, no `Date.now()` — caller controls timing.
+ */
+export const buildMintMessageData = (params: { card: CardData; ownerAddress: string }): MintMessageData => {
+    const { card, ownerAddress } = params;
+    const owner = Address.parse(ownerAddress);
+
+    const contentCell = encodeOnChainContent({
+        name: card.name,
+        description: card.description,
+        image: card.imageUrl,
+    });
+
+    const { stateInit, address } = buildSingleNftStateInit({
+        ownerAddress: owner,
+        editorAddress: owner,
+        contentCell,
+        royaltyParams: {
+            royaltyFactor: ROYALTY_FACTOR,
+            royaltyBase: ROYALTY_BASE,
+            royaltyAddress: owner,
+        },
+    });
+
+    const stateInitCell = beginCell().store(storeStateInit(stateInit)).endCell();
+
+    return {
+        address: address.toString(),
+        amount: NFT_DEPLOY_AMOUNT.toString(),
+        stateInit: stateInitCell.toBoc().toString('base64') as Base64String,
+    };
+};

From 34057be394a3c38af12d13ab4c8a09b0dba5c19f Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Wed, 3 Jun 2026 15:46:07 +0400
Subject: [PATCH 36/46] feat(gasless): use LowBalanceModal in mint

---
 .../mint/components/card-generator.tsx        |  39 ++-
 .../mint/components/mint-settings-modal.tsx   |  24 +-
 .../mint/hooks/use-can-enable-gasless.ts      |  34 +++
 .../src/features/mint/hooks/use-mint-nft.ts   |  48 +++-
 .../mint/hooks/use-mint-transaction.ts        |  43 ++--
 .../mint/store/actions/enable-gasless.ts      |  40 ++++
 .../src/features/mint/store/index.ts          |   1 +
 .../low-balance-modal.stories.tsx             |  13 +-
 .../low-balance-modal/low-balance-modal.tsx   |  44 +++-
 .../staking-widget-provider.tsx               |  14 +-
 .../swap-widget-provider.tsx                  |  14 +-
 packages/appkit-react/src/locales/en.ts       |   3 +
 .../utils/balance/check-ton-balance.test.ts   | 128 ++++++++++
 .../src/utils/balance/check-ton-balance.ts    |  53 +++++
 .../balance/check-transfer-balance.test.ts    | 223 ++++++++++++++++++
 .../utils/balance/check-transfer-balance.ts   |  84 +++++++
 .../utils/balance/get-ton-shortfall.test.ts   | 148 ------------
 .../src/utils/balance/get-ton-shortfall.ts    |  82 -------
 packages/appkit/src/utils/index.ts            |   3 +-
 19 files changed, 746 insertions(+), 292 deletions(-)
 create mode 100644 apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts
 create mode 100644 apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts
 create mode 100644 packages/appkit/src/utils/balance/check-ton-balance.test.ts
 create mode 100644 packages/appkit/src/utils/balance/check-ton-balance.ts
 create mode 100644 packages/appkit/src/utils/balance/check-transfer-balance.test.ts
 create mode 100644 packages/appkit/src/utils/balance/check-transfer-balance.ts
 delete mode 100644 packages/appkit/src/utils/balance/get-ton-shortfall.test.ts
 delete mode 100644 packages/appkit/src/utils/balance/get-ton-shortfall.ts

diff --git a/apps/appkit-minter/src/features/mint/components/card-generator.tsx b/apps/appkit-minter/src/features/mint/components/card-generator.tsx
index 6f64bcff0..325c8470c 100644
--- a/apps/appkit-minter/src/features/mint/components/card-generator.tsx
+++ b/apps/appkit-minter/src/features/mint/components/card-generator.tsx
@@ -9,7 +9,14 @@
 import { useCallback, useEffect, useState } from 'react';
 import type React from 'react';
 import { AlertCircle, Coins, Sparkles } from 'lucide-react';
-import { Button, ButtonWithConnect, SettingsButton, useSelectedWallet } from '@ton/appkit-react';
+import {
+    Button,
+    ButtonWithConnect,
+    LowBalanceModal,
+    SettingsButton,
+    useGaslessConfig,
+    useSelectedWallet,
+} from '@ton/appkit-react';
 import { getErrorMessage } from '@ton/appkit';
 
 import { CardPreview } from './card-preview';
@@ -17,6 +24,8 @@ import { MintConfirmModal } from './mint-confirm-modal';
 import { MintSettingsModal } from './mint-settings-modal';
 import { useCardGenerator } from '../hooks/use-card-generator';
 import { useMintNft } from '../hooks/use-mint-nft';
+import type { MintShortfall } from '../hooks/use-mint-nft';
+import { enableGasless } from '../store/actions/enable-gasless';
 import { mintCard } from '../store/actions/mint-card';
 import { setMintError } from '../store/actions/set-mint-error';
 
@@ -37,10 +46,12 @@ export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
     const { currentCard, isGenerating, generate } = useCardGenerator();
     const [wallet] = useSelectedWallet();
     const mint = useMintNft();
+    const { data: gaslessConfig } = useGaslessConfig();
 
     const [mintErrorLocal, setMintErrorLocal] = useState<string | null>(null);
     const [isSettingsOpen, setIsSettingsOpen] = useState(false);
     const [isConfirmOpen, setIsConfirmOpen] = useState(false);
+    const [pendingShortfall, setPendingShortfall] = useState<MintShortfall | undefined>(undefined);
 
     // Wallet disconnect closes any open mint-flow modals so the user can't
     // confirm a quote whose `from` no longer matches the active wallet.
@@ -48,10 +59,18 @@ export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
         if (!wallet) {
             setIsSettingsOpen(false);
             setIsConfirmOpen(false);
+            setPendingShortfall(undefined);
         }
     }, [wallet]);
 
     const handleConfirm = useCallback(async () => {
+        const shortfall = mint.checkShortfall();
+        if (shortfall) {
+            setIsConfirmOpen(false);
+            setPendingShortfall(shortfall);
+            return;
+        }
+
         setIsConfirmOpen(false);
         try {
             await mint.send();
@@ -65,6 +84,14 @@ export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
         }
     }, [mint]);
 
+    const handleSwitchToGasless = useCallback(() => {
+        enableGasless({ supportedAssets: gaslessConfig?.supportedAssets });
+        setPendingShortfall(undefined);
+        setIsConfirmOpen(true);
+    }, [gaslessConfig]);
+
+    const dismissShortfall = useCallback(() => setPendingShortfall(undefined), []);
+
     return (
         <div className={cn('mx-auto flex w-full max-w-[434px] flex-col gap-4', className)}>
             <div className="flex justify-center rounded-2xl bg-secondary p-6">
@@ -130,6 +157,16 @@ export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
 
             <MintSettingsModal open={isSettingsOpen} onClose={() => setIsSettingsOpen(false)} />
             <MintConfirmModal open={isConfirmOpen} onClose={() => setIsConfirmOpen(false)} onConfirm={handleConfirm} />
+
+            {pendingShortfall && (
+                <LowBalanceModal
+                    open
+                    mode={pendingShortfall.mode}
+                    requiredTon={pendingShortfall.requiredTon}
+                    onCancel={dismissShortfall}
+                    onSwitchToGasless={handleSwitchToGasless}
+                />
+            )}
         </div>
     );
 };
diff --git a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
index 06bcc6445..0669324ac 100644
--- a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
+++ b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
@@ -9,14 +9,12 @@
 import { useEffect, useMemo, useState } from 'react';
 import type { FC } from 'react';
 import { Button, Modal, Switch, useGaslessConfig, useNetwork, useSelectedWallet } from '@ton/appkit-react';
-import { compareAddress } from '@ton/appkit';
-import type { UserFriendlyAddress } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
+import { enableGasless } from '../store/actions/enable-gasless';
 import { setGaslessEnabled } from '../store/actions/set-gasless-enabled';
-import { setGaslessFeeAsset } from '../store/actions/set-gasless-fee-asset';
 import { getMintForwardAddress } from '../constants';
-import { USDT_MASTER_MAINNET } from '../../../core/constants/tokens';
+import { useCanEnableGasless } from '../hooks/use-can-enable-gasless';
 
 interface MintSettingsModalProps {
     open: boolean;
@@ -34,11 +32,11 @@ interface MintSettingsModalProps {
  */
 export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose }) => {
     const gaslessEnabled = useMinterStore((state) => state.gaslessEnabled);
-    const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
 
     const [wallet] = useSelectedWallet();
     const network = useNetwork();
     const { data: gaslessConfig } = useGaslessConfig();
+    const canEnableGasless = useCanEnableGasless();
 
     const supportsSignMessage = useMemo(() => {
         const features = wallet?.getSupportedFeatures();
@@ -47,7 +45,6 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
     }, [wallet]);
 
     const isNetworkSupported = network ? !!getMintForwardAddress(network.chainId) : false;
-    const canEnableGasless = supportsSignMessage && isNetworkSupported;
 
     const [stagedEnabled, setStagedEnabled] = useState(gaslessEnabled);
 
@@ -59,17 +56,10 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
 
     const handleSave = () => {
         if (stagedEnabled !== gaslessEnabled) {
-            setGaslessEnabled(stagedEnabled);
-
-            // Auto-seed fee-asset on first enable so the confirm modal renders
-            // with a valid selection. Pick USDT when the relayer accepts it,
-            // otherwise fall back to the first listed asset.
-            if (stagedEnabled && !gaslessFeeAsset && gaslessConfig?.supportedAssets?.length) {
-                const preferred = gaslessConfig.supportedAssets.find((asset) =>
-                    compareAddress(asset.address, USDT_MASTER_MAINNET),
-                );
-                const seed: UserFriendlyAddress = preferred?.address ?? gaslessConfig.supportedAssets[0].address;
-                setGaslessFeeAsset(seed);
+            if (stagedEnabled) {
+                enableGasless({ supportedAssets: gaslessConfig?.supportedAssets });
+            } else {
+                setGaslessEnabled(false);
             }
         }
         onClose();
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts b/apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts
new file mode 100644
index 000000000..521963d5b
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useMemo } from 'react';
+import { useNetwork, useSelectedWallet } from '@ton/appkit-react';
+
+import { getMintForwardAddress } from '../constants';
+
+/**
+ * Whether the gasless mint flow is usable right now:
+ * - the connected wallet advertises the `SignMessage` feature, AND
+ * - the current network has a deployed `MintForward` forwarder address.
+ *
+ * Returns `false` when no wallet is connected.
+ */
+export const useCanEnableGasless = (): boolean => {
+    const [wallet] = useSelectedWallet();
+    const network = useNetwork();
+
+    const supportsSignMessage = useMemo(() => {
+        const features = wallet?.getSupportedFeatures();
+        if (features === undefined) return false;
+        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+    }, [wallet]);
+
+    const isNetworkSupported = network ? !!getMintForwardAddress(network.chainId) : false;
+
+    return supportsSignMessage && isNetworkSupported;
+};
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
index d55679aeb..676c5ecb7 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
@@ -6,15 +6,24 @@
  *
  */
 
+import { useCallback } from 'react';
 import { useMutation } from '@tanstack/react-query';
-import { useGaslessQuote, useSendGaslessTransaction, useSendTransaction } from '@ton/appkit-react';
+import { toNano } from '@ton/core';
+import { useBalance, useGaslessQuote, useSendGaslessTransaction, useSendTransaction } from '@ton/appkit-react';
+import { checkTonBalance, formatUnits } from '@ton/appkit';
 import type { GaslessQuote } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
+import { useCanEnableGasless } from './use-can-enable-gasless';
 import { useGaslessMintFee } from './use-gasless-mint-fee';
 import { useGaslessMintMessage } from './use-gasless-mint-message';
 import { useMintTransaction } from './use-mint-transaction';
 
+/** TON buffer beyond the deploy amount when checking shortfall for the regular flow. */
+const REGULAR_MINT_GAS_BUFFER = toNano('0.01');
+
+export type MintShortfall = { mode: 'gasless' | 'topup'; requiredTon: string };
+
 export interface UseMintNftReturn {
     /** Trigger the mint — picks the right flow based on `gaslessEnabled` in store. */
     send: () => Promise<void>;
@@ -24,6 +33,14 @@ export interface UseMintNftReturn {
     error: Error | undefined;
     /** Inputs are resolved and (when gasless) a fresh quote is in hand. */
     canSend: boolean;
+    /**
+     * Run a pre-flight shortfall check. Returns `undefined` when the user can proceed
+     * (or when the gasless flow is active — the relayer fronts gas there). Otherwise
+     * returns a `MintShortfall` describing which path to suggest:
+     * - `'gasless'` if the user could switch flows to bypass the TON requirement.
+     * - `'topup'` if gasless isn't available — the user must add TON.
+     */
+    checkShortfall: () => MintShortfall | undefined;
 
     gasless: {
         /** Derived from the store flag — convenience for UI gating. */
@@ -48,14 +65,17 @@ export interface UseMintNftReturn {
  * - **Regular**: emits the raw NFT deploy via {@link useSendTransaction}, building
  *   the request lazily at click-time via {@link useMintTransaction}.
  *
- * The `send` action is itself a `useMutation` so its state is tracked
- * end-to-end (covering both the inner build and the inner send call).
+ * The `send` action focuses on the send itself — pre-flight balance check is
+ * exposed separately as {@link UseMintNftReturn.checkShortfall} so the UI can
+ * intercept and offer alternatives (e.g. switch to gasless) before signing.
  */
 export const useMintNft = (): UseMintNftReturn => {
     const gaslessEnabled = useMinterStore((state) => state.gaslessEnabled);
     const gaslessFeeAsset = useMinterStore((state) => state.gaslessFeeAsset);
 
-    const { build: buildMintTransaction, isReady: isMintReady } = useMintTransaction();
+    const { messages, build: buildMintTransaction, isReady: isMintReady } = useMintTransaction();
+    const canEnableGasless = useCanEnableGasless();
+    const { data: tonBalance } = useBalance();
 
     // Gasless path
     const { data: message } = useGaslessMintMessage();
@@ -86,6 +106,25 @@ export const useMintNft = (): UseMintNftReturn => {
         },
     });
 
+    const checkShortfall = useCallback((): MintShortfall | undefined => {
+        // Gasless flow: relayer fronts gas — no pre-flight check needed.
+        if (gaslessEnabled) return undefined;
+        if (!messages) return undefined;
+
+        const shortfall = checkTonBalance({
+            messages,
+            tonBalance,
+            gasBufferNanos: REGULAR_MINT_GAS_BUFFER,
+        });
+
+        if (!shortfall) return undefined;
+
+        return {
+            mode: canEnableGasless ? 'gasless' : 'topup',
+            requiredTon: formatUnits(shortfall.requiredNanos, 9),
+        };
+    }, [gaslessEnabled, messages, tonBalance, canEnableGasless]);
+
     const canSend =
         isMintReady && !sendMutation.isPending && (!gaslessEnabled || (!!quote && !isLoadingQuote && !quoteError));
 
@@ -94,6 +133,7 @@ export const useMintNft = (): UseMintNftReturn => {
         isSending: sendMutation.isPending,
         error: sendMutation.error ?? undefined,
         canSend,
+        checkShortfall,
         gasless: {
             enabled: gaslessEnabled,
             quote: quote ?? undefined,
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
index d5f1034e1..fb04808be 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-transaction.ts
@@ -6,9 +6,10 @@
  *
  */
 
+import { useMemo } from 'react';
 import { useMutation } from '@tanstack/react-query';
-import { useSelectedWallet } from '@ton/appkit-react';
-import type { TransactionRequest } from '@ton/appkit';
+import { useAddress } from '@ton/appkit-react';
+import type { TransactionRequest, TransactionRequestMessage } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
 import { buildMintMessageData } from '../lib/build-mint-message-data';
@@ -17,46 +18,54 @@ import { buildMintMessageData } from '../lib/build-mint-message-data';
 const VALID_UNTIL_SECONDS = 600;
 
 export interface UseMintTransactionReturn {
-    /** Builds a fresh NFT deploy `TransactionRequest`. Throws when inputs aren't ready. */
+    /**
+     * Pre-computed deploy messages (eager). Available when card + wallet are ready.
+     * Reused by downstream checks like `getTonShortfall` without invoking the build mutation.
+     */
+    messages: TransactionRequestMessage[] | undefined;
+    /** Wraps current `messages` with a fresh `validUntil` and returns a ready-to-send `TransactionRequest`. */
     build: () => Promise<TransactionRequest>;
-    /** Current card and connected wallet are both present. */
+    /** Card + wallet are present, so `messages` is non-undefined. */
     isReady: boolean;
-    /** Build is in flight (negligible — build is sync; tracked for parity with other mutations). */
+    /** Build mutation is in flight. */
     isBuilding: boolean;
     /** Latest build error from the mutation. */
     buildError: Error | undefined;
 }
 
 /**
- * Builder for the regular (non-gasless) NFT deploy `TransactionRequest`.
- * Wraps the build in a `useMutation` so the request is constructed lazily at
- * `build()`-time — `validUntil` is computed from `Date.now()` and would be
- * stale if pre-computed at mount.
+ * Builder for the regular (non-gasless) NFT deploy.
+ *
+ * The deploy `messages` are derived eagerly from card + wallet so callers can
+ * pre-check them (e.g. against the user's TON balance) without invoking the
+ * build mutation. The mutation itself only adds a freshly stamped
+ * `validUntil` at click-time.
  */
 export const useMintTransaction = (): UseMintTransactionReturn => {
     const currentCard = useMinterStore((state) => state.currentCard);
-    const [wallet] = useSelectedWallet();
+    const walletAddress = useAddress();
 
-    const isReady = !!currentCard && !!wallet;
+    const messages = useMemo<TransactionRequestMessage[] | undefined>(() => {
+        if (!currentCard || !walletAddress) return undefined;
+        return [buildMintMessageData({ card: currentCard, ownerAddress: walletAddress })];
+    }, [currentCard, walletAddress]);
 
     const mutation = useMutation<TransactionRequest>({
         mutationFn: async () => {
-            if (!currentCard || !wallet) {
+            if (!messages) {
                 throw new Error('Cannot build mint transaction: no current card or wallet');
             }
-
-            const data = buildMintMessageData({ card: currentCard, ownerAddress: wallet.getAddress() });
-
             return {
                 validUntil: Math.floor(Date.now() / 1000) + VALID_UNTIL_SECONDS,
-                messages: [data],
+                messages,
             };
         },
     });
 
     return {
+        messages,
         build: mutation.mutateAsync,
-        isReady,
+        isReady: !!messages,
         isBuilding: mutation.isPending,
         buildError: mutation.error ?? undefined,
     };
diff --git a/apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts b/apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts
new file mode 100644
index 000000000..07c79a5be
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { compareAddress } from '@ton/appkit';
+import type { GaslessSupportedAsset, UserFriendlyAddress } from '@ton/appkit';
+
+import { useMinterStore } from '../minter-store';
+import { USDT_MASTER_MAINNET } from '../../../../core/constants/tokens';
+
+export interface EnableGaslessParams {
+    /** Relayer-accepted assets. Used to seed `gaslessFeeAsset` on first enable. */
+    supportedAssets: GaslessSupportedAsset[] | undefined;
+}
+
+/**
+ * Turns gasless on and seeds `gaslessFeeAsset` if it isn't set yet — picks
+ * USDT when the relayer accepts it, otherwise the first listed asset.
+ *
+ * Shared between the mint settings modal (Save) and the low-balance modal
+ * (Switch to gasless) so both call sites converge on the same behaviour.
+ */
+export const enableGasless = ({ supportedAssets }: EnableGaslessParams): void => {
+    const { gaslessFeeAsset } = useMinterStore.getState();
+
+    const next: Partial<{ gaslessEnabled: boolean; gaslessFeeAsset: UserFriendlyAddress | null }> = {
+        gaslessEnabled: true,
+    };
+
+    if (!gaslessFeeAsset && supportedAssets?.length) {
+        const preferred = supportedAssets.find((asset) => compareAddress(asset.address, USDT_MASTER_MAINNET));
+        next.gaslessFeeAsset = preferred?.address ?? supportedAssets[0].address;
+    }
+
+    useMinterStore.setState(next);
+};
diff --git a/apps/appkit-minter/src/features/mint/store/index.ts b/apps/appkit-minter/src/features/mint/store/index.ts
index 7f26e7929..31ac142b4 100644
--- a/apps/appkit-minter/src/features/mint/store/index.ts
+++ b/apps/appkit-minter/src/features/mint/store/index.ts
@@ -16,3 +16,4 @@ export { setMinting } from './actions/set-minting';
 export { setMintError } from './actions/set-mint-error';
 export { setGaslessEnabled } from './actions/set-gasless-enabled';
 export { setGaslessFeeAsset } from './actions/set-gasless-fee-asset';
+export { enableGasless } from './actions/enable-gasless';
diff --git a/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.stories.tsx b/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.stories.tsx
index 93fbdd13b..3e74418cf 100644
--- a/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.stories.tsx
+++ b/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.stories.tsx
@@ -18,7 +18,7 @@ const meta: Meta<typeof LowBalanceModal> = {
 export default meta;
 type Story = StoryObj<typeof LowBalanceModal>;
 
-export const Default: Story = {
+export const Reduce: Story = {
     args: {
         open: true,
         mode: 'reduce',
@@ -33,7 +33,16 @@ export const Topup: Story = {
         open: true,
         mode: 'topup',
         requiredTon: '0.423',
-        onChange: () => {},
+        onCancel: () => {},
+    },
+};
+
+export const Gasless: Story = {
+    args: {
+        open: true,
+        mode: 'gasless',
+        requiredTon: '0.011',
+        onSwitchToGasless: () => {},
         onCancel: () => {},
     },
 };
diff --git a/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.tsx b/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.tsx
index 68841ca9c..0c82e96ad 100644
--- a/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.tsx
+++ b/packages/appkit-react/src/components/shared/low-balance-modal/low-balance-modal.tsx
@@ -13,32 +13,49 @@ import { Button } from '../../ui/button';
 import { useI18n } from '../../../features/settings/hooks/use-i18n';
 import styles from './low-balance-modal.module.css';
 
-export type LowBalanceMode = 'reduce' | 'topup';
+export type LowBalanceMode = 'reduce' | 'topup' | 'gasless';
+
+const MESSAGE_KEY_BY_MODE: Record<LowBalanceMode, string> = {
+    reduce: 'lowBalance.messageReduce',
+    topup: 'lowBalance.messageTopup',
+    gasless: 'lowBalance.messageGasless',
+};
 
 export interface LowBalanceModalProps {
     open: boolean;
     /**
-     * `reduce` — user can fix it by reducing the amount (shows Change/Cancel).
-     * `topup`  — reducing doesn't help, user must top up TON (shows Close only).
+     * `reduce`  — user can fix it by reducing the amount (shows Change/Cancel). Requires `onChange`.
+     * `topup`   — reducing doesn't help, user must top up TON (shows Close only).
+     * `gasless` — alternative path via gasless flow (shows Switch/Cancel). Requires `onSwitchToGasless`.
      */
     mode: LowBalanceMode;
     /** Required amount in TON, formatted as a decimal string (e.g. "0.423"). */
     requiredTon: string;
-    onChange: () => void;
     onCancel: () => void;
+    /** Primary action for `reduce` mode. */
+    onChange?: () => void;
+    /** Primary action for `gasless` mode. */
+    onSwitchToGasless?: () => void;
 }
 
-export const LowBalanceModal: FC<LowBalanceModalProps> = ({ open, mode, requiredTon, onChange, onCancel }) => {
+export const LowBalanceModal: FC<LowBalanceModalProps> = ({
+    open,
+    mode,
+    requiredTon,
+    onCancel,
+    onChange,
+    onSwitchToGasless,
+}) => {
     const { t } = useI18n();
 
-    const messageKey = mode === 'reduce' ? 'lowBalance.messageReduce' : 'lowBalance.messageTopup';
+    const messageKey = MESSAGE_KEY_BY_MODE[mode];
 
     return (
         <Modal open={open} onOpenChange={(isOpen) => !isOpen && onCancel()} title={t('lowBalance.title')}>
             <p className={styles.message}>{t(messageKey, { amount: requiredTon })}</p>
 
             <div className={styles.actions}>
-                {mode === 'reduce' ? (
+                {mode === 'reduce' && (
                     <>
                         <Button variant="secondary" size="l" fullWidth onClick={onCancel}>
                             {t('lowBalance.cancel')}
@@ -47,7 +64,18 @@ export const LowBalanceModal: FC<LowBalanceModalProps> = ({ open, mode, required
                             {t('lowBalance.change')}
                         </Button>
                     </>
-                ) : (
+                )}
+                {mode === 'gasless' && (
+                    <>
+                        <Button variant="secondary" size="l" fullWidth onClick={onCancel}>
+                            {t('lowBalance.cancel')}
+                        </Button>
+                        <Button variant="fill" size="l" fullWidth onClick={onSwitchToGasless}>
+                            {t('lowBalance.switchToGasless')}
+                        </Button>
+                    </>
+                )}
+                {mode === 'topup' && (
                     <Button variant="fill" size="l" fullWidth onClick={onCancel}>
                         {t('lowBalance.close')}
                     </Button>
diff --git a/packages/appkit-react/src/features/staking/components/staking-widget-provider/staking-widget-provider.tsx b/packages/appkit-react/src/features/staking/components/staking-widget-provider/staking-widget-provider.tsx
index 282dbdb23..1c50351f1 100644
--- a/packages/appkit-react/src/features/staking/components/staking-widget-provider/staking-widget-provider.tsx
+++ b/packages/appkit-react/src/features/staking/components/staking-widget-provider/staking-widget-provider.tsx
@@ -8,11 +8,11 @@
 
 import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import type { FC, PropsWithChildren } from 'react';
-import type { Network, StakingProvider, StakingQuoteDirection, TonShortfall } from '@ton/appkit';
+import type { Network, StakingProvider, StakingQuoteDirection, TransferShortfall } from '@ton/appkit';
 import {
     calcMaxSpendable,
+    checkTransferBalance,
     formatUnits,
-    getTonShortfall,
     setDefaultStakingProvider,
     validateNumericString,
 } from '@ton/appkit';
@@ -25,6 +25,7 @@ import type {
 } from '@ton/appkit';
 import { UnstakeMode } from '@ton/appkit';
 
+import type { LowBalanceMode } from '../../../../components/shared/low-balance-modal/low-balance-modal';
 import { useNetwork } from '../../../network';
 import { useAppKit } from '../../../settings/hooks/use-app-kit';
 import { useStakingQuote } from '../../hooks/use-staking-quote';
@@ -104,7 +105,7 @@ export interface StakingContextType {
     /** True when the built transaction outflow exceeds the user's TON balance */
     isLowBalanceWarningOpen: boolean;
     /** `reduce` when the outgoing token is TON (user can fix by changing amount), `topup` otherwise. */
-    lowBalanceMode: 'reduce' | 'topup';
+    lowBalanceMode: LowBalanceMode;
     /** Required TON amount for the pending operation, formatted as a decimal string. Empty when no pending op. */
     lowBalanceRequiredTon: string;
     /** Replace the input with a value that fits into the current TON balance and close the warning */
@@ -172,7 +173,7 @@ export const StakingWidgetProvider: FC<StakingProviderProps> = ({ children, netw
     const [unstakeMode, setUnstakeMode] = useState<UnstakeModes>(UnstakeMode.INSTANT);
     const [direction, setDirection] = useState<StakingQuoteDirection>('stake');
     const [isReversed, setIsReversed] = useState(false);
-    const [pendingStake, setPendingStake] = useState<TonShortfall | undefined>(undefined);
+    const [pendingStake, setPendingStake] = useState<TransferShortfall | undefined>(undefined);
 
     const walletNetwork = useNetwork();
     const network = networkProp ?? walletNetwork;
@@ -331,9 +332,10 @@ export const StakingWidgetProvider: FC<StakingProviderProps> = ({ children, netw
             direction === 'stake' ? providerMetadata.stakeToken.address : providerMetadata.receiveToken?.address;
 
         if (outgoingTokenAddress) {
-            const shortfall = getTonShortfall({
+            const shortfall = checkTransferBalance({
                 messages: transactionParams.messages,
                 tonBalance: nativeBalanceData,
+                gasBufferNanos: 100_000_000n,
                 fromToken: { address: outgoingTokenAddress },
                 fromAmount: quote.amountIn,
             });
@@ -360,7 +362,7 @@ export const StakingWidgetProvider: FC<StakingProviderProps> = ({ children, netw
     }, []);
 
     const isLowBalanceWarningOpen = pendingStake !== undefined;
-    const lowBalanceMode: 'reduce' | 'topup' = pendingStake?.mode ?? 'reduce';
+    const lowBalanceMode: LowBalanceMode = pendingStake?.mode ?? 'reduce';
     const lowBalanceRequiredTon = useMemo(() => {
         if (!pendingStake) return '';
         return formatUnits(pendingStake.requiredNanos, 9);
diff --git a/packages/appkit-react/src/features/swap/components/swap-widget-provider/swap-widget-provider.tsx b/packages/appkit-react/src/features/swap/components/swap-widget-provider/swap-widget-provider.tsx
index eb7ab4f3d..4a9bf0500 100644
--- a/packages/appkit-react/src/features/swap/components/swap-widget-provider/swap-widget-provider.tsx
+++ b/packages/appkit-react/src/features/swap/components/swap-widget-provider/swap-widget-provider.tsx
@@ -12,8 +12,8 @@ import { formatUnits } from '@ton/appkit';
 import type { Network } from '@ton/appkit';
 import type { GetSwapQuoteData } from '@ton/appkit/queries';
 import type { SwapProvider } from '@ton/appkit';
-import { getTonShortfall } from '@ton/appkit';
-import type { TonShortfall } from '@ton/appkit';
+import { checkTransferBalance } from '@ton/appkit';
+import type { TransferShortfall } from '@ton/appkit';
 import { calcMaxSpendable } from '@ton/appkit';
 
 import { useSwapQuote } from '../../hooks/use-swap-quote';
@@ -25,6 +25,7 @@ import { useBalance } from '../../../balances/hooks/use-balance';
 import { useNetwork } from '../../../network';
 import { useSendTransaction } from '../../../transaction/hooks/use-send-transaction';
 import { useDebounceValue } from '../../../../hooks/use-debounce-value';
+import type { LowBalanceMode } from '../../../../components/shared/low-balance-modal/low-balance-modal';
 import type { AppkitUIToken } from '../../../../types/appkit-ui-token';
 import { mapSwapWidgetTokens } from '../../utils/map-swap-widget-tokens';
 import { useSwapTokenState } from './use-swap-token-state';
@@ -93,7 +94,7 @@ export interface SwapContextType {
     /** True when the built transaction outflow exceeds the user's TON balance */
     isLowBalanceWarningOpen: boolean;
     /** `reduce` when the outgoing token is TON (user can fix by changing amount), `topup` otherwise. */
-    lowBalanceMode: 'reduce' | 'topup';
+    lowBalanceMode: LowBalanceMode;
     /** Required TON amount for the pending operation, formatted as a decimal string. Empty when no pending op. */
     lowBalanceRequiredTon: string;
     /** Replace the input with a value that fits into the current TON balance and close the warning */
@@ -191,7 +192,7 @@ export const SwapWidgetProvider: FC<SwapProviderProps> = ({
     });
     const [slippage, setSlippage] = useState(defaultSlippage);
     const [fromAmountDebounced] = useDebounceValue(fromAmount, 500);
-    const [pendingSwap, setPendingSwap] = useState<TonShortfall | undefined>(undefined);
+    const [pendingSwap, setPendingSwap] = useState<TransferShortfall | undefined>(undefined);
     const address = useAddress();
     const [swapProvider, setSwapProviderId] = useSwapProvider();
     const swapProviders = useSwapProviders();
@@ -284,7 +285,7 @@ export const SwapWidgetProvider: FC<SwapProviderProps> = ({
         isNetworkSupported,
     });
     const isLowBalanceWarningOpen = pendingSwap !== undefined;
-    const lowBalanceMode: 'reduce' | 'topup' = pendingSwap?.mode ?? 'reduce';
+    const lowBalanceMode: LowBalanceMode = pendingSwap?.mode ?? 'reduce';
     const lowBalanceRequiredTon = useMemo(() => {
         if (!pendingSwap) return '';
         return formatUnits(pendingSwap.requiredNanos, 9);
@@ -315,9 +316,10 @@ export const SwapWidgetProvider: FC<SwapProviderProps> = ({
 
         const tx = await buildTransaction({ quote, userAddress: address });
 
-        const shortfall = getTonShortfall({
+        const shortfall = checkTransferBalance({
             messages: tx.messages,
             tonBalance,
+            gasBufferNanos: 100_000_000n,
             fromToken,
             fromAmount,
         });
diff --git a/packages/appkit-react/src/locales/en.ts b/packages/appkit-react/src/locales/en.ts
index 31be1140a..973707ae6 100644
--- a/packages/appkit-react/src/locales/en.ts
+++ b/packages/appkit-react/src/locales/en.ts
@@ -91,7 +91,10 @@ export default {
             'This operation requires ~{{ amount }} TON which exceeds your TON balance. Reduce the amount to continue.',
         messageTopup:
             'This operation needs ~{{ amount }} TON to cover network fees. Top up your TON balance to continue.',
+        messageGasless:
+            'This operation needs ~{{ amount }} TON which exceeds your TON balance. Switch to gasless to pay the fee in a jetton instead.',
         change: 'Change amount',
+        switchToGasless: 'Switch to gasless',
         cancel: 'Cancel',
         close: 'Close',
     },
diff --git a/packages/appkit/src/utils/balance/check-ton-balance.test.ts b/packages/appkit/src/utils/balance/check-ton-balance.test.ts
new file mode 100644
index 000000000..b82fb1993
--- /dev/null
+++ b/packages/appkit/src/utils/balance/check-ton-balance.test.ts
@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, expect, it } from 'vitest';
+
+import { checkTonBalance } from './check-ton-balance';
+
+/** 0.01 TON in nanos — a reasonable buffer for unit tests. */
+const BUFFER = 10_000_000n;
+
+const msg = (amountNanos: bigint) => ({ amount: amountNanos.toString() });
+
+describe('checkTonBalance', () => {
+    describe('balance is sufficient', () => {
+        it('returns undefined when balance exceeds outflow + buffer', () => {
+            const result = checkTonBalance({
+                messages: [msg(50_000_000n)], // 0.05 TON outflow
+                tonBalance: '1', // 1 TON
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toBeUndefined();
+        });
+
+        it('returns undefined when balance equals exactly (required = balance)', () => {
+            const result = checkTonBalance({
+                messages: [msg(50_000_000n)], // 0.05 TON
+                tonBalance: '0.06', // 0.06 TON = 0.05 + 0.01 buffer
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toBeUndefined();
+        });
+
+        it('returns undefined for an empty messages array when balance covers buffer', () => {
+            const result = checkTonBalance({
+                messages: [],
+                tonBalance: '0.01',
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toBeUndefined();
+        });
+    });
+
+    describe('balance is insufficient', () => {
+        it('returns shortfall when balance is below required', () => {
+            const result = checkTonBalance({
+                messages: [msg(50_000_000n)],
+                tonBalance: '0.05', // 0.05 TON — exactly outflow, but no headroom for buffer
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toEqual({ requiredNanos: 60_000_000n });
+        });
+
+        it('returns shortfall when balance is zero', () => {
+            const result = checkTonBalance({
+                messages: [msg(1_000_000n)], // 0.001 TON deploy
+                tonBalance: '0',
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toEqual({ requiredNanos: 11_000_000n });
+        });
+
+        it('sums multiple message outflows', () => {
+            const result = checkTonBalance({
+                messages: [msg(50_000_000n), msg(30_000_000n), msg(10_000_000n)],
+                tonBalance: '0.05',
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toEqual({ requiredNanos: 50_000_000n + 30_000_000n + 10_000_000n + BUFFER });
+        });
+
+        it('respects a smaller gasBufferNanos override', () => {
+            const result = checkTonBalance({
+                messages: [msg(50_000_000n)],
+                tonBalance: '0.05',
+                gasBufferNanos: 1_000_000n, // 0.001 TON buffer
+            });
+            expect(result).toEqual({ requiredNanos: 51_000_000n });
+        });
+
+        it('triggers on a 1-nano deficit (boundary)', () => {
+            const result = checkTonBalance({
+                messages: [msg(50_000_000n)],
+                tonBalance: '0.059999999', // 1 nano short of 0.06 = 50_000_000 + 10_000_000 buffer
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toEqual({ requiredNanos: 60_000_000n });
+        });
+    });
+
+    describe('unloaded balance', () => {
+        it('returns undefined when tonBalance is undefined (not yet loaded)', () => {
+            const result = checkTonBalance({
+                messages: [msg(50_000_000n)],
+                tonBalance: undefined,
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toBeUndefined();
+        });
+
+        it('treats undefined as "unknown", not as zero — no false-positive shortfall', () => {
+            // If `undefined` were treated as 0n, a user with insufficient balance would already
+            // see a shortfall flash on first render before their real balance loads.
+            const result = checkTonBalance({
+                messages: [msg(1_000_000_000n)],
+                tonBalance: undefined,
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toBeUndefined();
+        });
+    });
+
+    describe('precision', () => {
+        it('handles bigint values larger than Number.MAX_SAFE_INTEGER', () => {
+            const huge = 1_000_000_000_000_000_000n; // 1 quintillion nanos = 1 billion TON
+            const result = checkTonBalance({
+                messages: [msg(huge)],
+                tonBalance: '0',
+                gasBufferNanos: BUFFER,
+            });
+            expect(result).toEqual({ requiredNanos: huge + BUFFER });
+        });
+    });
+});
diff --git a/packages/appkit/src/utils/balance/check-ton-balance.ts b/packages/appkit/src/utils/balance/check-ton-balance.ts
new file mode 100644
index 000000000..bd4b57673
--- /dev/null
+++ b/packages/appkit/src/utils/balance/check-ton-balance.ts
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { parseUnits } from '@ton/walletkit';
+
+export interface CheckTonBalanceParams {
+    /** Outgoing messages of the built transaction — each `amount` is the TON value in nanos. */
+    messages: Array<{ amount: string }>;
+    /**
+     * User's TON balance as a decimal string (`formatUnits(balance, 9)` format).
+     * `undefined` means "not loaded yet" — function returns `undefined` (no judgement).
+     */
+    tonBalance: string | undefined;
+    /** Extra TON headroom on top of total outflow. Caller-supplied — no opinion on default. */
+    gasBufferNanos: bigint;
+}
+
+export interface TonBalanceShortfall {
+    /** Total TON the user wallet must hold for the transaction to land. */
+    requiredNanos: bigint;
+}
+
+/**
+ * Pure balance check: does the user have enough TON for the built transaction?
+ *
+ * Returns `undefined` when the balance is sufficient OR when it hasn't loaded
+ * yet (treating unloaded as "unknown" rather than "zero" avoids false-positive
+ * shortfalls flashing on first render).
+ *
+ * No mode classification — this hook reports only "shortfall exists, here's
+ * how much was needed." Callers decide what to suggest (topup, gasless,
+ * reduce, etc.). For transfer/swap flows where the user can reduce their own
+ * outflow, compose this with `checkTransferBalance`.
+ */
+export const checkTonBalance = ({
+    messages,
+    tonBalance,
+    gasBufferNanos,
+}: CheckTonBalanceParams): TonBalanceShortfall | undefined => {
+    if (tonBalance === undefined) return undefined;
+
+    const totalOutNanos = messages.reduce((acc, m) => acc + BigInt(m.amount), 0n);
+    const requiredNanos = totalOutNanos + gasBufferNanos;
+    const tonBalanceNanos = parseUnits(tonBalance, 9);
+
+    if (tonBalanceNanos >= requiredNanos) return undefined;
+    return { requiredNanos };
+};
diff --git a/packages/appkit/src/utils/balance/check-transfer-balance.test.ts b/packages/appkit/src/utils/balance/check-transfer-balance.test.ts
new file mode 100644
index 000000000..17cb146ae
--- /dev/null
+++ b/packages/appkit/src/utils/balance/check-transfer-balance.test.ts
@@ -0,0 +1,223 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { describe, expect, it } from 'vitest';
+
+import { checkTransferBalance } from './check-transfer-balance';
+
+const BUFFER = 10_000_000n; // 0.01 TON
+const TON = { address: 'ton' };
+const JETTON = { address: 'EQA_jetton_master' };
+
+const msg = (amountNanos: bigint) => ({ amount: amountNanos.toString() });
+
+describe('checkTransferBalance', () => {
+    describe('balance is sufficient', () => {
+        it('returns undefined regardless of fromToken', () => {
+            expect(
+                checkTransferBalance({
+                    messages: [msg(50_000_000n)],
+                    tonBalance: '1',
+                    gasBufferNanos: BUFFER,
+                    fromToken: TON,
+                    fromAmount: '0.04',
+                }),
+            ).toBeUndefined();
+            expect(
+                checkTransferBalance({
+                    messages: [msg(50_000_000n)],
+                    tonBalance: '1',
+                    gasBufferNanos: BUFFER,
+                    fromToken: JETTON,
+                    fromAmount: '100',
+                }),
+            ).toBeUndefined();
+        });
+
+        it('returns undefined when balance is unloaded', () => {
+            const result = checkTransferBalance({
+                messages: [msg(50_000_000n)],
+                tonBalance: undefined,
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.04',
+            });
+            expect(result).toBeUndefined();
+        });
+    });
+
+    describe('jetton outflow — always topup', () => {
+        it('returns topup when jetton-from has insufficient TON for gas', () => {
+            const result = checkTransferBalance({
+                messages: [msg(50_000_000n)], // 0.05 TON jetton-transfer gas
+                tonBalance: '0.02',
+                gasBufferNanos: BUFFER,
+                fromToken: JETTON,
+                fromAmount: '100',
+            });
+            expect(result).toEqual({ mode: 'topup', requiredNanos: 60_000_000n });
+        });
+
+        it('returns topup even when balance is zero', () => {
+            const result = checkTransferBalance({
+                messages: [msg(1_000_000n)],
+                tonBalance: '0',
+                gasBufferNanos: BUFFER,
+                fromToken: JETTON,
+                fromAmount: '50',
+            });
+            expect(result).toEqual({ mode: 'topup', requiredNanos: 11_000_000n });
+        });
+
+        it('does not consider safetyMarginNanos for jetton outflow', () => {
+            // safetyMarginNanos only matters in the reduce calculation — jetton can't reduce.
+            const result = checkTransferBalance({
+                messages: [msg(50_000_000n)],
+                tonBalance: '0.02',
+                gasBufferNanos: BUFFER,
+                fromToken: JETTON,
+                fromAmount: '100',
+                safetyMarginNanos: 1_000_000_000n, // 1 TON — would be huge if applied
+            });
+            expect(result).toEqual({ mode: 'topup', requiredNanos: 60_000_000n });
+        });
+    });
+
+    describe('TON outflow — reduce when gas fits', () => {
+        it('returns reduce with a smaller suggestedFromAmount when balance covers gas', () => {
+            // total_out = fromAmount + gas. User has enough for gas + buffer + safety, but
+            // not for full fromAmount. Suggest reduced amount.
+            const fromAmountNanos = 500_000_000n; // 0.5 TON intended spend
+            const gasOnlyNanos = 50_000_000n; // 0.05 TON gas attached to other messages
+            const tonBalance = '0.4'; // can't afford 0.5 spend, but enough for gas + margin
+
+            const result = checkTransferBalance({
+                messages: [msg(fromAmountNanos + gasOnlyNanos)],
+                tonBalance,
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.5',
+            });
+
+            // suggested = balance - gasOnly - gasBuffer - safetyMargin
+            // = 400_000_000 - 50_000_000 - 10_000_000 - 20_000_000 = 320_000_000n = 0.32 TON
+            expect(result).toEqual({
+                mode: 'reduce',
+                requiredNanos: fromAmountNanos + gasOnlyNanos + BUFFER,
+                suggestedFromAmount: '0.32',
+            });
+        });
+
+        it('returns topup when even gas does not fit', () => {
+            // Balance below gasOnly + buffer + safetyMargin → reducing won't help.
+            const result = checkTransferBalance({
+                messages: [msg(500_000_000n)], // 0.5 TON total outflow
+                tonBalance: '0.001', // way too low for any meaningful gas
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.4',
+            });
+            expect(result?.mode).toBe('topup');
+            expect(result?.requiredNanos).toBe(510_000_000n);
+        });
+
+        it('boundary: balance equals nonSpendReserved exactly → topup', () => {
+            // tonBalance <= nonSpendReserved should return topup (cannot leave anything to spend).
+            const gasOnly = 50_000_000n;
+            const fromAmount = 100_000_000n;
+            // nonSpendReserved = gasOnly + BUFFER + DEFAULT_SAFETY_MARGIN_NANOS = 80_000_000n
+            const balanceAtBoundary = '0.08';
+
+            const result = checkTransferBalance({
+                messages: [msg(gasOnly + fromAmount)],
+                tonBalance: balanceAtBoundary,
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.1',
+            });
+
+            expect(result?.mode).toBe('topup');
+        });
+
+        it('boundary: 1-nano above nonSpendReserved → reduce', () => {
+            const gasOnly = 50_000_000n;
+            const fromAmount = 100_000_000n;
+            // nonSpendReserved = gasOnly + BUFFER + DEFAULT_SAFETY_MARGIN_NANOS = 80_000_000n
+
+            const result = checkTransferBalance({
+                messages: [msg(gasOnly + fromAmount)],
+                tonBalance: '0.080000001', // 1 nano above the boundary
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.1',
+            });
+
+            // suggested = 1 nano
+            expect(result).toEqual({
+                mode: 'reduce',
+                requiredNanos: gasOnly + fromAmount + BUFFER,
+                suggestedFromAmount: '0.000000001',
+            });
+        });
+    });
+
+    describe('safetyMarginNanos', () => {
+        it('shrinks the suggested reduced amount when safetyMargin is larger', () => {
+            const tonBalance = '0.4';
+            const baseParams = {
+                messages: [msg(550_000_000n)], // 0.55 TON total outflow
+                tonBalance,
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.5',
+            };
+
+            const lowMargin = checkTransferBalance({ ...baseParams, safetyMarginNanos: 5_000_000n });
+            const highMargin = checkTransferBalance({ ...baseParams, safetyMarginNanos: 50_000_000n });
+
+            // higher safety margin → less suggested
+            expect(lowMargin?.mode).toBe('reduce');
+            expect(highMargin?.mode).toBe('reduce');
+            if (lowMargin?.mode === 'reduce' && highMargin?.mode === 'reduce') {
+                expect(BigInt(lowMargin.suggestedFromAmount.replace('.', '').padEnd(10, '0'))).toBeGreaterThan(
+                    BigInt(highMargin.suggestedFromAmount.replace('.', '').padEnd(10, '0')),
+                );
+            }
+        });
+
+        it('uses DEFAULT_SAFETY_MARGIN_NANOS when not provided', () => {
+            const result = checkTransferBalance({
+                messages: [msg(550_000_000n)],
+                tonBalance: '0.4',
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.5',
+            });
+            expect(result?.mode).toBe('reduce');
+            // gasOnly = 50_000_000, balance = 400_000_000
+            // suggested = 400 - 50 - 10 - 20 = 320 mTON
+            if (result?.mode === 'reduce') {
+                expect(result.suggestedFromAmount).toBe('0.32');
+            }
+        });
+    });
+
+    describe('composes checkTonBalance', () => {
+        it('returns undefined when checkTonBalance would (sufficient or unloaded)', () => {
+            // Same inputs as a sufficient-balance check
+            const result = checkTransferBalance({
+                messages: [msg(10_000_000n)],
+                tonBalance: '1',
+                gasBufferNanos: BUFFER,
+                fromToken: TON,
+                fromAmount: '0.005',
+            });
+            expect(result).toBeUndefined();
+        });
+    });
+});
diff --git a/packages/appkit/src/utils/balance/check-transfer-balance.ts b/packages/appkit/src/utils/balance/check-transfer-balance.ts
new file mode 100644
index 000000000..b7387cd31
--- /dev/null
+++ b/packages/appkit/src/utils/balance/check-transfer-balance.ts
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { formatUnits, parseUnits } from '@ton/walletkit';
+
+import { checkTonBalance } from './check-ton-balance';
+import type { CheckTonBalanceParams } from './check-ton-balance';
+
+/**
+ * Default headroom baked into the suggested reduced amount, on top of the gas buffer.
+ * Covers quote/gas drift between the current built tx and the one sent after the
+ * amount changes. 0.02 TON.
+ */
+export const DEFAULT_SAFETY_MARGIN_NANOS = 20_000_000n;
+
+export interface CheckTransferBalanceParams extends CheckTonBalanceParams {
+    /** The asset being transferred / swapped. TON-from enables the `'reduce'` outcome. */
+    fromToken: { address: string };
+    /** Amount of `fromToken` being sent, as a decimal string in `fromToken` units. */
+    fromAmount: string;
+    /**
+     * Headroom baked into the suggested reduced amount when the recovery mode is `'reduce'`.
+     * Defaults to {@link DEFAULT_SAFETY_MARGIN_NANOS}.
+     */
+    safetyMarginNanos?: bigint;
+}
+
+export type TransferShortfall =
+    | { mode: 'reduce'; requiredNanos: bigint; suggestedFromAmount: string }
+    | { mode: 'topup'; requiredNanos: bigint };
+
+/**
+ * Balance check for user-initiated transfers (send TON / jetton / NFT) and swaps —
+ * where the user controls a `fromAmount` and might be able to fix a shortfall by
+ * sending less.
+ *
+ * Returns:
+ * - `undefined` when balance is sufficient (or unloaded — see {@link checkTonBalance}).
+ * - `{ mode: 'reduce', suggestedFromAmount }` only when `fromToken` is TON and the
+ *   remaining balance can still cover gas — the user can keep going by spending less.
+ * - `{ mode: 'topup' }` otherwise (reducing wouldn't free up TON gas).
+ *
+ * Gasless availability is intentionally **not** modelled here — that's a UI policy.
+ * Caller maps `'topup'` to `'gasless'` when a gasless alternative is on the table.
+ */
+export const checkTransferBalance = ({
+    messages,
+    tonBalance,
+    gasBufferNanos,
+    fromToken,
+    fromAmount,
+    safetyMarginNanos = DEFAULT_SAFETY_MARGIN_NANOS,
+}: CheckTransferBalanceParams): TransferShortfall | undefined => {
+    const shortfall = checkTonBalance({ messages, tonBalance, gasBufferNanos });
+    if (!shortfall) return undefined;
+
+    // Reducing the user's own amount only helps when the outflow is in TON.
+    // For jetton / NFT outflow, gas is denominated in TON regardless — reducing
+    // the jetton-side input doesn't free up any TON.
+    if (fromToken.address !== 'ton') {
+        return { mode: 'topup', requiredNanos: shortfall.requiredNanos };
+    }
+
+    // We know `tonBalance !== undefined` because checkTonBalance returned a shortfall
+    // (it short-circuits on undefined balance).
+    const totalOutNanos = messages.reduce((acc, m) => acc + BigInt(m.amount), 0n);
+    const fromAmountNanos = parseUnits(fromAmount, 9);
+    const gasOnlyNanos = totalOutNanos - fromAmountNanos;
+    const nonSpendReservedNanos = gasOnlyNanos + gasBufferNanos + safetyMarginNanos;
+    const tonBalanceNanos = parseUnits(tonBalance as string, 9);
+
+    if (tonBalanceNanos <= nonSpendReservedNanos) {
+        // Even gas doesn't fit — reducing the spend amount won't help.
+        return { mode: 'topup', requiredNanos: shortfall.requiredNanos };
+    }
+
+    const suggestedFromAmount = formatUnits(tonBalanceNanos - nonSpendReservedNanos, 9);
+    return { mode: 'reduce', requiredNanos: shortfall.requiredNanos, suggestedFromAmount };
+};
diff --git a/packages/appkit/src/utils/balance/get-ton-shortfall.test.ts b/packages/appkit/src/utils/balance/get-ton-shortfall.test.ts
deleted file mode 100644
index 68d916b6d..000000000
--- a/packages/appkit/src/utils/balance/get-ton-shortfall.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { describe, expect, it } from 'vitest';
-
-import { DEFAULT_GAS_BUFFER_NANOS, DEFAULT_SAFETY_MARGIN_NANOS, getTonShortfall } from './get-ton-shortfall';
-
-const TON = { address: 'ton' };
-const JETTON = { address: 'EQA_jetton_address' };
-
-// Helper — convert a decimal string of TON to nanos as a string (for message amounts).
-const toNanos = (ton: string): string => BigInt(Math.round(Number(ton) * 1e9)).toString();
-
-describe('getTonShortfall', () => {
-    it('returns undefined when TON balance covers the built transaction', () => {
-        // Swap 1 TON, total tx outflow 1.3 TON (1 TON swap + 0.3 TON attached gas), balance 2 TON.
-        const result = getTonShortfall({
-            messages: [{ amount: toNanos('1.3') }],
-            tonBalance: '2',
-            fromToken: TON,
-            fromAmount: '1',
-        });
-        expect(result).toBeUndefined();
-    });
-
-    it('returns topup when fromToken is a jetton and TON balance is below outflow + buffer', () => {
-        // Jetton swap, tx needs 0.05 TON for gas, user has 0 TON.
-        const result = getTonShortfall({
-            messages: [{ amount: toNanos('0.05') }],
-            tonBalance: '0',
-            fromToken: JETTON,
-            fromAmount: '100',
-        });
-        expect(result).toEqual({
-            mode: 'topup',
-            requiredNanos: 50_000_000n + DEFAULT_GAS_BUFFER_NANOS,
-            suggestedFromAmount: '',
-        });
-    });
-
-    it('returns reduce for TON-from when balance covers gas but not full amount', () => {
-        // User wants 1 TON swap, total outflow 1.3 TON, has 1 TON. Gas only = 0.3 TON.
-        // Balance (1) > nonSwapReserved (0.3 gas + 0.1 buffer + 0.02 safety = 0.42) → reduce mode.
-        const result = getTonShortfall({
-            messages: [{ amount: toNanos('1.3') }],
-            tonBalance: '1',
-            fromToken: TON,
-            fromAmount: '1',
-        });
-        expect(result?.mode).toBe('reduce');
-        if (result?.mode !== 'reduce') return;
-        // Suggested = 1 - 0.42 = 0.58
-        expect(result.suggestedFromAmount).toBe('0.58');
-        expect(result.requiredNanos).toBe(1_300_000_000n + DEFAULT_GAS_BUFFER_NANOS);
-    });
-
-    it('returns topup for TON-from when balance cannot cover even gas (reducing would not help)', () => {
-        // User wants 1 TON swap, total outflow 1.3 TON → gas = 0.3 TON. Balance 0.2 TON.
-        // nonSwapReserved = 0.3 + 0.1 buffer + 0.02 safety = 0.42 TON → balance (0.2) <= 0.42 → topup.
-        const result = getTonShortfall({
-            messages: [{ amount: toNanos('1.3') }],
-            tonBalance: '0.2',
-            fromToken: TON,
-            fromAmount: '1',
-        });
-        expect(result).toEqual({
-            mode: 'topup',
-            requiredNanos: 1_300_000_000n + DEFAULT_GAS_BUFFER_NANOS,
-            suggestedFromAmount: '',
-        });
-    });
-
-    it('treats an undefined tonBalance as zero', () => {
-        const result = getTonShortfall({
-            messages: [{ amount: toNanos('0.05') }],
-            tonBalance: undefined,
-            fromToken: JETTON,
-            fromAmount: '100',
-        });
-        expect(result?.mode).toBe('topup');
-    });
-
-    it('sums amounts across multiple messages', () => {
-        // Two messages attaching 0.6 TON each → totalOut = 1.2 TON. Balance 1 TON → shortfall.
-        const result = getTonShortfall({
-            messages: [{ amount: toNanos('0.6') }, { amount: toNanos('0.6') }],
-            tonBalance: '1',
-            fromToken: JETTON,
-            fromAmount: '100',
-        });
-        expect(result?.mode).toBe('topup');
-        expect(result?.requiredNanos).toBe(1_200_000_000n + DEFAULT_GAS_BUFFER_NANOS);
-    });
-
-    it('respects a custom gasBufferNanos', () => {
-        const baseParams = {
-            messages: [{ amount: toNanos('1.3') }],
-            tonBalance: '1.3',
-            fromToken: TON,
-            fromAmount: '1',
-        };
-
-        // With the default buffer (0.1 TON), balance 1.3 is insufficient (needs 1.4).
-        expect(getTonShortfall(baseParams)?.mode).toBe('reduce');
-
-        // With a zero buffer, 1.3 TON balance covers the 1.3 TON outflow exactly.
-        expect(getTonShortfall({ ...baseParams, gasBufferNanos: 0n })).toBeUndefined();
-    });
-
-    it('respects a custom safetyMarginNanos in the reduce branch', () => {
-        // Default margin: suggested = balance - gas - buffer - 0.02 = 1 - 0.3 - 0.1 - 0.02 = 0.58
-        // Zero margin:    suggested = balance - gas - buffer       = 1 - 0.3 - 0.1       = 0.6
-        const baseParams = {
-            messages: [{ amount: toNanos('1.3') }],
-            tonBalance: '1',
-            fromToken: TON,
-            fromAmount: '1',
-        };
-
-        const withDefault = getTonShortfall(baseParams);
-        expect(withDefault?.mode === 'reduce' ? withDefault.suggestedFromAmount : null).toBe('0.58');
-
-        const withZero = getTonShortfall({ ...baseParams, safetyMarginNanos: 0n });
-        expect(withZero?.mode === 'reduce' ? withZero.suggestedFromAmount : null).toBe('0.6');
-    });
-
-    it('flips from reduce to topup when a large custom safetyMarginNanos eats the balance', () => {
-        // Balance 1 TON, gas 0.3 TON, buffer 0.1 TON. With a 1 TON safety margin, nonSwapReserved becomes 1.4 TON → topup.
-        const result = getTonShortfall({
-            messages: [{ amount: toNanos('1.3') }],
-            tonBalance: '1',
-            fromToken: TON,
-            fromAmount: '1',
-            safetyMarginNanos: 1_000_000_000n,
-        });
-        expect(result?.mode).toBe('topup');
-    });
-
-    it('exports sane default constants', () => {
-        expect(DEFAULT_GAS_BUFFER_NANOS).toBe(100_000_000n);
-        expect(DEFAULT_SAFETY_MARGIN_NANOS).toBe(20_000_000n);
-    });
-});
diff --git a/packages/appkit/src/utils/balance/get-ton-shortfall.ts b/packages/appkit/src/utils/balance/get-ton-shortfall.ts
deleted file mode 100644
index 732bd6336..000000000
--- a/packages/appkit/src/utils/balance/get-ton-shortfall.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) TonTech.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import { formatUnits, parseUnits } from '@ton/walletkit';
-
-/** Default extra TON buffer added on top of built transaction outflow when checking balance before sending. */
-export const DEFAULT_GAS_BUFFER_NANOS = 100_000_000n;
-
-/**
- * Default extra headroom baked into the suggested reduced amount, on top of the gas buffer.
- * Covers quote/gas drift between the current built tx and the one that will actually be sent
- * after the amount changes. 0.02 TON.
- */
-export const DEFAULT_SAFETY_MARGIN_NANOS = 20_000_000n;
-
-export type TonShortfall =
-    | { mode: 'reduce'; requiredNanos: bigint; suggestedFromAmount: string }
-    | { mode: 'topup'; requiredNanos: bigint; suggestedFromAmount: '' };
-
-export interface GetTonShortfallParams {
-    /** Messages of the built transaction. Each `amount` is the TON value in nanos attached to the message. */
-    messages: Array<{ amount: string }>;
-    /** User's current TON balance as a decimal string (same format `formatUnits(balance, 9)` returns). */
-    tonBalance: string | undefined;
-    /** The outgoing token — `{ address: 'ton' }` when the user spends TON, otherwise a jetton. */
-    fromToken: { address: string };
-    /** Amount the user intends to spend in `fromToken` units, as a decimal string. */
-    fromAmount: string;
-    /**
-     * Extra TON headroom on top of built-tx outflow when checking balance before sending.
-     * Defaults to {@link DEFAULT_GAS_BUFFER_NANOS}.
-     */
-    gasBufferNanos?: bigint;
-    /**
-     * Extra headroom baked into the suggested reduced amount, on top of the gas buffer.
-     * Defaults to {@link DEFAULT_SAFETY_MARGIN_NANOS}.
-     */
-    safetyMarginNanos?: bigint;
-}
-
-/**
- * Check whether the user's TON balance covers the built transaction.
- * - Returns `null` if the balance is sufficient.
- * - Returns `{ mode: 'reduce', ... }` with a smaller suggested `fromAmount` when `fromToken` is TON
- *   and the balance is enough to cover at least gas (user can fix it by reducing the amount).
- * - Returns `{ mode: 'topup', ... }` when `fromToken` is a jetton (reducing jetton amount won't free up TON gas),
- *   or when `fromToken` is TON but the balance can't even cover gas (reducing won't help — user must top up).
- */
-export const getTonShortfall = ({
-    messages,
-    tonBalance,
-    fromToken,
-    fromAmount,
-    gasBufferNanos = DEFAULT_GAS_BUFFER_NANOS,
-    safetyMarginNanos = DEFAULT_SAFETY_MARGIN_NANOS,
-}: GetTonShortfallParams): TonShortfall | undefined => {
-    const totalOutNanos = messages.reduce((acc, m) => acc + BigInt(m.amount), 0n);
-    const requiredNanos = totalOutNanos + gasBufferNanos;
-    const tonBalanceNanos = tonBalance ? parseUnits(tonBalance, 9) : 0n;
-
-    if (tonBalanceNanos >= requiredNanos) return;
-
-    if (fromToken.address === 'ton') {
-        const gasOnlyNanos = totalOutNanos - parseUnits(fromAmount, 9);
-        const nonSwapReservedNanos = gasOnlyNanos + gasBufferNanos + safetyMarginNanos;
-
-        // Balance can't cover even gas for a minimal outgoing tx — reducing the amount won't help.
-        if (tonBalanceNanos <= nonSwapReservedNanos) {
-            return { mode: 'topup', requiredNanos, suggestedFromAmount: '' };
-        }
-
-        const suggestedFromAmount = formatUnits(tonBalanceNanos - nonSwapReservedNanos, 9);
-        return { mode: 'reduce', requiredNanos, suggestedFromAmount };
-    }
-
-    return { mode: 'topup', requiredNanos, suggestedFromAmount: '' };
-};
diff --git a/packages/appkit/src/utils/index.ts b/packages/appkit/src/utils/index.ts
index 8a0ca94dc..4ba787f4e 100644
--- a/packages/appkit/src/utils/index.ts
+++ b/packages/appkit/src/utils/index.ts
@@ -28,7 +28,8 @@ export * from './amount/format-large-value';
 export * from './amount/truncate-decimals';
 export * from './amount/validate-numeric-string';
 export * from './balance/calc-max-spendable';
-export * from './balance/get-ton-shortfall';
+export * from './balance/check-ton-balance';
+export * from './balance/check-transfer-balance';
 export * from './arrays/key-by';
 export * from './arrays/random-from-array';
 export * from './errors/get-error-message';

From 4b37eecfca03b33d7f7276c35f95278972f3aa41 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Thu, 4 Jun 2026 10:36:53 +0400
Subject: [PATCH 37/46] feat(gasless): turn off gasless if not available

---
 .../src/features/mint/hooks/use-mint-nft.ts          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
index 676c5ecb7..5d010b9b2 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
@@ -6,7 +6,7 @@
  *
  */
 
-import { useCallback } from 'react';
+import { useCallback, useEffect } from 'react';
 import { useMutation } from '@tanstack/react-query';
 import { toNano } from '@ton/core';
 import { useBalance, useGaslessQuote, useSendGaslessTransaction, useSendTransaction } from '@ton/appkit-react';
@@ -14,6 +14,7 @@ import { checkTonBalance, formatUnits } from '@ton/appkit';
 import type { GaslessQuote } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
+import { setGaslessEnabled } from '../store/actions/set-gasless-enabled';
 import { useCanEnableGasless } from './use-can-enable-gasless';
 import { useGaslessMintFee } from './use-gasless-mint-fee';
 import { useGaslessMintMessage } from './use-gasless-mint-message';
@@ -125,6 +126,15 @@ export const useMintNft = (): UseMintNftReturn => {
         };
     }, [gaslessEnabled, messages, tonBalance, canEnableGasless]);
 
+    // Reconcile the persisted `gaslessEnabled` flag with current availability:
+    // switching to a wallet/network that can't do gasless (no `SignMessage`, no
+    // deployed forwarder) must drop the flag — otherwise the settings switch
+    // stays disabled-on and the gasless send path waits forever on a quote that
+    // can never be produced.
+    useEffect(() => {
+        if (gaslessEnabled && !canEnableGasless) setGaslessEnabled(false);
+    }, [gaslessEnabled, canEnableGasless]);
+
     const canSend =
         isMintReady && !sendMutation.isPending && (!gaslessEnabled || (!!quote && !isLoadingQuote && !quoteError));
 

From 5b327bc8fdf98e71f0707321a99f567115252604 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Fri, 5 Jun 2026 11:23:54 +0400
Subject: [PATCH 38/46] feat(gasless): rework code

---
 .../mint/components/card-generator.tsx        | 14 ++------
 .../mint/components/mint-settings-modal.tsx   |  5 ++-
 .../src/features/mint/hooks/use-mint-nft.ts   | 21 ++++++++++-
 .../mint/store/actions/enable-gasless.ts      | 36 ++++++-------------
 .../store/actions/seed-gasless-fee-asset.ts   | 30 ++++++++++++++++
 .../src/features/mint/store/index.ts          |  1 +
 6 files changed, 66 insertions(+), 41 deletions(-)
 create mode 100644 apps/appkit-minter/src/features/mint/store/actions/seed-gasless-fee-asset.ts

diff --git a/apps/appkit-minter/src/features/mint/components/card-generator.tsx b/apps/appkit-minter/src/features/mint/components/card-generator.tsx
index 325c8470c..1dcf0842a 100644
--- a/apps/appkit-minter/src/features/mint/components/card-generator.tsx
+++ b/apps/appkit-minter/src/features/mint/components/card-generator.tsx
@@ -9,14 +9,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import type React from 'react';
 import { AlertCircle, Coins, Sparkles } from 'lucide-react';
-import {
-    Button,
-    ButtonWithConnect,
-    LowBalanceModal,
-    SettingsButton,
-    useGaslessConfig,
-    useSelectedWallet,
-} from '@ton/appkit-react';
+import { Button, ButtonWithConnect, LowBalanceModal, SettingsButton, useSelectedWallet } from '@ton/appkit-react';
 import { getErrorMessage } from '@ton/appkit';
 
 import { CardPreview } from './card-preview';
@@ -46,7 +39,6 @@ export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
     const { currentCard, isGenerating, generate } = useCardGenerator();
     const [wallet] = useSelectedWallet();
     const mint = useMintNft();
-    const { data: gaslessConfig } = useGaslessConfig();
 
     const [mintErrorLocal, setMintErrorLocal] = useState<string | null>(null);
     const [isSettingsOpen, setIsSettingsOpen] = useState(false);
@@ -85,10 +77,10 @@ export const CardGenerator: React.FC<CardGeneratorProps> = ({ className }) => {
     }, [mint]);
 
     const handleSwitchToGasless = useCallback(() => {
-        enableGasless({ supportedAssets: gaslessConfig?.supportedAssets });
+        enableGasless();
         setPendingShortfall(undefined);
         setIsConfirmOpen(true);
-    }, [gaslessConfig]);
+    }, []);
 
     const dismissShortfall = useCallback(() => setPendingShortfall(undefined), []);
 
diff --git a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
index 0669324ac..6e94d6e3f 100644
--- a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
+++ b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
@@ -8,7 +8,7 @@
 
 import { useEffect, useMemo, useState } from 'react';
 import type { FC } from 'react';
-import { Button, Modal, Switch, useGaslessConfig, useNetwork, useSelectedWallet } from '@ton/appkit-react';
+import { Button, Modal, Switch, useNetwork, useSelectedWallet } from '@ton/appkit-react';
 
 import { useMinterStore } from '../store/minter-store';
 import { enableGasless } from '../store/actions/enable-gasless';
@@ -35,7 +35,6 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
 
     const [wallet] = useSelectedWallet();
     const network = useNetwork();
-    const { data: gaslessConfig } = useGaslessConfig();
     const canEnableGasless = useCanEnableGasless();
 
     const supportsSignMessage = useMemo(() => {
@@ -57,7 +56,7 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
     const handleSave = () => {
         if (stagedEnabled !== gaslessEnabled) {
             if (stagedEnabled) {
-                enableGasless({ supportedAssets: gaslessConfig?.supportedAssets });
+                enableGasless();
             } else {
                 setGaslessEnabled(false);
             }
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
index 5d010b9b2..8c6de6834 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
@@ -9,12 +9,19 @@
 import { useCallback, useEffect } from 'react';
 import { useMutation } from '@tanstack/react-query';
 import { toNano } from '@ton/core';
-import { useBalance, useGaslessQuote, useSendGaslessTransaction, useSendTransaction } from '@ton/appkit-react';
+import {
+    useBalance,
+    useGaslessConfig,
+    useGaslessQuote,
+    useSendGaslessTransaction,
+    useSendTransaction,
+} from '@ton/appkit-react';
 import { checkTonBalance, formatUnits } from '@ton/appkit';
 import type { GaslessQuote } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
 import { setGaslessEnabled } from '../store/actions/set-gasless-enabled';
+import { seedGaslessFeeAsset } from '../store/actions/seed-gasless-fee-asset';
 import { useCanEnableGasless } from './use-can-enable-gasless';
 import { useGaslessMintFee } from './use-gasless-mint-fee';
 import { useGaslessMintMessage } from './use-gasless-mint-message';
@@ -77,6 +84,7 @@ export const useMintNft = (): UseMintNftReturn => {
     const { messages, build: buildMintTransaction, isReady: isMintReady } = useMintTransaction();
     const canEnableGasless = useCanEnableGasless();
     const { data: tonBalance } = useBalance();
+    const { data: gaslessConfig } = useGaslessConfig({ query: { enabled: gaslessEnabled } });
 
     // Gasless path
     const { data: message } = useGaslessMintMessage();
@@ -135,6 +143,17 @@ export const useMintNft = (): UseMintNftReturn => {
         if (gaslessEnabled && !canEnableGasless) setGaslessEnabled(false);
     }, [gaslessEnabled, canEnableGasless]);
 
+    // Seed the fee asset once the relayer config resolves. Enabling gasless only
+    // flips the flag; seeding here (rather than at the enable call site) means the
+    // USDT default is applied even if the config hadn't loaded when gasless was
+    // turned on — otherwise the confirm modal would open on an empty "Select" and
+    // the quote (hence Confirm) would stay blocked until a manual pick.
+    useEffect(() => {
+        if (gaslessEnabled && !gaslessFeeAsset && gaslessConfig?.supportedAssets?.length) {
+            seedGaslessFeeAsset(gaslessConfig.supportedAssets);
+        }
+    }, [gaslessEnabled, gaslessFeeAsset, gaslessConfig]);
+
     const canSend =
         isMintReady && !sendMutation.isPending && (!gaslessEnabled || (!!quote && !isLoadingQuote && !quoteError));
 
diff --git a/apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts b/apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts
index 07c79a5be..eeaa81708 100644
--- a/apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts
+++ b/apps/appkit-minter/src/features/mint/store/actions/enable-gasless.ts
@@ -6,35 +6,19 @@
  *
  */
 
-import { compareAddress } from '@ton/appkit';
-import type { GaslessSupportedAsset, UserFriendlyAddress } from '@ton/appkit';
-
 import { useMinterStore } from '../minter-store';
-import { USDT_MASTER_MAINNET } from '../../../../core/constants/tokens';
-
-export interface EnableGaslessParams {
-    /** Relayer-accepted assets. Used to seed `gaslessFeeAsset` on first enable. */
-    supportedAssets: GaslessSupportedAsset[] | undefined;
-}
 
 /**
- * Turns gasless on and seeds `gaslessFeeAsset` if it isn't set yet — picks
- * USDT when the relayer accepts it, otherwise the first listed asset.
+ * Turns the gasless mint flow on.
+ *
+ * The fee asset is seeded separately and reactively via {@link seedGaslessFeeAsset}
+ * as the relayer config resolves — so the USDT default survives even when the
+ * config hasn't loaded yet at the moment gasless is enabled (settings Save or the
+ * low-balance "switch to gasless").
  *
- * Shared between the mint settings modal (Save) and the low-balance modal
- * (Switch to gasless) so both call sites converge on the same behaviour.
+ * Shared between the mint settings modal (Save) and the low-balance modal so both
+ * call sites converge on the same behaviour.
  */
-export const enableGasless = ({ supportedAssets }: EnableGaslessParams): void => {
-    const { gaslessFeeAsset } = useMinterStore.getState();
-
-    const next: Partial<{ gaslessEnabled: boolean; gaslessFeeAsset: UserFriendlyAddress | null }> = {
-        gaslessEnabled: true,
-    };
-
-    if (!gaslessFeeAsset && supportedAssets?.length) {
-        const preferred = supportedAssets.find((asset) => compareAddress(asset.address, USDT_MASTER_MAINNET));
-        next.gaslessFeeAsset = preferred?.address ?? supportedAssets[0].address;
-    }
-
-    useMinterStore.setState(next);
+export const enableGasless = (): void => {
+    useMinterStore.setState({ gaslessEnabled: true });
 };
diff --git a/apps/appkit-minter/src/features/mint/store/actions/seed-gasless-fee-asset.ts b/apps/appkit-minter/src/features/mint/store/actions/seed-gasless-fee-asset.ts
new file mode 100644
index 000000000..17e53f65d
--- /dev/null
+++ b/apps/appkit-minter/src/features/mint/store/actions/seed-gasless-fee-asset.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { compareAddress } from '@ton/appkit';
+import type { GaslessSupportedAsset } from '@ton/appkit';
+
+import { useMinterStore } from '../minter-store';
+import { USDT_MASTER_MAINNET } from '../../../../core/constants/tokens';
+
+/**
+ * Seeds `gaslessFeeAsset` from the relayer's supported assets — USDT preferred,
+ * otherwise the first listed. Idempotent: a no-op once a fee asset is already
+ * chosen or when the supported list is empty.
+ *
+ * Called reactively as the relayer config resolves (see `useMintNft`), so the
+ * default is applied regardless of whether the config had loaded at the moment
+ * gasless was enabled.
+ */
+export const seedGaslessFeeAsset = (supportedAssets: GaslessSupportedAsset[]): void => {
+    const { gaslessFeeAsset } = useMinterStore.getState();
+    if (gaslessFeeAsset || supportedAssets.length === 0) return;
+
+    const preferred = supportedAssets.find((asset) => compareAddress(asset.address, USDT_MASTER_MAINNET));
+    useMinterStore.setState({ gaslessFeeAsset: preferred?.address ?? supportedAssets[0].address });
+};
diff --git a/apps/appkit-minter/src/features/mint/store/index.ts b/apps/appkit-minter/src/features/mint/store/index.ts
index 31ac142b4..894d926c1 100644
--- a/apps/appkit-minter/src/features/mint/store/index.ts
+++ b/apps/appkit-minter/src/features/mint/store/index.ts
@@ -17,3 +17,4 @@ export { setMintError } from './actions/set-mint-error';
 export { setGaslessEnabled } from './actions/set-gasless-enabled';
 export { setGaslessFeeAsset } from './actions/set-gasless-fee-asset';
 export { enableGasless } from './actions/enable-gasless';
+export { seedGaslessFeeAsset } from './actions/seed-gasless-fee-asset';

From e54804456c40d25fe56dfc00a6761f982099bc4a Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Fri, 5 Jun 2026 13:02:05 +0400
Subject: [PATCH 39/46] feat(gasless): add invalide after error and add
 readable error for incorrect raw.external from tonapi

---
 .../src/features/mint/hooks/use-mint-nft.ts   | 15 ++++++++-
 .../tonapi/TonApiGaslessProvider.spec.ts      | 20 ++++++++++--
 .../tonapi/mappers/map-gasless-send.ts        | 31 +++++++++++++------
 .../src/defi/gasless/tonapi/types/send.ts     |  7 +++--
 4 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
index 8c6de6834..4ba1ef18d 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-mint-nft.ts
@@ -7,7 +7,7 @@
  */
 
 import { useCallback, useEffect } from 'react';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { toNano } from '@ton/core';
 import {
     useBalance,
@@ -92,6 +92,7 @@ export const useMintNft = (): UseMintNftReturn => {
         data: quote,
         isFetching: isLoadingQuote,
         error: quoteError,
+        queryKey: gaslessQuoteKey,
     } = useGaslessQuote({
         messages: message ? [message] : [],
         feeAsset: gaslessFeeAsset ?? undefined,
@@ -103,6 +104,8 @@ export const useMintNft = (): UseMintNftReturn => {
     const { mutateAsync: sendGasless } = useSendGaslessTransaction();
     const { mutateAsync: sendRegular } = useSendTransaction();
 
+    const queryClient = useQueryClient();
+
     const sendMutation = useMutation({
         mutationFn: async (): Promise<void> => {
             if (gaslessEnabled) {
@@ -113,6 +116,16 @@ export const useMintNft = (): UseMintNftReturn => {
             const request = await buildMintTransaction();
             await sendRegular(request);
         },
+        onError: () => {
+            // On a failed gasless send, drop the cached quote so a retry refetches a
+            // fresh one (new `validUntil`) instead of re-submitting the same — e.g.
+            // after a quote-expiry or relayer error. This doesn't touch the on-chain
+            // seqno guard (the send still re-signs at click-time); it just refreshes
+            // the relayer estimate the confirm modal shows and the next send uses.
+            if (gaslessEnabled) {
+                void queryClient.invalidateQueries({ queryKey: gaslessQuoteKey });
+            }
+        },
     });
 
     const checkShortfall = useCallback((): MintShortfall | undefined => {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 714897b37..48bc7cba5 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -417,8 +417,9 @@ describe('TonApiGaslessProvider.sendTransaction', () => {
         internalBoc: buildSignedInternalBoc(),
     };
 
-    // TonAPI's `external` is the hex BoC of the broadcasted external-in message.
-    // The provider expects it to be present; build a valid one once and reuse.
+    // TonAPI's `external` is the hex BoC of the broadcasted external-in message
+    // (NOT a hash, despite the OpenAPI description). The provider derives the
+    // result from it; build a valid one once and reuse.
     const validExternalHex = internalBocToExternalMessageBoc(buildSignedInternalBoc()).toBoc().toString('hex');
     const successfulSendResponse = () => jsonResponse({ protocol_name: 'tonapi', external: validExternalHex });
 
@@ -448,7 +449,7 @@ describe('TonApiGaslessProvider.sendTransaction', () => {
 
         const result = await provider.sendTransaction(baseSendParams);
 
-        // All three SendTransactionResponse fields populated
+        // boc/hash come from `raw.external` (the actual broadcasted external message).
         expect(result.boc).toBe(externalCell.toBoc().toString('base64'));
         expect(result.normalizedBoc).toBeDefined();
         expect(() => Cell.fromBase64(result.normalizedBoc)).not.toThrow();
@@ -457,6 +458,19 @@ describe('TonApiGaslessProvider.sendTransaction', () => {
         expect(result.internalBoc).toBe(baseSendParams.internalBoc);
     });
 
+    it('throws GaslessError(SEND_FAILED) when `external` is not a parseable BoC (e.g. a bare hash)', async () => {
+        const fetchApi = makeFetch();
+        const provider = makeProvider(fetchApi);
+        // OpenAPI describes `external` as a normalized hash; if TonAPI ever actually
+        // returns one, it can't be parsed as a BoC — fail loudly, not cryptically.
+        fetchApi.mockResolvedValueOnce(jsonResponse({ protocol_name: 'tonapi', external: '00'.repeat(32) }));
+
+        await expect(provider.sendTransaction(baseSendParams)).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.SendFailed,
+        });
+    });
+
     it('throws GaslessError(SEND_FAILED) when the relayer omits the external field', async () => {
         const fetchApi = makeFetch();
         const provider = makeProvider(fetchApi);
diff --git a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
index 82528dade..bccd7dc60 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/mappers/map-gasless-send.ts
@@ -28,12 +28,14 @@ export const buildGaslessSendRequest = (params: GaslessSendParams): TonApiGasles
 /**
  * Wire → domain: turn TonAPI's `GaslessTx` response into a `SendTransactionResponse`.
  *
- * The OpenAPI description claims `external` is a "Normalized hash of the
- * external message", but the wire payload is actually the **full BoC** of the
- * external-in message the relayer broadcasted (hex-encoded). We re-encode it
- * to base64 and normalize via `getNormalizedExtMessageHash` so consumers get
- * the same `{ boc, normalizedBoc, normalizedHash }` triple as
- * `wallet.sendTransaction` returns.
+ * Despite the OpenAPI description ("Normalized hash of the external message"),
+ * `external` is the **full hex BoC** of the external-in message the relayer
+ * actually broadcast — verified against live TonAPI. Crucially it is the
+ * *relayer's own* external message (addressed to the relayer's wallet), which
+ * differs from the external message we submit (addressed to the user's wallet),
+ * so it is the only source for the real on-chain hash. We re-encode it to base64
+ * and normalize via `getNormalizedExtMessageHash` to yield the same
+ * `{ boc, normalizedBoc, normalizedHash }` triple as `wallet.sendTransaction`.
  */
 export const mapGaslessSend = (raw: TonApiGaslessSendResponse): SendTransactionResponse => {
     if (!raw.external) {
@@ -42,7 +44,18 @@ export const mapGaslessSend = (raw: TonApiGaslessSendResponse): SendTransactionR
         });
     }
 
-    const boc = hexBocToBase64(raw.external);
-    const { hash: normalizedHash, boc: normalizedBoc } = getNormalizedExtMessageHash(boc);
-    return { boc, normalizedBoc, normalizedHash };
+    try {
+        const boc = hexBocToBase64(raw.external);
+        const { hash: normalizedHash, boc: normalizedBoc } = getNormalizedExtMessageHash(boc);
+        return { boc, normalizedBoc, normalizedHash };
+    } catch (cause) {
+        // Guards the OpenAPI-divergence risk: if TonAPI ever returns a bare hash
+        // (or anything that isn't a parseable external-in BoC), fail loudly with a
+        // typed error instead of crashing cryptically or returning a wrong hash.
+        throw new GaslessError(
+            'Relayer `external` is not a parseable external-message BoC — TonAPI response format may have changed.',
+            GaslessErrorCode.SendFailed,
+            { external: raw.external, cause },
+        );
+    }
 };
diff --git a/packages/walletkit/src/defi/gasless/tonapi/types/send.ts b/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
index 89ddf2205..e0ca28270 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/types/send.ts
@@ -18,8 +18,11 @@ export interface TonApiGaslessSendRequest {
 /**
  * Wire-format response from `POST /v2/gasless/send` (TonAPI `GaslessTx`).
  *
- * `external` is the TEP-467 normalized hash of the external message the relayer
- * broadcasted. Optional in the schema; required field is `protocol_name`.
+ * `external` is optional in the schema; `protocol_name` is required. The OpenAPI
+ * labels `external` as a "normalized hash", but in practice (verified against
+ * live TonAPI) it is the full hex BoC of the external-in message the relayer
+ * broadcast — and it's the relayer's own message, distinct from the one we
+ * submit, so it's the source of truth for the on-chain hash (see `mapGaslessSend`).
  */
 export interface TonApiGaslessSendResponse {
     external?: string;

From 11927b47ee96d76cad73e84240f799519495102f Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 8 Jun 2026 15:58:39 +0400
Subject: [PATCH 40/46] feat(gasless): add gasless send in demo-wallet

---
 .../src/hooks/useGaslessJettonSend.ts         | 129 ++++++++++
 apps/demo-wallet/src/hooks/useSendToken.ts    |  97 ++++++++
 .../demo-wallet/src/pages/SendTransaction.tsx | 131 +++++++---
 demo/wallet-core/src/hooks/useWalletStore.ts  |  25 ++
 demo/wallet-core/src/index.ts                 |   4 +
 .../src/store/createWalletStore.ts            |   4 +
 .../src/store/slices/gaslessSlice.ts          | 233 ++++++++++++++++++
 .../src/store/slices/walletCoreSlice.ts       |  16 ++
 demo/wallet-core/src/types/store.ts           |  40 ++-
 packages/walletkit/src/core/TonWalletKit.ts   |  11 +
 packages/walletkit/src/types/kit.ts           |   5 +-
 11 files changed, 660 insertions(+), 35 deletions(-)
 create mode 100644 apps/demo-wallet/src/hooks/useGaslessJettonSend.ts
 create mode 100644 apps/demo-wallet/src/hooks/useSendToken.ts
 create mode 100644 demo/wallet-core/src/store/slices/gaslessSlice.ts

diff --git a/apps/demo-wallet/src/hooks/useGaslessJettonSend.ts b/apps/demo-wallet/src/hooks/useGaslessJettonSend.ts
new file mode 100644
index 000000000..a31725885
--- /dev/null
+++ b/apps/demo-wallet/src/hooks/useGaslessJettonSend.ts
@@ -0,0 +1,129 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useEffect, useMemo } from 'react';
+import { isValidAddress } from '@ton/walletkit';
+import type { Jetton, Wallet, GaslessSupportedAsset, SendTransactionResponse } from '@ton/walletkit';
+import { useGasless } from '@demo/wallet-core';
+
+import { useJettonInfo } from '@/hooks/useJettonInfo';
+import { formatUnits, parseUnits } from '@/utils/units';
+
+const QUOTE_DEBOUNCE_MS = 400;
+
+interface UseGaslessJettonSendParams {
+    wallet: Wallet | null | undefined;
+    /** The jetton being sent, or `undefined` when TON is selected. */
+    jetton: Jetton | undefined;
+    recipient: string;
+    amount: string;
+}
+
+export interface UseGaslessJettonSendResult {
+    /** Gasless is offered for the current selection (jetton + SignMessage wallet). */
+    canUse: boolean;
+    /** Gasless is enabled AND offered — the path the send actually takes. */
+    effective: boolean;
+    enabled: boolean;
+    setEnabled: (enabled: boolean) => void;
+    feeAsset: string | null;
+    setFeeAsset: (address: string) => void;
+    supportedAssets: GaslessSupportedAsset[];
+    /** Formatted relayer commission (e.g. "0.21 USDT"), or null while quoting / unset. */
+    feeFormatted: string | null;
+    isQuoting: boolean;
+    isSending: boolean;
+    /** A fresh quote is in hand (gates the Send button). */
+    hasQuote: boolean;
+    error: string | null;
+    send: () => Promise<SendTransactionResponse>;
+}
+
+/**
+ * Encapsulates the gasless jetton-send flow for the Send page: availability,
+ * relayer config + fee-asset selection, reactive (debounced) quoting and the
+ * send. Keeps `SendTransaction` thin.
+ */
+export const useGaslessJettonSend = ({
+    wallet,
+    jetton,
+    recipient,
+    amount,
+}: UseGaslessJettonSendParams): UseGaslessJettonSendResult => {
+    const gasless = useGasless();
+
+    const supportsSignMessage = useMemo(() => {
+        const features = wallet?.getSupportedFeatures();
+        if (!features) return false;
+        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+    }, [wallet]);
+
+    const canUse = Boolean(jetton) && supportsSignMessage;
+    const effective = gasless.enabled && canUse;
+
+    const feeAssetInfo = useJettonInfo(gasless.feeAsset ?? undefined);
+    const feeFormatted =
+        gasless.currentQuote && feeAssetInfo?.decimals != null
+            ? `${formatUnits(gasless.currentQuote.fee, feeAssetInfo.decimals)} ${feeAssetInfo.symbol ?? ''}`.trim()
+            : null;
+
+    // Resolve the relayer config (fee assets + relay address) once gasless is on
+    // — single load point so the selector is populated before the first quote.
+    useEffect(() => {
+        if (effective) gasless.loadGaslessConfig();
+    }, [effective, gasless.loadGaslessConfig]);
+
+    // Reset gasless state when leaving the page.
+    useEffect(() => {
+        return () => gasless.clearGasless();
+    }, [gasless.clearGasless]);
+
+    // Re-quote (debounced) as the inputs change. The prior quote is invalidated
+    // synchronously first, so a stale quote can't be sent during the debounce
+    // window (the Send button gates on `hasQuote`).
+    useEffect(() => {
+        if (!effective) return;
+        gasless.clearGaslessQuote();
+
+        const inputAmount = parseFloat(amount);
+        const decimals = jetton?.decimalsNumber;
+        if (
+            !jetton ||
+            !recipient ||
+            !isValidAddress(recipient) ||
+            !(inputAmount > 0) ||
+            !gasless.feeAsset ||
+            !decimals
+        ) {
+            return;
+        }
+
+        const transferAmount = parseUnits(amount, decimals).toString();
+        const jettonAddress = jetton.address;
+        const id = setTimeout(() => {
+            gasless.getGaslessQuote({ recipientAddress: recipient, jettonAddress, transferAmount });
+        }, QUOTE_DEBOUNCE_MS);
+        return () => clearTimeout(id);
+    }, [effective, recipient, amount, gasless.feeAsset, jetton, gasless.clearGaslessQuote, gasless.getGaslessQuote]);
+
+    return {
+        canUse,
+        effective,
+        enabled: gasless.enabled,
+        setEnabled: gasless.setGaslessEnabled,
+        feeAsset: gasless.feeAsset,
+        setFeeAsset: gasless.setGaslessFeeAsset,
+        supportedAssets: gasless.supportedAssets,
+        feeFormatted,
+        isQuoting: gasless.isLoadingQuote,
+        isSending: gasless.isSending,
+        hasQuote: Boolean(gasless.currentQuote),
+        error: gasless.error,
+        send: gasless.sendGasless,
+    };
+};
diff --git a/apps/demo-wallet/src/hooks/useSendToken.ts b/apps/demo-wallet/src/hooks/useSendToken.ts
new file mode 100644
index 000000000..edbd99a59
--- /dev/null
+++ b/apps/demo-wallet/src/hooks/useSendToken.ts
@@ -0,0 +1,97 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { useCallback } from 'react';
+import type { ITonWalletKit, Jetton, Wallet } from '@ton/walletkit';
+
+import { parseUnits } from '@/utils/units';
+import { useGaslessJettonSend } from '@/hooks/useGaslessJettonSend';
+import type { UseGaslessJettonSendResult } from '@/hooks/useGaslessJettonSend';
+
+const TON_DECIMALS = 9;
+
+interface UseSendTokenParams {
+    wallet: Wallet | null | undefined;
+    walletKit: ITonWalletKit | null;
+    tokenType: 'TON' | 'JETTON';
+    /** Selected jetton when `tokenType === 'JETTON'`. */
+    jetton: Jetton | undefined;
+    recipient: string;
+    amount: string;
+}
+
+export interface UseSendTokenResult {
+    /** Send the transfer, dispatching to the gasless or the regular flow. */
+    send: () => Promise<void>;
+    /** Inputs aren't ready (no wallet/recipient/amount, or gasless quote pending). */
+    isDisabled: boolean;
+    /** Gasless sub-state for the UI (toggle, fee-asset selector, fee, errors). */
+    gasless: UseGaslessJettonSendResult;
+}
+
+/**
+ * Single entry point for the Send page, mirroring appkit-minter's `useMintNft`:
+ * `send()` builds and submits the transfer, picking the gasless flow when it's
+ * effective and falling back to the regular TON / jetton transfer otherwise.
+ * Balance validation stays in the page (gating mirrors the mint flow).
+ */
+export const useSendToken = ({
+    wallet,
+    walletKit,
+    tokenType,
+    jetton,
+    recipient,
+    amount,
+}: UseSendTokenParams): UseSendTokenResult => {
+    const gasless = useGaslessJettonSend({
+        wallet,
+        jetton: tokenType === 'JETTON' ? jetton : undefined,
+        recipient,
+        amount,
+    });
+
+    const send = useCallback(async () => {
+        if (!wallet) throw new Error('No wallet available');
+
+        // Gasless jetton transfer: relay the already-fetched, locally-signed quote.
+        if (gasless.effective && jetton) {
+            await gasless.send();
+            return;
+        }
+
+        if (tokenType === 'TON') {
+            const tx = await wallet.createTransferTonTransaction({
+                recipientAddress: recipient,
+                transferAmount: parseUnits(amount, TON_DECIMALS).toString(),
+            });
+            if (walletKit) await walletKit.handleNewTransaction(wallet, tx);
+            return;
+        }
+
+        if (jetton) {
+            const decimals = jetton.decimalsNumber;
+            if (!decimals) throw new Error('Jetton decimals not found');
+
+            const tx = await wallet.createTransferJettonTransaction({
+                recipientAddress: recipient,
+                jettonAddress: jetton.address,
+                transferAmount: parseUnits(amount, decimals).toString(),
+            });
+            if (walletKit) await walletKit.handleNewTransaction(wallet, tx);
+        }
+    }, [wallet, walletKit, tokenType, jetton, recipient, amount, gasless.effective, gasless.send]);
+
+    const isDisabled =
+        !wallet ||
+        !recipient ||
+        !amount ||
+        parseFloat(amount) <= 0 ||
+        (gasless.effective && (!gasless.hasQuote || gasless.isQuoting || gasless.isSending));
+
+    return { send, isDisabled, gasless };
+};
diff --git a/apps/demo-wallet/src/pages/SendTransaction.tsx b/apps/demo-wallet/src/pages/SendTransaction.tsx
index b6e01db5b..2abf2f978 100644
--- a/apps/demo-wallet/src/pages/SendTransaction.tsx
+++ b/apps/demo-wallet/src/pages/SendTransaction.tsx
@@ -18,6 +18,8 @@ import { createComponentLogger } from '../utils/logger';
 
 import { getFormattedJettonInfo } from '@/utils/jetton';
 import { useFormattedJetton } from '@/hooks/useFormattedJetton';
+import { useJettonInfo } from '@/hooks/useJettonInfo';
+import { useSendToken } from '@/hooks/useSendToken';
 
 // Create logger for send transaction
 const log = createComponentLogger('SendTransaction');
@@ -27,6 +29,13 @@ interface SelectedToken {
     data?: Jetton;
 }
 
+/** One fee-asset option — resolves the jetton ticker (falls back to a short address). */
+const FeeAssetOption: React.FC<{ address: string }> = ({ address }) => {
+    const info = useJettonInfo(address);
+    const label = info?.symbol || `${address.slice(0, 4)}…${address.slice(-4)}`;
+    return <option value={address}>{label}</option>;
+};
+
 export const SendTransaction: React.FC = () => {
     const walletKit = useWalletKit();
     const [recipient, setRecipient] = useState('');
@@ -47,6 +56,21 @@ export const SendTransaction: React.FC = () => {
     const selectedJettonInfo = useFormattedJetton(selectedToken?.data);
     const getJettonInfo = (jetton: Jetton) => getFormattedJettonInfo(formatJettonAmount)(jetton);
 
+    // Single send entry point — dispatches gasless vs regular (TON/jetton).
+    // Gasless is offered only for jettons on a SignMessage-capable wallet.
+    const sender = useSendToken({
+        wallet: currentWallet,
+        walletKit,
+        tokenType: selectedToken.type,
+        jetton: selectedToken.data,
+        recipient,
+        amount,
+    });
+    const gasless = sender.gasless;
+    const canUseGasless = gasless.canUse;
+    const effectiveGasless = gasless.effective;
+    const gaslessFeeFormatted = gasless.feeFormatted;
+
     useEffect(() => {
         loadUserJettons();
     }, [loadUserJettons]);
@@ -98,34 +122,8 @@ export const SendTransaction: React.FC = () => {
                 throw new Error('Insufficient balance');
             }
 
-            if (!currentWallet) {
-                throw new Error('No wallet available');
-            }
-
-            if (selectedToken.type === 'TON') {
-                const nanoTonAmount = Math.floor(inputAmount * 1000000000).toString();
-                const tonTransferParams: TONTransferRequest = {
-                    recipientAddress: recipient,
-                    transferAmount: nanoTonAmount,
-                };
-                const result = await currentWallet.createTransferTonTransaction(tonTransferParams);
-                if (walletKit) {
-                    await walletKit.handleNewTransaction(currentWallet, result);
-                }
-            } else if (selectedToken.data) {
-                const decimals = selectedToken.data.decimalsNumber;
-                if (!decimals) throw new Error('Jetton decimals not found');
-
-                const jettonAmount = Math.floor(inputAmount * Math.pow(10, decimals)).toString();
-                const jettonTransaction = await currentWallet.createTransferJettonTransaction({
-                    recipientAddress: recipient,
-                    jettonAddress: selectedToken.data.address,
-                    transferAmount: jettonAmount,
-                });
-                if (walletKit) {
-                    await walletKit.handleNewTransaction(currentWallet, jettonTransaction);
-                }
-            }
+            // Build + submit, dispatching gasless vs regular inside the hook.
+            await sender.send();
 
             navigate('/wallet', {
                 state: { message: `${getCurrentTokenSymbol()} sent successfully!` },
@@ -237,7 +235,7 @@ export const SendTransaction: React.FC = () => {
     };
 
     const balanceForAnimated = selectedToken.type === 'TON' ? balance : undefined;
-    const isSendDisabled = !currentWallet || !recipient || !amount || parseFloat(amount) <= 0;
+    const isSendDisabled = sender.isDisabled;
     const isSendFastDisabled = !currentWallet || !address;
 
     return (
@@ -508,7 +506,7 @@ export const SendTransaction: React.FC = () => {
                                                     {amount} {getCurrentTokenSymbol()}
                                                 </span>
                                             </div>
-                                            {selectedToken.type === 'JETTON' && (
+                                            {selectedToken.type === 'JETTON' && !effectiveGasless && (
                                                 <p className="text-xs text-blue-700 pt-1">
                                                     TON fees will be deducted separately.
                                                 </p>
@@ -516,11 +514,70 @@ export const SendTransaction: React.FC = () => {
                                         </div>
                                     )}
 
+                                    {/* Gasless: pay the fee in a jetton (jettons only, SignMessage wallets) */}
+                                    {canUseGasless && (
+                                        <div className="space-y-2 rounded-md border border-gray-200 p-3">
+                                            <label className="flex items-center gap-2 text-sm text-gray-700">
+                                                <input
+                                                    type="checkbox"
+                                                    checked={gasless.enabled}
+                                                    onChange={(e) => gasless.setEnabled(e.target.checked)}
+                                                    data-testid="gasless-toggle"
+                                                />
+                                                <span>Gasless — pay the fee in a jetton</span>
+                                            </label>
+
+                                            {effectiveGasless && (
+                                                <>
+                                                    <div>
+                                                        <label className="block text-xs text-gray-500 mb-1">
+                                                            Fee asset
+                                                        </label>
+                                                        <select
+                                                            value={gasless.feeAsset ?? ''}
+                                                            onChange={(e) => gasless.setFeeAsset(e.target.value)}
+                                                            disabled={gasless.supportedAssets.length === 0}
+                                                            className="w-full border border-gray-200 rounded-md px-2 py-1.5 text-sm"
+                                                            data-testid="gasless-fee-asset"
+                                                        >
+                                                            {!gasless.feeAsset && (
+                                                                <option value="" disabled>
+                                                                    Select
+                                                                </option>
+                                                            )}
+                                                            {gasless.supportedAssets.map((asset) => (
+                                                                <FeeAssetOption
+                                                                    key={asset.address}
+                                                                    address={asset.address}
+                                                                />
+                                                            ))}
+                                                        </select>
+                                                    </div>
+                                                    <div className="flex justify-between text-sm">
+                                                        <span className="text-gray-500">Gas fee:</span>
+                                                        <span>
+                                                            {gasless.error
+                                                                ? '—'
+                                                                : gasless.isQuoting
+                                                                  ? 'Calculating…'
+                                                                  : (gaslessFeeFormatted ?? '—')}
+                                                        </span>
+                                                    </div>
+                                                    {gasless.error && (
+                                                        <p className="text-xs text-red-600" data-testid="gasless-error">
+                                                            {gasless.error}
+                                                        </p>
+                                                    )}
+                                                </>
+                                            )}
+                                        </div>
+                                    )}
+
                                     {error && <div className="text-red-600 text-sm text-center">{error}</div>}
 
                                     {/* Send buttons */}
                                     <div className="flex gap-2">
-                                        {showFastSend && (
+                                        {showFastSend && !effectiveGasless && (
                                             <Button
                                                 type="button"
                                                 variant="secondary"
@@ -535,12 +592,20 @@ export const SendTransaction: React.FC = () => {
                                         )}
                                         <Button
                                             type="submit"
-                                            isLoading={isLoading}
+                                            isLoading={isLoading || gasless.isSending}
                                             disabled={isSendDisabled}
                                             className="flex-1"
                                             data-testid="send-submit"
                                         >
-                                            {isLoading ? `Sending...` : `Send ${getCurrentTokenSymbol()}`}
+                                            {effectiveGasless
+                                                ? gasless.isSending
+                                                    ? 'Sending…'
+                                                    : gasless.isQuoting
+                                                      ? 'Quoting…'
+                                                      : 'Send Gasless'
+                                                : isLoading
+                                                  ? `Sending...`
+                                                  : `Send ${getCurrentTokenSymbol()}`}
                                         </Button>
                                     </div>
                                 </form>
diff --git a/demo/wallet-core/src/hooks/useWalletStore.ts b/demo/wallet-core/src/hooks/useWalletStore.ts
index a373b8738..c8bc5c3f1 100644
--- a/demo/wallet-core/src/hooks/useWalletStore.ts
+++ b/demo/wallet-core/src/hooks/useWalletStore.ts
@@ -249,6 +249,31 @@ export const useSwap = () => {
         })),
     );
 };
+/**
+ * Hook for Gasless transfers
+ */
+export const useGasless = () => {
+    return useWalletStore(
+        useShallow((state) => ({
+            enabled: state.gasless.enabled,
+            feeAsset: state.gasless.feeAsset,
+            supportedAssets: state.gasless.supportedAssets,
+            relayAddress: state.gasless.relayAddress,
+            currentQuote: state.gasless.currentQuote,
+            isLoadingConfig: state.gasless.isLoadingConfig,
+            isLoadingQuote: state.gasless.isLoadingQuote,
+            isSending: state.gasless.isSending,
+            error: state.gasless.error,
+            setGaslessEnabled: state.setGaslessEnabled,
+            setGaslessFeeAsset: state.setGaslessFeeAsset,
+            clearGaslessQuote: state.clearGaslessQuote,
+            loadGaslessConfig: state.loadGaslessConfig,
+            getGaslessQuote: state.getGaslessQuote,
+            sendGasless: state.sendGasless,
+            clearGasless: state.clearGasless,
+        })),
+    );
+};
 /**
  * Hook for Staking
  */
diff --git a/demo/wallet-core/src/index.ts b/demo/wallet-core/src/index.ts
index 0d7096352..ebf6d58b0 100644
--- a/demo/wallet-core/src/index.ts
+++ b/demo/wallet-core/src/index.ts
@@ -32,6 +32,7 @@ export {
     useJettons,
     useSwap,
     useStaking,
+    useGasless,
 } from './hooks/useWalletStore';
 export { useFormattedTonBalance, useFormattedAmount } from './hooks/useFormattedBalance';
 export { useWalletInitialization } from './hooks/useWalletInitialization';
@@ -48,6 +49,9 @@ export type {
     NftsSlice,
     SwapSlice,
     StakingSlice,
+    GaslessSlice,
+    GaslessState,
+    GaslessQuoteRequest,
 } from './types/store';
 
 export type {
diff --git a/demo/wallet-core/src/store/createWalletStore.ts b/demo/wallet-core/src/store/createWalletStore.ts
index 9296f8839..fec4f4aa1 100644
--- a/demo/wallet-core/src/store/createWalletStore.ts
+++ b/demo/wallet-core/src/store/createWalletStore.ts
@@ -18,6 +18,7 @@ import { createJettonsSlice } from './slices/jettonsSlice';
 import { createNftsSlice } from './slices/nftsSlice';
 import { createSwapSlice } from './slices/swapSlice';
 import { createStakingSlice } from './slices/stakingSlice';
+import { createGaslessSlice } from './slices/gaslessSlice';
 import type { AppState } from '../types/store';
 import type { StorageAdapter } from '../adapters/storage/types';
 import type { WalletKitConfig } from '../types/wallet';
@@ -145,6 +146,9 @@ export function createWalletStore(options: CreateWalletStoreOptions = {}) {
                         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                         // @ts-ignore
                         ...createStakingSlice(...a),
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore
+                        ...createGaslessSlice(...a),
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     })) as unknown as any,
                     {
diff --git a/demo/wallet-core/src/store/slices/gaslessSlice.ts b/demo/wallet-core/src/store/slices/gaslessSlice.ts
new file mode 100644
index 000000000..16ca30464
--- /dev/null
+++ b/demo/wallet-core/src/store/slices/gaslessSlice.ts
@@ -0,0 +1,233 @@
+/**
+ * Copyright (c) TonTech.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+    asAddressFriendly,
+    compareAddress,
+    createJettonTransferPayload,
+    createTransferTransaction,
+    DEFAULT_JETTON_GAS_FEE,
+} from '@ton/walletkit';
+import type { SendTransactionResponse } from '@ton/walletkit';
+
+import { createComponentLogger } from '../../utils/logger';
+import type { SetState, GaslessSliceCreator } from '../../types/store';
+
+const log = createComponentLogger('GaslessSlice');
+
+/** USDT (Tether USD) jetton master on TON mainnet — preferred default fee asset. */
+const USDT_MASTER_MAINNET = 'EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs';
+
+/** Pick the default fee asset from the relayer list — USDT if accepted, else the first. */
+const pickDefaultFeeAsset = (supportedAssets: { address: string }[]): string | null => {
+    if (supportedAssets.length === 0) return null;
+    const usdt = supportedAssets.find((asset) => compareAddress(asset.address, USDT_MASTER_MAINNET));
+    return usdt?.address ?? supportedAssets[0].address;
+};
+
+export const createGaslessSlice: GaslessSliceCreator = (set: SetState, get) => ({
+    gasless: {
+        enabled: false,
+        feeAsset: null,
+        supportedAssets: [],
+        relayAddress: null,
+        currentQuote: null,
+        isLoadingConfig: false,
+        isLoadingQuote: false,
+        isSending: false,
+        error: null,
+    },
+
+    setGaslessEnabled: (enabled: boolean) => {
+        set((state) => {
+            state.gasless.enabled = enabled;
+            // Drop any stale error on each toggle; clear the quote when turning off.
+            state.gasless.error = null;
+            if (!enabled) state.gasless.currentQuote = null;
+        });
+    },
+
+    setGaslessFeeAsset: (address: string) => {
+        set((state) => {
+            state.gasless.feeAsset = address;
+            // Fee asset changed — the existing quote no longer reflects it.
+            state.gasless.currentQuote = null;
+        });
+    },
+
+    clearGaslessQuote: () => {
+        set((state) => {
+            state.gasless.currentQuote = null;
+            state.gasless.error = null;
+        });
+    },
+
+    loadGaslessConfig: async () => {
+        const state = get();
+        const kit = state.walletCore.walletKit;
+        const network = state.walletManagement.currentWallet?.getNetwork();
+
+        if (!kit || !network) return;
+
+        set((state) => {
+            state.gasless.isLoadingConfig = true;
+        });
+
+        try {
+            const config = await kit.gasless.getConfig(network);
+
+            set((state) => {
+                state.gasless.supportedAssets = config.supportedAssets;
+                state.gasless.relayAddress = config.relayAddress;
+                state.gasless.isLoadingConfig = false;
+                // Seed the fee asset on first load (USDT preferred), keep an existing pick.
+                if (!state.gasless.feeAsset) {
+                    state.gasless.feeAsset = pickDefaultFeeAsset(config.supportedAssets);
+                }
+            });
+        } catch (error) {
+            log.error('Failed to load gasless config:', error);
+            set((state) => {
+                state.gasless.isLoadingConfig = false;
+                state.gasless.error = error instanceof Error ? error.message : 'Failed to load gasless config';
+            });
+        }
+    },
+
+    getGaslessQuote: async ({ recipientAddress, jettonAddress, transferAmount, comment }) => {
+        const state = get();
+        const wallet = state.walletManagement.currentWallet;
+        const kit = state.walletCore.walletKit;
+
+        if (!wallet || !kit) {
+            set((state) => {
+                state.gasless.error = 'WalletKit not initialized';
+            });
+            return;
+        }
+
+        // The relayer config (relay address + fee asset) is loaded once via
+        // `loadGaslessConfig` when gasless is enabled — see `useGaslessJettonSend`.
+        const { feeAsset, relayAddress } = get().gasless;
+        if (!feeAsset || !relayAddress) {
+            set((state) => {
+                state.gasless.error = 'Gasless is not available on this network';
+            });
+            return;
+        }
+
+        set((state) => {
+            state.gasless.isLoadingQuote = true;
+            state.gasless.error = null;
+        });
+
+        try {
+            const network = wallet.getNetwork();
+            const jettonWalletAddress = await wallet.getJettonWalletAddress(asAddressFriendly(jettonAddress));
+
+            // `responseDestination = relayer`: the relayer fronts the message's TON
+            // budget, so its unspent remainder returns to it rather than the user —
+            // otherwise the relayer pads the commission to cover the loss.
+            const payload = createJettonTransferPayload({
+                amount: BigInt(transferAmount),
+                destination: asAddressFriendly(recipientAddress),
+                responseDestination: asAddressFriendly(relayAddress),
+                comment,
+            });
+
+            const tx = createTransferTransaction({
+                targetAddress: jettonWalletAddress,
+                amount: DEFAULT_JETTON_GAS_FEE,
+                payload,
+                fromAddress: wallet.getAddress(),
+            });
+
+            const quote = await kit.gasless.getQuote({
+                network,
+                feeAsset: asAddressFriendly(feeAsset),
+                walletAddress: wallet.getAddress(),
+                walletPublicKey: wallet.getPublicKey(),
+                messages: tx.messages,
+            });
+
+            set((state) => {
+                state.gasless.currentQuote = quote;
+                state.gasless.isLoadingQuote = false;
+            });
+        } catch (error) {
+            log.error('Failed to get gasless quote:', error);
+            set((state) => {
+                state.gasless.isLoadingQuote = false;
+                state.gasless.currentQuote = null;
+                state.gasless.error = error instanceof Error ? error.message : 'Failed to get gasless quote';
+            });
+        }
+    },
+
+    sendGasless: async (): Promise<SendTransactionResponse> => {
+        const state = get();
+        const { currentQuote } = state.gasless;
+        const wallet = state.walletManagement.currentWallet;
+        const kit = state.walletCore.walletKit;
+
+        if (!currentQuote || !wallet || !kit) {
+            throw new Error('Gasless quote not ready');
+        }
+
+        set((state) => {
+            state.gasless.isSending = true;
+            state.gasless.error = null;
+        });
+
+        try {
+            const network = wallet.getNetwork();
+
+            // Sign the relayer-wrapped messages locally → internal-message BoC the
+            // relayer broadcasts (paying the gas). No approval modal: the wallet
+            // holds the key and signs directly.
+            const internalBoc = await wallet.getSignedSignMessage({
+                messages: currentQuote.messages,
+                validUntil: currentQuote.validUntil,
+                network,
+                fromAddress: wallet.getAddress(),
+            });
+
+            const result = await kit.gasless.sendTransaction({
+                network,
+                walletPublicKey: wallet.getPublicKey(),
+                internalBoc,
+            });
+
+            set((state) => {
+                state.gasless.isSending = false;
+                state.gasless.currentQuote = null;
+            });
+
+            return result;
+        } catch (error) {
+            log.error('Failed to send gasless transaction:', error);
+            // Don't write to `gasless.error` here — the send error is surfaced by
+            // the caller (it rethrows). `gasless.error` stays reserved for quote /
+            // config failures shown inline, so the message isn't duplicated.
+            set((state) => {
+                state.gasless.isSending = false;
+            });
+            throw error;
+        }
+    },
+
+    clearGasless: () => {
+        set((state) => {
+            state.gasless.enabled = false;
+            state.gasless.currentQuote = null;
+            state.gasless.isLoadingQuote = false;
+            state.gasless.isSending = false;
+            state.gasless.error = null;
+        });
+    },
+});
diff --git a/demo/wallet-core/src/store/slices/walletCoreSlice.ts b/demo/wallet-core/src/store/slices/walletCoreSlice.ts
index 38e3778ee..987ffb629 100644
--- a/demo/wallet-core/src/store/slices/walletCoreSlice.ts
+++ b/demo/wallet-core/src/store/slices/walletCoreSlice.ts
@@ -20,6 +20,7 @@ import {
 import type { ITonWalletKit } from '@ton/walletkit';
 import { createOmnistonProvider } from '@ton/walletkit/swap/omniston';
 import { createTonstakersProvider } from '@ton/walletkit/staking/tonstakers';
+import { createTonApiGaslessProvider } from '@ton/walletkit/gasless/tonapi';
 
 import { createComponentLogger } from '../../utils/logger';
 import { isExtension } from '../../utils/isExtension';
@@ -119,6 +120,21 @@ function createWalletKitInstance(walletKitConfig?: WalletKitConfig): ITonWalletK
     );
     walletKit.staking.registerProvider(createTonstakersProvider());
 
+    // Pass the TonAPI keys to the gasless relayer only when TonAPI is the
+    // configured provider — otherwise the keys are Toncenter keys and don't
+    // apply. Without a key it falls back to the public TonAPI endpoints.
+    const gaslessConfig =
+        walletKitConfig?.tonApiProvider === 'tonapi' &&
+        (walletKitConfig.tonApiKeyMainnet || walletKitConfig.tonApiKeyTestnet)
+            ? {
+                  chains: {
+                      [Network.mainnet().chainId]: { apiKey: walletKitConfig.tonApiKeyMainnet },
+                      [Network.testnet().chainId]: { apiKey: walletKitConfig.tonApiKeyTestnet },
+                  },
+              }
+            : undefined;
+    walletKit.gasless.registerProvider(createTonApiGaslessProvider(gaslessConfig));
+
     log.info(`WalletKit initialized with network: ${isExtension() ? 'extension' : 'web'}`);
     return walletKit;
 }
diff --git a/demo/wallet-core/src/types/store.ts b/demo/wallet-core/src/types/store.ts
index c01117542..589e85303 100644
--- a/demo/wallet-core/src/types/store.ts
+++ b/demo/wallet-core/src/types/store.ts
@@ -29,6 +29,9 @@ import type {
     StakingProviderInfo,
     StakeParams,
     UnstakeModes,
+    GaslessQuote,
+    GaslessSupportedAsset,
+    SendTransactionResponse,
 } from '@ton/walletkit';
 
 import type { PendingTransaction } from './streaming';
@@ -285,6 +288,38 @@ export interface StakingSlice {
     validateStakingInputs: () => string | null;
 }
 
+export interface GaslessState {
+    enabled: boolean;
+    feeAsset: string | null;
+    supportedAssets: GaslessSupportedAsset[];
+    relayAddress: string | null;
+    currentQuote: GaslessQuote | null;
+    isLoadingConfig: boolean;
+    isLoadingQuote: boolean;
+    isSending: boolean;
+    error: string | null;
+}
+
+export interface GaslessQuoteRequest {
+    recipientAddress: string;
+    jettonAddress: string;
+    /** Amount to transfer in the jetton's smallest unit. */
+    transferAmount: string;
+    comment?: string;
+}
+
+export interface GaslessSlice {
+    gasless: GaslessState;
+
+    setGaslessEnabled: (enabled: boolean) => void;
+    setGaslessFeeAsset: (address: string) => void;
+    clearGaslessQuote: () => void;
+    loadGaslessConfig: () => Promise<void>;
+    getGaslessQuote: (params: GaslessQuoteRequest) => Promise<void>;
+    sendGasless: () => Promise<SendTransactionResponse>;
+    clearGasless: () => void;
+}
+
 export interface SwapSlice {
     swap: SwapState;
 
@@ -311,7 +346,8 @@ export interface AppState
         JettonsSlice,
         NftsSlice,
         SwapSlice,
-        StakingSlice {
+        StakingSlice,
+        GaslessSlice {
     isHydrated: boolean;
 }
 
@@ -337,6 +373,8 @@ export type SwapSliceCreator = StateCreator<AppState, [['zustand/immer', never]]
 
 export type StakingSliceCreator = StateCreator<AppState, [['zustand/immer', never]], [], StakingSlice>;
 
+export type GaslessSliceCreator = StateCreator<AppState, [['zustand/immer', never]], [], GaslessSlice>;
+
 // Migration types
 export interface MigrationState {
     version: number;
diff --git a/packages/walletkit/src/core/TonWalletKit.ts b/packages/walletkit/src/core/TonWalletKit.ts
index b080bff8f..1ac09eda7 100644
--- a/packages/walletkit/src/core/TonWalletKit.ts
+++ b/packages/walletkit/src/core/TonWalletKit.ts
@@ -32,6 +32,7 @@ import type { JettonsAPI } from '../types/jettons';
 import { ConnectHandler } from '../handlers/ConnectHandler';
 import { SwapManager } from '../defi/swap';
 import { StakingManager } from '../defi/staking';
+import { GaslessManager } from '../defi/gasless';
 import type {
     RawBridgeEventConnect,
     RawBridgeEventRestoreConnection,
@@ -99,6 +100,7 @@ export class TonWalletKit implements ITonWalletKit {
     private swapManager: SwapManager;
     private streamingManager: StreamingManager;
     private stakingManager: StakingManager;
+    private gaslessManager: GaslessManager;
     private initializer: Initializer;
     private eventProcessor!: StorageEventProcessor;
     private bridgeManager!: BridgeManager;
@@ -143,6 +145,8 @@ export class TonWalletKit implements ITonWalletKit {
         this.swapManager = new SwapManager(() => this.createFactoryContext());
         // Initialize StakingManager
         this.stakingManager = new StakingManager(() => this.createFactoryContext());
+        // Initialize GaslessManager
+        this.gaslessManager = new GaslessManager(() => this.createFactoryContext());
 
         this.eventEmitter.on('restoreConnection', async ({ payload: event }) => {
             if (!event.domain) {
@@ -894,6 +898,13 @@ export class TonWalletKit implements ITonWalletKit {
         return this.stakingManager;
     }
 
+    /**
+     * Gasless API access
+     */
+    get gasless(): GaslessManager {
+        return this.gaslessManager;
+    }
+
     /**
      * Get the event emitter for this kit instance
      * Allows external components to listen to and emit events
diff --git a/packages/walletkit/src/types/kit.ts b/packages/walletkit/src/types/kit.ts
index 2291e3f62..ce691d35b 100644
--- a/packages/walletkit/src/types/kit.ts
+++ b/packages/walletkit/src/types/kit.ts
@@ -31,7 +31,7 @@ import type {
     ConnectionApprovalResponse,
     EmbeddedRequestEvent,
 } from '../api/models';
-import type { SwapAPI, StakingAPI } from '../api/interfaces';
+import type { SwapAPI, StakingAPI, GaslessAPI } from '../api/interfaces';
 import type { NetworkManager } from '../core/NetworkManager';
 import type { ProviderFactoryContext } from './factory';
 
@@ -187,4 +187,7 @@ export interface ITonWalletKit {
 
     /** Staking API access */
     staking: StakingAPI;
+
+    /** Gasless API access */
+    gasless: GaslessAPI;
 }

From a6bbb051ef24eba6673721fc226960faed332c53 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 8 Jun 2026 16:08:13 +0400
Subject: [PATCH 41/46] feat(gasless): add toast

---
 apps/demo-wallet/src/hooks/useSendToken.ts    | 19 ++++---
 .../demo-wallet/src/pages/SendTransaction.tsx | 57 ++++++++++---------
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/apps/demo-wallet/src/hooks/useSendToken.ts b/apps/demo-wallet/src/hooks/useSendToken.ts
index edbd99a59..96ac45bad 100644
--- a/apps/demo-wallet/src/hooks/useSendToken.ts
+++ b/apps/demo-wallet/src/hooks/useSendToken.ts
@@ -7,7 +7,7 @@
  */
 
 import { useCallback } from 'react';
-import type { ITonWalletKit, Jetton, Wallet } from '@ton/walletkit';
+import type { ITonWalletKit, Jetton, SendTransactionResponse, Wallet } from '@ton/walletkit';
 
 import { parseUnits } from '@/utils/units';
 import { useGaslessJettonSend } from '@/hooks/useGaslessJettonSend';
@@ -26,8 +26,12 @@ interface UseSendTokenParams {
 }
 
 export interface UseSendTokenResult {
-    /** Send the transfer, dispatching to the gasless or the regular flow. */
-    send: () => Promise<void>;
+    /**
+     * Send the transfer, dispatching to the gasless or the regular flow. Returns
+     * the gasless relayer response (with `normalizedHash`) for the gasless flow,
+     * or `undefined` for the regular flow (which goes through the preview queue).
+     */
+    send: () => Promise<SendTransactionResponse | undefined>;
     /** Inputs aren't ready (no wallet/recipient/amount, or gasless quote pending). */
     isDisabled: boolean;
     /** Gasless sub-state for the UI (toggle, fee-asset selector, fee, errors). */
@@ -55,13 +59,12 @@ export const useSendToken = ({
         amount,
     });
 
-    const send = useCallback(async () => {
+    const send = useCallback(async (): Promise<SendTransactionResponse | undefined> => {
         if (!wallet) throw new Error('No wallet available');
 
         // Gasless jetton transfer: relay the already-fetched, locally-signed quote.
         if (gasless.effective && jetton) {
-            await gasless.send();
-            return;
+            return gasless.send();
         }
 
         if (tokenType === 'TON') {
@@ -70,7 +73,7 @@ export const useSendToken = ({
                 transferAmount: parseUnits(amount, TON_DECIMALS).toString(),
             });
             if (walletKit) await walletKit.handleNewTransaction(wallet, tx);
-            return;
+            return undefined;
         }
 
         if (jetton) {
@@ -84,6 +87,8 @@ export const useSendToken = ({
             });
             if (walletKit) await walletKit.handleNewTransaction(wallet, tx);
         }
+
+        return undefined;
     }, [wallet, walletKit, tokenType, jetton, recipient, amount, gasless.effective, gasless.send]);
 
     const isDisabled =
diff --git a/apps/demo-wallet/src/pages/SendTransaction.tsx b/apps/demo-wallet/src/pages/SendTransaction.tsx
index 2abf2f978..933a27b74 100644
--- a/apps/demo-wallet/src/pages/SendTransaction.tsx
+++ b/apps/demo-wallet/src/pages/SendTransaction.tsx
@@ -102,6 +102,24 @@ export const SendTransaction: React.FC = () => {
         return selectedJettonInfo?.symbol || '';
     };
 
+    // Success toast with explorer links — for flows that return a broadcast hash
+    // immediately (gasless send, fast send).
+    const notifySent = (normalizedHash: string) => {
+        const { tonScan, tonViewer } = getTransactionExplorerUrls(normalizedHash, network);
+        toast.success('Transaction is sent to the network', {
+            description: (
+                <span className="flex gap-3 mt-1">
+                    <a href={tonScan} target="_blank" rel="noopener noreferrer" className="text-blue-600 underline">
+                        TonScan
+                    </a>
+                    <a href={tonViewer} target="_blank" rel="noopener noreferrer" className="text-blue-600 underline">
+                        TonViewer
+                    </a>
+                </span>
+            ),
+        });
+    };
+
     const handleSend = async (e: React.FormEvent) => {
         e.preventDefault();
         setError('');
@@ -123,11 +141,18 @@ export const SendTransaction: React.FC = () => {
             }
 
             // Build + submit, dispatching gasless vs regular inside the hook.
-            await sender.send();
+            const result = await sender.send();
 
-            navigate('/wallet', {
-                state: { message: `${getCurrentTokenSymbol()} sent successfully!` },
-            });
+            // Gasless relays immediately and returns a hash → toast with explorer
+            // links; the regular flow goes through the preview queue.
+            if (result?.normalizedHash) {
+                notifySent(result.normalizedHash);
+                navigate('/wallet');
+            } else {
+                navigate('/wallet', {
+                    state: { message: `${getCurrentTokenSymbol()} sent successfully!` },
+                });
+            }
         } catch (err) {
             log.error('Send transaction error:', err);
             setError(err instanceof Error ? err.message : 'Failed to send transaction');
@@ -178,29 +203,7 @@ export const SendTransaction: React.FC = () => {
                 result = await currentWallet.sendTransaction(jettonTransaction);
             }
             if (result?.normalizedHash) {
-                const { tonScan, tonViewer } = getTransactionExplorerUrls(result.normalizedHash, network);
-                toast.success('Transaction is sent to the network', {
-                    description: (
-                        <span className="flex gap-3 mt-1">
-                            <a
-                                href={tonScan}
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                className="text-blue-600 underline"
-                            >
-                                TonScan
-                            </a>
-                            <a
-                                href={tonViewer}
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                className="text-blue-600 underline"
-                            >
-                                TonViewer
-                            </a>
-                        </span>
-                    ),
-                });
+                notifySent(result.normalizedHash);
             }
         } catch (err) {
             log.error('Fast send error:', err);

From bf64fc9df4814ffe2b24c0328a08eda9acf99d7b Mon Sep 17 00:00:00 2001
From: Tim <truecarry@gmail.com>
Date: Mon, 8 Jun 2026 16:08:47 +0300
Subject: [PATCH 42/46] feat(gasless): add registerProvider to TonWalletKit
 class

---
 packages/walletkit/src/core/TonWalletKit.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/walletkit/src/core/TonWalletKit.ts b/packages/walletkit/src/core/TonWalletKit.ts
index 9ff4baed2..026c4c8bf 100644
--- a/packages/walletkit/src/core/TonWalletKit.ts
+++ b/packages/walletkit/src/core/TonWalletKit.ts
@@ -32,6 +32,7 @@ import type { JettonsAPI } from '../types/jettons';
 import { ConnectHandler } from '../handlers/ConnectHandler';
 import { SwapManager } from '../defi/swap';
 import { StakingManager } from '../defi/staking';
+import type { GaslessProvider } from '../defi/gasless';
 import { GaslessManager } from '../defi/gasless';
 import type {
     RawBridgeEventConnect,
@@ -877,6 +878,9 @@ export class TonWalletKit implements ITonWalletKit {
             case 'streaming':
                 this.streamingManager.registerProvider(provider as StreamingProvider);
                 break;
+            case 'gasless':
+                this.gaslessManager.registerProvider(provider as GaslessProvider);
+                break;
             default:
                 throw new Error('Unknown provider type');
         }

From fe65de7247a2fc00f765dc4ab6d0dc30c43160df Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 8 Jun 2026 17:56:46 +0400
Subject: [PATCH 43/46] feat(gasless): add util to check if wallet supports
 sign message

---
 .../balances/components/gasless-controls.tsx  | 11 +++++------
 .../mint/components/mint-settings-modal.tsx   |  8 ++++----
 .../mint/hooks/use-can-enable-gasless.ts      |  8 ++++----
 .../src/hooks/useGaslessJettonSend.ts         |  9 ++++-----
 packages/appkit/src/utils/index.ts            |  1 +
 .../models/TonApiGaslessProviderConfig.ts     | 19 +++++++++++++++----
 packages/walletkit/src/index.ts               |  7 ++++++-
 .../src/utils/checkSignMessageSupport.ts      | 18 ++++++++++++++----
 8 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx b/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
index 439e63c22..77cfb63cf 100644
--- a/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
+++ b/apps/appkit-minter/src/features/balances/components/gasless-controls.tsx
@@ -9,7 +9,7 @@
 import { useMemo } from 'react';
 import type { FC } from 'react';
 import { useSelectedWallet } from '@ton/appkit-react';
-import { getErrorMessage } from '@ton/appkit';
+import { getErrorMessage, supportsSignMessage } from '@ton/appkit';
 import type { UserFriendlyAddress } from '@ton/appkit';
 
 import { FeeAssetSelect } from './fee-asset-select';
@@ -38,10 +38,9 @@ export const GaslessControls: FC<GaslessControlsProps> = ({
     quoteError,
 }) => {
     const [selectedWallet] = useSelectedWallet();
-    const supportsSignMessage = useMemo(() => {
+    const hasSignMessage = useMemo(() => {
         const features = selectedWallet?.getSupportedFeatures();
-        if (features === undefined) return true;
-        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+        return features === undefined ? true : supportsSignMessage(features);
     }, [selectedWallet]);
 
     return (
@@ -50,13 +49,13 @@ export const GaslessControls: FC<GaslessControlsProps> = ({
                 <input
                     type="checkbox"
                     checked={enabled}
-                    disabled={!supportsSignMessage}
+                    disabled={!hasSignMessage}
                     onChange={(event) => onEnabledChange(event.target.checked)}
                 />
                 <span>Gasless — pay the gas fee in another token</span>
             </label>
 
-            {!supportsSignMessage && (
+            {!hasSignMessage && (
                 <p className="text-xs text-tertiary-foreground">
                     Connected wallet does not support gasless (no SignMessage feature).
                 </p>
diff --git a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
index 6e94d6e3f..2e96c602e 100644
--- a/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
+++ b/apps/appkit-minter/src/features/mint/components/mint-settings-modal.tsx
@@ -9,6 +9,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import type { FC } from 'react';
 import { Button, Modal, Switch, useNetwork, useSelectedWallet } from '@ton/appkit-react';
+import { supportsSignMessage } from '@ton/appkit';
 
 import { useMinterStore } from '../store/minter-store';
 import { enableGasless } from '../store/actions/enable-gasless';
@@ -37,10 +38,9 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
     const network = useNetwork();
     const canEnableGasless = useCanEnableGasless();
 
-    const supportsSignMessage = useMemo(() => {
+    const hasSignMessage = useMemo(() => {
         const features = wallet?.getSupportedFeatures();
-        if (features === undefined) return true;
-        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+        return features === undefined ? true : supportsSignMessage(features);
     }, [wallet]);
 
     const isNetworkSupported = network ? !!getMintForwardAddress(network.chainId) : false;
@@ -64,7 +64,7 @@ export const MintSettingsModal: FC<MintSettingsModalProps> = ({ open, onClose })
         onClose();
     };
 
-    const hint = !supportsSignMessage
+    const hint = !hasSignMessage
         ? 'Connected wallet does not support gasless (no SignMessage feature).'
         : !isNetworkSupported
           ? 'Gasless is not available on this network.'
diff --git a/apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts b/apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts
index 521963d5b..c4c2ba8b6 100644
--- a/apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts
+++ b/apps/appkit-minter/src/features/mint/hooks/use-can-enable-gasless.ts
@@ -8,6 +8,7 @@
 
 import { useMemo } from 'react';
 import { useNetwork, useSelectedWallet } from '@ton/appkit-react';
+import { supportsSignMessage } from '@ton/appkit';
 
 import { getMintForwardAddress } from '../constants';
 
@@ -22,13 +23,12 @@ export const useCanEnableGasless = (): boolean => {
     const [wallet] = useSelectedWallet();
     const network = useNetwork();
 
-    const supportsSignMessage = useMemo(() => {
+    const hasSignMessage = useMemo(() => {
         const features = wallet?.getSupportedFeatures();
-        if (features === undefined) return false;
-        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+        return features === undefined ? false : supportsSignMessage(features);
     }, [wallet]);
 
     const isNetworkSupported = network ? !!getMintForwardAddress(network.chainId) : false;
 
-    return supportsSignMessage && isNetworkSupported;
+    return hasSignMessage && isNetworkSupported;
 };
diff --git a/apps/demo-wallet/src/hooks/useGaslessJettonSend.ts b/apps/demo-wallet/src/hooks/useGaslessJettonSend.ts
index a31725885..121251333 100644
--- a/apps/demo-wallet/src/hooks/useGaslessJettonSend.ts
+++ b/apps/demo-wallet/src/hooks/useGaslessJettonSend.ts
@@ -7,7 +7,7 @@
  */
 
 import { useEffect, useMemo } from 'react';
-import { isValidAddress } from '@ton/walletkit';
+import { isValidAddress, supportsSignMessage } from '@ton/walletkit';
 import type { Jetton, Wallet, GaslessSupportedAsset, SendTransactionResponse } from '@ton/walletkit';
 import { useGasless } from '@demo/wallet-core';
 
@@ -57,13 +57,12 @@ export const useGaslessJettonSend = ({
 }: UseGaslessJettonSendParams): UseGaslessJettonSendResult => {
     const gasless = useGasless();
 
-    const supportsSignMessage = useMemo(() => {
+    const hasSignMessage = useMemo(() => {
         const features = wallet?.getSupportedFeatures();
-        if (!features) return false;
-        return features.some((feature) => typeof feature === 'object' && feature.name === 'SignMessage');
+        return features ? supportsSignMessage(features) : false;
     }, [wallet]);
 
-    const canUse = Boolean(jetton) && supportsSignMessage;
+    const canUse = Boolean(jetton) && hasSignMessage;
     const effective = gasless.enabled && canUse;
 
     const feeAssetInfo = useJettonInfo(gasless.feeAsset ?? undefined);
diff --git a/packages/appkit/src/utils/index.ts b/packages/appkit/src/utils/index.ts
index 4ba787f4e..4a04777a9 100644
--- a/packages/appkit/src/utils/index.ts
+++ b/packages/appkit/src/utils/index.ts
@@ -15,6 +15,7 @@ export {
     asBase64,
     asHex,
     checkSignMessageSupport,
+    supportsSignMessage,
     SupportError,
     SupportErrorCode,
     type CheckSignMessageSupportOptions,
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
index f06245d54..9ce784ae2 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
@@ -25,17 +25,28 @@ import type { TonApiGaslessChainConfig } from './TonApiGaslessChainConfig';
  * ```
  */
 export interface TonApiGaslessProviderConfig {
-    /** Per-chain settings keyed by `Network#chainId`. */
+    /**
+     * Per-chain settings keyed by `Network#chainId`.
+     */
     chains?: { [chainId: string]: TonApiGaslessChainConfig };
-    /** Provider id. Defaults to `tonapi`. */
+    /**
+     * Provider id. Defaults to `tonapi`.
+     */
     providerId?: string;
-    /** Number of send retries on transient errors. Defaults to 5. */
+    /**
+     * Number of send retries on transient errors. Defaults to 5.
+     * @format int
+     */
     sendRetries?: number;
-    /** Delay between send retries in ms. Defaults to 2000. */
+    /**
+     * Delay between send retries in ms. Defaults to 2000.
+     * @format int
+     */
     sendRetryDelayMs?: number;
     /**
      * TTL for the in-memory `/v2/gasless/config` cache (ms). Defaults to
      * 5 minutes. Set to `0` to disable caching.
+     * @format int
      */
     configCacheTtlMs?: number;
 }
diff --git a/packages/walletkit/src/index.ts b/packages/walletkit/src/index.ts
index 27d8ace38..fe1800f4c 100644
--- a/packages/walletkit/src/index.ts
+++ b/packages/walletkit/src/index.ts
@@ -104,7 +104,12 @@ export { isValidAddress, compareAddress, asAddressFriendly } from './utils/addre
 export { withTimeout } from './utils/withTimeout';
 export { validateTransactionMessage } from './validation';
 export { createDeviceInfo, createWalletManifest, getMaxOutgoingMessages } from './utils/getDefaultWalletConfig';
-export { checkSignMessageSupport, SupportError, SupportErrorCode } from './utils/checkSignMessageSupport';
+export {
+    checkSignMessageSupport,
+    supportsSignMessage,
+    SupportError,
+    SupportErrorCode,
+} from './utils/checkSignMessageSupport';
 export type { CheckSignMessageSupportOptions } from './utils/checkSignMessageSupport';
 export { Signer } from './utils/Signer';
 export { ParseStack, SerializeStack } from './utils/tvmStack';
diff --git a/packages/walletkit/src/utils/checkSignMessageSupport.ts b/packages/walletkit/src/utils/checkSignMessageSupport.ts
index 1564c5997..940d0477c 100644
--- a/packages/walletkit/src/utils/checkSignMessageSupport.ts
+++ b/packages/walletkit/src/utils/checkSignMessageSupport.ts
@@ -50,6 +50,19 @@ export class SupportError extends Error {
     }
 }
 
+/** Find the wallet's advertised `SignMessage` feature, if any. */
+function findSignMessageFeature(features: Feature[]): SignMessageFeature | undefined {
+    return features.find(
+        (feature): feature is SignMessageFeature =>
+            !!feature && typeof feature === 'object' && feature.name === 'SignMessage',
+    );
+}
+
+/** Whether the connected wallet advertises the `SignMessage` feature at all. */
+export function supportsSignMessage(features: Feature[]): boolean {
+    return findSignMessageFeature(features) !== undefined;
+}
+
 /**
  * Throws {@link SupportError} (with a `code` discriminating the
  * specific failure) when the connected wallet's advertised `Feature[]` cannot
@@ -58,10 +71,7 @@ export class SupportError extends Error {
  * didn't declare `maxMessages` (request may still be rejected by the wallet).
  */
 export function checkSignMessageSupport(features: Feature[], options: CheckSignMessageSupportOptions): never | void {
-    const signMessageFeature = features.find(
-        (feature): feature is SignMessageFeature =>
-            !!feature && typeof feature === 'object' && feature.name === 'SignMessage',
-    );
+    const signMessageFeature = findSignMessageFeature(features);
 
     if (!signMessageFeature) {
         throw new SupportError("Wallet doesn't support SignMessage feature.", SupportErrorCode.NotSupported);

From 4ffa168d57332a784d3d924088b5656edd7b4987 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 8 Jun 2026 18:09:16 +0400
Subject: [PATCH 44/46] feat(new-ui): add quote retries

---
 .../tonapi/TonApiGaslessProvider.spec.ts      | 48 ++++++++++++++++++-
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 24 +++++++++-
 .../src/defi/gasless/tonapi/constants.ts      |  6 +++
 .../models/TonApiGaslessProviderConfig.ts     | 10 ++++
 4 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
index 48bc7cba5..1d5bf59b4 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.spec.ts
@@ -56,6 +56,8 @@ const makeProvider = (
     return TonApiGaslessProvider.createFromContext(ctxWith(networks), {
         sendRetries: 1,
         sendRetryDelayMs: 0,
+        quoteRetries: 1,
+        quoteRetryDelayMs: 0,
         ...config,
     });
 };
@@ -350,7 +352,8 @@ describe('TonApiGaslessProvider.getQuote', () => {
     });
 
     it('wraps fetch errors in GaslessError(QUOTE_FAILED)', async () => {
-        fetchApi.mockResolvedValueOnce(new Response('relayer down', { status: 502 }));
+        // 502 is transient, so the provider retries it — return it for every attempt.
+        fetchApi.mockResolvedValue(new Response('relayer down', { status: 502 }));
 
         await expect(provider.getQuote(baseQuoteParams)).rejects.toMatchObject({
             name: 'GaslessError',
@@ -358,6 +361,49 @@ describe('TonApiGaslessProvider.getQuote', () => {
         });
     });
 
+    it('retries on transient 5xx failures up to quoteRetries', async () => {
+        const retryFetch = makeFetch();
+        const retryProvider = makeProvider(retryFetch, { quoteRetries: 2 });
+        retryFetch
+            .mockResolvedValueOnce(new Response('transient', { status: 500 }))
+            .mockResolvedValueOnce(new Response('transient', { status: 503 }))
+            .mockResolvedValueOnce(jsonResponse(makeRawQuote()));
+
+        const result = await retryProvider.getQuote(baseQuoteParams);
+
+        expect(retryFetch).toHaveBeenCalledTimes(3);
+        expect(result.fee).toBe('1234');
+    });
+
+    it('does NOT retry the quote on 4xx client errors', async () => {
+        const fourxxFetch = makeFetch();
+        const retryProvider = makeProvider(fourxxFetch, { quoteRetries: 3 });
+        fourxxFetch.mockResolvedValue(
+            new Response(JSON.stringify({ error: 'bad request' }), {
+                status: 400,
+                headers: { 'content-type': 'application/json' },
+            }),
+        );
+
+        await expect(retryProvider.getQuote(baseQuoteParams)).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.QuoteFailed,
+        });
+        expect(fourxxFetch).toHaveBeenCalledTimes(1);
+    });
+
+    it('wraps persistent 5xx errors in GaslessError(QUOTE_FAILED) after exhausting retries', async () => {
+        const persistentFetch = makeFetch();
+        const retryProvider = makeProvider(persistentFetch, { quoteRetries: 2 });
+        persistentFetch.mockResolvedValue(new Response('boom', { status: 500 }));
+
+        await expect(retryProvider.getQuote(baseQuoteParams)).rejects.toMatchObject({
+            name: 'GaslessError',
+            code: GaslessErrorCode.QuoteFailed,
+        });
+        expect(persistentFetch).toHaveBeenCalledTimes(3);
+    });
+
     it('maps TonAPI error_code 40000 to GaslessError(UNSUPPORTED_FEE_ASSET)', async () => {
         fetchApi.mockResolvedValueOnce(
             new Response(JSON.stringify({ error: 'Jetton is not supported.', error_code: 40000 }), {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index 168aa6cac..e1e9fe7a1 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -22,12 +22,15 @@ import { ApiClientTonApi } from '../../../clients/tonapi/ApiClientTonApi';
 import { globalLogger } from '../../../core/Logger';
 import type { ProviderFactoryContext } from '../../../types/factory';
 import { delay } from '../../../utils/delay';
+import { CallForSuccess } from '../../../utils/retry';
 import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
 import {
     DEFAULT_CONFIG_CACHE_TTL_MS,
     DEFAULT_METADATA,
     DEFAULT_PROVIDER_ID,
+    DEFAULT_QUOTE_RETRIES,
+    DEFAULT_QUOTE_RETRY_DELAY_MS,
     DEFAULT_SEND_RETRIES,
     DEFAULT_SEND_RETRY_DELAY_MS,
 } from './constants';
@@ -69,6 +72,8 @@ export class TonApiGaslessProvider extends GaslessProvider {
     private readonly clients: Record<string, ApiClientTonApi> = {};
     private readonly sendRetries: number;
     private readonly sendRetryDelayMs: number;
+    private readonly quoteRetries: number;
+    private readonly quoteRetryDelayMs: number;
     private readonly configCacheTtlMs: number;
     private readonly configCache?: LRUCache<string, GaslessConfig, Network>;
 
@@ -81,6 +86,8 @@ export class TonApiGaslessProvider extends GaslessProvider {
         this.providerId = options.providerId ?? DEFAULT_PROVIDER_ID;
         this.sendRetries = options.sendRetries ?? DEFAULT_SEND_RETRIES;
         this.sendRetryDelayMs = options.sendRetryDelayMs ?? DEFAULT_SEND_RETRY_DELAY_MS;
+        this.quoteRetries = options.quoteRetries ?? DEFAULT_QUOTE_RETRIES;
+        this.quoteRetryDelayMs = options.quoteRetryDelayMs ?? DEFAULT_QUOTE_RETRY_DELAY_MS;
         this.configCacheTtlMs = options.configCacheTtlMs ?? DEFAULT_CONFIG_CACHE_TTL_MS;
 
         if (this.configCacheTtlMs > 0) {
@@ -185,8 +192,21 @@ export class TonApiGaslessProvider extends GaslessProvider {
 
         try {
             const http = this.getClient(params.network);
-            const raw = await http.postJson<TonApiGaslessEstimateResponse>(`/v2/gasless/estimate/${masterId}`, body);
-            return mapGaslessQuote(raw, params.network);
+            // Retry transient failures (5xx / network) with a fixed delay. The
+            // quote is read-only and idempotent, so a stale/flaky relayer response
+            // is safe to re-request; 4xx are surfaced immediately via `isTransientError`.
+            return await CallForSuccess(
+                async () => {
+                    const raw = await http.postJson<TonApiGaslessEstimateResponse>(
+                        `/v2/gasless/estimate/${masterId}`,
+                        body,
+                    );
+                    return mapGaslessQuote(raw, params.network);
+                },
+                this.quoteRetries + 1,
+                this.quoteRetryDelayMs,
+                isTransientError,
+            );
         } catch (error) {
             log.error('Failed to quote gasless transaction', { error, params });
             throw mapTonApiGaslessError(error, GaslessErrorCode.QuoteFailed, 'Failed to quote gasless transaction');
diff --git a/packages/walletkit/src/defi/gasless/tonapi/constants.ts b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
index d55627b0b..de0111acd 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/constants.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
@@ -23,6 +23,12 @@ export const DEFAULT_SEND_RETRIES = 3;
 /** Base delay between send retries (ms). Subsequent retries use exponential backoff (2× per attempt). */
 export const DEFAULT_SEND_RETRY_DELAY_MS = 2000;
 
+/** Default number of retries for `/v2/gasless/estimate` on transient failures (5xx / network). */
+export const DEFAULT_QUOTE_RETRIES = 2;
+
+/** Fixed delay between quote retries (ms). */
+export const DEFAULT_QUOTE_RETRY_DELAY_MS = 1000;
+
 /**
  * Default TTL for the in-memory `/v2/gasless/config` cache (ms). The relayer
  * config (relay address + supported fee jettons) is essentially static, so a
diff --git a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
index 9ce784ae2..abc2279fe 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/models/TonApiGaslessProviderConfig.ts
@@ -43,6 +43,16 @@ export interface TonApiGaslessProviderConfig {
      * @format int
      */
     sendRetryDelayMs?: number;
+    /**
+     * Number of quote retries on transient errors (5xx / network). Defaults to 2.
+     * @format int
+     */
+    quoteRetries?: number;
+    /**
+     * Fixed delay between quote retries in ms. Defaults to 1000.
+     * @format int
+     */
+    quoteRetryDelayMs?: number;
     /**
      * TTL for the in-memory `/v2/gasless/config` cache (ms). Defaults to
      * 5 minutes. Set to `0` to disable caching.

From 368150f7d8b442b84bffc281325205af557164aa Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 8 Jun 2026 18:14:47 +0400
Subject: [PATCH 45/46] feat(gasless): toast walletkit missing error

---
 apps/demo-wallet/src/hooks/useSendToken.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/demo-wallet/src/hooks/useSendToken.ts b/apps/demo-wallet/src/hooks/useSendToken.ts
index 96ac45bad..033520269 100644
--- a/apps/demo-wallet/src/hooks/useSendToken.ts
+++ b/apps/demo-wallet/src/hooks/useSendToken.ts
@@ -7,6 +7,7 @@
  */
 
 import { useCallback } from 'react';
+import { toast } from 'sonner';
 import type { ITonWalletKit, Jetton, SendTransactionResponse, Wallet } from '@ton/walletkit';
 
 import { parseUnits } from '@/utils/units';
@@ -62,6 +63,14 @@ export const useSendToken = ({
     const send = useCallback(async (): Promise<SendTransactionResponse | undefined> => {
         if (!wallet) throw new Error('No wallet available');
 
+        // The regular flow routes the built tx through the kit's transaction queue;
+        // without the kit it would silently no-op and the page would still report
+        // success. Surface it instead of pretending the transfer went through.
+        if (!walletKit) {
+            toast.error('Cannot send transaction', { description: 'Wallet is not initialized yet.' });
+            throw new Error('WalletKit is not initialized');
+        }
+
         // Gasless jetton transfer: relay the already-fetched, locally-signed quote.
         if (gasless.effective && jetton) {
             return gasless.send();
@@ -72,7 +81,7 @@ export const useSendToken = ({
                 recipientAddress: recipient,
                 transferAmount: parseUnits(amount, TON_DECIMALS).toString(),
             });
-            if (walletKit) await walletKit.handleNewTransaction(wallet, tx);
+            await walletKit.handleNewTransaction(wallet, tx);
             return undefined;
         }
 
@@ -85,7 +94,7 @@ export const useSendToken = ({
                 jettonAddress: jetton.address,
                 transferAmount: parseUnits(amount, decimals).toString(),
             });
-            if (walletKit) await walletKit.handleNewTransaction(wallet, tx);
+            await walletKit.handleNewTransaction(wallet, tx);
         }
 
         return undefined;

From ea41429a595bd9756f7a2731d69fada4684f5f77 Mon Sep 17 00:00:00 2001
From: VK <heyllog@gmail.com>
Date: Mon, 8 Jun 2026 18:27:36 +0400
Subject: [PATCH 46/46] feat(gasless): polishing

---
 apps/demo-wallet/src/hooks/useSendToken.ts    |  2 +-
 .../gasless/tonapi/TonApiGaslessProvider.ts   | 44 +++++++------------
 .../src/defi/gasless/tonapi/constants.ts      |  6 +--
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/apps/demo-wallet/src/hooks/useSendToken.ts b/apps/demo-wallet/src/hooks/useSendToken.ts
index 033520269..d7a71144a 100644
--- a/apps/demo-wallet/src/hooks/useSendToken.ts
+++ b/apps/demo-wallet/src/hooks/useSendToken.ts
@@ -67,7 +67,7 @@ export const useSendToken = ({
         // without the kit it would silently no-op and the page would still report
         // success. Surface it instead of pretending the transfer went through.
         if (!walletKit) {
-            toast.error('Cannot send transaction', { description: 'Wallet is not initialized yet.' });
+            toast.error('Cannot send transaction', { description: 'WalletKit is not initialized yet.' });
             throw new Error('WalletKit is not initialized');
         }
 
diff --git a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
index e1e9fe7a1..ec2941222 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/TonApiGaslessProvider.ts
@@ -21,7 +21,6 @@ import type {
 import { ApiClientTonApi } from '../../../clients/tonapi/ApiClientTonApi';
 import { globalLogger } from '../../../core/Logger';
 import type { ProviderFactoryContext } from '../../../types/factory';
-import { delay } from '../../../utils/delay';
 import { CallForSuccess } from '../../../utils/retry';
 import { GaslessError, GaslessErrorCode } from '../errors';
 import { GaslessProvider } from '../GaslessProvider';
@@ -217,33 +216,24 @@ export class TonApiGaslessProvider extends GaslessProvider {
         const body = buildGaslessSendRequest(params);
         const http = this.getClient(params.network);
 
-        // Exponential backoff, transient-only retry. The wallet's seqno guard
-        // protects against on-chain double-spend if a retry duplicates a BoC
-        // that was actually accepted; we still avoid hammering 4xx errors to
-        // keep relayer gas burn down and surface real failures fast.
-        const attemptsTotal = this.sendRetries + 1;
-        let attempt = 0;
-        let lastError: unknown;
-
-        while (attempt < attemptsTotal) {
-            try {
-                const raw = await http.postJson<TonApiGaslessSendResponse>('/v2/gasless/send', body);
-                return { ...mapGaslessSend(raw), internalBoc: params.internalBoc };
-            } catch (error) {
-                lastError = error;
-
-                const lastAttempt = attempt === attemptsTotal - 1;
-                if (lastAttempt || !isTransientError(error)) {
-                    break;
-                }
-
-                await delay(this.sendRetryDelayMs * 2 ** attempt);
-                attempt++;
-            }
+        // Retry transient failures (5xx / network) with a fixed delay. The wallet's
+        // seqno guard protects against on-chain double-spend if a retry duplicates a
+        // BoC that was actually accepted; 4xx are surfaced immediately (`isTransientError`)
+        // to keep relayer gas burn down and fail fast on requests that won't improve.
+        try {
+            return await CallForSuccess(
+                async () => {
+                    const raw = await http.postJson<TonApiGaslessSendResponse>('/v2/gasless/send', body);
+                    return { ...mapGaslessSend(raw), internalBoc: params.internalBoc };
+                },
+                this.sendRetries + 1,
+                this.sendRetryDelayMs,
+                isTransientError,
+            );
+        } catch (error) {
+            log.error('Failed to send gasless transaction', { error, chainId: params.network.chainId });
+            throw mapTonApiGaslessError(error, GaslessErrorCode.SendFailed, 'Failed to send gasless transaction');
         }
-
-        log.error('Failed to send gasless transaction', { error: lastError, chainId: params.network.chainId });
-        throw mapTonApiGaslessError(lastError, GaslessErrorCode.SendFailed, 'Failed to send gasless transaction');
     }
 
     private getClient(network: Network): ApiClientTonApi {
diff --git a/packages/walletkit/src/defi/gasless/tonapi/constants.ts b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
index de0111acd..8bff0d32f 100644
--- a/packages/walletkit/src/defi/gasless/tonapi/constants.ts
+++ b/packages/walletkit/src/defi/gasless/tonapi/constants.ts
@@ -20,14 +20,14 @@ export const DEFAULT_METADATA: GaslessProviderMetadata = {
 /** Default number of retries for `/v2/gasless/send` on transient failures (5xx / network). */
 export const DEFAULT_SEND_RETRIES = 3;
 
-/** Base delay between send retries (ms). Subsequent retries use exponential backoff (2× per attempt). */
+/** Fixed delay between send retries (ms). */
 export const DEFAULT_SEND_RETRY_DELAY_MS = 2000;
 
 /** Default number of retries for `/v2/gasless/estimate` on transient failures (5xx / network). */
-export const DEFAULT_QUOTE_RETRIES = 2;
+export const DEFAULT_QUOTE_RETRIES = 3;
 
 /** Fixed delay between quote retries (ms). */
-export const DEFAULT_QUOTE_RETRY_DELAY_MS = 1000;
+export const DEFAULT_QUOTE_RETRY_DELAY_MS = 2000;
 
 /**
  * Default TTL for the in-memory `/v2/gasless/config` cache (ms). The relayer