@ledgerhq/live-common 21.14.1 → 21.16.2

package/src/bridge/jsHelpers.ts

@@ -1,4 +1,5 @@
 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";
@@ -34,6 +35,7 @@ import type {
   SyncConfig,
   CryptoCurrency,
   DerivationMode,
+  NFT,
 } from "../types";
 import type { CurrencyBridge, AccountBridge } from "../types/bridge";
 import getAddress from "../hw/getAddress";
@@ -116,6 +118,39 @@ Operation[] {
   return all;
 }
 
+export const mergeNfts = (
+  oldNfts: NFT[] | undefined,
+  newNfts: NFT[] | undefined
+): NFT[] => {
+  if (!newNfts?.length) return oldNfts ?? [];
+
+  // Getting a map of id => NFT
+  const newNftsPerId: Record<string, NFT> = (newNfts as NFT[]).reduce(
+    (acc, curr) => setWith(acc, curr.id, curr, Object),
+    {}
+  );
+
+  // copying the argument to avoid mutating it
+  const nfts = oldNfts?.slice() ?? [];
+  for (let i = 0; i < nfts.length; i++) {
+    const nft = nfts[i];
+    // The NFTs are the same, do don't anything
+    if (!newNftsPerId[nft.id] || isEqual(nft, newNftsPerId[nft.id])) {
+      // NFT already in, deleting it from the newNfts to keep only the un-added ones at the end
+      delete newNftsPerId[nft.id];
+      continue;
+    }
+
+    // Use the new NFT instead (as a copy cause we're deleting the reference just after)
+    nfts[i] = Object.assign({}, newNftsPerId[nft.id]);
+    // Delete it from the newNfts to keep only the un-added ones at the end
+    delete newNftsPerId[nft.id];
+  }
+
+  // Adding the rest of newNfts that was not already in oldNfts
+  return nfts.concat(Object.values(newNftsPerId));
+};
+
 export const makeSync =
   (
     getAccountShape: GetAccountShape,

package/src/csvExport.ts

@@ -2,7 +2,7 @@ import { BigNumber } from "bignumber.js";
 import type { Currency, Account, AccountLike, Operation } from "./types";
 import { formatCurrencyUnit } from "./currencies";
 import { getAccountCurrency, getMainAccount, flattenAccounts } from "./account";
-import { flattenOperationWithInternals } from "./operation";
+import { flattenOperationWithInternalsAndNfts } from "./operation";
 import { calculate } from "./countervalues/logic";
 import type { CounterValuesState } from "./countervalues/types";
 
@@ -143,7 +143,8 @@ const accountRows = (
 ): Array<string[]> =>
   account.operations
     .reduce(
-      (ops: Operation[], op) => ops.concat(flattenOperationWithInternals(op)),
+      (ops: Operation[], op) =>
+        ops.concat(flattenOperationWithInternalsAndNfts(op)),
       []
     )
     .map((operation) =>