From 947dec4eeba70d6190d1dac4de2e01cc7bf7d2ea Mon Sep 17 00:00:00 2001 From: Randolph <840094513@qq.com> Date: Fri, 8 Jul 2022 20:09:02 +0800 Subject: [PATCH 1/8] feat: delete LinkOutIcon initial fill color --- packages/icons/general/LinkOut.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/icons/general/LinkOut.tsx b/packages/icons/general/LinkOut.tsx index 3dfd945cc774..7d42b718ffe5 100644 --- a/packages/icons/general/LinkOut.tsx +++ b/packages/icons/general/LinkOut.tsx @@ -7,7 +7,6 @@ export const LinkOutIcon: typeof SvgIcon = createIcon( , From da793b50ff89d2f91fb569cd23ee1cee9a3b5ffb Mon Sep 17 00:00:00 2001 From: Randolph <840094513@qq.com> Date: Fri, 8 Jul 2022 20:14:03 +0800 Subject: [PATCH 2/8] feat: refresh wallet setting date when wallets change --- .../Web3Profile/src/SNSAdaptor/components/WalletSetting.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugins/Web3Profile/src/SNSAdaptor/components/WalletSetting.tsx b/packages/plugins/Web3Profile/src/SNSAdaptor/components/WalletSetting.tsx index fc28d84146cc..7a30bda13bbc 100644 --- a/packages/plugins/Web3Profile/src/SNSAdaptor/components/WalletSetting.tsx +++ b/packages/plugins/Web3Profile/src/SNSAdaptor/components/WalletSetting.tsx @@ -156,7 +156,7 @@ const WalletSetting = memo( -1, ), ) - }, [open]) + }, [open, wallets]) useEffect(() => { if (confirmButtonDisabled) setConfirmButtonDisabled(false) From b861a9faa9a75667cc968db2dd664cf556b7a6df Mon Sep 17 00:00:00 2001 From: Randolph <840094513@qq.com> Date: Fri, 8 Jul 2022 20:31:18 +0800 Subject: [PATCH 3/8] feat: change button name and collection style --- .../Web3Profile/src/SNSAdaptor/components/ImageManagement.tsx | 2 +- packages/plugins/Web3Profile/src/locales/en-US.json | 3 ++- packages/shared/src/UI/components/NFTCard/index.tsx | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/plugins/Web3Profile/src/SNSAdaptor/components/ImageManagement.tsx b/packages/plugins/Web3Profile/src/SNSAdaptor/components/ImageManagement.tsx index 69da446dd5e5..380c3f181f16 100644 --- a/packages/plugins/Web3Profile/src/SNSAdaptor/components/ImageManagement.tsx +++ b/packages/plugins/Web3Profile/src/SNSAdaptor/components/ImageManagement.tsx @@ -127,7 +127,7 @@ export function ImageManagement(props: ImageManagementProps) { )) ) : ( - + )} {!hasConnectedWallets && ( diff --git a/packages/plugins/Web3Profile/src/locales/en-US.json b/packages/plugins/Web3Profile/src/locales/en-US.json index b99a368308a5..8116d5297dfd 100644 --- a/packages/plugins/Web3Profile/src/locales/en-US.json +++ b/packages/plugins/Web3Profile/src/locales/en-US.json @@ -26,7 +26,8 @@ "copied": "Copied", "listed": "Listed", "unlisted": "Unlisted", - "add_wallet": "No connected wallet, pleae add wallet.", + "add_wallet": "Add Wallet", + "add_wallet_to_connected": "No connected wallet, pleae add wallet.", "open_wallet": "You’ve switched off all wallets. Please go to settings to active.", "tip_persona_sign_success": "Persona signed successfully.", "tip_wallet_sign_error": "Wallet connection failed.", diff --git a/packages/shared/src/UI/components/NFTCard/index.tsx b/packages/shared/src/UI/components/NFTCard/index.tsx index b9303adc712a..241ea284d505 100644 --- a/packages/shared/src/UI/components/NFTCard/index.tsx +++ b/packages/shared/src/UI/components/NFTCard/index.tsx @@ -67,6 +67,7 @@ const useStyles = makeStyles<{ networkPluginID: NetworkPluginID }>()((theme, pro display: 'flex', justifyContent: 'center', alignItems: 'center', + borderRadius: 12, }, image: { width: 126, From 0be24b24a7e9c9bc2378d4aa638e01d9d5f47723 Mon Sep 17 00:00:00 2001 From: Randolph <840094513@qq.com> Date: Fri, 8 Jul 2022 20:36:26 +0800 Subject: [PATCH 4/8] feat: change nextId UI under web3 tab --- .../src/plugins/NextID/components/NextIdPage.tsx | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/mask/src/plugins/NextID/components/NextIdPage.tsx b/packages/mask/src/plugins/NextID/components/NextIdPage.tsx index 20ae7994a13f..5d4bf79ba397 100644 --- a/packages/mask/src/plugins/NextID/components/NextIdPage.tsx +++ b/packages/mask/src/plugins/NextID/components/NextIdPage.tsx @@ -221,21 +221,6 @@ export function NextIdPage({ persona }: NextIdPageProps) { ) } - if (!isAccountVerified && isOwn) { - return ( - - - {t.verify_Twitter_ID_intro()} - {t.verify_Twitter_ID()} - - - - - - - ) - } - return ( <> From d8de6aa0bc8cb201148b68727bb4c5e1e51fa481 Mon Sep 17 00:00:00 2001 From: Randolph <840094513@qq.com> Date: Sun, 10 Jul 2022 15:44:39 +0800 Subject: [PATCH 5/8] fix: address display of menu --- packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx b/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx index 247dca396a53..30a427edc761 100644 --- a/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx +++ b/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx @@ -123,8 +123,7 @@ 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 From e7c0a2ba9e36316db5f3bd1e9ae62de79a2bd98f Mon Sep 17 00:00:00 2001 From: Randolph <840094513@qq.com> Date: Sun, 10 Jul 2022 16:21:37 +0800 Subject: [PATCH 6/8] fix: copywriting of FindTruman --- packages/mask/shared-ui/locales/en-US.json | 3 ++- .../plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx | 9 ++++----- packages/mask/src/plugins/FindTruman/locales/en-US.json | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index 901f2b8d58de..b7eb9d8281f0 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_powered_by": "Powered By", + "plugin_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..092a3425ffad 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_powered_by')} - FindTruman + {i18N('plugin_find_truman')} Date: Sun, 10 Jul 2022 16:38:44 +0800 Subject: [PATCH 7/8] fix: donations and footprints display --- packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx | 7 +++++-- packages/plugins/RSS3/src/SNSAdaptor/index.tsx | 8 +------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx b/packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx index 30a427edc761..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 )} @@ -124,7 +127,7 @@ export function TabCard({ type, socialAddressList, persona }: TabCardProps) { return ( onSelect(x)}> {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 = { From 6bd1d9ea98fa1ede5403be365c9f2bfc5c3174a6 Mon Sep 17 00:00:00 2001 From: Randolph <840094513@qq.com> Date: Sun, 10 Jul 2022 16:54:30 +0800 Subject: [PATCH 8/8] feat: chang fundtruman copywriting --- packages/mask/shared-ui/locales/en-US.json | 4 ++-- .../src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json index b7eb9d8281f0..a1f4b2e197d1 100644 --- a/packages/mask/shared-ui/locales/en-US.json +++ b/packages/mask/shared-ui/locales/en-US.json @@ -421,8 +421,8 @@ "plugin_savings_withdraw": "Withdraw", "plugin_savings_process_deposit": "Processing Deposit", "plugin_savings_process_withdraw": "Processing Withdrawal", - "plugin_powered_by": "Powered By", - "plugin_find_truman": "FindTruman", + "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 092a3425ffad..6f2d69701e93 100644 --- a/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx +++ b/packages/mask/src/plugins/FindTruman/SNSAdaptor/FindTrumanDialog.tsx @@ -125,10 +125,10 @@ export function FindTrumanDialog(props: FindTrumanDialogProps) { color="textSecondary" fontSize={14} fontWeight={700}> - {i18N('plugin_powered_by')} + {i18N('plugin_findtruman_powered_by')} - {i18N('plugin_find_truman')} + {i18N('plugin_findtruman_find_truman')}