fix(suite): temp

trezor · Dec 12, 2024 · 837e7ae · 837e7ae
1 parent 284d0eb
commit 837e7ae
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 127 deletions.
diff --git a/packages/suite/src/support/messages.ts b/packages/suite/src/support/messages.ts
@@ -5002,12 +5002,12 @@ export default defineMessages({
     },
     TR_EXPERIMENTAL_NFT_SECTION: {
         id: 'TR_EXPERIMENTAL_NFT_SECTION',
-        defaultMessage: 'NFT Section',
+        defaultMessage: 'NFTs (non-fungible tokens)',
     },
     TR_EXPERIMENTAL_NFT_SECTION_DESCRIPTION: {
         id: 'TR_EXPERIMENTAL_NFT_SECTION_DESCRIPTION',
         defaultMessage:
-            'Access NFT section in your wallet. Right now available only for EVM based chains.',
+            'Access the NFTs stored in your wallet. Currently available for EVM-based chains only.',
     },
     TR_EXPERIMENTAL_FEATURES_ALLOW: {
         id: 'TR_EXPERIMENTAL_FEATURES_ALLOW',

diff --git a/packages/suite/src/views/wallet/nfts/NftsTable/NftsRow.tsx b/packages/suite/src/views/wallet/nfts/NftsTable/NftsRow.tsx
@@ -195,76 +195,49 @@ const NftsRow = ({ nft, network, isShown, selectedAccount }: NftsRowProps) => {
                             isCollapsed={!isCollectionOpen}
                             isHighlightedOnHover={false}
                         >
-                            <Table.Cell></Table.Cell>
-                            <Table.Cell align="right">
-                                <Column alignItems="flex-end">
-                                    <HiddenPlaceholder>
-                                        <RedactNumericalValue value="1" />
-                                    </HiddenPlaceholder>
-                                </Column>
-                            </Table.Cell>
-                            <Table.Cell align="right" colSpan={2}>
-                                <Column alignItems="flex-end">
-                                    <HiddenPlaceholder key={nft.contract + index}>
+                            <Table.Cell>
+                                <HiddenPlaceholder key={nft.contract + index}>
+                                    <Row gap={spacings.xxs}>
+                                        {nft.name}
                                         <TrezorLink
                                             href={getNftExplorerUrl(network, nft, id.toString())}
                                             target="_blank"
                                             variant="underline"
                                         >
-                                            <RedactNumericalValue value={id.toString()} />
+                                            #<RedactNumericalValue value={id.toString()} />
                                         </TrezorLink>
-                                    </HiddenPlaceholder>
-                                </Column>
-                            </Table.Cell>
-                        </Table.Row>
-                    ))}
-                </>
-            )}
-            {nft.type === 'ERC1155' && (
-                <>
-                    {nft.multiTokenValues?.map((value, index) => (
-                        <Table.Row
-                            key={nft.contract + index}
-                            isCollapsed={!isCollectionOpen}
-                            isHighlightedOnHover={false}
-                        >
-                            <Table.Cell></Table.Cell>
-                            <Table.Cell align="right">
-                                <Column alignItems="flex-end">
-                                    <Row key={nft.contract + index}>
-                                        <HiddenPlaceholder>
-                                            <RedactNumericalValue
-                                                value={value.value?.toString() || ''}
-                                            />
-                                        </HiddenPlaceholder>
-                                    </Row>
-                                </Column>
-                            </Table.Cell>
-                            <Table.Cell align="right" colSpan={2}>
-                                <Column alignItems="flex-end">
-                                    <Row key={nft.contract + index}>
-                                        <HiddenPlaceholder>
-                                            <TrezorLink
-                                                href={getNftExplorerUrl(
-                                                    network,
-                                                    nft,
-                                                    value?.id?.toString(),
-                                                )}
-                                                target="_blank"
-                                                variant="underline"
-                                            >
-                                                <RedactNumericalValue
-                                                    value={value.id?.toString() || ''}
-                                                />
-                                            </TrezorLink>
-                                        </HiddenPlaceholder>
+                                        <Badge>
+                                            <RedactNumericalValue value="1x" />
+                                        </Badge>
                                     </Row>
-                                </Column>
+                                </HiddenPlaceholder>
                             </Table.Cell>
                         </Table.Row>
                     ))}
                 </>
             )}
+            {nft.type === 'ERC1155' &&
+                nft.multiTokenValues?.map((value, index) => (
+                    <Table.Row
+                        key={nft.contract + index}
+                        isCollapsed={!isCollectionOpen}
+                        isHighlightedOnHover={false}
+                    >
+                        <Table.Cell align="right">
+                            <HiddenPlaceholder>
+                                {nft.name} #
+                                <TrezorLink
+                                    href={getNftExplorerUrl(network, nft, value?.id?.toString())}
+                                    target="_blank"
+                                    variant="underline"
+                                >
+                                    <RedactNumericalValue value={value.id?.toString() || ''} />
+                                </TrezorLink>
+                                <RedactNumericalValue value={value.value?.toString() || ''} />
+                            </HiddenPlaceholder>
+                        </Table.Cell>
+                    </Table.Row>
+                ))}
         </>
     );
 };

diff --git a/suite-common/icons/assets/pictureFrame.svg b/suite-common/icons/assets/pictureFrame.svg
diff --git a/suite-common/icons/assets/trezorSafe7.svg b/suite-common/icons/assets/trezorSafe7.svg
diff --git a/suite-common/icons/assets/trezorSafe7Filled.svg b/suite-common/icons/assets/trezorSafe7Filled.svg
diff --git a/suite-common/icons/cryptoAssets/cryptoIcons/base.svg b/suite-common/icons/cryptoAssets/cryptoIcons/base.svg
diff --git a/suite-common/icons/generateIconFont.ts b/suite-common/icons/generateIconFont.ts
@@ -77,6 +77,7 @@ const usedIcons = [
     'pencilSimpleLine',
     'piggyBank',
     'piggyBankFilled',
+    'pictureFrame',
     'plugs',
     'plus',
     'plusCircle',

diff --git a/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.json b/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.json
@@ -32,65 +32,66 @@
     "plugs": 61727,
     "piggyBankFilled": 61728,
     "piggyBank": 61729,
-    "pencilSimpleLine": 61730,
-    "pencilSimple": 61731,
-    "pencil": 61732,
-    "password": 61733,
-    "palette": 61734,
-    "magnifyingGlass": 61735,
-    "lock": 61736,
-    "link": 61737,
-    "lightbulb": 61738,
-    "lifebuoy": 61739,
-    "info": 61740,
-    "image": 61741,
-    "house": 61742,
-    "handPalm": 61743,
-    "githubLogo": 61744,
-    "gear": 61745,
-    "flagCheckered": 61746,
-    "flag": 61747,
-    "fingerprintSimple": 61748,
-    "fingerprint": 61749,
-    "filePdf": 61750,
-    "facebookLogo": 61751,
-    "eyeSlash": 61752,
-    "eye": 61753,
-    "discover": 61754,
-    "detective": 61755,
-    "database": 61756,
-    "cpu": 61757,
-    "copy": 61758,
-    "coins": 61759,
-    "coinVerticalCheck": 61760,
-    "clockClockwise": 61761,
-    "circleDashed": 61762,
-    "checks": 61763,
-    "checkCircleFilled": 61764,
-    "checkCircle": 61765,
-    "check": 61766,
-    "chatCircle": 61767,
-    "change": 61768,
-    "caretUpFilled": 61769,
-    "caretUpDown": 61770,
-    "caretUp": 61771,
-    "caretRight": 61772,
-    "caretLeft": 61773,
-    "caretDownFilled": 61774,
-    "caretDown": 61775,
-    "caretCircleRight": 61776,
-    "calendar": 61777,
-    "bugBeetle": 61778,
-    "bookmarkSimple": 61779,
-    "backspace": 61780,
-    "arrowsCounterClockwise": 61781,
-    "arrowUpRight": 61782,
-    "arrowUp": 61783,
-    "arrowURightDown": 61784,
-    "arrowSquareOut": 61785,
-    "arrowRight": 61786,
-    "arrowLineUpRight": 61787,
-    "arrowLineUp": 61788,
-    "arrowLineDown": 61789,
-    "arrowDown": 61790
+    "pictureFrame": 61730,
+    "pencilSimpleLine": 61731,
+    "pencilSimple": 61732,
+    "pencil": 61733,
+    "password": 61734,
+    "palette": 61735,
+    "magnifyingGlass": 61736,
+    "lock": 61737,
+    "link": 61738,
+    "lightbulb": 61739,
+    "lifebuoy": 61740,
+    "info": 61741,
+    "image": 61742,
+    "house": 61743,
+    "handPalm": 61744,
+    "githubLogo": 61745,
+    "gear": 61746,
+    "flagCheckered": 61747,
+    "flag": 61748,
+    "fingerprintSimple": 61749,
+    "fingerprint": 61750,
+    "filePdf": 61751,
+    "facebookLogo": 61752,
+    "eyeSlash": 61753,
+    "eye": 61754,
+    "discover": 61755,
+    "detective": 61756,
+    "database": 61757,
+    "cpu": 61758,
+    "copy": 61759,
+    "coins": 61760,
+    "coinVerticalCheck": 61761,
+    "clockClockwise": 61762,
+    "circleDashed": 61763,
+    "checks": 61764,
+    "checkCircleFilled": 61765,
+    "checkCircle": 61766,
+    "check": 61767,
+    "chatCircle": 61768,
+    "change": 61769,
+    "caretUpFilled": 61770,
+    "caretUpDown": 61771,
+    "caretUp": 61772,
+    "caretRight": 61773,
+    "caretLeft": 61774,
+    "caretDownFilled": 61775,
+    "caretDown": 61776,
+    "caretCircleRight": 61777,
+    "calendar": 61778,
+    "bugBeetle": 61779,
+    "bookmarkSimple": 61780,
+    "backspace": 61781,
+    "arrowsCounterClockwise": 61782,
+    "arrowUpRight": 61783,
+    "arrowUp": 61784,
+    "arrowURightDown": 61785,
+    "arrowSquareOut": 61786,
+    "arrowRight": 61787,
+    "arrowLineUpRight": 61788,
+    "arrowLineUp": 61789,
+    "arrowLineDown": 61790,
+    "arrowDown": 61791
 }
diff --git a/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.ttf b/suite-common/icons/iconFontsMobile/TrezorSuiteIcons.ttf
diff --git a/suite-common/icons/src/icons.ts b/suite-common/icons/src/icons.ts
@@ -1825,6 +1825,7 @@ export const icons = {
     piFilled: require('../assets/piFilled.svg'),
     pianoKeys: require('../assets/pianoKeys.svg'),
     pianoKeysFilled: require('../assets/pianoKeysFilled.svg'),
+    pictureFrame: require('../assets/pictureFrame.svg'),
     pictureInPicture: require('../assets/pictureInPicture.svg'),
     pictureInPictureFilled: require('../assets/pictureInPictureFilled.svg'),
     piggyBank: require('../assets/piggyBank.svg'),