From b66e06383fbcb23737c3547abc1899670628a3bc Mon Sep 17 00:00:00 2001 From: billy Date: Fri, 25 Feb 2022 17:36:05 +0800 Subject: [PATCH 01/24] feat: disable add btn when sns reach limit --- .../src/pages/Personas/components/PersonaCard/index.tsx | 1 + .../src/pages/Personas/components/PersonaLine/index.tsx | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx index 55cd06a623ad..d44fbf353d06 100644 --- a/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx +++ b/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx @@ -112,6 +112,7 @@ export const PersonaCardUI = memo((props) => { return ( = 5} key={networkIdentifier} onConnect={() => onConnect(identifier, networkIdentifier)} onDisconnect={onDisconnect} diff --git a/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx index 6af75bd51342..5017b9700274 100644 --- a/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx +++ b/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx @@ -57,10 +57,11 @@ export interface ConnectedPersonaLineProps { onDisconnect: (identifier: ProfileIdentifier) => void profileIdentifiers: ProfileIdentifier[] networkIdentifier: string + disableAdd?: boolean } export const ConnectedPersonaLine = memo( - ({ profileIdentifiers, onConnect, onDisconnect, networkIdentifier, isHideOperations }) => { + ({ profileIdentifiers, onConnect, onDisconnect, networkIdentifier, isHideOperations, disableAdd }) => { const t = useDashboardI18N() const { openProfilePage } = PersonaContext.useContainer() const { classes } = useStyles() @@ -98,6 +99,7 @@ export const ConnectedPersonaLine = memo( {!isHideOperations && ( Date: Mon, 28 Feb 2022 11:59:45 +0800 Subject: [PATCH 02/24] fix: disable add --- .../src/pages/Personas/components/PersonaCard/Row.tsx | 1 + .../src/pages/Personas/components/PersonaCard/index.tsx | 1 - .../src/pages/Personas/components/PersonaLine/index.tsx | 9 ++++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/dashboard/src/pages/Personas/components/PersonaCard/Row.tsx b/packages/dashboard/src/pages/Personas/components/PersonaCard/Row.tsx index 7ae22ff78561..868a222c9882 100644 --- a/packages/dashboard/src/pages/Personas/components/PersonaCard/Row.tsx +++ b/packages/dashboard/src/pages/Personas/components/PersonaCard/Row.tsx @@ -177,6 +177,7 @@ export const PersonaRowCardUI = memo((props) => { } else { return ( = 5} isHideOperations={false} key={networkIdentifier} onConnect={() => onConnect(identifier, networkIdentifier)} diff --git a/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx index d44fbf353d06..55cd06a623ad 100644 --- a/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx +++ b/packages/dashboard/src/pages/Personas/components/PersonaCard/index.tsx @@ -112,7 +112,6 @@ export const PersonaCardUI = memo((props) => { return ( = 5} key={networkIdentifier} onConnect={() => onConnect(identifier, networkIdentifier)} onDisconnect={onDisconnect} diff --git a/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx index 5017b9700274..dbd0e5049421 100644 --- a/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx +++ b/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx @@ -17,6 +17,10 @@ const useStyles = makeStyles()((theme) => ({ link: { height: 28, }, + disabled: { + opacity: 0.6, + pointerEvents: 'none', + }, })) export interface UnconnectedPersonaLineProps { onConnect: () => void @@ -71,7 +75,7 @@ export const ConnectedPersonaLine = memo( const handleUserIdClick = async (network: string, userId: string) => { await openProfilePage(network, userId) } - + console.log(disableAdd, 'ffff') return ( ( {!isHideOperations && ( { From c3f53c4c3a28c473ef33277a4ec60e5f2903eea7 Mon Sep 17 00:00:00 2001 From: billy Date: Mon, 28 Feb 2022 13:50:03 +0800 Subject: [PATCH 03/24] fix: add persona add --- .../Personas/components/PersonaLine/index.tsx | 17 ++++++++++++-- .../icons/general/NextIdPersonaVerfied.tsx | 19 ++++++++++++++++ .../icons/general/NextIdPersonaWarning.tsx | 22 +++++++++++++++++++ packages/icons/general/index.ts | 2 ++ 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 packages/icons/general/NextIdPersonaVerfied.tsx create mode 100644 packages/icons/general/NextIdPersonaWarning.tsx diff --git a/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx index dbd0e5049421..eaaeae22fed6 100644 --- a/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx +++ b/packages/dashboard/src/pages/Personas/components/PersonaLine/index.tsx @@ -6,6 +6,7 @@ import { DisconnectProfileDialog } from '../DisconnectProfileDialog' import type { ProfileIdentifier } from '@masknet/shared-base' import { SOCIAL_MEDIA_ICON_MAPPING } from '@masknet/shared' import { PersonaContext } from '../../hooks/usePersonaContext' +import { NextIdPersonaWarningIcon, NextIdPersonaVerifiedIcon } from '@masknet/icons' const useStyles = makeStyles()((theme) => ({ connect: { @@ -21,6 +22,11 @@ const useStyles = makeStyles()((theme) => ({ opacity: 0.6, pointerEvents: 'none', }, + userIdBox: { + display: 'flex', + alignItems: 'center', + gap: theme.spacing(0.5), + }, })) export interface UnconnectedPersonaLineProps { onConnect: () => void @@ -75,7 +81,14 @@ export const ConnectedPersonaLine = memo( const handleUserIdClick = async (network: string, userId: string) => { await openProfilePage(network, userId) } - console.log(disableAdd, 'ffff') + const userIdBox = (id: string, verify: boolean) => { + return ( +
+
@{id}
+ {verify ? : } +
+ ) + } return ( ( key={x.userId} onClick={() => handleUserIdClick(networkIdentifier, x.userId)} sx={{ color: MaskColorVar.textPrimary, fontSize: 13, mr: 1, cursor: 'pointer' }}> - @{x.userId} + {userIdBox(x.userId, true)} ))} diff --git a/packages/icons/general/NextIdPersonaVerfied.tsx b/packages/icons/general/NextIdPersonaVerfied.tsx new file mode 100644 index 000000000000..471d84f8416a --- /dev/null +++ b/packages/icons/general/NextIdPersonaVerfied.tsx @@ -0,0 +1,19 @@ +import { createIcon } from '../utils' +import type { SvgIcon } from '@mui/material' + +export const NextIdPersonaVerifiedIcon: typeof SvgIcon = createIcon( + 'NextIdPersonaVerified', + + + + , + '0 0 16 16', +) diff --git a/packages/icons/general/NextIdPersonaWarning.tsx b/packages/icons/general/NextIdPersonaWarning.tsx new file mode 100644 index 000000000000..e9a6f8c80c8d --- /dev/null +++ b/packages/icons/general/NextIdPersonaWarning.tsx @@ -0,0 +1,22 @@ +import { createIcon } from '../utils' +import type { SvgIcon } from '@mui/material' + +export const NextIdPersonaWarningIcon: typeof SvgIcon = createIcon( + 'NextIdPersonaWarning', + + + + + , + '0 0 16 16', +) diff --git a/packages/icons/general/index.ts b/packages/icons/general/index.ts index 53d34c78d71c..4a7dd23302db 100644 --- a/packages/icons/general/index.ts +++ b/packages/icons/general/index.ts @@ -89,3 +89,5 @@ export * from './Cram' export * from './TriangleWarning' export * from './OpenSeaColoredIcon' export * from './Collectible' +export * from './NextIdPersonaVerfied' +export * from './NextIdPersonaWarning' From 527d2b7f69f7ed6c69279e6469ef57ed8cfc814d Mon Sep 17 00:00:00 2001 From: billy Date: Mon, 28 Feb 2022 15:37:34 +0800 Subject: [PATCH 04/24] fix: change opensea.io to opensea in persona page --- .../src/pages/Personas/components/PersonaSetup/index.tsx | 2 +- packages/dashboard/src/pages/Personas/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dashboard/src/pages/Personas/components/PersonaSetup/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaSetup/index.tsx index 66806d56f944..50670ba9fe2b 100644 --- a/packages/dashboard/src/pages/Personas/components/PersonaSetup/index.tsx +++ b/packages/dashboard/src/pages/Personas/components/PersonaSetup/index.tsx @@ -40,7 +40,7 @@ export const PersonaSetup = memo(({ networkIdentifier, onConnect }: PersonaSetup - {t.personas_setup_connect_tips({ type: networkIdentifier.replace('.com', '') })} + {t.personas_setup_connect_tips({ type: networkIdentifier.split('.')[0] })}