[LIVE-1174] - Feature: Upgrade NFT architecture (#4870)

* Add nftMetadataResolver to currencyBridge Proxy * Update DropDowns for NFTs * Update NFT send flow for new NFT model * Update NFT Gallery for new NFT model * Update NFT Collections for new NFT model * Update NFT Viewer for new NFT model * Update operations for new NFT model * Add missing error translation for NFT quantity * Add LLC dependency * Fix NFT send summary showing wrong NFT * Remove all $FlowFixMe for exported memo * Update LLC dep to future v22.0.0
LedgerHQ · Apr 20, 2022 · a08a7e5 · a08a7e5
1 parent a05562b
commit a08a7e5
Show file tree

Hide file tree

Showing 24 changed files with 335 additions and 286 deletions.
diff --git a/package.json b/package.json
@@ -49,7 +49,8 @@
     "@ledgerhq/hw-transport": "6.24.1",
     "@ledgerhq/hw-transport-http": "6.26.0",
     "@ledgerhq/hw-transport-node-hid-singleton": "6.26.0",
-    "@ledgerhq/live-common": "https://github.com/LedgerHQ/ledger-live-common.git\\#sunset-libcore",
+    "@ledgerhq/ledger-core": "6.14.5",
+    "@ledgerhq/live-common": "https://github.com/LedgerHQ/ledger-live-common.git#921fef7bfbd31642322c8cbfb0b746dae5d6774e",
     "@ledgerhq/logs": "6.10.0",
     "@ledgerhq/react-ui": "^0.7.4",
     "@open-wc/webpack-import-meta-loader": "^0.4.7",

diff --git a/src/helpers/nftLinksFactory.js b/src/helpers/nftLinksFactory.js
@@ -0,0 +1,74 @@
+import IconOpensea from "~/renderer/icons/Opensea";
+import IconRarible from "~/renderer/icons/Rarible";
+import IconGlobe from "~/renderer/icons/Globe";
+import { openURL } from "~/renderer/linking";
+
+const linksPerCurrency = {
+  ethereum: (t, links) => [
+    links?.opensea && {
+      key: "opensea",
+      id: "opensea",
+      label: t("NFT.viewer.actions.open", { viewer: "Opensea.io" }),
+      Icon: IconOpensea,
+      type: "external",
+      callback: () => openURL(links.opensea),
+    },
+    links?.rarible && {
+      key: "rarible",
+      id: "rarible",
+      label: t("NFT.viewer.actions.open", { viewer: "Rarible" }),
+      Icon: IconRarible,
+      type: "external",
+      callback: () => openURL(links.rarible),
+    },
+    {
+      key: "sep2",
+      id: "sep2",
+      type: "separator",
+      label: "",
+    },
+    links?.etherscan && {
+      key: "etherscan",
+      id: "etherscan",
+      label: t("NFT.viewer.actions.open", { viewer: "Explorer" }),
+      Icon: IconGlobe,
+      type: "external",
+      callback: () => openURL(links.etherscan),
+    },
+  ],
+  polygon: (t, links) => [
+    links?.opensea && {
+      key: "opensea",
+      id: "opensea",
+      label: t("NFT.viewer.actions.open", { viewer: "Opensea.io" }),
+      Icon: IconOpensea,
+      type: "external",
+      callback: () => openURL(links.opensea),
+    },
+    links?.rarible && {
+      key: "rarible",
+      id: "rarible",
+      label: t("NFT.viewer.actions.open", { viewer: "Rarible" }),
+      Icon: IconRarible,
+      type: "external",
+      callback: () => openURL(links.rarible),
+    },
+    {
+      key: "sep2",
+      id: "sep2",
+      type: "separator",
+      label: "",
+    },
+    links?.polygonscan && {
+      key: "polygonscan",
+      id: "polygonscan",
+      label: t("NFT.viewer.actions.open", { viewer: "Explorer" }),
+      Icon: IconGlobe,
+      type: "external",
+      callback: () => openURL(links.polygonscan),
+    },
+  ],
+};
+
+export default (currencyId, t, links) =>
+  linksPerCurrency?.[currencyId]?.(t, links).filter(x => x) || [];
diff --git a/src/renderer/bridge/proxy.js b/src/renderer/bridge/proxy.js
@@ -51,6 +51,7 @@ export const getCurrencyBridge = (currency: CryptoCurrency): CurrencyBridge => {
     hydrate: value => bridgeImpl.getCurrencyBridge(currency).hydrate(value, currency),
 
     scanAccounts,
+    nftMetadataResolver: bridgeImpl.getCurrencyBridge(currency).nftMetadataResolver,
   };
 
   if (getPreloadStrategy) {

diff --git a/src/renderer/components/Breadcrumb/NFTCrumb.js b/src/renderer/components/Breadcrumb/NFTCrumb.js
@@ -1,5 +1,5 @@
 // @flow
-import React, { useCallback, useMemo } from "react";
+import React, { useCallback, useMemo, memo } from "react";
 import { useHistory, useParams } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { nftsByCollections } from "@ledgerhq/live-common/lib/nft";
@@ -13,6 +13,7 @@ import IconAngleUp from "~/renderer/icons/AngleUp";
 import { Separator, Item, TextLink, AngleDown, Check } from "./common";
 import { setTrackingSource } from "~/renderer/analytics/TrackPage";
 import CollectionName from "~/renderer/screens/nft/CollectionName";
+import type { ProtoNFT } from "@ledgerhq/live-common/lib/nft";
 
 const LabelWithMeta = ({
   item,
@@ -21,12 +22,12 @@ const LabelWithMeta = ({
   isActive: boolean,
   item: {
     label: string,
-    collection: { nfts: any[], contract: string, standard: string },
+    content: ProtoNFT,
   },
 }) => (
   <Item isActive={isActive}>
     <Text ff={`Inter|${isActive ? "SemiBold" : "Regular"}`} fontSize={4}>
-      <CollectionName collection={item.collection} fallback={item.collection.contract} />
+      <CollectionName nft={item.content} fallback={item.content.contract} />
     </Text>
     {isActive && (
       <Check>
@@ -36,23 +37,26 @@ const LabelWithMeta = ({
   </Item>
 );
 
-export default function NFTCrumb() {
+const NFTCrumb = () => {
   const history = useHistory();
   const { id, collectionAddress } = useParams();
   const account = useSelector(state => accountSelector(state, { accountId: id }));
-  const collections = nftsByCollections(account.nfts);
+  const collections = useMemo(() => nftsByCollections(account.nfts), [account.nfts]);
 
   const items = useMemo(
     () =>
-      collections.map(collection => ({
-        key: collection.contract,
-        label: collection.contract,
-        collection,
+      Object.entries(collections).map(([contract, nfts]: any) => ({
+        key: contract,
+        label: contract,
+        content: nfts[0],
       })),
     [collections],
   );
-  const activeItem =
-    items.find((item: any) => item.collection.contract === collectionAddress) || items[0];
+
+  const activeItem = useMemo(
+    () => items.find((item: any) => item.nft?.contract === collectionAddress) || items[0],
+    [collectionAddress, items],
+  );
 
   const onCollectionSelected = useCallback(
     item => {
@@ -91,12 +95,12 @@ export default function NFTCrumb() {
             renderItem={LabelWithMeta}
             onChange={onCollectionSelected}
           >
-            {({ isOpen, value }) => (
+            {({ isOpen }) => (
               <TextLink>
                 <Button>
                   <CollectionName
-                    collection={activeItem.collection}
-                    fallback={activeItem.collection.contract}
+                    nft={activeItem.content}
+                    fallback={activeItem?.content?.contract}
                   />
                 </Button>
                 <AngleDown>
@@ -109,4 +113,6 @@ export default function NFTCrumb() {
       ) : null}
     </>
   );
-}
+};
+
+export default memo<{}>(NFTCrumb);
diff --git a/src/renderer/components/ContextMenu/NFTContextMenu.js b/src/renderer/components/ContextMenu/NFTContextMenu.js
@@ -1,62 +1,33 @@
 // @flow
-import React from "react";
+import React, { useMemo, memo } from "react";
 import { useTranslation } from "react-i18next";
 import { useNftMetadata } from "@ledgerhq/live-common/lib/nft/NftMetadataProvider";
-import IconOpensea from "~/renderer/icons/Opensea";
-import IconRarible from "~/renderer/icons/Rarible";
-import IconGlobe from "~/renderer/icons/Globe";
-import { openURL } from "~/renderer/linking";
 import ContextMenuItem from "./ContextMenuItem";
+import nftLinksFactory from "~/helpers/nftLinksFactory";
 
 type Props = {
   contract: string,
   tokenId: string,
+  currencyId: string,
   leftClick?: boolean,
   children: any,
 };
 
-export default function NFTContextMenu({ leftClick, children, contract, tokenId }: Props) {
+const NFTContextMenu = ({ leftClick, children, contract, tokenId, currencyId }: Props) => {
   const { t } = useTranslation();
-  const { metadata } = useNftMetadata(contract, tokenId);
-
-  const defaultLinks = {
-    openSea: `https://opensea.io/assets/${contract}/${tokenId}`,
-    rarible: `https://rarible.com/token/${contract}:${tokenId}`,
-    etherscan: `https://etherscan.io/token/${contract}?a=${tokenId}`,
-  };
-
-  const menuItems = [
-    {
-      key: "opensea",
-      label: t("NFT.viewer.actions.open", { viewer: "Opensea.io" }),
-      Icon: IconOpensea,
-      type: "external",
-      callback: () => openURL(metadata?.links?.opensea || defaultLinks.openSea),
-    },
-    {
-      key: "rarible",
-      label: t("NFT.viewer.actions.open", { viewer: "Rarible" }),
-      Icon: IconRarible,
-      type: "external",
-      callback: () => openURL(metadata?.links?.rarible || defaultLinks.rarible),
-    },
-    {
-      key: "sep2",
-      type: "separator",
-      label: "",
-    },
-    {
-      key: "etherscan",
-      label: t("NFT.viewer.actions.open", { viewer: "Explorer" }),
-      Icon: IconGlobe,
-      type: "external",
-      callback: () => openURL(metadata?.links?.etherscan || defaultLinks.etherscan),
-    },
-  ];
+  const { status, metadata } = useNftMetadata(contract, tokenId, currencyId);
+  const links = useMemo(() => nftLinksFactory(currencyId, t, metadata?.links), [
+    currencyId,
+    metadata?.links,
+    t,
+  ]);
+  const menuItems = useMemo(() => (status === "loaded" ? links : []), [links, status]);
 
   return (
     <ContextMenuItem leftClick={leftClick} items={menuItems}>
       {children}
     </ContextMenuItem>
   );
-}
+};
+
+export default memo<Props>(NFTContextMenu);
diff --git a/src/renderer/components/DropDownSelector.js b/src/renderer/components/DropDownSelector.js
@@ -52,6 +52,7 @@ export type DropDownItemType = {
   key: string,
   label: any,
   disabled?: boolean,
+  content?: any,
 };
 
 const OptionContainer = styled.div`

diff --git a/src/renderer/drawers/NFTViewerDrawer/ExternalViewerButton.js b/src/renderer/drawers/NFTViewerDrawer/ExternalViewerButton.js
@@ -1,6 +1,6 @@
 // @flow
 
-import React from "react";
+import React, { useMemo, memo } from "react";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 
@@ -9,16 +9,12 @@ import Button from "~/renderer/components/Button";
 import DropDownSelector, { DropDownItem } from "~/renderer/components/DropDownSelector";
 import IconDots from "~/renderer/icons/Dots";
 import IconExternal from "~/renderer/icons/ExternalLink";
-import IconOpensea from "~/renderer/icons/Opensea";
-import IconRarible from "~/renderer/icons/Rarible";
-import IconGlobe from "~/renderer/icons/Globe";
-import { openURL } from "~/renderer/linking";
+import nftLinksFactory from "~/helpers/nftLinksFactory";
 
+import type { NFTMetadataResponse } from "@ledgerhq/live-common/lib/types";
 import type { DropDownItemType } from "~/renderer/components/DropDownSelector";
 import type { ThemedComponent } from "~/renderer/styles/StyleProvider";
 
-import type { NFTMetadataResponse } from "@ledgerhq/live-common/lib/types";
-
 const Separator: ThemedComponent<{}> = styled.div`
   background-color: ${p => p.theme.colors.palette.divider};
   height: 1px;
@@ -37,68 +33,44 @@ const Item: ThemedComponent<{
   display: flex;
 `;
 
-type ItemType = DropDownItemType & {
-  icon?: React$Element<*>,
-  onClick?: Function,
-  type?: "separator",
-};
-
 type ExternalViewerButtonProps = {
   links: $PropertyType<$PropertyType<NFTMetadataResponse, "result">, "links">,
   contract: string,
   tokenId: string,
+  currencyId: string,
 };
 
-export const ExternalViewerButton = ({ links, contract, tokenId }: ExternalViewerButtonProps) => {
+const ExternalViewerButton = ({
+  links,
+  contract,
+  tokenId,
+  currencyId,
+}: ExternalViewerButtonProps) => {
   const { t } = useTranslation();
 
-  const defaultLinks = {
-    openSea: `https://opensea.io/assets/${contract}/${tokenId}`,
-    rarible: `https://rarible.com/token/${contract}:${tokenId}`,
-    etherscan: `https://etherscan.io/token/${contract}?a=${tokenId}`,
-  };
-
-  const items: DropDownItemType[] = [
-    {
-      key: "opensea",
-      label: t("NFT.viewer.actions.open", { viewer: "Opensea.io" }),
-      icon: <IconOpensea size={16} />,
-      onClick: () => openURL(links?.opensea || defaultLinks.openSea),
-    },
-    {
-      key: "rarible",
-      label: t("NFT.viewer.actions.open", { viewer: "Rarible" }),
-      icon: <IconRarible size={16} />,
-      onClick: () => openURL(links?.rarible || defaultLinks.rarible),
-    },
-    {
-      key: "sep2",
-      type: "separator",
-      label: "",
-    },
-    {
-      key: "etherscan",
-      label: t("NFT.viewer.actions.open", { viewer: "Explorer" }),
-      icon: <IconGlobe size={16} />,
-      onClick: () => openURL(links?.etherscan || defaultLinks.etherscan),
-    },
-  ];
+  const items: DropDownItemType[] = useMemo(() => nftLinksFactory(currencyId, t, links), [
+    currencyId,
+    links,
+    t,
+  ]);
 
-  const renderItem = ({ item }: { item: ItemType }) => {
+  const renderItem = ({ item }) => {
     if (item.type === "separator") {
       return <Separator />;
     }
 
+    const Icon = item.Icon ? React.createElement(item.Icon, { size: 16 }) : <></>;
+
     return (
       <Item
-        id={`external-popout-${item.key}`}
+        id={`external-popout-${item.id}`}
         horizontal
         flow={2}
         onClick={item.onClick}
-        disableHover={item.key === "hideEmpty"}
+        disableHover={item.id === "hideEmpty"}
       >
         <Box horizontal>
-          {item.icon ? <Box mr={2}>{item.icon}</Box> : null}
+          {item.Icon ? <Box mr={2}>{Icon}</Box> : null}
           {item.label}
         </Box>
         <Box ml={4}>
@@ -125,3 +97,5 @@ export const ExternalViewerButton = ({ links, contract, tokenId }: ExternalViewe
     </DropDownSelector>
   );
 };
+
+export default memo<ExternalViewerButtonProps>(ExternalViewerButton);