@ledgerhq/live-common 34.54.0-nightly.20251129023709 → 34.54.0-nightly.20251203101856

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.54.0-nightly.20251129023709",
+  "version": "34.54.0-nightly.20251203101856",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -81,16 +81,13 @@
   "files": [
     "lib",
     "lib-es",
-    "src",
-    "react.js",
-    "reactNative.js"
+    "src"
   ],
   "peerDependencies": {
     "@tanstack/react-query": ">=5",
     "react": ">=16",
     "react-dom": ">=16",
     "react-native": ">=0.65.1",
-    "react-native-svg": ">=12.1.1",
     "react-redux": "7.2.9",
     "redux-actions": "2.6.5"
   },
@@ -109,9 +106,6 @@
     },
     "redux-actions": {
       "optional": true
-    },
-    "react-native-svg": {
-      "optional": true
     }
   },
   "react-native": {
@@ -120,12 +114,12 @@
   "dependencies": {
     "@blooo/hw-app-acre": "^1.1.1",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2",
-    "@ledgerhq/device-management-kit": "0.11.1",
+    "@ledgerhq/device-management-kit": "0.11.2",
     "@ledgerhq/speculos-device-controller": "0.1.0",
     "@ledgerhq/live-app-sdk": "^0.8.1",
-    "@ledgerhq/wallet-api-client": "^1.12.5",
-    "@ledgerhq/wallet-api-core": "^1.26.1",
-    "@ledgerhq/wallet-api-server": "^2.0.0",
+    "@ledgerhq/wallet-api-client": "^1.12.6",
+    "@ledgerhq/wallet-api-core": "^1.27.0",
+    "@ledgerhq/wallet-api-server": "^2.0.1",
     "@noble/curves": "^1.9.7",
     "@noble/hashes": "1.8.0",
     "@reduxjs/toolkit": "2.8.2",
@@ -182,46 +176,45 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.14.0-nightly.20251129023709",
-    "@ledgerhq/coin-aptos": "^3.6.1-nightly.20251129023709",
-    "@ledgerhq/coin-bitcoin": "^0.25.1-nightly.20251129023709",
-    "@ledgerhq/coin-canton": "^0.11.0-nightly.20251129023709",
-    "@ledgerhq/coin-cardano": "^0.15.1-nightly.20251129023709",
-    "@ledgerhq/coin-casper": "^2.4.1-nightly.20251129023709",
-    "@ledgerhq/coin-celo": "^1.7.2-nightly.20251129023709",
-    "@ledgerhq/coin-cosmos": "^0.20.1-nightly.20251129023709",
-    "@ledgerhq/coin-evm": "^2.36.0-nightly.20251129023709",
-    "@ledgerhq/coin-filecoin": "^1.15.0-nightly.20251129023709",
-    "@ledgerhq/coin-framework": "^6.10.0-nightly.20251129023709",
-    "@ledgerhq/coin-hedera": "^1.15.0-nightly.20251129023709",
-    "@ledgerhq/coin-icon": "^0.15.1-nightly.20251129023709",
-    "@ledgerhq/coin-internet_computer": "^1.11.1-nightly.20251129023709",
-    "@ledgerhq/coin-kaspa": "^1.4.2-nightly.20251129023709",
-    "@ledgerhq/coin-mina": "^1.4.2-nightly.20251129023709",
-    "@ledgerhq/coin-multiversx": "^0.8.1-nightly.20251129023709",
-    "@ledgerhq/coin-near": "^0.16.1-nightly.20251129023709",
-    "@ledgerhq/coin-polkadot": "^6.13.1-nightly.20251129023709",
-    "@ledgerhq/coin-solana": "^0.38.0-nightly.20251129023709",
-    "@ledgerhq/coin-stacks": "^0.12.1-nightly.20251129023709",
-    "@ledgerhq/coin-stellar": "^6.8.0-nightly.20251129023709",
-    "@ledgerhq/coin-sui": "^0.18.1-nightly.20251129023709",
-    "@ledgerhq/coin-tezos": "^6.10.0-nightly.20251129023709",
-    "@ledgerhq/coin-ton": "^0.17.1-nightly.20251129023709",
-    "@ledgerhq/coin-tron": "^5.7.1-nightly.20251129023709",
-    "@ledgerhq/coin-vechain": "^2.12.2-nightly.20251129023709",
-    "@ledgerhq/coin-xrp": "^7.9.0-nightly.20251129023709",
-    "@ledgerhq/crypto-icons-ui": "^1.24.0-nightly.20251129023709",
-    "@ledgerhq/cryptoassets": "^13.34.0-nightly.20251129023709",
-    "@ledgerhq/device-core": "^0.6.9-nightly.20251129023709",
+    "@ledgerhq/coin-algorand": "^0.14.0-nightly.20251203101856",
+    "@ledgerhq/coin-aptos": "^3.6.1-nightly.20251203101856",
+    "@ledgerhq/coin-bitcoin": "^0.26.0-nightly.20251203101856",
+    "@ledgerhq/coin-canton": "^0.11.0-nightly.20251203101856",
+    "@ledgerhq/coin-cardano": "^0.15.1-nightly.20251203101856",
+    "@ledgerhq/coin-casper": "^2.4.1-nightly.20251203101856",
+    "@ledgerhq/coin-celo": "^1.7.2-nightly.20251203101856",
+    "@ledgerhq/coin-cosmos": "^0.21.0-nightly.20251203101856",
+    "@ledgerhq/coin-evm": "^2.36.0-nightly.20251203101856",
+    "@ledgerhq/coin-filecoin": "^1.15.0-nightly.20251203101856",
+    "@ledgerhq/coin-framework": "^6.10.0-nightly.20251203101856",
+    "@ledgerhq/coin-hedera": "^1.15.0-nightly.20251203101856",
+    "@ledgerhq/coin-icon": "^0.15.1-nightly.20251203101856",
+    "@ledgerhq/coin-internet_computer": "^1.11.1-nightly.20251203101856",
+    "@ledgerhq/coin-kaspa": "^1.4.2-nightly.20251203101856",
+    "@ledgerhq/coin-mina": "^1.4.2-nightly.20251203101856",
+    "@ledgerhq/coin-multiversx": "^0.8.1-nightly.20251203101856",
+    "@ledgerhq/coin-near": "^0.16.1-nightly.20251203101856",
+    "@ledgerhq/coin-polkadot": "^6.14.0-nightly.20251203101856",
+    "@ledgerhq/coin-solana": "^0.38.0-nightly.20251203101856",
+    "@ledgerhq/coin-stacks": "^0.12.1-nightly.20251203101856",
+    "@ledgerhq/coin-stellar": "^6.8.0-nightly.20251203101856",
+    "@ledgerhq/coin-sui": "^0.18.1-nightly.20251203101856",
+    "@ledgerhq/coin-tezos": "^6.10.0-nightly.20251203101856",
+    "@ledgerhq/coin-ton": "^0.17.1-nightly.20251203101856",
+    "@ledgerhq/coin-tron": "^5.7.1-nightly.20251203101856",
+    "@ledgerhq/coin-vechain": "^2.12.2-nightly.20251203101856",
+    "@ledgerhq/coin-xrp": "^7.9.0-nightly.20251203101856",
+    "@ledgerhq/cryptoassets": "^13.34.0-nightly.20251203101856",
+    "@ledgerhq/device-core": "^0.6.9-nightly.20251203101856",
     "@ledgerhq/devices": "8.7.0",
     "@ledgerhq/errors": "^6.27.0",
     "@ledgerhq/hw-app-algorand": "^6.31.9",
     "@ledgerhq/hw-app-aptos": "^6.34.9",
-    "@ledgerhq/hw-app-btc": "^10.12.1-nightly.20251129023709",
-    "@ledgerhq/hw-app-celo": "^6.35.4-nightly.20251129023709",
+    "@ledgerhq/hw-app-btc": "^10.12.1-nightly.20251203101856",
+    "@ledgerhq/hw-app-celo": "^6.35.4-nightly.20251203101856",
     "@ledgerhq/hw-app-cosmos": "^6.32.9",
-    "@ledgerhq/hw-app-eth": "^7.0.0-nightly.20251129023709",
-    "@ledgerhq/hw-app-exchange": "^0.18.0-nightly.20251129023709",
+    "@ledgerhq/hw-app-eth": "^7.0.0-nightly.20251203101856",
+    "@ledgerhq/hw-app-exchange": "^0.18.0-nightly.20251203101856",
     "@ledgerhq/hw-app-hedera": "^1.2.9",
     "@ledgerhq/hw-app-icon": "^1.3.9",
     "@ledgerhq/hw-app-kaspa": "^1.3.2",
@@ -232,29 +225,29 @@
     "@ledgerhq/hw-app-sui": "^1.4.0",
     "@ledgerhq/hw-app-tezos": "^6.31.9",
     "@ledgerhq/hw-app-trx": "^6.31.9",
-    "@ledgerhq/hw-app-vet": "^0.8.0-nightly.20251129023709",
+    "@ledgerhq/hw-app-vet": "^0.8.0-nightly.20251203101856",
     "@ledgerhq/hw-app-xrp": "^6.32.7",
     "@ledgerhq/hw-bolos": "^6.32.9",
     "@ledgerhq/hw-transport": "6.31.13",
     "@ledgerhq/hw-transport-mocker": "^6.29.13",
-    "@ledgerhq/ledger-cal-service": "^1.9.1-nightly.20251129023709",
-    "@ledgerhq/ledger-trust-service": "^0.4.3-nightly.20251129023709",
+    "@ledgerhq/ledger-cal-service": "^1.9.1-nightly.20251203101856",
+    "@ledgerhq/ledger-trust-service": "^0.4.3-nightly.20251203101856",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-countervalues": "^0.10.1-nightly.20251129023709",
-    "@ledgerhq/live-countervalues-react": "^0.7.3-nightly.20251129023709",
+    "@ledgerhq/live-countervalues": "^0.10.1-nightly.20251203101856",
+    "@ledgerhq/live-countervalues-react": "^0.7.3-nightly.20251203101856",
     "@ledgerhq/live-dmk-shared": "^0.15.0",
-    "@ledgerhq/live-env": "^2.22.0-nightly.20251129023709",
+    "@ledgerhq/live-env": "^2.22.0-nightly.20251203101856",
     "@ledgerhq/live-hooks": "0.2.0",
-    "@ledgerhq/live-network": "^2.1.2-nightly.20251129023709",
+    "@ledgerhq/live-network": "^2.1.2-nightly.20251203101856",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.5.2-nightly.20251129023709",
-    "@ledgerhq/live-signer-evm": "^0.10.2-nightly.20251129023709",
-    "@ledgerhq/live-signer-solana": "^0.6.2-nightly.20251129023709",
-    "@ledgerhq/live-wallet": "^0.16.1-nightly.20251129023709",
+    "@ledgerhq/live-signer-canton": "^0.5.2-nightly.20251203101856",
+    "@ledgerhq/live-signer-evm": "^0.10.2-nightly.20251203101856",
+    "@ledgerhq/live-signer-solana": "^0.6.2-nightly.20251203101856",
+    "@ledgerhq/live-wallet": "^0.16.1-nightly.20251203101856",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.3.0-nightly.20251129023709",
-    "@ledgerhq/wallet-api-acre-module": "^0.10.0-nightly.20251129023709",
-    "@ledgerhq/wallet-api-exchange-module": "^0.19.0-nightly.20251129023709"
+    "@ledgerhq/speculos-transport": "^0.3.0-nightly.20251203101856",
+    "@ledgerhq/wallet-api-acre-module": "^0.10.0-nightly.20251203101856",
+    "@ledgerhq/wallet-api-exchange-module": "^0.19.0-nightly.20251203101856"
   },
   "devDependencies": {
     "@solana/web3.js": "1.95.4",
@@ -292,7 +285,6 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-native": "0.77.3",
-    "react-native-svg": "15.12.1",
     "react-test-renderer": "18.3.1",
     "redux-actions": "2.6.5",
     "timemachine": "^0.3.2",
@@ -302,10 +294,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.3.3-nightly.20251129023709",
+    "@ledgerhq/device-react": "^0.3.3-nightly.20251203101856",
     "@ledgerhq/types-cryptoassets": "^7.30.0",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.90.0-nightly.20251129023709"
+    "@ledgerhq/types-live": "^6.90.0-nightly.20251203101856"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/__tests__/test-helpers/bridge.ts

@@ -35,7 +35,7 @@ import { firstValueFrom } from "rxjs";
 const warnDev = process.env.CI ? (..._args) => {} : (...msg) => console.warn(...msg);
 // FIXME move out into DatasetTest to be defined in
 const blacklistOpsSumEq = {
-  currencies: ["ripple", "ethereum", "tezos"],
+  currencies: ["ripple", "ethereum", "tezos", "assethub_polkadot"],
   impls: ["mock"],
 };
 

package/src/__tests__/test-helpers/environment.ts

@@ -45,6 +45,7 @@ setSupportedCurrencies([
   "cosmos",
   "algorand",
   "polkadot",
+  "assethub_polkadot",
   "bitcoin_testnet",
   "bitcoin_regtest",
   "ethereum_sepolia",

package/src/account/index.ts

@@ -16,3 +16,9 @@ export * from "./formatters";
 export * from "./helpers";
 export * from "./serialization";
 export * from "./support";
+export {
+  RecentAddressesStore,
+  getRecentAddressesStore,
+  setupRecentAddressesStore,
+  RecentAddressesCache,
+} from "./recentAddresses";

package/src/account/recentAddresses.test.ts

@@ -0,0 +1,104 @@
+import { RecentAddressesStore, setupRecentAddressesStore, getRecentAddressesStore } from ".";
+import { RECENT_ADDRESSES_COUNT_LIMIT } from "./recentAddresses";
+
+describe("RecentAddressesStore", () => {
+  const onAddAddressCompleteMock = jest.fn();
+  let store: RecentAddressesStore;
+
+  beforeEach(() => {
+    onAddAddressCompleteMock.mockClear();
+    setupRecentAddressesStore({}, onAddAddressCompleteMock);
+    store = getRecentAddressesStore();
+  });
+
+  it("should add one address and return this only address", async () => {
+    const newAddress = "0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3";
+    await store.addAddress("ethereum", newAddress);
+    const addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([newAddress]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+  });
+
+  it("should add a second address and return addresses sorted by insertion", async () => {
+    const newAddress = "0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3";
+    await store.addAddress("ethereum", newAddress);
+    let addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([newAddress]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+
+    const newAddress2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
+    await store.addAddress("ethereum", newAddress2);
+    addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([newAddress2, newAddress]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(2);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress2, newAddress] });
+  });
+
+  it("should replace at first place when an address is already saved", async () => {
+    const newAddress = "0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3";
+    await store.addAddress("ethereum", newAddress);
+    let addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([newAddress]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+
+    const newAddress2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
+    await store.addAddress("ethereum", newAddress2);
+    addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([newAddress2, newAddress]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(2);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress2, newAddress] });
+
+    await store.addAddress("ethereum", newAddress);
+    addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([newAddress, newAddress2]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(3);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress, newAddress2] });
+  });
+
+  it("should replace at first place and remove last element when addresses exceed count limit", async () => {
+    let expectedAddresses: string[] = [];
+    for (let index = 0; index < RECENT_ADDRESSES_COUNT_LIMIT; index++) {
+      await store.addAddress("ethereum", `0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3${index}`);
+      expectedAddresses.unshift(`0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3${index}`);
+    }
+
+    let addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual(expectedAddresses);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(RECENT_ADDRESSES_COUNT_LIMIT);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: expectedAddresses });
+
+    const newAddress2 = "0xB69B37A4Fb4A18b3258f974ff6e9f529AD2647b1";
+    expectedAddresses.splice(expectedAddresses.length - 1, 1);
+    expectedAddresses = [newAddress2, ...expectedAddresses];
+
+    await store.addAddress("ethereum", newAddress2);
+    addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual(expectedAddresses);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(RECENT_ADDRESSES_COUNT_LIMIT + 1);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: expectedAddresses });
+  });
+
+  it("should add an address of a different currency", async () => {
+    const newAddress = "0x66c4371aE8FFeD2ec1c2EBbbcCfb7E494181E1E3";
+    await store.addAddress("ethereum", newAddress);
+
+    let addresses = store.getAddresses("ethereum");
+    expect(addresses).toEqual([newAddress]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(1);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({ ethereum: [newAddress] });
+
+    const newAddress2 = "bc1pxlmrudqyq8qd8pfsc4mpmlaw56x6vtcr9m8nvp8kj3gckefc4kmqhkg4l7";
+    await store.addAddress("bitcoin", newAddress2);
+
+    addresses = store.getAddresses("bitcoin");
+    expect(addresses).toEqual([newAddress2]);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledTimes(2);
+    expect(onAddAddressCompleteMock).toHaveBeenCalledWith({
+      ethereum: [newAddress],
+      bitcoin: [newAddress2],
+    });
+  });
+});

package/src/account/recentAddresses.ts

@@ -0,0 +1,84 @@
+export const RECENT_ADDRESSES_COUNT_LIMIT = 12;
+
+export type RecentAddressesCache = Record<string, string[]>;
+
+export interface RecentAddressesStore {
+  addAddress(currency: string, address: string): void;
+  syncAddresses(cache: RecentAddressesCache): void;
+  getAddresses(currency: string): string[];
+}
+
+type CallbackMode = "triggerCallback" | "skipCallback";
+
+let recentAddressesStore: RecentAddressesStore | null = null;
+
+export function getRecentAddressesStore(): RecentAddressesStore {
+  if (recentAddressesStore === null) {
+    throw new Error(
+      "Recent addresses store instance is null, please call function setupRecentAddressesStore in application initialization",
+    );
+  }
+  return recentAddressesStore;
+}
+
+export function setupRecentAddressesStore(
+  addressesByCurrency: RecentAddressesCache,
+  onAddAddressComplete: (addressesByCurrency: RecentAddressesCache) => void,
+): void {
+  recentAddressesStore = new RecentAddressesStoreImpl(addressesByCurrency, onAddAddressComplete);
+}
+
+class RecentAddressesStoreImpl implements RecentAddressesStore {
+  private addressesByCurrency: RecentAddressesCache = {};
+  private readonly onAddAddressComplete: (addressesByCurrency: Record<string, string[]>) => void;
+
+  constructor(
+    addressesByCurrency: RecentAddressesCache,
+    onAddAddressComplete: (addressesByCurrency: RecentAddressesCache) => void,
+  ) {
+    this.addressesByCurrency = { ...addressesByCurrency };
+    this.onAddAddressComplete = onAddAddressComplete;
+  }
+
+  addAddress(currency: string, address: string): void {
+    this.addAddressToCache(currency, address, "triggerCallback");
+  }
+
+  syncAddresses(cache: RecentAddressesCache): void {
+    const previousAddresses = { ...this.addressesByCurrency };
+    this.addressesByCurrency = { ...cache };
+    for (const currency in previousAddresses) {
+      for (const address of previousAddresses[currency]) {
+        this.addAddressToCache(currency, address, "skipCallback");
+      }
+    }
+
+    this.onAddAddressComplete(this.addressesByCurrency);
+  }
+
+  getAddresses(currency: string): string[] {
+    const addresses = this.addressesByCurrency[currency];
+    return addresses ?? [];
+  }
+
+  private addAddressToCache(currency: string, address: string, callbackMode: CallbackMode): void {
+    if (!this.addressesByCurrency[currency]) {
+      this.addressesByCurrency[currency] = [];
+    }
+
+    const addresses = this.addressesByCurrency[currency];
+    const addressIndex = addresses.indexOf(address);
+    if (addressIndex !== -1) {
+      addresses.splice(addressIndex, 1);
+    } else if (addresses.length >= RECENT_ADDRESSES_COUNT_LIMIT) {
+      addresses.pop();
+    }
+
+    addresses.unshift(address);
+    this.addressesByCurrency[currency] = [...addresses];
+
+    if (callbackMode === "triggerCallback") {
+      this.onAddAddressComplete(this.addressesByCurrency);
+    }
+  }
+}

package/src/exchange/swap/postSwapState.ts

@@ -106,6 +106,7 @@ export const postSwapCancelled: PostSwapCancelled = async ({
   seedIdTo,
   refundAddress,
   payoutAddress,
+  data,
   ...rest
 }) => {
   if (isIntegrationTestEnv()) return mockPostSwapCancelled({ provider, swapId, ...rest });
@@ -138,7 +139,8 @@ export const postSwapCancelled: PostSwapCancelled = async ({
 
     const shouldIncludeAddresses =
       rest.statusCode === "WrongDeviceForAccountPayout" ||
-      rest.statusCode === "WrongDeviceForAccountRefund";
+      rest.statusCode === "WrongDeviceForAccountRefund" ||
+      rest.statusCode === "FeeNotLoaded";
 
     const requestData = {
       provider,
@@ -147,11 +149,14 @@ export const postSwapCancelled: PostSwapCancelled = async ({
       swapIntentWithoutProvider,
       payloadAddressMatchAccountAddress,
       fromAmount,
-      fromAccountAddress: shouldIncludeAddresses ? fromAccountAddress : undefined,
-      toAccountAddress: shouldIncludeAddresses ? toAccountAddress : undefined,
-      payloadRefundAddress: shouldIncludeAddresses ? refundAddress : undefined,
-      payloadPayoutAddress: shouldIncludeAddresses ? payoutAddress : undefined,
+      ...(shouldIncludeAddresses && {
+        fromAccountAddress,
+        toAccountAddress,
+        payloadRefundAddress: refundAddress,
+        payloadPayoutAddress: payoutAddress,
+      }),
       maybeSeedMatch: seedIdFrom === seedIdTo, // Only true if both accounts are from the same seed and from the same chain type
+      data,
       ...rest,
     };
 

package/src/exchange/swap/types.ts

@@ -214,7 +214,9 @@ export type SwapStateAcceptedRequest = SwapStateRequest & {
   transactionId: string;
 };
 
-export type SwapStateCancelledRequest = SwapStateRequest;
+export type SwapStateCancelledRequest = SwapStateRequest & {
+  data?: string;
+};
 
 export type PostSwapAccepted = (arg0: SwapStateAcceptedRequest) => Promise<null>;
 

package/src/families/bitcoin/walletApiAdapter.test.ts

@@ -122,6 +122,42 @@ describe("getPlatformTransactionSignFlowInfos", () => {
     "strategy": 0,
   },
 }
+`);
+    });
+
+    test("with changeAddress provided", () => {
+      const btcPlatformTx: WalletAPITransaction = {
+        family: "bitcoin",
+        amount: new BigNumber(100000),
+        recipient: "0xABCDEF",
+        changeAddress: "1ChangeAddressExample",
+      };
+
+      const { canEditFees, hasFeesProvided, liveTx } = btc.getWalletAPITransactionSignFlowInfos({
+        walletApiTransaction: btcPlatformTx,
+        account: {} as Account,
+      });
+
+      expect(canEditFees).toBe(true);
+
+      expect(hasFeesProvided).toBe(false);
+
+      expect(liveTx).toMatchInlineSnapshot(`
+{
+  "amount": "100000",
+  "changeAddress": "1ChangeAddressExample",
+  "family": "bitcoin",
+  "feePerByte": null,
+  "feesStrategy": "medium",
+  "networkInfo": null,
+  "rbf": false,
+  "recipient": "0xABCDEF",
+  "useAllAmount": false,
+  "utxoStrategy": {
+    "excludeUTXOs": [],
+    "strategy": 0,
+  },
+}
 `);
     });
   });

package/src/families/bitcoin/walletApiAdapter.ts

@@ -35,6 +35,10 @@ const convertToLiveTransaction: ConvertToLiveTransaction<
     liveTx.opReturnData = walletApiTransaction.opReturnData;
   }
 
+  if (walletApiTransaction.changeAddress) {
+    liveTx.changeAddress = walletApiTransaction.changeAddress;
+  }
+
   if (hasFeesProvided) {
     liveTx.feesStrategy = null;
   }

package/src/families/cosmos/datasets/__snapshots__/cosmos.integration.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`cosmos currency bridge scanAccounts cosmos seed 1 1`] = `
 [
   {
-    "balance": "7291071",
+    "balance": "7289352",
     "currencyId": "cosmos",
     "derivationMode": "",
     "freshAddress": "cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl",
@@ -12,14 +12,14 @@ exports[`cosmos currency bridge scanAccounts cosmos seed 1 1`] = `
     "index": 0,
     "pendingOperations": [],
     "seedIdentifier": "0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a",
-    "spendableBalance": "4656860",
+    "spendableBalance": "2655141",
     "swapHistory": [],
     "syncHash": undefined,
     "used": true,
     "xpub": "cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl",
   },
   {
-    "balance": "1095084",
+    "balance": "1095085",
     "currencyId": "cosmos",
     "derivationMode": "",
     "freshAddress": "cosmos108uy5q9jt59gwugq5yrdhkzcd9jryslmpcstk5",
@@ -28,7 +28,7 @@ exports[`cosmos currency bridge scanAccounts cosmos seed 1 1`] = `
     "index": 1,
     "pendingOperations": [],
     "seedIdentifier": "0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a",
-    "spendableBalance": "887584",
+    "spendableBalance": "887585",
     "swapHistory": [],
     "syncHash": undefined,
     "used": true,
@@ -783,6 +783,29 @@ exports[`cosmos currency bridge scanAccounts cosmos seed 1 2`] = `
       "type": "DELEGATE",
       "value": "9267",
     },
+    {
+      "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
+      "blockHash": null,
+      "blockHeight": 28615251,
+      "extra": {
+        "memo": "Ledger Live",
+        "validators": [
+          {
+            "address": "cosmosvaloper10wljxpl03053h9690apmyeakly3ylhejrucvtm",
+            "amount": "1000000",
+          },
+        ],
+      },
+      "fee": "15217",
+      "hasFailed": false,
+      "hash": "37D1A48254F3C1DED61C1C6E093595A750CBF5C79BBACD10A34DE6B70C3E1D0F",
+      "id": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:-37D1A48254F3C1DED61C1C6E093595A750CBF5C79BBACD10A34DE6B70C3E1D0F-DELEGATE",
+      "recipients": [],
+      "senders": [],
+      "transactionSequenceNumber": "185",
+      "type": "DELEGATE",
+      "value": "15217",
+    },
     {
       "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
       "blockHash": null,
@@ -1232,6 +1255,29 @@ exports[`cosmos currency bridge scanAccounts cosmos seed 1 2`] = `
       "type": "OUT",
       "value": "3729",
     },
+    {
+      "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
+      "blockHash": null,
+      "blockHeight": 28615228,
+      "extra": {
+        "memo": "Ledger Live",
+        "validators": [
+          {
+            "address": "cosmosvaloper10wljxpl03053h9690apmyeakly3ylhejrucvtm",
+            "amount": "1000000",
+          },
+        ],
+      },
+      "fee": "19524",
+      "hasFailed": false,
+      "hash": "6FE3C64E57224720FAE82136656CE087CD84EA18E55F54F6BB180881EAA56004",
+      "id": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:-6FE3C64E57224720FAE82136656CE087CD84EA18E55F54F6BB180881EAA56004-DELEGATE",
+      "recipients": [],
+      "senders": [],
+      "transactionSequenceNumber": "184",
+      "type": "DELEGATE",
+      "value": "19524",
+    },
     {
       "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
       "blockHash": null,
@@ -1794,6 +1840,29 @@ exports[`cosmos currency bridge scanAccounts cosmos seed 1 2`] = `
       "type": "REDELEGATE",
       "value": "24612",
     },
+    {
+      "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
+      "blockHash": null,
+      "blockHeight": 28513219,
+      "extra": {
+        "memo": "Ledger Live",
+        "validators": [
+          {
+            "address": "cosmosvaloper1clpqr4nrk4khgkxj78fcwwh6dl3uw4epsluffn",
+            "amount": "17874",
+          },
+        ],
+      },
+      "fee": "17705",
+      "hasFailed": false,
+      "hash": "9A71C2ADCECCC8837EA95C20CF19758CB3ABBB72FA96230ED0517D0C2C3CC372",
+      "id": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:-9A71C2ADCECCC8837EA95C20CF19758CB3ABBB72FA96230ED0517D0C2C3CC372-REWARD",
+      "recipients": [],
+      "senders": [],
+      "transactionSequenceNumber": "183",
+      "type": "REWARD",
+      "value": "17874",
+    },
     {
       "accountId": "js:2:cosmos:cosmos1g84934jpu3v5de5yqukkkhxmcvsw3u2ajxvpdl:",
       "blockHash": null,