@ledgerhq/coin-aptos 3.5.0-nightly.1 → 3.5.0-nightly.20251030160608

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-aptos",
-  "version": "3.5.0-nightly.1",
+  "version": "3.5.0-nightly.20251030160608",
   "description": "Ledger Aptos Coin integration",
   "keywords": [
     "Ledger",
@@ -95,15 +95,15 @@
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
     "rxjs": "^7.8.1",
-    "@ledgerhq/coin-framework": "^6.8.0-nightly.1",
-    "@ledgerhq/cryptoassets": "^13.31.1-nightly.0",
-    "@ledgerhq/devices": "8.6.2-nightly.0",
-    "@ledgerhq/errors": "^6.27.0-nightly.0",
-    "@ledgerhq/live-env": "^2.19.0",
-    "@ledgerhq/live-network": "^2.0.20",
+    "@ledgerhq/coin-framework": "^6.8.0-nightly.20251030160608",
+    "@ledgerhq/cryptoassets": "^13.32.0-nightly.20251030160608",
+    "@ledgerhq/devices": "8.7.0-nightly.20251030160608",
+    "@ledgerhq/errors": "^6.27.0-nightly.20251030160608",
+    "@ledgerhq/live-env": "^2.20.0-nightly.20251030160608",
+    "@ledgerhq/live-network": "^2.1.0-nightly.20251030160608",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/types-cryptoassets": "^7.29.0",
-    "@ledgerhq/types-live": "^6.88.0-nightly.0"
+    "@ledgerhq/types-cryptoassets": "^7.30.0-nightly.20251030160608",
+    "@ledgerhq/types-live": "^6.88.0-nightly.20251030160608"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.4.0",
@@ -111,12 +111,12 @@
     "@types/jest": "^29.5.14",
     "@types/lodash": "^4.17.14",
     "@types/semver": "^7.5.8",
-    "axios": "1.11.0",
+    "axios": "1.12.2",
     "jest": "^29.7.0",
     "react": "18.3.1",
     "ts-jest": "^29.2.5",
-    "@ledgerhq/disable-network-setup": "^0.0.0",
-    "@ledgerhq/types-cryptoassets": "^7.29.0"
+    "@ledgerhq/disable-network-setup": "^0.1.0-nightly.20251030160608",
+    "@ledgerhq/types-cryptoassets": "^7.30.0-nightly.20251030160608"
   },
   "scripts": {
     "clean": "rimraf lib lib-es",

package/src/__tests__/api/craftTransaction.unit.test.ts

@@ -72,48 +72,6 @@ describe("craftTransaction", () => {
     );
   });
 
-  it("creates a native coin transaction using all amount available", async () => {
-    const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
-    const mockGetBalances = jest
-      .fn()
-      .mockResolvedValue([{ contractAddress: APTOS_ASSET_ID, amount: 12345 }]);
-    mockedAptosApi.mockImplementation(() => ({
-      generateTransaction: mockGenerateTransaction,
-      getBalances: mockGetBalances,
-    }));
-
-    const api = createApi({
-      aptosSettings: {},
-    });
-
-    const txArg: TransactionIntent = {
-      intentType: "transaction",
-      type: "send",
-      sender: SENDER_ADDR,
-      senderPublicKey: "public-key",
-      recipient: RECIPIENT_ADDR,
-      amount: 0n,
-      asset: { type: "native" },
-    };
-
-    const { transaction: tx } = await api.craftTransaction(txArg);
-
-    expect(tx).not.toEqual("");
-    expect(Hex.isValid(tx).valid).toBeTruthy();
-    expect(mockGetBalances).toHaveBeenCalledTimes(1);
-    expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
-
-    expect(mockGenerateTransaction).toHaveBeenCalledWith(
-      SENDER_ADDR,
-      expect.objectContaining({
-        function: "0x1::aptos_account::transfer_coins",
-        typeArguments: [APTOS_ASSET_ID],
-        functionArguments: [RECIPIENT_ADDR, "12345"],
-      }),
-      expect.anything(),
-    );
-  });
-
   it("creates a coin token transaction", async () => {
     const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
     const mockGetBalances = jest
@@ -156,48 +114,6 @@ describe("craftTransaction", () => {
     );
   });
 
-  it("creates a fungible_asset token transaction using all amount available", async () => {
-    const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
-    const mockGetBalances = jest
-      .fn()
-      .mockResolvedValue([{ contractAddress: "0x42", amount: 12345 }]);
-    mockedAptosApi.mockImplementation(() => ({
-      generateTransaction: mockGenerateTransaction,
-      getBalances: mockGetBalances,
-    }));
-
-    const api = createApi({
-      aptosSettings: {},
-    });
-
-    const txArg: TransactionIntent = {
-      intentType: "transaction",
-      type: "send",
-      sender: SENDER_ADDR,
-      senderPublicKey: "public-key",
-      recipient: RECIPIENT_ADDR,
-      amount: 0n,
-      asset: { type: "fungible_asset", assetReference: "0x42" },
-    };
-
-    const { transaction: tx } = await api.craftTransaction(txArg);
-
-    expect(tx).not.toEqual("");
-    expect(Hex.isValid(tx).valid).toBeTruthy();
-    expect(mockGetBalances).toHaveBeenCalledTimes(1);
-    expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
-
-    expect(mockGenerateTransaction).toHaveBeenCalledWith(
-      SENDER_ADDR,
-      expect.objectContaining({
-        function: "0x1::primary_fungible_store::transfer",
-        typeArguments: ["0x1::fungible_asset::Metadata"],
-        functionArguments: ["0x42", RECIPIENT_ADDR, "12345"],
-      }),
-      expect.anything(),
-    );
-  });
-
   it("throws an exception for invalid tokenType", async () => {
     const mockGenerateTransaction = jest.fn().mockResolvedValue(rawTxn);
     const mockGetBalances = jest

package/src/__tests__/bridge/deviceTransactionConfig.test.ts

@@ -6,14 +6,14 @@ import { APTOS_PRECISION } from "../../constants";
 const nonBreakableSpace = " ";
 
 describe("deviceTransactionConfig", () => {
-  test("coin transfer", () => {
+  test("coin transfer", async () => {
     const account = createFixtureAccount();
     const parentAccount = null;
     const transaction = createFixtureTransaction({
       amount: BigNumber(123).shiftedBy(APTOS_PRECISION),
       fees: BigNumber(456),
     });
-    const fields = getDeviceTransactionConfig({
+    const fields = await getDeviceTransactionConfig({
       account,
       parentAccount,
       transaction,
@@ -33,7 +33,7 @@ describe("deviceTransactionConfig", () => {
     ]);
   });
 
-  test("stake", () => {
+  test("stake", async () => {
     const account = createFixtureAccount();
     const parentAccount = null;
     const transaction = createFixtureTransaction({
@@ -42,7 +42,7 @@ describe("deviceTransactionConfig", () => {
       recipient: "delegator id",
       mode: "stake",
     });
-    const fields = getDeviceTransactionConfig({
+    const fields = await getDeviceTransactionConfig({
       account,
       parentAccount,
       transaction,
@@ -67,7 +67,7 @@ describe("deviceTransactionConfig", () => {
     ]);
   });
 
-  test("unstake", () => {
+  test("unstake", async () => {
     const account = createFixtureAccount();
     const parentAccount = null;
     const transaction = createFixtureTransaction({
@@ -76,7 +76,7 @@ describe("deviceTransactionConfig", () => {
       recipient: "delegator id",
       mode: "unstake",
     });
-    const fields = getDeviceTransactionConfig({
+    const fields = await getDeviceTransactionConfig({
       account,
       parentAccount,
       transaction,
@@ -101,7 +101,7 @@ describe("deviceTransactionConfig", () => {
     ]);
   });
 
-  test("unstake", () => {
+  test("unstake", async () => {
     const account = createFixtureAccount();
     const parentAccount = null;
     const transaction = createFixtureTransaction({
@@ -109,7 +109,7 @@ describe("deviceTransactionConfig", () => {
       fees: BigNumber(456),
       mode: "withdraw",
     });
-    const fields = getDeviceTransactionConfig({
+    const fields = await getDeviceTransactionConfig({
       account,
       parentAccount,
       transaction,

package/src/__tests__/bridge/logic.test.ts

@@ -4,12 +4,13 @@ import { APTOS_COIN_CHANGE, OP_TYPE } from "../../constants";
 import { getMaxSendBalance, getBlankOperation, txsToOps } from "../../bridge/logic";
 import type { AptosTransaction, TransactionOptions } from "../../types";
 import { createFixtureAccount, createFixtureTransaction } from "../../bridge/bridge.fixture";
-import { findTokenByAddressInCurrency } from "@ledgerhq/cryptoassets";
+import { getCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
 import { decodeTokenAccountId, encodeTokenAccountId } from "@ledgerhq/coin-framework/account/index";
 import { normalizeTransactionOptions } from "../../logic/normalizeTransactionOptions";
 
 jest.mock("@ledgerhq/cryptoassets");
 jest.mock("@ledgerhq/coin-framework/account/index");
+jest.mock("@ledgerhq/coin-framework/crypto-assets/index");
 
 describe("Aptos logic ", () => {
   describe("getMaxSendBalance", () => {
@@ -149,7 +150,7 @@ describe("Aptos logic ", () => {
 
 describe("Aptos sync logic ", () => {
   describe("txsToOps", () => {
-    it("should convert Aptos transactions to operations correctly", () => {
+    it("should convert Aptos transactions to operations correctly", async () => {
       const address = "0x11";
       const id = "test_id";
       const txs: AptosTransaction[] = [
@@ -219,7 +220,7 @@ describe("Aptos sync logic ", () => {
         } as unknown as AptosTransaction,
       ];
 
-      const [result] = txsToOps({ address }, id, txs);
+      const [result] = await txsToOps({ address }, id, txs);
 
       expect(result).toHaveLength(1);
       expect(result[0]).toEqual({
@@ -240,7 +241,7 @@ describe("Aptos sync logic ", () => {
       });
     });
 
-    it("should skip transactions without functions in payload", () => {
+    it("should skip transactions without functions in payload", async () => {
       const address = "0x11";
       const id = "test_id";
       const txs: AptosTransaction[] = [
@@ -259,12 +260,12 @@ describe("Aptos sync logic ", () => {
         } as unknown as AptosTransaction,
       ];
 
-      const [result] = txsToOps({ address }, id, txs);
+      const [result] = await txsToOps({ address }, id, txs);
 
       expect(result).toHaveLength(0);
     });
 
-    it("should skip transactions that result in no Aptos change", () => {
+    it("should skip transactions that result in no Aptos change", async () => {
       const address = "0x11";
       const id = "test_id";
       const txs: AptosTransaction[] = [
@@ -288,12 +289,12 @@ describe("Aptos sync logic ", () => {
         } as unknown as AptosTransaction,
       ];
 
-      const [result] = txsToOps({ address }, id, txs);
+      const [result] = await txsToOps({ address }, id, txs);
 
       expect(result).toHaveLength(0);
     });
 
-    it("should handle failed transactions", () => {
+    it("should handle failed transactions", async () => {
       const address = "0xa0d8";
       const id = "test_id";
       const txs: AptosTransaction[] = [
@@ -418,7 +419,7 @@ describe("Aptos sync logic ", () => {
         } as unknown as AptosTransaction,
       ];
 
-      const [result] = txsToOps({ address }, id, txs);
+      const [result] = await txsToOps({ address }, id, txs);
 
       expect(result).toHaveLength(1);
       expect(result[0]).toEqual({
@@ -439,47 +440,50 @@ describe("Aptos sync logic ", () => {
       });
     });
 
-    it("should convert Aptos token transactions to operations correctly", () => {
-      (findTokenByAddressInCurrency as jest.Mock).mockReturnValue({
-        type: "TokenCurrency",
-        id: "aptos/coin/dstapt::staked_coin::stakedaptos",
-        contractAddress: "0xd111::staked_coin::StakedAptos",
-        parentCurrency: {
-          type: "CryptoCurrency",
-          id: "aptos",
-          coinType: 637,
-          name: "Aptos",
-          managerAppName: "Aptos",
-          ticker: "APT",
-          scheme: "aptos",
-          color: "#231F20",
-          family: "aptos",
+    it("should convert Aptos token transactions to operations correctly", async () => {
+      (encodeTokenAccountId as jest.Mock).mockReturnValue("token_account_id");
+      (getCryptoAssetsStore as jest.Mock).mockReturnValue({
+        findTokenByAddressInCurrency: jest.fn().mockReturnValue({
+          type: "TokenCurrency",
+          id: "aptos/coin/dstapt::staked_coin::stakedaptos",
+          contractAddress: "0xd111::staked_coin::StakedAptos",
+          parentCurrency: {
+            type: "CryptoCurrency",
+            id: "aptos",
+            coinType: 637,
+            name: "Aptos",
+            managerAppName: "Aptos",
+            ticker: "APT",
+            scheme: "aptos",
+            color: "#231F20",
+            family: "aptos",
+            units: [
+              {
+                name: "APT",
+                code: "APT",
+                magnitude: 8,
+              },
+            ],
+            explorerViews: [
+              {
+                address: "https://explorer.aptoslabs.com/account/$address?network=mainnet",
+                tx: "https://explorer.aptoslabs.com/txn/$hash?network=mainnet",
+              },
+            ],
+          },
+          name: "dstAPT",
+          tokenType: "coin",
+          ticker: "dstAPT",
+          disableCountervalue: false,
+          delisted: false,
           units: [
             {
-              name: "APT",
-              code: "APT",
+              name: "dstAPT",
+              code: "dstAPT",
               magnitude: 8,
             },
           ],
-          explorerViews: [
-            {
-              address: "https://explorer.aptoslabs.com/account/$address?network=mainnet",
-              tx: "https://explorer.aptoslabs.com/txn/$hash?network=mainnet",
-            },
-          ],
-        },
-        name: "dstAPT",
-        tokenType: "coin",
-        ticker: "dstAPT",
-        disableCountervalue: false,
-        delisted: false,
-        units: [
-          {
-            name: "dstAPT",
-            code: "dstAPT",
-            magnitude: 8,
-          },
-        ],
+        }),
       });
 
       jest.mock("../../bridge/logic", () => ({
@@ -698,7 +702,7 @@ describe("Aptos sync logic ", () => {
         } as unknown as AptosTransaction,
       ];
 
-      const [ops, tokenOps] = txsToOps({ address }, id, txs);
+      const [ops, tokenOps] = await txsToOps({ address }, id, txs);
 
       expect(ops).toHaveLength(1);
       expect(ops[0]).toEqual({
@@ -721,6 +725,7 @@ describe("Aptos sync logic ", () => {
       expect(tokenOps).toHaveLength(1);
       expect(tokenOps[0]).toEqual({
         id: expect.any(String),
+        accountId: "token_account_id",
         hash: "0x123",
         type: OP_TYPE.OUT,
         value: new BigNumber(1500000),
@@ -736,47 +741,49 @@ describe("Aptos sync logic ", () => {
       });
     });
 
-    it("should convert Aptos token transactions to operations correctly", () => {
-      (findTokenByAddressInCurrency as jest.Mock).mockReturnValue({
-        type: "TokenCurrency",
-        id: "aptos/fungible_asset/cellana_0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
-        contractAddress: "0x2ebb",
-        parentCurrency: {
-          type: "CryptoCurrency",
-          id: "aptos",
-          coinType: 637,
-          name: "Aptos",
-          managerAppName: "Aptos",
-          ticker: "APT",
-          scheme: "aptos",
-          color: "#231F20",
-          family: "aptos",
+    it("should convert Aptos token transactions to operations correctly", async () => {
+      (getCryptoAssetsStore as jest.Mock).mockReturnValue({
+        findTokenByAddressInCurrency: jest.fn().mockReturnValue({
+          type: "TokenCurrency",
+          id: "aptos/fungible_asset/cellana_0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
+          contractAddress: "0x2ebb",
+          parentCurrency: {
+            type: "CryptoCurrency",
+            id: "aptos",
+            coinType: 637,
+            name: "Aptos",
+            managerAppName: "Aptos",
+            ticker: "APT",
+            scheme: "aptos",
+            color: "#231F20",
+            family: "aptos",
+            units: [
+              {
+                name: "APT",
+                code: "APT",
+                magnitude: 8,
+              },
+            ],
+            explorerViews: [
+              {
+                address: "https://explorer.aptoslabs.com/account/$address?network=mainnet",
+                tx: "https://explorer.aptoslabs.com/txn/$hash?network=mainnet",
+              },
+            ],
+          },
+          name: "CELLANA",
+          tokenType: "fungible_asset",
+          ticker: "CELL",
+          disableCountervalue: false,
+          delisted: false,
           units: [
             {
-              name: "APT",
-              code: "APT",
+              name: "CELLANA",
+              code: "CELL",
               magnitude: 8,
             },
           ],
-          explorerViews: [
-            {
-              address: "https://explorer.aptoslabs.com/account/$address?network=mainnet",
-              tx: "https://explorer.aptoslabs.com/txn/$hash?network=mainnet",
-            },
-          ],
-        },
-        name: "CELLANA",
-        tokenType: "fungible_asset",
-        ticker: "CELL",
-        disableCountervalue: false,
-        delisted: false,
-        units: [
-          {
-            name: "CELLANA",
-            code: "CELL",
-            magnitude: 8,
-          },
-        ],
+        }),
       });
 
       jest.mock("../../bridge/logic", () => ({
@@ -1009,7 +1016,7 @@ describe("Aptos sync logic ", () => {
         } as unknown as AptosTransaction,
       ];
 
-      const [ops, tokenOps] = txsToOps({ address: "0x6b8c" }, "test_id", txs);
+      const [ops, tokenOps] = await txsToOps({ address: "0x6b8c" }, "test_id", txs);
 
       expect(ops).toHaveLength(0);
 

package/src/__tests__/bridge/synchronisation.test.ts

@@ -66,7 +66,7 @@ describe("getAccountShape", () => {
     const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
 
     jest.mocked(mergeOps).mockReturnValue([]);
-    jest.mocked(txsToOps).mockReturnValue([[], [], []]);
+    jest.mocked(txsToOps).mockResolvedValue([[], [], []]);
 
     const account = await getAccountShape(
       {
@@ -120,7 +120,7 @@ describe("getAccountShape", () => {
     const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
 
     jest.mocked(mergeOps).mockReturnValue([]);
-    jest.mocked(txsToOps).mockReturnValue([[], [], []]);
+    jest.mocked(txsToOps).mockResolvedValue([[], [], []]);
 
     const account = await getAccountShape(
       {
@@ -173,7 +173,7 @@ describe("getAccountShape", () => {
     const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
 
     jest.mocked(mergeOps).mockReturnValue([]);
-    jest.mocked(txsToOps).mockReturnValue([[], [], []]);
+    jest.mocked(txsToOps).mockResolvedValue([[], [], []]);
 
     const account = await getAccountShape(
       {
@@ -206,7 +206,7 @@ describe("getAccountShape", () => {
     const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
 
     jest.mocked(mergeOps).mockReturnValue([]);
-    jest.mocked(txsToOps).mockReturnValue([[], [], []]);
+    jest.mocked(txsToOps).mockResolvedValue([[], [], []]);
 
     const account = await getAccountShape(
       {
@@ -259,7 +259,7 @@ describe("getAccountShape", () => {
     const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
 
     jest.mocked(mergeOps).mockReturnValue([]);
-    jest.mocked(txsToOps).mockReturnValue([[], [], []]);
+    jest.mocked(txsToOps).mockResolvedValue([[], [], []]);
 
     const account = await getAccountShape(
       {
@@ -312,7 +312,7 @@ describe("getAccountShape", () => {
     const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
 
     jest.mocked(mergeOps).mockReturnValue([]);
-    jest.mocked(txsToOps).mockReturnValue([[], [], []]);
+    jest.mocked(txsToOps).mockResolvedValue([[], [], []]);
 
     const account = await getAccountShape(
       {
@@ -941,7 +941,7 @@ describe("getAccountShape", () => {
     const stakingOperations = [] as Operation[];
 
     jest.mocked(mergeOps).mockReturnValue(operations);
-    jest.mocked(txsToOps).mockReturnValue([operations, tokenOperations, stakingOperations]);
+    jest.mocked(txsToOps).mockResolvedValue([operations, tokenOperations, stakingOperations]);
 
     const info = {
       currency: {
@@ -2207,7 +2207,7 @@ describe("getStake", () => {
     }));
 
     jest.mocked(mergeOps).mockReturnValue(operations);
-    jest.mocked(txsToOps).mockReturnValue([operations, tokenOperations, stakingOperations]);
+    jest.mocked(txsToOps).mockResolvedValue([operations, tokenOperations, stakingOperations]);
 
     const info = {
       currency: {

package/src/bridge/deviceTransactionConfig.ts

@@ -4,7 +4,7 @@ import { Transaction } from "../types";
 import { formatCurrencyUnit } from "@ledgerhq/coin-framework/currencies/formatCurrencyUnit";
 import { getAccountCurrency, getMainAccount } from "@ledgerhq/coin-framework/account/helpers";
 
-function getDeviceTransactionConfig({
+async function getDeviceTransactionConfig({
   account,
   parentAccount,
   transaction,
@@ -12,7 +12,7 @@ function getDeviceTransactionConfig({
   account: AccountLike;
   parentAccount: Account | null | undefined;
   transaction: Transaction;
-}): Array<DeviceTransactionField> {
+}): Promise<Array<DeviceTransactionField>> {
   const { mode } = transaction;
   const fields: DeviceTransactionField[] = [];
   const mainAccount = getMainAccount(account, parentAccount);

package/src/bridge/logic.ts

@@ -2,13 +2,12 @@ import BigNumber from "bignumber.js";
 import { EntryFunctionPayloadResponse } from "@aptos-labs/ts-sdk";
 import type { Account, Operation, OperationType, TokenAccount } from "@ledgerhq/types-live";
 import {
-  decodeTokenAccountId,
   encodeTokenAccountId,
   findSubAccountById,
   isTokenAccount,
 } from "@ledgerhq/coin-framework/account/index";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
-import { findTokenByAddressInCurrency } from "@ledgerhq/cryptoassets";
+import { getCryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/index";
 import { APTOS_ASSET_ID, OP_TYPE, DEFAULT_GAS, DEFAULT_GAS_PRICE } from "../constants";
 import type { AptosTransaction, Transaction } from "../types";
 import { convertFunctionPayloadResponseToInputEntryFunctionData } from "../logic/transactionsToOperations";
@@ -58,17 +57,17 @@ export const getBlankOperation = (
   hasFailed: false,
 });
 
-export const txsToOps = (
+export const txsToOps = async (
   info: { address: string },
   id: string,
   txs: (AptosTransaction | null)[],
-): [Operation[], Operation[], Operation[]] => {
+): Promise<[Operation[], Operation[], Operation[]]> => {
   const { address } = info;
   const ops: Operation[] = [];
   const opsTokens: Operation[] = [];
   const opsStaking: Operation[] = [];
 
-  txs.forEach(tx => {
+  for (const tx of txs) {
     if (tx !== null) {
       const op: Operation = getBlankOperation(tx, id);
       op.fee = new BigNumber(tx.gas_used).multipliedBy(new BigNumber(tx.gas_unit_price));
@@ -80,7 +79,7 @@ export const txsToOps = (
       const function_address = getFunctionAddress(payload);
 
       if (!function_address) {
-        return; // skip transaction without functions in payload
+        continue; // skip transaction without functions in payload
       }
 
       const { coin_id, amount_in, amount_out, type } = getCoinAndAmounts(tx, address);
@@ -113,24 +112,31 @@ export const txsToOps = (
         if (coin_id === APTOS_ASSET_ID) {
           ops.push(op);
         } else {
-          const token = findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
+          const token = await getCryptoAssetsStore().findTokenByAddressInCurrency(
+            coin_id.toLowerCase(),
+            "aptos",
+          );
           if (token !== undefined) {
-            op.accountId = encodeTokenAccountId(id, token);
+            const tokenAccountId = encodeTokenAccountId(id, token);
+            op.accountId = tokenAccountId;
             opsTokens.push(op);
 
             if (op.type === OP_TYPE.OUT) {
-              ops.push({
+              const accountId = tokenAccountId.split("+")[0];
+              // Create FEES operation with decoded main account ID
+              const feesOp = {
                 ...op,
-                accountId: decodeTokenAccountId(op.accountId).accountId,
+                accountId,
                 value: op.fee,
-                type: "FEES",
-              });
+                type: "FEES" as const,
+              };
+              ops.push(feesOp);
             }
           }
         }
       }
     }
-  });
+  }
 
   return [ops, opsTokens, opsStaking];
 };