Merge branch 'develop' into token-api

zhangyouxin · Jan 16, 2024 · acec240 · acec240
2 parents 3562e3a + 48d790d
commit acec240
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/components/Header/MenusComp/index.tsx b/src/components/Header/MenusComp/index.tsx
@@ -1,5 +1,5 @@
 import { Link } from 'react-router-dom'
-import { FC, memo } from 'react'
+import { FC, memo, PropsWithChildren } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Dropdown } from 'antd'
 import classNames from 'classnames'
@@ -47,13 +47,13 @@ const useMenuDataList = () => {
           name: t('navbar.inscription'),
           url: '/inscriptions',
         },
+        {
+          type: LinkType.Inner,
+          name: t('navbar.nft_collections'),
+          url: '/nft-collections',
+        },
       ],
     },
-    {
-      type: LinkType.Inner,
-      name: t('navbar.nft_collections'),
-      url: '/nft-collections',
-    },
     {
       type: LinkType.Inner,
       name: t('navbar.charts'),
@@ -75,7 +75,7 @@ const useMenuDataList = () => {
   return list
 }
 
-const SubmenuDropdown: FC<{ menu: MenuData }> = ({ children, menu }) => {
+const SubmenuDropdown: FC<PropsWithChildren<{ menu: MenuData }>> = ({ children, menu }) => {
   return (
     <Dropdown
       overlay={

diff --git a/src/pages/Tokens/index.tsx b/src/pages/Tokens/index.tsx
@@ -82,7 +82,7 @@ const TokenItem = ({ token, isLast }: { token: UDT | OmigaInscriptionCollection;
     localeNumberString(token.addressesCount)
   )
 
-  const isKnown = (Boolean(name) && token.published) || isOmigaInscriptionCollection(token)
+  const isKnown = (Boolean(name || symbol) && token.published) || isOmigaInscriptionCollection(token)
 
   return (
     <TokensTableItem>