@ledgerhq/live-common 21.19.7 → 21.20.0

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live-common"
   },
-  "version": "21.19.7",
+  "version": "21.20.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "Apache-2.0",

package/src/__tests__/svg.ts

@@ -0,0 +1,78 @@
+import fs from "fs";
+import glob from "glob";
+import path from "path";
+
+const rootDir = path.join(__dirname, "../data");
+
+declare global {
+  namespace jest {
+    interface Matchers<R> {
+      toBeValidSvg(a: string, b: string): R;
+    }
+  }
+}
+
+expect.extend({
+  toBeValidSvg(received, fileName, errorMessage) {
+    if (received) {
+      return {
+        message: () => `Svg: ${fileName} valid`,
+        pass: true,
+      };
+    } else {
+      return {
+        message: () => `Svg: ${fileName} invalid
+          ${errorMessage}
+        `,
+        pass: false,
+      };
+    }
+  },
+});
+
+test("svg icons valid", async () => {
+  glob.sync(`${rootDir}/icons/svg/*.svg`).map((svgFileName) => {
+    const buffer = fs.readFileSync(svgFileName);
+    const fileContent = buffer.toString();
+
+    const tags = fileContent.match(/<[^>]*?>/g) || [];
+
+    expect(tags.length > 1).toBeTruthy();
+
+    tags.forEach((element, i) => {
+      if (i === 0) {
+        const m = /width="([^"]+)"/.exec(element);
+        if (!m) {
+          throw new Error("no width found in " + svgFileName);
+        }
+        const [, size] = m;
+        expect(element.includes('height="' + size + '"')).toBeValidSvg(
+          svgFileName,
+          "Must contain height of same width. " + element
+        );
+        expect(
+          element.includes('viewBox="0 0 ' + size + " " + size + '"')
+        ).toBeValidSvg(svgFileName, "Must contain correct viewport");
+        expect(!/style=/.test(element)).toBeValidSvg(
+          svgFileName,
+          "Must not contain style attrs. " + element
+        );
+      } else {
+        expect(
+          /svg|path|line|rect|ellipse|polyline|polygon|circle|g/.test(element)
+        ).toBeValidSvg(
+          svgFileName,
+          "must only contain svg|path|line|rect|ellipse|polyline|polygon|circle|g"
+        );
+        expect(
+          !/style=|clipPath|mask|id=|class=|url\(|clip-path|data|defs/.test(
+            element
+          )
+        ).toBeValidSvg(
+          svgFileName,
+          "must not contain style=|clipPath|mask|id|class|url|clip-path|data|defs"
+        );
+      }
+    });
+  });
+});

package/src/bridge/jsHelpers.ts

@@ -1,5 +1,4 @@
 import isEqual from "lodash/isEqual";
-import setWith from "lodash/setWith";
 import { BigNumber } from "bignumber.js";
 import { Observable, from } from "rxjs";
 import { log } from "@ledgerhq/logs";
@@ -64,7 +63,7 @@ type AccountUpdater = (arg0: Account) => Account;
 const sameDate = (a, b) => Math.abs(a - b) < 1000 * 60 * 30;
 
 // an operation is relatively immutable, however we saw that sometimes it can temporarily change due to reorg,..
-export const sameOp = (a: Operation, b: Operation) =>
+export const sameOp = (a: Operation, b: Operation): boolean =>
   a === b ||
   (a.id === b.id && // hash, accountId, type are in id
     (a.fee ? a.fee.isEqualTo(b.fee) : a.fee === b.fee) &&
@@ -119,20 +118,15 @@ Operation[] {
   return all;
 }
 
-export const mergeNfts = (
-  oldNfts: NFT[] | undefined,
-  newNfts: NFT[] | undefined
-): NFT[] => {
-  if (!newNfts?.length) return oldNfts ?? [];
-
+export const mergeNfts = (oldNfts: NFT[], newNfts: NFT[]): NFT[] => {
   // Getting a map of id => NFT
-  const newNftsPerId: Record<string, NFT> = (newNfts as NFT[]).reduce(
-    (acc, curr) => setWith(acc, curr.id, curr, Object),
-    {}
-  );
+  const newNftsPerId: Record<string, NFT> = {};
+  newNfts.forEach((n) => {
+    newNftsPerId[n.id] = n;
+  });
 
   // copying the argument to avoid mutating it
-  const nfts = oldNfts?.slice() ?? [];
+  const nfts = oldNfts.slice();
   for (let i = 0; i < nfts.length; i++) {
     const nft = nfts[i];
 
@@ -141,8 +135,8 @@ export const mergeNfts = (
       nfts.splice(i, 1);
       i--;
     } else if (!isEqual(nft, newNftsPerId[nft.id])) {
-      // Use the new NFT instead (as a copy cause we're deleting the reference just after)
-      nfts[i] = Object.assign({}, newNftsPerId[nft.id]);
+      // Use the new NFT instead
+      nfts[i] = newNftsPerId[nft.id];
     }
 
     // Delete it from the newNfts to keep only the un-added ones at the end

package/src/data/icons/react/index.tsx

@@ -95,7 +95,6 @@ export { default as colx } from "./colx";
 export { default as comp } from "./comp";
 export { default as coqui } from "./coqui";
 export { default as cred } from "./cred";
-export { default as cro } from "./cro";
 export { default as crpt } from "./crpt";
 export { default as crw } from "./crw";
 export { default as cs } from "./cs";
@@ -179,7 +178,6 @@ export { default as gnt } from "./gnt";
 export { default as gold } from "./gold";
 export { default as grc } from "./grc";
 export { default as grin } from "./grin";
-export { default as grs } from "./grs";
 export { default as gsc } from "./gsc";
 export { default as gto } from "./gto";
 export { default as gup } from "./gup";

package/src/data/icons/react/matic.tsx

@@ -6,7 +6,7 @@ interface Props {
           };
 
 function matic({size, color = "currentColor"}: Props) {
-  return <svg width={size} height={size} viewBox="0 0 24 24" fill="none"><path fillRule="evenodd" clipRule="evenodd" d="M17.0004 6.08237L14.5034 7.52212H14.5009V10.4019L14.4921 10.4031L7.00013 6.08237L4.50113 7.52237L4.49988 7.52187V16.4749L6.99863 17.9156L7.00013 17.9041V17.9149L9.49988 16.4749V13.2849L11.9944 14.7224L11.9959 14.7254L11.9979 14.7241L14.5014 13.2911V16.4761L16.9896 17.9101V17.9176L16.9959 17.9139L17.0004 17.9164L17.0039 17.9094L19.4889 16.4776V7.52987L19.5001 7.52337L17.0004 6.08237Z" fill={color} /></svg>;
+  return <svg width={size} height={size} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M17.0922 8.69345C16.7232 8.47781 16.2435 8.47781 15.8377 8.69345L12.9594 10.3467L11.0037 11.425L8.12546 13.0782C7.75645 13.2939 7.27675 13.2939 6.87085 13.0782L4.58303 11.7843C4.21402 11.5687 3.95572 11.1734 3.95572 10.7421V8.19028C3.95572 7.75899 4.17712 7.36364 4.58303 7.14799L6.83394 5.89007C7.20295 5.67442 7.68265 5.67442 8.08855 5.89007L10.3395 7.14799C10.7085 7.36364 10.9668 7.75899 10.9668 8.19028V9.84356L12.9225 8.72939V7.07612C12.9225 6.64482 12.7011 6.24947 12.2952 6.03383L8.12546 3.66173C7.75645 3.44609 7.27675 3.44609 6.87085 3.66173L2.62731 6.03383C2.2214 6.24947 2 6.64482 2 7.07612V11.8563C2 12.2875 2.2214 12.6829 2.62731 12.8986L6.87085 15.2706C7.23984 15.4863 7.71956 15.4863 8.12546 15.2706L11.0037 13.6533L12.9594 12.5391L15.8377 10.9218C16.2066 10.7061 16.6863 10.7061 17.0922 10.9218L19.3432 12.1797C19.7121 12.3954 19.9704 12.7907 19.9704 13.222V15.7738C19.9704 16.2051 19.7491 16.6004 19.3432 16.8161L17.0922 18.11C16.7232 18.3256 16.2435 18.3256 15.8377 18.11L13.5867 16.852C13.2177 16.6364 12.9594 16.241 12.9594 15.8097V14.1565L11.0037 15.2706V16.9239C11.0037 17.3552 11.2251 17.7505 11.631 17.9662L15.8745 20.3383C16.2435 20.5539 16.7232 20.5539 17.1291 20.3383L21.3727 17.9662C21.7417 17.7505 22 17.3552 22 16.9239V12.1437C22 11.7125 21.7786 11.3172 21.3727 11.1015L17.0922 8.69345Z" fill={color} /></svg>;
 }
 
 export default matic;

package/src/data/icons/reactNative/index.tsx

@@ -95,7 +95,6 @@ export { default as colx } from "./colx";
 export { default as comp } from "./comp";
 export { default as coqui } from "./coqui";
 export { default as cred } from "./cred";
-export { default as cro } from "./cro";
 export { default as crpt } from "./crpt";
 export { default as crw } from "./crw";
 export { default as cs } from "./cs";
@@ -179,7 +178,6 @@ export { default as gnt } from "./gnt";
 export { default as gold } from "./gold";
 export { default as grc } from "./grc";
 export { default as grin } from "./grin";
-export { default as grs } from "./grs";
 export { default as gsc } from "./gsc";
 export { default as gto } from "./gto";
 export { default as gup } from "./gup";

package/src/data/icons/reactNative/matic.tsx

@@ -7,7 +7,7 @@ interface Props {
             };
 
 function matic({ size, color }: Props) {
-  return <Svg width={size} height={size} viewBox="0 0 24 24" fill="none"><Path fillRule="evenodd" clipRule="evenodd" d="M17.0004 6.08237L14.5034 7.52212H14.5009V10.4019L14.4921 10.4031L7.00013 6.08237L4.50113 7.52237L4.49988 7.52187V16.4749L6.99863 17.9156L7.00013 17.9041V17.9149L9.49988 16.4749V13.2849L11.9944 14.7224L11.9959 14.7254L11.9979 14.7241L14.5014 13.2911V16.4761L16.9896 17.9101V17.9176L16.9959 17.9139L17.0004 17.9164L17.0039 17.9094L19.4889 16.4776V7.52987L19.5001 7.52337L17.0004 6.08237Z" fill={color} /></Svg>;
+  return <Svg width={size} height={size} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><Path d="M17.0922 8.69345C16.7232 8.47781 16.2435 8.47781 15.8377 8.69345L12.9594 10.3467L11.0037 11.425L8.12546 13.0782C7.75645 13.2939 7.27675 13.2939 6.87085 13.0782L4.58303 11.7843C4.21402 11.5687 3.95572 11.1734 3.95572 10.7421V8.19028C3.95572 7.75899 4.17712 7.36364 4.58303 7.14799L6.83394 5.89007C7.20295 5.67442 7.68265 5.67442 8.08855 5.89007L10.3395 7.14799C10.7085 7.36364 10.9668 7.75899 10.9668 8.19028V9.84356L12.9225 8.72939V7.07612C12.9225 6.64482 12.7011 6.24947 12.2952 6.03383L8.12546 3.66173C7.75645 3.44609 7.27675 3.44609 6.87085 3.66173L2.62731 6.03383C2.2214 6.24947 2 6.64482 2 7.07612V11.8563C2 12.2875 2.2214 12.6829 2.62731 12.8986L6.87085 15.2706C7.23984 15.4863 7.71956 15.4863 8.12546 15.2706L11.0037 13.6533L12.9594 12.5391L15.8377 10.9218C16.2066 10.7061 16.6863 10.7061 17.0922 10.9218L19.3432 12.1797C19.7121 12.3954 19.9704 12.7907 19.9704 13.222V15.7738C19.9704 16.2051 19.7491 16.6004 19.3432 16.8161L17.0922 18.11C16.7232 18.3256 16.2435 18.3256 15.8377 18.11L13.5867 16.852C13.2177 16.6364 12.9594 16.241 12.9594 15.8097V14.1565L11.0037 15.2706V16.9239C11.0037 17.3552 11.2251 17.7505 11.631 17.9662L15.8745 20.3383C16.2435 20.5539 16.7232 20.5539 17.1291 20.3383L21.3727 17.9662C21.7417 17.7505 22 17.3552 22 16.9239V12.1437C22 11.7125 21.7786 11.3172 21.3727 11.1015L17.0922 8.69345Z" fill={color} /></Svg>;
 }
 
 export default matic;

package/src/data/icons/svg/MATIC.svg

@@ -1,3 +1,3 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0004 6.08237L14.5034 7.52212H14.5009V10.4019L14.4921 10.4031L7.00013 6.08237L4.50113 7.52237L4.49988 7.52187V16.4749L6.99863 17.9156L7.00013 17.9041V17.9149L9.49988 16.4749V13.2849L11.9944 14.7224L11.9959 14.7254L11.9979 14.7241L14.5014 13.2911V16.4761L16.9896 17.9101V17.9176L16.9959 17.9139L17.0004 17.9164L17.0039 17.9094L19.4889 16.4776V7.52987L19.5001 7.52337L17.0004 6.08237Z" fill="#2B6DEF"/>
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.0922 8.69345C16.7232 8.47781 16.2435 8.47781 15.8377 8.69345L12.9594 10.3467L11.0037 11.425L8.12546 13.0782C7.75645 13.2939 7.27675 13.2939 6.87085 13.0782L4.58303 11.7843C4.21402 11.5687 3.95572 11.1734 3.95572 10.7421V8.19028C3.95572 7.75899 4.17712 7.36364 4.58303 7.14799L6.83394 5.89007C7.20295 5.67442 7.68265 5.67442 8.08855 5.89007L10.3395 7.14799C10.7085 7.36364 10.9668 7.75899 10.9668 8.19028V9.84356L12.9225 8.72939V7.07612C12.9225 6.64482 12.7011 6.24947 12.2952 6.03383L8.12546 3.66173C7.75645 3.44609 7.27675 3.44609 6.87085 3.66173L2.62731 6.03383C2.2214 6.24947 2 6.64482 2 7.07612V11.8563C2 12.2875 2.2214 12.6829 2.62731 12.8986L6.87085 15.2706C7.23984 15.4863 7.71956 15.4863 8.12546 15.2706L11.0037 13.6533L12.9594 12.5391L15.8377 10.9218C16.2066 10.7061 16.6863 10.7061 17.0922 10.9218L19.3432 12.1797C19.7121 12.3954 19.9704 12.7907 19.9704 13.222V15.7738C19.9704 16.2051 19.7491 16.6004 19.3432 16.8161L17.0922 18.11C16.7232 18.3256 16.2435 18.3256 15.8377 18.11L13.5867 16.852C13.2177 16.6364 12.9594 16.241 12.9594 15.8097V14.1565L11.0037 15.2706V16.9239C11.0037 17.3552 11.2251 17.7505 11.631 17.9662L15.8745 20.3383C16.2435 20.5539 16.7232 20.5539 17.1291 20.3383L21.3727 17.9662C21.7417 17.7505 22 17.3552 22 16.9239V12.1437C22 11.7125 21.7786 11.3172 21.3727 11.1015L17.0922 8.69345Z" fill="#8247E5"/>
 </svg>

package/src/families/ethereum/modules/compound.resilience.test.ts

@@ -1,6 +1,6 @@
 import "../../../__tests__/test-helpers/setup";
 import { reduce } from "rxjs/operators";
-import { fromAccountRaw, toAccountRaw } from "../../../account";
+import { fromAccountRaw } from "../../../account";
 import type { Account } from "../../../types";
 import { getAccountBridge } from "../../../bridge";
 import { makeBridgeCacheSystem } from "../../../bridge/cache";
@@ -33,21 +33,5 @@ test("if API is down, an account still sync fine", async () => {
     })
     .pipe(reduce((a, f: (arg0: Account) => Account) => f(a), account))
     .toPromise();
-  const raw = toAccountRaw(synced);
-  // empty unstable fields
-  raw.blockHeight = 0;
-  raw.lastSyncDate = "";
-  raw.creationDate = "";
-  delete raw.balanceHistoryCache;
-  delete raw.syncHash;
-  raw.subAccounts = (raw.subAccounts || []).map((a) => {
-    delete a.balanceHistoryCache;
-    return a;
-  });
-  raw.operations = raw.operations.map((op) => {
-    op.blockHeight = 0;
-    op.date = "";
-    return op;
-  });
-  expect(raw).toMatchSnapshot();
+  expect(synced).not.toBeFalsy();
 });

package/src/families/ethereum/modules/erc20.ts

@@ -137,10 +137,6 @@ const erc20approve: ModeModule = {
 
   fillOptimisticOperation(_account, _transaction, operation) {
     operation.type = "FEES";
-    operation.extra = {
-      ...operation.extra,
-      approving: true, // workaround to track the status ENABLING
-    };
   },
 };
 export const modes: Record<Modes, ModeModule> = {

package/src/families/ethereum/modules/erc721.ts

@@ -118,10 +118,6 @@ const erc721Transfer: ModeModule = {
    */
   fillOptimisticOperation(a, t, op) {
     op.type = "FEES";
-    op.extra = {
-      ...op.extra,
-      approving: true, // workaround to track the status ENABLING
-    };
   },
 };
 

package/src/families/ethereum/nft.integration.test.ts

@@ -0,0 +1,168 @@
+import "../../__tests__/test-helpers/setup";
+import { reduce } from "rxjs/operators";
+import { fromAccountRaw, toAccountRaw } from "../../account";
+import type { Account, AccountRaw } from "../../types";
+import { getAccountBridge } from "../../bridge";
+import { makeBridgeCacheSystem } from "../../bridge/cache";
+import { patchAccount } from "../../reconciliation";
+import { setEnv } from "../../env";
+
+jest.setTimeout(200000);
+
+const ethTestingAccounts: AccountRaw[] = [
+  {
+    id: "js:1:ethereum:0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a:",
+    seedIdentifier: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+    name: "G4sp4rd",
+    derivationMode: "",
+    index: 0,
+    freshAddress: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+    freshAddressPath: "44'/60'/0'/0/0",
+    freshAddresses: [],
+    pendingOperations: [],
+    operations: [],
+    currencyId: "ethereum",
+    unitMagnitude: 18,
+    balance: "",
+    blockHeight: 0,
+    lastSyncDate: "",
+    xpub: "",
+  },
+];
+
+const gaspardPolygonAccount: AccountRaw = {
+  id: "js:1:polygon:0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a:",
+  seedIdentifier: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+  name: "G4sp4rd",
+  derivationMode: "",
+  index: 0,
+  freshAddress: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+  freshAddressPath: "44'/60'/0'/0/0",
+  freshAddresses: [],
+  pendingOperations: [],
+  operations: [],
+  currencyId: "polygon",
+  unitMagnitude: 18,
+  balance: "",
+  blockHeight: 0,
+  lastSyncDate: "",
+  xpub: "",
+};
+
+const gaspardBscAccount: AccountRaw = {
+  id: "js:1:bsc:0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a:",
+  seedIdentifier: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+  name: "G4sp4rd",
+  derivationMode: "",
+  index: 0,
+  freshAddress: "0xb98d10d9f6d07ba283bfd21b2dfec050f9ae282a",
+  freshAddressPath: "44'/60'/0'/0/0",
+  freshAddresses: [],
+  pendingOperations: [],
+  operations: [],
+  currencyId: "bsc",
+  unitMagnitude: 18,
+  balance: "",
+  blockHeight: 0,
+  lastSyncDate: "",
+  xpub: "",
+};
+
+async function sync(account, withNFT = true) {
+  const bridge = getAccountBridge(account);
+  const blacklistedTokenIds = [];
+  setEnv("NFT", withNFT);
+  const r = await bridge
+    .sync(account, {
+      paginationConfig: {},
+      blacklistedTokenIds,
+    })
+    .pipe(reduce((a, f: (arg0: Account) => Account) => f(a), account))
+    .toPromise();
+  setEnv("NFT", false);
+  return r;
+}
+
+const localCache = {};
+const cache = makeBridgeCacheSystem({
+  saveData(c, d) {
+    localCache[c.id] = d;
+    return Promise.resolve();
+  },
+  getData(c) {
+    return Promise.resolve(localCache[c.id]);
+  },
+});
+
+ethTestingAccounts.forEach((a) => {
+  describe(a.name + " NFT on ethereum", () => {
+    let account = fromAccountRaw(a);
+
+    test("first sync & have nfts", async () => {
+      await cache.prepareCurrency(account.currency);
+      account = await sync(account);
+      expect(account.nfts?.length || 0).not.toBe(0);
+    });
+
+    test("no nft should be on quantity 0 or negative", () => {
+      expect(account.nfts?.find((n) => !n.amount.gt(0))).toEqual(undefined);
+    });
+
+    test("patchAccount restore new NFTs correctly", () => {
+      const copy = {
+        ...account,
+        operations: [],
+        nfts: account.nfts?.slice(Math.ceil((account.nfts?.length || 0) / 2)),
+      };
+      const newAccount = patchAccount(copy, toAccountRaw(account));
+      expect(newAccount.nfts).toEqual(account.nfts);
+    });
+
+    test("remove half NFTs will restore them with half operations", async () => {
+      const halfOps = Math.ceil(account.operations.length / 2);
+      const copy = {
+        ...account,
+        operations: account.operations.slice(halfOps),
+        nfts: account.nfts?.slice(Math.ceil((account.nfts?.length || 0) / 2)),
+      };
+      const resync = await sync(copy);
+      expect(resync.nfts).toEqual(account.nfts);
+    });
+
+    test("start account with .nfts and disable the NFT flag should make it disappear", async () => {
+      expect(account.nfts).not.toBeFalsy();
+      const resync = await sync(account, false);
+      expect(resync.nfts).toBeFalsy();
+    });
+
+    test("start account without .nfts and enable the NFT flag should make it appear", async () => {
+      const first = await sync(account, false);
+      expect(first.nfts).toBeFalsy();
+      const second = await sync(first, true);
+      expect(second.nfts).not.toBeFalsy();
+      expect(second.nfts).toEqual(account.nfts);
+    });
+  });
+});
+
+describe.skip("gaspard NFT on polygon", () => {
+  let account = fromAccountRaw(gaspardPolygonAccount);
+  test("first sync", async () => {
+    await cache.prepareCurrency(account.currency);
+    account = await sync(account);
+  });
+  test(".nfts shouldn't be visible", () => {
+    expect(account.nfts).toBeFalsy();
+  });
+});
+
+describe("gaspard NFT on bsc", () => {
+  let account = fromAccountRaw(gaspardBscAccount);
+  test("first sync", async () => {
+    await cache.prepareCurrency(account.currency);
+    account = await sync(account);
+  });
+  test(".nfts shouldn't be visible", () => {
+    expect(account.nfts).toBeFalsy();
+  });
+});

package/src/families/ethereum/nft.merging.unit.test.ts

@@ -0,0 +1,78 @@
+import "../../__tests__/test-helpers/setup";
+import BigNumber from "bignumber.js";
+import { toNFTRaw } from "../../account";
+import type { NFT } from "../../types";
+import { mergeNfts } from "../../bridge/jsHelpers";
+import { encodeNftId } from "../../nft";
+
+describe("nft merging", () => {
+  const makeNFT = (tokenId: string, contract: string, amount: number): NFT => ({
+    id: encodeNftId("test", contract, tokenId),
+    tokenId,
+    amount: new BigNumber(amount),
+    collection: {
+      contract,
+      standard: "erc721",
+    },
+  });
+  const oldNfts = [
+    makeNFT("1", "contract1", 10),
+    makeNFT("2", "contract1", 1),
+    makeNFT("3", "contract2", 6),
+  ];
+
+  test("should remove first NFT and return new array with same refs", () => {
+    const nfts = [makeNFT("2", "contract1", 1), makeNFT("3", "contract2", 6)];
+    const newNfts = mergeNfts(oldNfts, nfts);
+
+    expect(newNfts.map(toNFTRaw)).toEqual(nfts.map(toNFTRaw));
+    expect(oldNfts[1]).toBe(newNfts[0]);
+    expect(oldNfts[2]).toBe(newNfts[1]);
+  });
+
+  test("should remove any NFT and return new array with same refs", () => {
+    const nfts = [makeNFT("1", "contract1", 10), makeNFT("3", "contract2", 6)];
+    const newNfts = mergeNfts(oldNfts, nfts);
+
+    expect(newNfts.map(toNFTRaw)).toEqual(nfts.map(toNFTRaw));
+    expect(oldNfts[0]).toBe(newNfts[0]);
+    expect(oldNfts[2]).toBe(newNfts[1]);
+  });
+
+  test("should change NFT amount and return new array with new ref", () => {
+    const nfts = [
+      makeNFT("1", "contract1", 10),
+      makeNFT("2", "contract1", 5),
+      makeNFT("3", "contract2", 6),
+    ];
+    const addToNft1 = mergeNfts(oldNfts, nfts);
+
+    expect(addToNft1.map(toNFTRaw)).toEqual(nfts.map(toNFTRaw));
+    expect(oldNfts[0]).toBe(addToNft1[0]);
+    expect(oldNfts[1]).not.toBe(addToNft1[1]);
+    expect(oldNfts[2]).toBe(addToNft1[2]);
+  });
+
+  test("should add NFT and return new array with new ref", () => {
+    const nfts = [
+      makeNFT("1", "contract1", 10),
+      makeNFT("2", "contract1", 1),
+      makeNFT("3", "contract2", 6),
+      makeNFT("4", "contract2", 4),
+    ];
+    const addToNft1 = mergeNfts(oldNfts, nfts);
+
+    expect(addToNft1.map(toNFTRaw)).toEqual(
+      [
+        makeNFT("4", "contract2", 4),
+        makeNFT("1", "contract1", 10),
+        makeNFT("2", "contract1", 1),
+        makeNFT("3", "contract2", 6),
+      ].map(toNFTRaw)
+    );
+    expect(oldNfts[0]).toBe(addToNft1[1]);
+    expect(oldNfts[1]).toBe(addToNft1[2]);
+    expect(oldNfts[2]).toBe(addToNft1[3]);
+    expect(addToNft1[0]).toBe(nfts[3]);
+  });
+});

package/src/families/ethereum/synchronisation.ts

@@ -167,7 +167,7 @@ export const getAccountShape: GetAccountShape = async (
   const operations = mergeOps(initialStableOperations, newOps);
 
   const nfts = isNFTActive(currency)
-    ? mergeNfts(initialAccount?.nfts, nftsFromOperations(operations))
+    ? mergeNfts(initialAccount?.nfts || [], nftsFromOperations(operations))
     : undefined;
 
   const accountShape: Partial<Account> = {
@@ -396,7 +396,7 @@ const txToOps =
     const erc1155Operations =
       !erc1155_transfer_events || !isNFTActive(currency)
         ? []
-        : flatMap(erc1155_transfer_events, (event) => {
+        : flatMap(erc1155_transfer_events, (event, i) => {
             const sender = safeEncodeEIP55(event.sender);
             const receiver = safeEncodeEIP55(event.receiver);
             const contract = safeEncodeEIP55(event.contract);
@@ -410,7 +410,7 @@ const txToOps =
 
             const all: Operation[] = [];
 
-            event.transfers.forEach((transfer) => {
+            event.transfers.forEach((transfer, j) => {
               const tokenId = transfer.id;
               const value = new BigNumber(transfer.value);
               const nftId = encodeNftId(id, event.contract, tokenId);
@@ -418,7 +418,7 @@ const txToOps =
               if (sending) {
                 const type = "NFT_OUT";
                 all.push({
-                  id: `${nftId}-${hash}-${type}`,
+                  id: `${nftId}-${hash}-${type}-i${i}_${j}`,
                   senders: [sender],
                   recipients: [receiver],
                   contract,
@@ -441,7 +441,7 @@ const txToOps =
               if (receiving) {
                 const type = "NFT_IN";
                 all.push({
-                  id: `${nftId}-${hash}-${type}`,
+                  id: `${nftId}-${hash}-${type}-i${i}`,
                   senders: [sender],
                   recipients: [receiver],
                   contract,

package/src/nft/NftMetadataProvider/index.tsx

@@ -7,7 +7,7 @@ import React, {
 } from "react";
 import { Currency, findCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import { API, apiForCurrency } from "../../api/Ethereum";
-import { NFTMetadataResponse } from "../../types";
+import { NFT, NFTMetadataResponse } from "../../types";
 import { getNftKey } from "../helpers";
 import {
   Batch,
@@ -77,14 +77,19 @@ export const metadataCallBatcher = (() => {
   };
 })();
 
-export function useNftMetadata(contract: string, tokenId: string): NFTResource {
+// DEPRECATED, use useNftResource
+export function useNftMetadata(
+  contract: string | undefined,
+  tokenId: string | undefined
+): NFTResource {
   const { cache, loadNFTMetadata } = useContext(NftMetadataContext);
 
-  const key = getNftKey(contract, tokenId);
+  const key = contract && tokenId ? getNftKey(contract, tokenId) : "";
 
   const cachedData = cache[key];
 
   useEffect(() => {
+    if (!contract || !tokenId) return;
     if (!cachedData || isOutdated(cachedData)) {
       loadNFTMetadata(contract, tokenId);
     }
@@ -99,6 +104,10 @@ export function useNftMetadata(contract: string, tokenId: string): NFTResource {
   }
 }
 
+export function useNftResource(nft: NFT | undefined): NFTResource {
+  return useNftMetadata(nft?.collection.contract, nft?.tokenId);
+}
+
 export function useNftAPI(): NFTMetadataContextAPI {
   const { clearCache, loadNFTMetadata } = useContext(NftMetadataContext);
 

package/src/operation.ts

@@ -105,7 +105,6 @@ export function getOperationAmountNumber(op: Operation): BigNumber {
     case "REWARD":
     case "REWARD_PAYOUT":
     case "SUPPLY":
-    case "NFT_IN":
       return op.value;
 
     case "OUT":
@@ -119,7 +118,6 @@ export function getOperationAmountNumber(op: Operation): BigNumber {
     case "OPT_OUT":
     case "REDEEM":
     case "SLASH":
-    case "NFT_OUT":
       return op.value.negated();
 
     case "FREEZE":

package/lib/data/icons/react/cro.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-interface Props {
-    size: number;
-    color?: string;
-}
-declare function cro({ size, color }: Props): JSX.Element;
-export default cro;
-//# sourceMappingURL=cro.d.ts.map

package/lib/data/icons/react/cro.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cro.d.ts","sourceRoot":"","sources":["../../../../src/data/icons/react/cro.tsx"],"names":[],"mappings":";AAEA,UAAU,KAAK;IACH,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAEX,iBAAS,GAAG,CAAC,EAAC,IAAI,EAAE,KAAsB,EAAC,EAAE,KAAK,eAEjD;AAED,eAAe,GAAG,CAAC"}

package/lib/data/icons/react/cro.js

@@ -1,30 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-exports.__esModule = true;
-var React = __importStar(require("react"));
-;
-function cro(_a) {
-    var size = _a.size, _b = _a.color, color = _b === void 0 ? "currentColor" : _b;
-    return React.createElement("svg", { width: size, height: size, viewBox: "0 0 24 24", fill: "none", xmlns: "http://www.w3.org/2000/svg" },
-        React.createElement("path", { fillRule: "evenodd", clipRule: "evenodd", d: "M0 5.99919L10.3937 0L20.7808 5.99919V18.0008L10.3937 24L0 18.0008V5.99919ZM10.3937 20.4289L17.7038 16.2314V7.77829L10.3937 3.55819L3.08032 7.77829V16.2314L10.3937 20.4289ZM10.3906 17.6037L15.2436 14.801V9.19898L10.3906 6.39634L5.53767 9.19898V14.801L10.3906 17.6037Z", fill: color }));
-}
-exports["default"] = cro;
-//# sourceMappingURL=cro.js.map