@ledgerhq/live-common 34.53.0-nightly.20251112023812 → 34.53.0-nightly.20251113023835

package/lib-es/bridge/useBridgeTransaction.js

@@ -4,6 +4,7 @@ import { log } from "@ledgerhq/logs";
 import { getAccountBridge } from ".";
 import { getMainAccount } from "../account";
 import { delay } from "../promise";
+import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 const initial = {
     account: null,
     parentAccount: null,
@@ -18,6 +19,18 @@ const initial = {
     statusOnTransaction: null,
     errorAccount: null,
     errorStatus: null,
+    syncing: false,
+    synced: false,
+};
+export const shouldSyncBeforeTx = (currency) => {
+    const currencyConfig = LiveConfig.getValueByKey(`config_currency_${currency.id}`);
+    const sharedConfig = LiveConfig.getValueByKey("config_currency");
+    if (currencyConfig && "syncBeforeTx" in currencyConfig) {
+        return currencyConfig.syncBeforeTx === true;
+    }
+    else {
+        return sharedConfig && "syncBeforeTx" in sharedConfig && sharedConfig.syncBeforeTx === true;
+    }
 };
 const makeInit = (optionalInit) => () => {
     let s = initial;
@@ -67,6 +80,8 @@ const reducer = (state, action) => {
                     account,
                     parentAccount,
                     transaction: t,
+                    syncing: false,
+                    synced: false,
                 };
             }
             catch (e) {
@@ -75,6 +90,8 @@ const reducer = (state, action) => {
                     account,
                     parentAccount,
                     errorAccount: e,
+                    syncing: false,
+                    synced: false,
                 };
             }
         }
@@ -102,6 +119,10 @@ const reducer = (state, action) => {
             if (action.error === state.errorStatus)
                 return state;
             return { ...state, errorStatus: action.error };
+        case "onStartSync":
+            return { ...state, syncing: true, synced: false };
+        case "onSync":
+            return { ...state, syncing: false, synced: true };
         default:
             return state;
     }
@@ -110,7 +131,7 @@ const INITIAL_ERROR_RETRY_DELAY = 1000;
 const ERROR_RETRY_DELAY_MULTIPLIER = 1.5;
 const DEBOUNCE_STATUS_DELAY = 300;
 const useBridgeTransaction = (optionalInit) => {
-    const [{ account, parentAccount, transaction, status, statusOnTransaction, errorAccount, errorStatus }, dispatch,] = useReducer(reducer, undefined, makeInit(optionalInit));
+    const [{ account, parentAccount, transaction, status, statusOnTransaction, syncing, synced, errorAccount, errorStatus, }, dispatch,] = useReducer(reducer, undefined, makeInit(optionalInit));
     const setAccount = useCallback((account, parentAccount) => dispatch({
         type: "setAccount",
         account,
@@ -127,6 +148,27 @@ const useBridgeTransaction = (optionalInit) => {
     const mainAccount = account ? getMainAccount(account, parentAccount) : null;
     const errorDelay = useRef(INITIAL_ERROR_RETRY_DELAY);
     const statusIsPending = useRef(false); // Stores if status already being processed
+    const shouldSync = mainAccount && shouldSyncBeforeTx(mainAccount.currency);
+    useEffect(() => {
+        if (mainAccount === null || synced || syncing)
+            return;
+        if (!shouldSync)
+            return; // skip sync if not required by currency config
+        dispatch({ type: "onStartSync" });
+        const bridge = getAccountBridge(mainAccount, null);
+        const sub = bridge.sync(mainAccount, { paginationConfig: {} }).subscribe({
+            error: (_) => {
+                // we do not block the user in case of error for now but it should be the case
+                dispatch({ type: "onSync" });
+            },
+            complete: () => {
+                dispatch({ type: "onSync" });
+            },
+        });
+        return () => {
+            sub.unsubscribe();
+        };
+    }, [mainAccount, synced, syncing, shouldSync]);
     const bridgePending = transaction !== statusOnTransaction;
     // when transaction changes, prepare the transaction
     useEffect(() => {
@@ -134,7 +176,7 @@ const useBridgeTransaction = (optionalInit) => {
         let errorTimeout;
         // If bridge is not pending, transaction change is due to
         // the last onStatus dispatch (prepareTransaction changed original transaction) and must be ignored
-        if (!bridgePending)
+        if (!bridgePending && !synced)
             return;
         if (mainAccount && transaction) {
             // We don't debounce first status refresh, but any subsequent to avoid multiple calls
@@ -200,7 +242,7 @@ const useBridgeTransaction = (optionalInit) => {
                 errorTimeout = null;
             }
         };
-    }, [transaction, mainAccount, bridgePending, dispatch]);
+    }, [transaction, mainAccount, bridgePending, dispatch, synced]);
     const bridgeError = errorAccount || errorStatus;
     useEffect(() => {
         if (bridgeError && globalOnBridgeError) {
@@ -216,7 +258,7 @@ const useBridgeTransaction = (optionalInit) => {
         parentAccount,
         setAccount,
         bridgeError,
-        bridgePending,
+        bridgePending: bridgePending && (shouldSync ? !synced : true),
     };
 };
 let globalOnBridgeError = null;

package/lib-es/bridge/useBridgeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBridgeTransaction.js","sourceRoot":"","sources":["../../src/bridge/useBridgeTransaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useBridgeTransaction.js","sourceRoot":"","sources":["../../src/bridge/useBridgeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,GAAG,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAInC,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAiE9D,MAAM,OAAO,GAAuB;IAClC,OAAO,EAAE,IAAI;IACb,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE;QACN,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,EAAE;QACZ,aAAa,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;QAC/B,MAAM,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;QACxB,UAAU,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC;KAC7B;IACD,mBAAmB,EAAE,IAAI;IACzB,YAAY,EAAE,IAAI;IAClB,WAAW,EAAE,IAAI;IACjB,OAAO,EAAE,KAAK;IACd,MAAM,EAAE,KAAK;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAwB,EAAW,EAAE;IACtE,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,mBAAmB,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IAClF,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACjE,IAAI,cAAc,IAAI,cAAc,IAAI,cAAc,EAAE;QACtD,OAAO,cAAc,CAAC,YAAY,KAAK,IAAI,CAAC;KAC7C;SAAM;QACL,OAAO,YAAY,IAAI,cAAc,IAAI,YAAY,IAAI,YAAY,CAAC,YAAY,KAAK,IAAI,CAAC;KAC7F;AACH,CAAC,CAAC;AAEF,MAAM,QAAQ,GACZ,CACE,YAA0D,EAC1D,EAAE,CACJ,GAAa,EAAE;IACb,IAAI,CAAC,GAAG,OAAmB,CAAC;IAE5B,IAAI,YAAY,EAAE;QAChB,MAAM,KAAK,GAAG,YAAY,EAAE,CAAC;QAC7B,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;QAEtD,IAAI,OAAO,EAAE;YACX,CAAC,GAAI,OAAsB,CAAC,CAAC,EAAE;gBAC7B,IAAI,EAAE,YAAY;gBAClB,OAAO;gBACP,aAAa;aACd,CAAC,CAAC;SACJ;QAED,IAAI,WAAW,EAAE;YACf,CAAC,GAAI,OAAsB,CAAC,CAAC,EAAE;gBAC7B,IAAI,EAAE,gBAAgB;gBACtB,WAAW;aACZ,CAAC,CAAC;SACJ;KACF;IAED,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEJ,MAAM,OAAO,GAAG,CACd,KAAe,EACf,MAAkB,EACR,EAAE;IACZ,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,YAAY,CAAC,CAAC;YACjB,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;YAE1C,IAAI;gBACF,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;gBAC3D,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAqB,CAAC;gBAC5E,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,CAAC;gBAC9D,IAAI,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAC9C;gBACE,gGAAgG;gBAChG,KAAK,CAAC,WAAW,EAAE,IAAI;oBACvB,gGAAgG;oBAChG,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EACjC;oBACA,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,EAAE;wBAC9B,gGAAgG;wBAChG,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI;qBAC7B,CAAC,CAAC;iBACJ;gBAED,IAAI,YAAY,EAAE;oBAChB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,YAAY,EAAE,CAAC;iBAC5B;gBAED,OAAO;oBACL,GAAG,OAAO;oBACV,OAAO;oBACP,aAAa;oBACb,WAAW,EAAE,CAAC;oBACd,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,KAAK;iBACF,CAAC;aACf;YAAC,OAAO,CAAM,EAAE;gBACf,OAAO;oBACL,GAAG,OAAO;oBACV,OAAO;oBACP,aAAa;oBACb,YAAY,EAAE,CAAC;oBACf,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,KAAK;iBACF,CAAC;aACf;SACF;QAED,KAAK,gBAAgB;YACnB,IAAI,KAAK,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW;gBAAE,OAAO,KAAK,CAAC;YAC3D,OAAO,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;QAEvD,KAAK,mBAAmB,CAAC,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,WAAW;gBAAE,OAAO,KAAK,CAAC;YACrC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACtD,IAAI,KAAK,CAAC,WAAW,KAAK,WAAW;gBAAE,OAAO,KAAK,CAAC;YACpD,OAAO,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,CAAC;SAClC;QAED,KAAK,UAAU;YACb,OAAO;gBACL,GAAG,KAAK;gBACR,WAAW,EAAE,IAAI;gBACjB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,mBAAmB,EAAE,MAAM,CAAC,WAAW;aACxC,CAAC;QAEJ,KAAK,eAAe;YAClB,IAAI,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,WAAW;gBAAE,OAAO,KAAK,CAAC;YACrD,OAAO,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAEjD,KAAK,aAAa;YAChB,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAEpD,KAAK,QAAQ;YACX,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAEpD;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,IAAI,CAAC;AACvC,MAAM,4BAA4B,GAAG,GAAG,CAAC;AACzC,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAElC,MAAM,oBAAoB,GAAG,CAC3B,YAA2D,EAChD,EAAE;IACb,MAAM,CACJ,EACE,OAAO,EACP,aAAa,EACb,WAAW,EACX,MAAM,EACN,mBAAmB,EACnB,OAAO,EACP,MAAM,EACN,YAAY,EACZ,WAAW,GACZ,EACD,QAAQ,EACT,GAAG,UAAU,CAAC,OAAqB,EAAE,SAAS,EAAE,QAAQ,CAAI,YAAY,CAAC,CAAC,CAAC;IAC5E,MAAM,UAAU,GAAG,WAAW,CAC5B,CAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CACzB,QAAQ,CAAC;QACP,IAAI,EAAE,YAAY;QAClB,OAAO;QACP,aAAa;KACd,CAAC,EACJ,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,cAAc,GAAG,WAAW,CAChC,WAAW,CAAC,EAAE,CACZ,QAAQ,CAAC;QACP,IAAI,EAAE,gBAAgB;QACtB,WAAW;KACZ,CAAC,EACJ,CAAC,QAAQ,CAAC,CACX,CAAC;IACF,MAAM,iBAAiB,GAAG,WAAW,CACnC,OAAO,CAAC,EAAE,CACR,QAAQ,CAAC;QACP,IAAI,EAAE,mBAAmB;QACzB,OAAO;KACR,CAAC,EACJ,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5E,MAAM,UAAU,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,2CAA2C;IAClF,MAAM,UAAU,GAAG,WAAW,IAAI,kBAAkB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE3E,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,WAAW,KAAK,IAAI,IAAI,MAAM,IAAI,OAAO;YAAE,OAAO;QAEtD,IAAI,CAAC,UAAU;YAAE,OAAO,CAAC,+CAA+C;QAExE,QAAQ,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC;YACvE,KAAK,EAAE,CAAC,CAAQ,EAAE,EAAE;gBAClB,8EAA8E;gBAC9E,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC/B,CAAC;YACD,QAAQ,EAAE,GAAG,EAAE;gBACb,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC/B,CAAC;SACF,CAAC,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAE/C,MAAM,aAAa,GAAG,WAAW,KAAK,mBAAmB,CAAC;IAE1D,oDAAoD;IACpD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,YAAmC,CAAC;QACxC,yDAAyD;QACzD,mGAAmG;QACnG,IAAI,CAAC,aAAa,IAAI,CAAC,MAAM;YAAE,OAAO;QAEtC,IAAI,WAAW,IAAI,WAAW,EAAE;YAC9B,qFAAqF;YACrF,0BAA0B;YAC1B,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/E,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,+DAA+D;YAE/F,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;iBACtB,IAAI,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;iBAC/C,IAAI,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;gBACnB,IAAI,MAAM;oBAAE,OAAO;gBACnB,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBACtF,IAAI,MAAM;oBAAE,OAAO;gBACnB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAC;gBACnF,IAAI,MAAM;oBAAE,OAAO;gBACnB,OAAO;oBACL,mBAAmB;oBACnB,MAAM;iBACP,CAAC;YACJ,CAAC,CAAC;iBACD,IAAI,CACH,MAAM,CAAC,EAAE;gBACP,IAAI,MAAM,IAAI,CAAC,MAAM;oBAAE,OAAO;gBAC9B,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;gBAC/C,UAAU,CAAC,OAAO,GAAG,yBAAyB,CAAC,CAAC,cAAc;gBAE9D,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,wCAAwC;gBAEzE,QAAQ,CAAC;oBACP,IAAI,EAAE,UAAU;oBAChB,MAAM;oBACN,WAAW,EAAE,mBAAmB;iBACjC,CAAC,CAAC;YACL,CAAC,EACD,CAAC,CAAC,EAAE;gBACF,IAAI,MAAM;oBAAE,OAAO;gBACnB,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC;gBAChC,QAAQ,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,KAAK,EAAE,CAAC;iBACT,CAAC,CAAC;gBACH,GAAG,CAAC,sBAAsB,EAAE,4BAA4B,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtE,8DAA8D;gBAC9D,GAAG,CAAC,sBAAsB,EAAE,gCAAgC,CAAC,CAAC;gBAC9D,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC7B,sBAAsB;oBACtB,UAAU,CAAC,OAAO,IAAI,4BAA4B,CAAC,CAAC,iBAAiB;oBAErE,aAAa;oBACb,MAAM,eAAe,GAAG;wBACtB,GAAG,WAAW;qBACf,CAAC;oBACF,QAAQ,CAAC;wBACP,IAAI,EAAE,gBAAgB;wBACtB,WAAW,EAAE,eAAe;qBAC7B,CAAC,CAAC,CAAC,sBAAsB;gBAC5B,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;YACzB,CAAC,CACF,CAAC;SACL;QAED,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,IAAI,CAAC;YAEd,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,YAAY,CAAC,CAAC;gBAC3B,YAAY,GAAG,IAAI,CAAC;aACrB;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhE,MAAM,WAAW,GAAG,YAAY,IAAI,WAAW,CAAC;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,WAAW,IAAI,mBAAmB,EAAE;YACtC,mBAAmB,CAAC,WAAW,CAAC,CAAC;SAClC;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO;QACL,WAAW;QACX,cAAc;QACd,iBAAiB;QACjB,MAAM;QACN,OAAO;QACP,aAAa;QACb,UAAU;QACV,WAAW;QACX,aAAa,EAAE,aAAa,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;KAC9D,CAAC;AACJ,CAAC,CAAC;AAIF,IAAI,mBAAmB,GAAwB,IAAI,CAAC;AAEpD,mGAAmG;AACnG,MAAM,UAAU,sBAAsB,CAAC,CAAsB;IAC3D,mBAAmB,GAAG,CAAC,CAAC;AAC1B,CAAC;AACD,MAAM,UAAU,sBAAsB;IACpC,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,eAAe,oBAAoB,CAAC"}

package/lib-es/e2e/index.d.ts

@@ -1,6 +1,171 @@
 import { EnvName } from "@ledgerhq/live-env";
 import { Feature, FeatureId } from "@ledgerhq/types-live";
-export declare const getAllFeatureFlags: (appLanguage?: string) => Partial<{
+export declare const getAllFeatureFlags: (appLanguage?: string, localOverrides?: {
+    currencyAvalancheCChain?: Feature | undefined;
+    currencyStacks?: Feature | undefined;
+    currencyOptimism?: Feature | undefined;
+    currencyOptimismSepolia?: Feature | undefined;
+    currencyArbitrum?: Feature | undefined;
+    currencyArbitrumSepolia?: Feature | undefined;
+    currencyRsk?: Feature | undefined;
+    currencyBittorrent?: Feature | undefined;
+    currencyEnergyWeb?: Feature | undefined;
+    currencyAstar?: Feature | undefined;
+    currencyMetis?: Feature | undefined;
+    currencyBoba?: Feature | undefined;
+    currencyMoonriver?: Feature | undefined;
+    currencyVelasEvm?: Feature | undefined;
+    currencySyscoin?: Feature | undefined;
+    currencyAptos?: Feature | undefined;
+    currencyAptosTestnet?: Feature | undefined;
+    currencyAxelar?: Feature | undefined;
+    currencySecretNetwork?: Feature | undefined;
+    currencySeiNetwork?: Feature | undefined;
+    currencyDesmos?: Feature | undefined;
+    currencyDydx?: Feature | undefined;
+    currencyUmee?: Feature | undefined;
+    currencyStargaze?: Feature | undefined;
+    currencyOnomy?: Feature | undefined;
+    currencyPersistence?: Feature | undefined;
+    currencyQuicksilver?: Feature | undefined;
+    currencyInternetComputer?: Feature | undefined;
+    currencyInjective?: Feature | undefined;
+    currencyTelosEvm?: Feature | undefined;
+    currencyCoreum?: Feature | undefined;
+    currencyPolygonZkEvm?: Feature | undefined;
+    currencyPolygonZkEvmTestnet?: Feature | undefined;
+    currencyBase?: Feature | undefined;
+    currencyBaseSepolia?: Feature | undefined;
+    currencyKlaytn?: Feature | undefined;
+    currencyVechain?: Feature | undefined;
+    currencyCasper?: Feature | undefined;
+    currencyNeonEvm?: Feature | undefined;
+    currencyLukso?: Feature | undefined;
+    currencyLinea?: Feature | undefined;
+    currencyLineaSepolia?: Feature | undefined;
+    currencyBlast?: Feature | undefined;
+    currencyBlastSepolia?: Feature | undefined;
+    currencyScroll?: Feature | undefined;
+    currencyScrollSepolia?: Feature | undefined;
+    currencyIcon?: Feature | undefined;
+    currencyTon?: Feature | undefined;
+    currencyEtherlink?: Feature | undefined;
+    currencyZkSync?: Feature | undefined;
+    currencyZkSyncSepolia?: Feature | undefined;
+    currencyMantra?: Feature | undefined;
+    currencyXion?: Feature | undefined;
+    currencyZenrock?: Feature | undefined;
+    currencySonic?: Feature | undefined;
+    currencySonicBlaze?: Feature | undefined;
+    currencySui?: Feature | undefined;
+    currencyMina?: Feature | undefined;
+    currencyBabylon?: Feature | undefined;
+    currencySeiNetworkEvm?: Feature | undefined;
+    currencyBerachain?: Feature | undefined;
+    currencyHyperevm?: Feature | undefined;
+    currencyCantonNetwork?: Feature | undefined;
+    currencyCantonNetworkDevnet?: Feature | undefined;
+    currencyCantonNetworkTestnet?: Feature | undefined;
+    currencyKaspa?: Feature | undefined;
+    currencyEthereumHoodi?: Feature | undefined;
+    currencyCore?: Feature | undefined;
+    currencyWestend?: Feature | undefined;
+    currencyAssetHubWestend?: Feature | undefined;
+    currencyAssetHubPolkadot?: Feature | undefined;
+    currencyPolkadot?: Feature | undefined;
+    currencyMonad?: Feature | undefined;
+    nanoOnboardingFundWallet?: Feature | undefined;
+    mixpanelAnalytics?: Feature | undefined;
+    welcomeScreenVideoCarousel?: Feature | undefined;
+    brazePushNotifications?: Feature | undefined;
+    ratingsPrompt?: Feature | undefined;
+    npsRatingsPrompt?: Feature | undefined;
+    counterValue?: Feature | undefined;
+    deviceInitialApps?: Feature | undefined;
+    buyDeviceFromLive?: Feature | undefined;
+    mockFeature?: Feature | undefined;
+    buySellUi?: Feature | undefined;
+    buySellLoader?: Feature | undefined;
+    buySellShortcut?: Feature | undefined;
+    referralProgramDesktopSidebar?: Feature | undefined;
+    disableNftSend?: Feature | undefined;
+    disableNftLedgerMarket?: Feature | undefined;
+    disableNftRaribleOpensea?: Feature | undefined;
+    receiveStakingFlowConfigDesktop?: Feature | undefined;
+    ethStakingModalWithFilters?: Feature | undefined;
+    ethStakingProviders?: Feature | undefined;
+    storyly?: Feature | undefined;
+    postOnboardingAssetsTransfer?: Feature | undefined;
+    firebaseEnvironmentReadOnly?: Feature | undefined;
+    protectServicesMobile?: Feature | undefined;
+    protectServicesDesktop?: Feature | undefined;
+    ptxServiceCtaExchangeDrawer?: Feature | undefined;
+    ptxServiceCtaScreens?: Feature | undefined;
+    swapWalletApiPartnerList?: Feature | undefined;
+    stakePrograms?: Feature | undefined;
+    portfolioExchangeBanner?: Feature | undefined;
+    editEvmTx?: Feature | undefined;
+    stakeAccountBanner?: Feature | undefined;
+    newsfeedPage?: Feature | undefined;
+    domainInputResolution?: Feature | undefined;
+    discover?: Feature | undefined;
+    transactionsAlerts?: Feature | undefined;
+    fetchAdditionalCoins?: Feature | undefined;
+    ptxCard?: Feature | undefined;
+    ptxSwapLiveAppMobile?: Feature | undefined;
+    ptxSwapLiveAppKycWarning?: Feature | undefined;
+    ptxSwapLiveApp?: Feature | undefined;
+    ptxSwapDetailedView?: Feature | undefined;
+    ptxEarnLiveApp?: Feature | undefined;
+    ptxEarnDrawerConfiguration?: Feature | undefined;
+    ptxSwapReceiveTRC20WithoutTrx?: Feature | undefined;
+    flexibleContentCards?: Feature | undefined;
+    llmAnalyticsOptInPrompt?: Feature | undefined;
+    ptxSwapMoonpayProvider?: Feature | undefined;
+    ptxSwapExodusProvider?: Feature | undefined;
+    lldAnalyticsOptInPrompt?: Feature | undefined;
+    lldChatbotSupport?: Feature | undefined;
+    llmChatbotSupport?: Feature | undefined;
+    myLedgerDisplayAppDeveloperName?: Feature | undefined;
+    lldActionCarousel?: Feature | undefined;
+    marketperformanceWidgetDesktop?: Feature | undefined;
+    lldRefreshMarketData?: Feature | undefined;
+    llmRefreshMarketData?: Feature | undefined;
+    lldWalletSync?: Feature | undefined;
+    llmWalletSync?: Feature | undefined;
+    enableAppsBackup?: Feature | undefined;
+    web3hub?: Feature | undefined;
+    llmMemoTag?: Feature | undefined;
+    lldMemoTag?: Feature | undefined;
+    ldmkTransport?: Feature | undefined;
+    llMevProtection?: Feature | undefined;
+    llCounterValueGranularitiesRates?: Feature | undefined;
+    llmRebornLP?: Feature | undefined;
+    llmAccountListUI?: Feature | undefined;
+    llmLedgerSyncEntryPoints?: Feature | undefined;
+    lldLedgerSyncEntryPoints?: Feature | undefined;
+    lldNanoSUpsellBanners?: Feature | undefined;
+    llmNanoSUpsellBanners?: Feature | undefined;
+    llmThai?: Feature | undefined;
+    lldThai?: Feature | undefined;
+    largemoverLandingpage?: Feature | undefined;
+    llmMmkvMigration?: Feature | undefined;
+    lldModularDrawer?: Feature | undefined;
+    llmModularDrawer?: Feature | undefined;
+    llNftEntryPoint?: Feature | undefined;
+    ldmkConnectApp?: Feature | undefined;
+    lldNetworkBasedAddAccount?: Feature | undefined;
+    llmDatadog?: Feature | undefined;
+    llmSentry?: Feature | undefined;
+    onboardingIgnoredOsUpdates?: Feature | undefined;
+    llmHomescreen?: Feature | undefined;
+    supportDeviceApex?: Feature | undefined;
+    llmSyncOnboardingIncr1?: Feature | undefined;
+    lldSyncOnboardingIncr1?: Feature | undefined;
+    noah?: Feature | undefined;
+    newSendFlow?: Feature | undefined;
+    lldSessionReplay?: Feature | undefined;
+} | undefined) => Partial<{
     currencyAvalancheCChain: Feature;
     currencyStacks: Feature;
     currencyOptimism: Feature;

package/lib-es/e2e/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/e2e/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,kBAAkB,iBACf,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EASrB,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA6B3B,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAMzB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/e2e/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAG1D,eAAO,MAAM,kBAAkB,iBACf,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUrB,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA6B3B,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAMzB,CAAC"}

package/lib-es/e2e/index.js

@@ -1,9 +1,9 @@
 import { getFeature, DEFAULT_FEATURES } from "../featureFlags";
-export const getAllFeatureFlags = (appLanguage) => {
+export const getAllFeatureFlags = (appLanguage, localOverrides) => {
     const res = {};
     Object.keys(DEFAULT_FEATURES).forEach(k => {
         const key = k;
-        const value = getFeature({ key, appLanguage });
+        const value = getFeature({ key, appLanguage, localOverrides });
         if (value !== null)
             res[key] = value;
     });

package/lib-es/e2e/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/e2e/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE/D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,WAAoB,EACsB,EAAE;IAC5C,MAAM,GAAG,GAA6C,EAAE,CAAC;IACzD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACxC,MAAM,GAAG,GAAG,CAAkC,CAAC;QAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;QAC/C,IAAI,KAAK,KAAK,IAAI;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAA8C,EAAE,EAAE;IAChF,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC/C,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,SAAS;QAC7B,UAAU,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,IAAI,CAAC;QAE/C,MAAM,OAAO,GAAG;YACd,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,kCAAkC,EAAE,KAAK,CAAC,kCAAkC;YAC5E,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC;YAC9D,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC;YAC9D,mCAAmC,EAAE,KAAK,CAAC,mCAAmC;YAC9E,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;SAChE,CAAC;QAEF,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzD,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC5B,UAAU,IAAI,MAAM,GAAG,IAAI,KAAK,MAAM,UAAU;qBAC7C,QAAQ,EAAE;qBACV,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;qBACvB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;aAC3B;SACF;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAmC,EAAE,EAAE;IACnE,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC/C,UAAU,IAAI,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC;KACzC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/e2e/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAE/D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,WAAoB,EACpB,cAA6D,EACnB,EAAE;IAC5C,MAAM,GAAG,GAA6C,EAAE,CAAC;IACzD,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACxC,MAAM,GAAG,GAAG,CAAkC,CAAC;QAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAC;QAC/D,IAAI,KAAK,KAAK,IAAI;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAA8C,EAAE,EAAE;IAChF,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC/C,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,SAAS;QAC7B,UAAU,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,IAAI,CAAC;QAE/C,MAAM,OAAO,GAAG;YACd,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,kCAAkC,EAAE,KAAK,CAAC,kCAAkC;YAC5E,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC;YAC9D,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,CAAC;YAC9D,mCAAmC,EAAE,KAAK,CAAC,mCAAmC;YAC9E,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;SAChE,CAAC;QAEF,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzD,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC5B,UAAU,IAAI,MAAM,GAAG,IAAI,KAAK,MAAM,UAAU;qBAC7C,QAAQ,EAAE;qBACV,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;qBACvB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;aAC3B;SACF;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAmC,EAAE,EAAE;IACnE,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC/C,UAAU,IAAI,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC;KACzC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.53.0-nightly.20251112023812",
+  "version": "34.53.0-nightly.20251113023835",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -168,45 +168,45 @@
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
     "react-redux": "7.2.9",
-    "@ledgerhq/coin-algorand": "^0.13.0-nightly.20251112023812",
-    "@ledgerhq/coin-aptos": "^3.6.0-nightly.20251112023812",
-    "@ledgerhq/coin-bitcoin": "^0.25.0-nightly.20251112023812",
-    "@ledgerhq/coin-canton": "^0.10.0-nightly.20251112023812",
-    "@ledgerhq/coin-cardano": "^0.15.0-nightly.20251112023812",
-    "@ledgerhq/coin-casper": "^2.3.1-nightly.20251112023812",
-    "@ledgerhq/coin-celo": "^1.7.1-nightly.20251112023812",
-    "@ledgerhq/coin-cosmos": "^0.20.0-nightly.20251112023812",
-    "@ledgerhq/coin-evm": "^2.35.0-nightly.20251112023812",
-    "@ledgerhq/coin-filecoin": "^1.14.1-nightly.20251112023812",
-    "@ledgerhq/coin-framework": "^6.9.0-nightly.20251112023812",
-    "@ledgerhq/coin-hedera": "^1.14.0-nightly.20251112023812",
-    "@ledgerhq/coin-icon": "^0.15.0-nightly.20251112023812",
-    "@ledgerhq/coin-internet_computer": "^1.10.1-nightly.20251112023812",
-    "@ledgerhq/coin-kaspa": "^1.4.1-nightly.20251112023812",
-    "@ledgerhq/coin-mina": "^1.4.1-nightly.20251112023812",
-    "@ledgerhq/coin-multiversx": "^0.8.0-nightly.20251112023812",
-    "@ledgerhq/coin-near": "^0.16.0-nightly.20251112023812",
-    "@ledgerhq/coin-polkadot": "^6.13.0-nightly.20251112023812",
-    "@ledgerhq/coin-solana": "^0.37.0-nightly.20251112023812",
-    "@ledgerhq/coin-stellar": "^6.7.0-nightly.20251112023812",
-    "@ledgerhq/coin-stacks": "^0.12.0-nightly.20251112023812",
-    "@ledgerhq/coin-sui": "^0.18.0-nightly.20251112023812",
-    "@ledgerhq/coin-tezos": "^6.9.0-nightly.20251112023812",
-    "@ledgerhq/coin-ton": "^0.17.0-nightly.20251112023812",
-    "@ledgerhq/coin-tron": "^5.7.0-nightly.20251112023812",
-    "@ledgerhq/coin-vechain": "^2.12.1-nightly.20251112023812",
-    "@ledgerhq/coin-xrp": "^7.8.0-nightly.20251112023812",
-    "@ledgerhq/crypto-icons-ui": "^1.23.0-nightly.20251112023812",
-    "@ledgerhq/cryptoassets": "^13.33.0-nightly.20251112023812",
-    "@ledgerhq/device-core": "^0.6.8-nightly.20251112023812",
+    "@ledgerhq/coin-algorand": "^0.13.0-nightly.20251113023835",
+    "@ledgerhq/coin-aptos": "^3.6.0-nightly.20251113023835",
+    "@ledgerhq/coin-bitcoin": "^0.25.0-nightly.20251113023835",
+    "@ledgerhq/coin-canton": "^0.10.0-nightly.20251113023835",
+    "@ledgerhq/coin-cardano": "^0.15.0-nightly.20251113023835",
+    "@ledgerhq/coin-casper": "^2.3.1-nightly.20251113023835",
+    "@ledgerhq/coin-celo": "^1.7.1-nightly.20251113023835",
+    "@ledgerhq/coin-cosmos": "^0.20.0-nightly.20251113023835",
+    "@ledgerhq/coin-evm": "^2.35.0-nightly.20251113023835",
+    "@ledgerhq/coin-filecoin": "^1.14.1-nightly.20251113023835",
+    "@ledgerhq/coin-framework": "^6.9.0-nightly.20251113023835",
+    "@ledgerhq/coin-hedera": "^1.14.0-nightly.20251113023835",
+    "@ledgerhq/coin-icon": "^0.15.0-nightly.20251113023835",
+    "@ledgerhq/coin-internet_computer": "^1.10.1-nightly.20251113023835",
+    "@ledgerhq/coin-kaspa": "^1.4.1-nightly.20251113023835",
+    "@ledgerhq/coin-mina": "^1.4.1-nightly.20251113023835",
+    "@ledgerhq/coin-multiversx": "^0.8.0-nightly.20251113023835",
+    "@ledgerhq/coin-near": "^0.16.0-nightly.20251113023835",
+    "@ledgerhq/coin-polkadot": "^6.13.0-nightly.20251113023835",
+    "@ledgerhq/coin-solana": "^0.37.0-nightly.20251113023835",
+    "@ledgerhq/coin-stacks": "^0.12.0-nightly.20251113023835",
+    "@ledgerhq/coin-stellar": "^6.7.0-nightly.20251113023835",
+    "@ledgerhq/coin-sui": "^0.18.0-nightly.20251113023835",
+    "@ledgerhq/coin-tezos": "^6.9.0-nightly.20251113023835",
+    "@ledgerhq/coin-ton": "^0.17.0-nightly.20251113023835",
+    "@ledgerhq/coin-tron": "^5.7.0-nightly.20251113023835",
+    "@ledgerhq/coin-vechain": "^2.12.1-nightly.20251113023835",
+    "@ledgerhq/coin-xrp": "^7.8.0-nightly.20251113023835",
+    "@ledgerhq/crypto-icons-ui": "^1.23.0-nightly.20251113023835",
+    "@ledgerhq/cryptoassets": "^13.33.0-nightly.20251113023835",
+    "@ledgerhq/device-core": "^0.6.8-nightly.20251113023835",
     "@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.0",
-    "@ledgerhq/hw-app-celo": "^6.35.3-nightly.20251112023812",
+    "@ledgerhq/hw-app-celo": "^6.35.3-nightly.20251113023835",
     "@ledgerhq/hw-app-cosmos": "^6.32.9",
-    "@ledgerhq/hw-app-eth": "^6.47.1-nightly.20251112023812",
+    "@ledgerhq/hw-app-eth": "^6.47.1-nightly.20251113023835",
     "@ledgerhq/hw-app-exchange": "^0.17.0",
     "@ledgerhq/hw-app-hedera": "^1.2.9",
     "@ledgerhq/hw-app-icon": "^1.3.9",
@@ -218,27 +218,27 @@
     "@ledgerhq/hw-app-sui": "^1.4.0",
     "@ledgerhq/hw-app-tezos": "^6.31.9",
     "@ledgerhq/hw-app-trx": "^6.31.9",
-    "@ledgerhq/hw-app-xrp": "^6.32.7",
     "@ledgerhq/hw-app-vet": "^0.7.0",
+    "@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.0-nightly.20251112023812",
-    "@ledgerhq/ledger-trust-service": "^0.4.2-nightly.20251112023812",
+    "@ledgerhq/ledger-cal-service": "^1.9.0-nightly.20251113023835",
+    "@ledgerhq/ledger-trust-service": "^0.4.2-nightly.20251113023835",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-countervalues": "^0.10.0-nightly.20251112023812",
-    "@ledgerhq/live-countervalues-react": "^0.7.2-nightly.20251112023812",
+    "@ledgerhq/live-countervalues": "^0.10.0-nightly.20251113023835",
+    "@ledgerhq/live-countervalues-react": "^0.7.2-nightly.20251113023835",
     "@ledgerhq/live-dmk-shared": "^0.15.0",
-    "@ledgerhq/live-env": "^2.21.0-nightly.20251112023812",
+    "@ledgerhq/live-env": "^2.21.0-nightly.20251113023835",
     "@ledgerhq/live-hooks": "0.2.0",
-    "@ledgerhq/live-network": "^2.1.1-nightly.20251112023812",
+    "@ledgerhq/live-network": "^2.1.1-nightly.20251113023835",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.5.1-nightly.20251112023812",
-    "@ledgerhq/live-signer-evm": "^0.10.1-nightly.20251112023812",
-    "@ledgerhq/live-signer-solana": "^0.6.1-nightly.20251112023812",
-    "@ledgerhq/live-wallet": "^0.16.0-nightly.20251112023812",
+    "@ledgerhq/live-signer-canton": "^0.5.1-nightly.20251113023835",
+    "@ledgerhq/live-signer-evm": "^0.10.1-nightly.20251113023835",
+    "@ledgerhq/live-signer-solana": "^0.6.1-nightly.20251113023835",
+    "@ledgerhq/live-wallet": "^0.16.0-nightly.20251113023835",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.15-nightly.20251112023812",
+    "@ledgerhq/speculos-transport": "^0.2.15-nightly.20251113023835",
     "@ledgerhq/wallet-api-acre-module": "^0.9.0",
     "@ledgerhq/wallet-api-exchange-module": "^0.18.0"
   },
@@ -288,10 +288,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
+    "@ledgerhq/device-react": "^0.3.2-nightly.20251113023835",
     "@ledgerhq/types-cryptoassets": "^7.30.0",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.89.0-nightly.20251112023812",
-    "@ledgerhq/device-react": "^0.3.2-nightly.20251112023812"
+    "@ledgerhq/types-live": "^6.89.0-nightly.20251113023835"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/bridge/generic-alpaca/buildSubAccounts.test.ts

@@ -534,4 +534,70 @@ describe("mergeSubAccounts", () => {
       },
     ]);
   });
+
+  it("prevents duplicates when token account ID changes but token.id stays the same", () => {
+    const oldSubAccounts = [
+      {
+        id: "accountId+stellar:USDC-GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
+        type: "TokenAccount",
+        parentId: "accountId",
+        token: {
+          id: "stellar/asset/USDC-GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
+        },
+        balance: new BigNumber(100),
+        spendableBalance: new BigNumber(100),
+        operations: [
+          {
+            id: "old-op-1",
+            type: "IN",
+            senders: ["sender1"],
+            recipients: ["owner"],
+            date: new Date("2019-01-01"),
+          },
+          {
+            id: "old-op-2",
+            type: "OUT",
+            senders: ["owner"],
+            recipients: ["recipient1"],
+            date: new Date("2019-01-02"),
+          },
+        ],
+        operationsCount: 2,
+      },
+    ] as Array<TokenAccount>;
+
+    const newSubAccounts = [
+      {
+        id: "accountId+stellar/asset/USDC-GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
+        type: "TokenAccount",
+        parentId: "accountId",
+        token: {
+          id: "stellar/asset/USDC-GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5",
+        },
+        balance: new BigNumber(150),
+        spendableBalance: new BigNumber(150),
+        operations: [
+          {
+            id: "new-op-1",
+            type: "IN",
+            senders: ["sender2"],
+            recipients: ["owner"],
+            date: new Date("2019-01-03"),
+          },
+        ],
+        operationsCount: 1,
+      },
+    ] as Array<TokenAccount>;
+
+    const merged = mergeSubAccounts(oldSubAccounts, newSubAccounts);
+
+    expect(merged).toHaveLength(1);
+    expect(merged[0]).toMatchObject({
+      token: { id: "stellar/asset/USDC-GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5" },
+      balance: new BigNumber(150),
+      spendableBalance: new BigNumber(150),
+      operationsCount: 3,
+    });
+    expect(merged[0].operations).toHaveLength(3);
+  });
 });

package/src/bridge/generic-alpaca/buildSubAccounts.ts

@@ -106,14 +106,14 @@ export function mergeSubAccounts(
     return newSubAccounts;
   }
 
-  const oldSubAccountsById = Object.fromEntries(
-    oldSubAccounts.map(account => [account.id, account]),
+  const oldSubAccountsByTokenId = Object.fromEntries(
+    oldSubAccounts.map(account => [account.token.id, account]),
   );
 
   const newSubAccountsToAdd: Array<TokenAccount> = [];
 
   for (const newSubAccount of newSubAccounts) {
-    const existingSubAccount = oldSubAccountsById[newSubAccount.id];
+    const existingSubAccount = oldSubAccountsByTokenId[newSubAccount.token.id];
 
     if (!existingSubAccount) {
       // New sub account does not exist yet. Just add it as is.
@@ -123,7 +123,7 @@ export function mergeSubAccounts(
 
     // New sub account is already known, probably outdated
     const operations = mergeOps(existingSubAccount.operations, newSubAccount.operations);
-    oldSubAccountsById[newSubAccount.id] = {
+    oldSubAccountsByTokenId[newSubAccount.token.id] = {
       ...existingSubAccount,
       balance: newSubAccount.balance,
       spendableBalance: newSubAccount.spendableBalance,
@@ -132,7 +132,7 @@ export function mergeSubAccounts(
     };
   }
 
-  const updatedOldSubAccounts = Object.values(oldSubAccountsById);
+  const updatedOldSubAccounts = Object.values(oldSubAccountsByTokenId);
 
   return [...updatedOldSubAccounts, ...newSubAccountsToAdd];
 }