RabbyHub · vvvvvv1vvvvvv · Jul 12, 2024 · Jul 12, 2024
diff --git 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
diff --git 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;
+      }
     }
   }
 }
diff --git 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
@@ -83,7 +83,11 @@ const AddTokenEntry = React.forwardRef<AddTokenEntryInst, Props>(
         /> */}
 
         <SpecialTokenListPopup
-          label={t('page.dashboard.tokenDetail.customizedButton')}
+          label={
+            tokens?.length > 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
@@ -94,7 +94,11 @@ export const AssetList = ({
             </div>
           ) : (
             <SpecialTokenListPopup
-              label={t('page.dashboard.tokenDetail.customizedButton')}
+              label={
+                tokens?.length > 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
@@ -18,7 +18,11 @@ export const BlockedButton: React.FC<Props> = ({ onClickLink, isTestnet }) => {
 
   return (
     <TokenButton
-      label={t('page.dashboard.tokenDetail.blockedButton')}
+      label={
+        list?.length > 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
@@ -21,7 +21,11 @@ export const CustomizedButton: React.FC<Props> = ({
 
   return (
     <TokenButton
-      label={t('page.dashboard.tokenDetail.customizedButton')}
+      label={
+        list?.length > 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
@@ -22,7 +22,7 @@ const TokenItemAsset: React.FC<Props> = ({ item }) => {
 
   return (
     <TCell className="py-8 flex gap-12 w-[160px] items-center">
-      <div className="relative">
+      <div className="relative h-[24px]">
         <Image
           className="w-24 h-24 rounded-full"
           src={item.logo_url || IconUnknown}

diff --git a/src/ui/views/NFTView/index.tsx b/src/ui/views/NFTView/index.tsx
@@ -20,7 +20,7 @@ const TabsStyled = styled(Tabs)`
     border-radius: 4px;
     color: var(--r-neutral-body, #3e495e);
     font-size: 12px;
-    transition: all 0.3s ease-in-out;
+    transition: background-color 0.3s ease-in-out;
     margin: 0 !important;
     width: 100px;
     height: 28px;