diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index 901f2b8d58de..a1f4b2e197d1 100644 --- a/packages/mask/shared-ui/locales/en-US.json +++ b/packages/mask/shared-ui/locales/en-US.json @@ -210,7 +210,6 @@ "sharing": "Sharing", "transfer": "Transfer", "export": "Export", - "wallet_status_bar_pending": "Pending", "wallet_load_retry": "Failed to load {{symbol}}. Click to retry.", "wallet_status_bar_pending": "Pending", "wallet_name": "Wallet Name", @@ -422,6 +421,8 @@ "plugin_savings_withdraw": "Withdraw", "plugin_savings_process_deposit": "Processing Deposit", "plugin_savings_process_withdraw": "Processing Withdrawal", + "plugin_findtruman_powered_by": "Powered By", + "plugin_findtruman_find_truman": "FindTruman", "plugin_trader_swap": "Swap", "plugin_trader_wrap": "Wrap", "plugin_trader_swap_from": "You sell", diff --git a/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx b/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx index 6fe99aa90272..6f2d69701e93 100644 --- a/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx +++ b/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx @@ -10,10 +10,9 @@ import { FindTrumanContext } from '../context' import { useAccount, useChainId } from '@masknet/plugin-infra/web3' import { useConst } from './hooks/useConst' import IntroductionPanel from './IntroductionPanel' -import { PluginWalletStatusBar } from '../../../utils' +import { PluginWalletStatusBar, useI18N } from '../../../utils' import { ChainBoundary } from '../../../web3/UI/ChainBoundary' import { NetworkPluginID } from '@masknet/web3-shared-base' -import { useI18N } from '../locales' const useStyles = makeStyles()((theme, props) => ({ wrapper: { @@ -77,7 +76,7 @@ interface FindTrumanDialogProps { } export function FindTrumanDialog(props: FindTrumanDialogProps) { - const i18N = useI18N() + const { t: i18N } = useI18N() const { open, onClose } = props const { classes } = useStyles() const account = useAccount() @@ -126,10 +125,10 @@ export function FindTrumanDialog(props: FindTrumanDialogProps) { color="textSecondary" fontSize={14} fontWeight={700}> - {i18N.powered_by()} + {i18N('plugin_findtruman_powered_by')} - FindTruman + {i18N('plugin_findtruman_find_truman')} - - {t.verify_Twitter_ID_intro()} - {t.verify_Twitter_ID()} - - - - - - - ) - } - return ( <> diff --git a/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx b/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx index 247dca396a53..888796c26d09 100644 --- a/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx +++ b/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx @@ -108,7 +108,10 @@ export function TabCard({ type, socialAddressList, persona }: TabCardProps) { className={classes.button}> {selectedAddress?.type === SocialAddressType.KV || selectedAddress?.type === SocialAddressType.ADDRESS ? ( - + ) : ( selectedAddress.label )} @@ -123,9 +126,8 @@ export function TabCard({ type, socialAddressList, persona }: TabCardProps) { {uniqBy(socialAddressList ?? [], (x) => x.address.toLowerCase()).map((x) => { return ( onSelect(x)}> - {selectedAddress?.type === SocialAddressType.KV || - selectedAddress?.type === SocialAddressType.ADDRESS ? ( - + {x?.type === SocialAddressType.KV || x?.type === SocialAddressType.ADDRESS ? ( + ) : ( x.label )} diff --git a/packages/plugins/RSS3/src/SNSAdaptor/index.tsx b/packages/plugins/RSS3/src/SNSAdaptor/index.tsx index 454adf7a5020..1d3e40b7a429 100644 --- a/packages/plugins/RSS3/src/SNSAdaptor/index.tsx +++ b/packages/plugins/RSS3/src/SNSAdaptor/index.tsx @@ -12,13 +12,7 @@ function sorter(a: SocialAddress, z: SocialAddress>) { - return ( - addressNames?.some( - (x) => - (x.type === SocialAddressType.RSS3 || x.type === SocialAddressType.KV) && - x.networkSupporterPluginID === NetworkPluginID.PLUGIN_EVM, - ) ?? false - ) + return !!addressNames?.some((x) => x.networkSupporterPluginID === NetworkPluginID.PLUGIN_EVM) } const sns: Plugin.SNSAdaptor.Definition = {