fix: some small UI issues (#11294)

DimensionDev · Jan 17, 2024 · d989f14 · d989f14
1 parent e27ab86
commit d989f14
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 24 deletions.
diff --git a/packages/mask/content-script/site-adaptors/twitter.com/locales/zh-CN.json b/packages/mask/content-script/site-adaptors/twitter.com/locales/zh-CN.json
@@ -1,3 +1,3 @@
 {
-    "additional_post_box__encrypted_post_pre": "此推特使用 #mask_io (@realMaskNetwork) 加密。 📪🔑\n\n🎭 🎭🎭 厌烦了纯文本？尝试向你的朋友发送加密消息。安装 {{encrypted}} 以发送你第一个加密推文。"
+    "additional_post_box__encrypted_post_pre": "此推特使用 #mask_io (@realMaskNetwork) 加密。 📪🔑\n\n🎭 🎭🎭 厌烦了纯文本？尝试向你的朋友发送加密消息。安装 {{- encrypted}} 以发送你第一个加密推文。"
 }
diff --git a/packages/mask/popups/components/ConnectedWallet/index.tsx b/packages/mask/popups/components/ConnectedWallet/index.tsx
@@ -140,7 +140,9 @@ export const ConnectedWallet = memo(function ConnectedWallet() {
                 MaskMessages.events.ownProofChanged.sendToAll()
                 showSnackbar(t.popups_wallet_disconnect_success())
             } catch {
-                showSnackbar(t.popups_wallet_disconnect_failed())
+                showSnackbar(t.popups_wallet_disconnect_failed(), {
+                    variant: 'error',
+                })
             }
         },
         [currentPersona],

diff --git a/packages/mask/shared-ui/locales/ja-JP.json b/packages/mask/shared-ui/locales/ja-JP.json
@@ -101,11 +101,11 @@
     "application_display_tab_plug_app-unlisted-placeholder": "設定のアイコンをクリックして、アプリボードに表示します。",
     "application_settings_tab_plug_app-unlisted-placeholder": "アプリのアイコンをクリックして、アプリボードに表示します。",
     "persona_load_failed": "読み込み失敗",
-    "additional_post_box__encrypted_post_pre": "#mask_io で復号しましょう！ {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "#mask_io で復号しましょう！ {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "こんにちは、#mask_io @{{account}} でラッキードロップを獲得しましょう。 \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "この投稿は #mask_io によって暗号化されています。 📪🔑 mask.io をインストールして復号しましょう！ ([I:b]) {{random}}",
     "auto_paste_failed_dialog_title": "手動でペーストする",
     "auto_paste_failed_dialog_content": "以下の文字列と画像（存在すれば）をコピーし、公開しましょう。",

diff --git a/packages/mask/shared-ui/locales/ko-KR.json b/packages/mask/shared-ui/locales/ko-KR.json
@@ -91,11 +91,11 @@
     "application_display_tab_plug_app-unlisted-placeholder": "설정 아이콘을 클릭하여 앱 보드에 나열합니다.",
     "application_settings_tab_plug_app-unlisted-placeholder": "애프리케이션 아이콘을 클릭하여 앱 보드에 나열합니다.",
     "persona_load_failed": "로딩 실패",
-    "additional_post_box__encrypted_post_pre": "#mask_io로 이 게시물을 해독하기. {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "#mask_io로 행운 드랍을 수령해 보세요. @{{account}} \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "#mask_io {{encrypted}} 덧붙이고 레드 패킷을 수령하세요.",
-    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "#mask_io로 이 게시물을 해독하기. {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "#mask_io로 행운 드랍을 수령해 보세요. @{{account}} \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "#mask_io {{- encrypted}} 덧붙이고 레드 패킷을 수령하세요.",
+    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "암호화된 이미지입니다. 📪🔑 mask.io 설치하고 해독하세요. {{random}}",
     "auto_paste_failed_dialog_title": "수동으로 붙여넣기",
     "auto_paste_failed_dialog_content": "아래의 문자와 이미지(있으면)를 복사하고 공유하세요",

diff --git a/packages/mask/shared-ui/locales/zh-CN.json b/packages/mask/shared-ui/locales/zh-CN.json
@@ -101,11 +101,11 @@
     "application_display_tab_plug_app-unlisted-placeholder": "点击设置图标进入设置页面，在应用面板上设置显示应用。",
     "application_settings_tab_plug_app-unlisted-placeholder": "点击应用图标将会在应用列表中显示。",
     "persona_load_failed": "加载失败",
-    "additional_post_box__encrypted_post_pre": "安装 #mask_io 解密此贴文 ！ {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "使用 #mask_io 来领取这个红包！@{{account}} \n\n$t(promote_red_packet)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "使用 #mask_io 来认领这个红包！@{{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "安装 #mask_io 解密此贴文 ！ {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet_sns_official_account": "使用 #mask_io 来领取这个红包！@{{account}} \n\n$t(promote_red_packet)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "使用 #mask_io 来认领这个红包！{{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service_sns_official_account": "$t(promote_file_service)\n {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_file_service": "$t(promote_file_service) {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "此图片使用#mask_io加密。📪🔑 安装mask.io解密它。 {{random}}",
     "auto_paste_failed_dialog_title": "手动粘贴",
     "auto_paste_failed_dialog_content": "请复制下面的文本和图片(如果有的话)再进行发布。",

diff --git a/packages/mask/shared-ui/locales/zh-TW.json b/packages/mask/shared-ui/locales/zh-TW.json
@@ -18,8 +18,8 @@
     "redirect_alert": "如果你的瀏覽器沒有跳轉， <terms>請點擊此處</terms>.",
     "add_nft_contract_search_hint": "檢索NFT合約名稱或地址",
     "applications": "應用",
-    "additional_post_box__encrypted_post_pre": "使用 #mask_io 解密這篇貼文！ {{encrypted}}",
-    "additional_post_box__encrypted_post_pre_red_packet": "用 #mask_io 開啟紅包 {{encrypted}}",
+    "additional_post_box__encrypted_post_pre": "使用 #mask_io 解密這篇貼文！ {{- encrypted}}",
+    "additional_post_box__encrypted_post_pre_red_packet": "用 #mask_io 開啟紅包 {{- encrypted}}",
     "additional_post_box__steganography_post_pre": "這張圖片是使用 #mask_io 加密。 📪🔑 安裝 mask.io 解密。 {{random}}",
     "auto_paste_failed_dialog_title": "手動貼上",
     "auto_paste_failed_dialog_content": "請複製下方文章或圖片 (如果有的話) 然後發佈它",

diff --git a/packages/shared/src/UI/components/AddressItem/index.tsx b/packages/shared/src/UI/components/AddressItem/index.tsx
@@ -1,11 +1,11 @@
 import { first } from 'lodash-es'
 import { Icons } from '@masknet/icons'
-import { makeStyles } from '@masknet/theme'
+import { ShadowRootTooltip, makeStyles } from '@masknet/theme'
 import { Box, Link, Typography, type TypographyProps } from '@mui/material'
 import { SocialAddressType, type SocialAccount } from '@masknet/shared-base'
 import { useWeb3Utils } from '@masknet/web3-hooks-base'
 import { isSameAddress } from '@masknet/web3-shared-base'
-import { isEnsSubdomain } from '@masknet/web3-shared-evm'
+import { formatDomainName, isEnsSubdomain } from '@masknet/web3-shared-evm'
 import type { Web3Helper } from '@masknet/web3-helpers'
 import { ReversedAddress } from '../../../index.js'
 
@@ -51,6 +51,8 @@ export function AddressItem({
         socialAccount.supportedAddressTypes?.includes(SocialAddressType.Firefly) || // Label from Firefly is not reliable
         isSameAddress(socialAccount.label, socialAccount.address)
 
+    const formattedDomain = formatDomainName(socialAccount.label)
+
     return (
         <>
             <Box onClick={(ev: React.MouseEvent) => onClick?.(ev)}>
@@ -60,9 +62,11 @@ export function AddressItem({
                         address={socialAccount.address}
                         pluginID={socialAccount.pluginID}
                     />
-                :   <Typography fontSize="14px" fontWeight={700} {...TypographyProps}>
-                        {socialAccount.label}
-                    </Typography>
+                :   <ShadowRootTooltip title={formattedDomain === socialAccount.label ? '' : socialAccount.label}>
+                        <Typography fontSize="14px" fontWeight={700} {...TypographyProps}>
+                            {formattedDomain}
+                        </Typography>
+                    </ShadowRootTooltip>
                 }
             </Box>
             {disableLinkIcon ? null : (