Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge testnet into mainnet #1765

Merged
merged 6 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"timezone-mock": "^1.1.4",
"ts-jest": "29.1.4",
"typescript": "4.9.5",
"webpack": "5.92.0"
"webpack": "5.94.0"
},
"scripts": {
"start": "react-app-rewired start",
Expand Down
2 changes: 1 addition & 1 deletion src/components/XUDTTag/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom'
import { Popover } from 'antd'
import styles from './styles.module.scss'

const HIDDEN_TAGS = ['duplicate', 'suspicious', 'utility', 'supply-unlimited', 'out-of-length-range']
const HIDDEN_TAGS = ['duplicate', 'suspicious', 'supply-unlimited', 'out-of-length-range']

const XUDTTag = ({ tagName, to, tooltip = false }: { tagName: string; to?: string; tooltip?: boolean }) => {
const { t, i18n } = useTranslation()
Expand Down
6 changes: 6 additions & 0 deletions src/components/XUDTTag/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@
color: #fa504f;
}

&[data-type='utility'] {
background: #d9f4ff;
border-color: #61c7fa;
color: #2b98e0;
}

span {
font-size: 12px;
font-style: normal;
Expand Down
8 changes: 4 additions & 4 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -805,8 +805,8 @@
"utility": "Utility",
"out-of-length-range": "Name Length Exceeded",
"duplicate": "Duplicate",
"layer-1-asset": "Layer1 Asset",
"layer-2-asset": "Layer2 Asset",
"layer-1-asset": "Issued on Bitcoin",
"layer-2-asset": "Issued on CKB",
"verified-on": "Verified On Platform",
"supply-limited": "Supply Limited",
"supply-unlimited": "Supply Unlimited",
Expand All @@ -819,8 +819,8 @@
"out-of-length-range": "This tag marks an asset whose name exceeds 60 characters in length.",
"duplicate": "Under case-sensitive conditions, this tag marks an asset whose name duplicates an already issued asset.",
"rgb++": "This tag marks an asset that is compatible with the RGB++ protocol, allowing for transfers between BTC and CKB.",
"layer-1-asset": "This tag marks an asset that is issued on Layer 1.",
"layer-2-asset": "This tag marks an asset that is issued on Layer 2.",
"layer-1-asset": "This tag marks an asset that is issued on Bitcoin.",
"layer-2-asset": "This tag marks an asset that is issued on CKB.",
"verified-on": "This tag marks an asset that has been verified by Cell Studio.",
"supply-limited": "This tag marks an asset that has a limited supply, with a maximum quantity limit.",
"supply-unlimited": "This tag marks an asset that has an unlimited supply, with no maximum quantity limit.",
Expand Down
8 changes: 4 additions & 4 deletions src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,8 @@
"utility": "有效用的",
"out-of-length-range": "超长",
"duplicate": "重复",
"layer-1-asset": "Layer 1 资产",
"layer-2-asset": "Layer 2 资产",
"layer-1-asset": "发行于 Bitcoin",
"layer-2-asset": "发行于 CKB",
"verified-on": "Platform 平台认证",
"supply-limited": "有限供应资产",
"supply-unlimited": "无限供应资产",
Expand All @@ -820,8 +820,8 @@
"out-of-length-range": "此 Tag 标记的资产名称长度超过 60 字符。",
"duplicate": "区分大小写前提下,此 Tag 标记的资产名称与已发行过的资产重复。",
"rgb++": "此 Tag 标记的资产是 RGB++ 协议兼容资产,可以在 BTC 和 CKB 之间相互转移。",
"layer-1-asset": "此 Tag 标记的资产是发行在 Layer1 上的资产。",
"layer-2-asset": "此 Tag 标记的资产是发行在 Layer2 上的资产。",
"layer-1-asset": "此 Tag 标记的资产是发行在 Bitcoin 上的资产。",
"layer-2-asset": "此 Tag 标记的资产是发行在 CKB 上的资产。",
"verified-on": "此 Tag 标记的资产是经过 Cell Studio 校验的资产。",
"supply-limited": "此Tag标记的资产是有限供应的资产,有最大资产数量限制。",
"supply-unlimited": "此Tag标记的资产是无限供应的资产,无最大资产数量限制。",
Expand Down
6 changes: 6 additions & 0 deletions src/pages/Xudts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ const getfilterList = (t: TFunction) => [
title: <XUDTTag tagName="supply-limited" />,
to: '/xudts',
},
{
key: 'utility',
value: t('xudt.tags.utility'),
title: <XUDTTag tagName="utility" />,
to: '/xudts',
},
]

const TokenInfo: FC<{ token: XUDT }> = ({ token }) => {
Expand Down
Loading