diff --git a/_raw/locales/en/messages.json b/_raw/locales/en/messages.json index 56e2ed6434e..70350ed18e5 100644 --- a/_raw/locales/en/messages.json +++ b/_raw/locales/en/messages.json @@ -1099,8 +1099,10 @@ "send": "Send", "receive": "Receive", "noTransactions": "No Transactions", - "customizedButton": "customized", - "blockedButton": "blocked" + "customizedButton": "custom token", + "customizedButtons": "custom tokens", + "blockedButton": "blocked token", + "blockedButtons": "blocked tokens" }, "assets": { "usdValue": "USD VALUE", @@ -1139,7 +1141,9 @@ "summaryDescription": "All assets in protocols (e.g. LP tokens) are resolved to the underlying assets for statistical calculations", "noMatch": "No Match", "lowValueDescription": "Low value assets will be shown here", - "lowValueAssets": "{{count}} low value assets" + "lowValueAssets_0": "{{count}} low value token", + "lowValueAssets_one": "{{count}} low value token", + "lowValueAssets_other": "{{count}} low value tokens" }, "noAssets": "No assets", "blockLinkText": "Search address to block token", diff --git a/src/ui/assets/dashboard/low-value-arrow.svg b/src/ui/assets/dashboard/low-value-arrow.svg index d5c767832b9..99c3912608c 100644 --- a/src/ui/assets/dashboard/low-value-arrow.svg +++ b/src/ui/assets/dashboard/low-value-arrow.svg @@ -1,3 +1,3 @@ - + diff --git a/src/ui/utils/confirmPopup.less b/src/ui/utils/confirmPopup.less index 59a493d71db..5c8014d0a7f 100644 --- a/src/ui/utils/confirmPopup.less +++ b/src/ui/utils/confirmPopup.less @@ -1,4 +1,10 @@ .confirm-modal { + .confirm-address-item { + &:hover{ + background-color: unset !important; + border-color: transparent !important; + } + } .ant-modal-content { background: var(--r-neutral-bg-1, #FFF); } @@ -13,6 +19,9 @@ .ant-modal-confirm-content { padding: 0 !important; background: var(--r-neutral-card-2, #f2f4f7); + .searched-account-item { + cursor: unset !important; + } } .ant-modal-confirm-btns { button { @@ -22,6 +31,12 @@ background: var(--r-neutral-bg-1, #FFF); color: var(--r-blue-default, #7084ff); border: 1px solid var(--r-blue-default, #7084ff); + &:hover{ + background: var(--r-blue-light-1, #eef1ff); + } + &::before { + display: none; + } } } } \ No newline at end of file diff --git a/src/ui/utils/useRepeatImportConfirm.tsx b/src/ui/utils/useRepeatImportConfirm.tsx index ebf1093e296..45f3f9e7292 100644 --- a/src/ui/utils/useRepeatImportConfirm.tsx +++ b/src/ui/utils/useRepeatImportConfirm.tsx @@ -51,6 +51,7 @@ export const useRepeatImportConfirm = () => { type={account.type} brandName={account.type} balance={account.balance} + className="confirm-address-item" /> ), onOk: () => { diff --git a/src/ui/views/CommonPopup/AssetList/AddTokenEntry.tsx b/src/ui/views/CommonPopup/AssetList/AddTokenEntry.tsx index 5986ad781be..ae7fc18be03 100644 --- a/src/ui/views/CommonPopup/AssetList/AddTokenEntry.tsx +++ b/src/ui/views/CommonPopup/AssetList/AddTokenEntry.tsx @@ -83,7 +83,11 @@ const AddTokenEntry = React.forwardRef( /> */} 1 + ? t('page.dashboard.tokenDetail.customizedButtons') + : t('page.dashboard.tokenDetail.customizedButton') + } buttonText={t('page.dashboard.assets.customButtonText')} description={t('page.dashboard.assets.customDescription')} onClickButton={() => { diff --git a/src/ui/views/CommonPopup/AssetList/AssetList.tsx b/src/ui/views/CommonPopup/AssetList/AssetList.tsx index d840f242ead..8ca5ec06c65 100644 --- a/src/ui/views/CommonPopup/AssetList/AssetList.tsx +++ b/src/ui/views/CommonPopup/AssetList/AssetList.tsx @@ -94,7 +94,11 @@ export const AssetList = ({ ) : ( 1 + ? t('page.dashboard.tokenDetail.customizedButtons') + : t('page.dashboard.tokenDetail.customizedButton') + } buttonText={t('page.dashboard.assets.customButtonText')} description={t('page.dashboard.assets.customDescription')} onClickButton={() => { diff --git a/src/ui/views/CommonPopup/AssetList/BlockedButton.tsx b/src/ui/views/CommonPopup/AssetList/BlockedButton.tsx index 31379752a9a..4baaad18362 100644 --- a/src/ui/views/CommonPopup/AssetList/BlockedButton.tsx +++ b/src/ui/views/CommonPopup/AssetList/BlockedButton.tsx @@ -18,7 +18,11 @@ export const BlockedButton: React.FC = ({ onClickLink, isTestnet }) => { return ( 1 + ? t('page.dashboard.tokenDetail.blockedButtons') + : t('page.dashboard.tokenDetail.blockedButton') + } tokens={list} linkText={t('page.dashboard.assets.blockLinkText')} description={t('page.dashboard.assets.blockDescription')} diff --git a/src/ui/views/CommonPopup/AssetList/CustomizedButton.tsx b/src/ui/views/CommonPopup/AssetList/CustomizedButton.tsx index 49254caa404..3ae43e2abb9 100644 --- a/src/ui/views/CommonPopup/AssetList/CustomizedButton.tsx +++ b/src/ui/views/CommonPopup/AssetList/CustomizedButton.tsx @@ -21,7 +21,11 @@ export const CustomizedButton: React.FC = ({ return ( 1 + ? t('page.dashboard.tokenDetail.customizedButtons') + : t('page.dashboard.tokenDetail.customizedButton') + } buttonText={t('page.dashboard.assets.customButtonText')} description={t('page.dashboard.assets.customDescription')} tokens={list} diff --git a/src/ui/views/CommonPopup/AssetList/TokenItem.tsx b/src/ui/views/CommonPopup/AssetList/TokenItem.tsx index d206aac7448..82839087728 100644 --- a/src/ui/views/CommonPopup/AssetList/TokenItem.tsx +++ b/src/ui/views/CommonPopup/AssetList/TokenItem.tsx @@ -22,7 +22,7 @@ const TokenItemAsset: React.FC = ({ item }) => { return ( -
+