Skip to content

fix: kill no connect when no localkey #6352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jack-Works merged 1 commit into from
May 26, 2022
Merged

fix: kill no connect when no localkey #6352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 16 additions & 15 deletions packages/mask/src/components/CompositionDialog/EncryptionTargetSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,22 @@ export function EncryptionTargetSelector(props: EncryptionTargetSelectorProps) {
const { t } = useI18N()
const { classes } = useStyles()
const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null)
const e2eDisabledMessage = props.e2eDisabled ? (
<div className={classes.flex}>
<Typography className={classes.mainTitle}>{t('persona_required')}</Typography>
<Typography
className={classes.create}
onClick={() => {
if (props.e2eDisabled === E2EUnavailableReason.NoLocalKey) return
props.e2eDisabled === E2EUnavailableReason.NoPersona
? props.onCreatePersona()
: props.onConnectPersona()
}}>
{props.e2eDisabled === E2EUnavailableReason.NoPersona ? t('create') : t('connect')}
</Typography>
</div>
) : null
const e2eDisabledMessage =
props.e2eDisabled && props.e2eDisabled !== E2EUnavailableReason.NoLocalKey ? (
<div className={classes.flex}>
<Typography className={classes.mainTitle}>{t('persona_required')}</Typography>
<Typography
className={classes.create}
onClick={() => {
if (props.e2eDisabled === E2EUnavailableReason.NoLocalKey) return
props.e2eDisabled === E2EUnavailableReason.NoPersona
? props.onCreatePersona()
: props.onConnectPersona()
}}>
{props.e2eDisabled === E2EUnavailableReason.NoPersona ? t('create') : t('connect')}
</Typography>
</div>
) : null
const noLocalKeyMessage = props.e2eDisabled === E2EUnavailableReason.NoLocalKey && (
<div className={classes.flex}>
<Typography className={classes.mainTitle}>{t('compose_no_local_key')}</Typography>
Expand Down