Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/mask/shared-ui/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -126,10 +125,10 @@ export function FindTrumanDialog(props: FindTrumanDialogProps) {
color="textSecondary"
fontSize={14}
fontWeight={700}>
{i18N.powered_by()}
{i18N('plugin_findtruman_powered_by')}
</Typography>
<Typography variant="body1" color="textPrimary" fontSize={14} fontWeight={700}>
FindTruman
{i18N('plugin_findtruman_find_truman')}
</Typography>
<img
className={classes.icon}
Expand Down
3 changes: 2 additions & 1 deletion packages/mask/src/plugins/FindTruman/locales/en-US.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"powered_by": "Powered By"
"powered_by": "Powered By",
"find_truman": "FindTruman"
}
15 changes: 0 additions & 15 deletions packages/mask/src/plugins/NextID/components/NextIdPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -221,21 +221,6 @@ export function NextIdPage({ persona }: NextIdPageProps) {
)
}

if (!isAccountVerified && isOwn) {
return (
<Box>
<Box className={classes.tip}>
<Typography className={classes.verifyIntro}>{t.verify_Twitter_ID_intro()}</Typography>
<Typography className={classes.verifyDetail}>{t.verify_Twitter_ID()}</Typography>
</Box>

<Stack justifyContent="center" direction="row" mt="24px">
<Button onClick={onVerify}>{t.verify_Twitter_ID_button()}</Button>
</Stack>
</Box>
)
}

return (
<>
<Box className={classes.container}>
Expand Down
10 changes: 6 additions & 4 deletions packages/plugins/RSS3/src/SNSAdaptor/TabCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@ export function TabCard({ type, socialAddressList, persona }: TabCardProps) {
className={classes.button}>
{selectedAddress?.type === SocialAddressType.KV ||
selectedAddress?.type === SocialAddressType.ADDRESS ? (
<ReversedAddress address={selectedAddress.address} />
<ReversedAddress
address={selectedAddress.address}
pluginId={selectedAddress.networkSupporterPluginID}
/>
) : (
selectedAddress.label
)}
Expand All @@ -123,9 +126,8 @@ export function TabCard({ type, socialAddressList, persona }: TabCardProps) {
{uniqBy(socialAddressList ?? [], (x) => x.address.toLowerCase()).map((x) => {
return (
<MenuItem key={x.address} value={x.address} onClick={() => onSelect(x)}>
{selectedAddress?.type === SocialAddressType.KV ||
selectedAddress?.type === SocialAddressType.ADDRESS ? (
<ReversedAddress address={x.address} />
{x?.type === SocialAddressType.KV || x?.type === SocialAddressType.ADDRESS ? (
<ReversedAddress address={x.address} pluginId={x.networkSupporterPluginID} />
) : (
x.label
)}
Expand Down
8 changes: 1 addition & 7 deletions packages/plugins/RSS3/src/SNSAdaptor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@ function sorter(a: SocialAddress<NetworkPluginID>, z: SocialAddress<NetworkPlugi
}

function shouldDisplay(identity?: SocialIdentity, addressNames?: Array<SocialAddress<NetworkPluginID>>) {
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 = {
Expand Down