Skip to content
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

Jump to bottom

fix: mf-5988 no need to check lock status and payment in persona page #11311

Merged
merged 1 commit into from
Jan 25, 2024
Merged

fix: mf-5988 no need to check lock status and payment in persona page #11311

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 3 additions & 26 deletions packages/mask/popups/pages/Personas/Home/UI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
import { Icons } from '@masknet/icons'
import { PopupHomeTabType, useParamTab } from '@masknet/shared'
import {
LockStatus,
PopupModalRoutes,
PopupRoutes,
currentMaskWalletLockStatusSettings,
type EnhanceableSite,
type ProfileAccount,
} from '@masknet/shared-base'
import { PopupModalRoutes, PopupRoutes, type EnhanceableSite, type ProfileAccount } from '@masknet/shared-base'
import { MaskTabList, makeStyles } from '@masknet/theme'
import { TabContext, TabPanel } from '@mui/lab'
import { Box, Tab, Typography, useTheme } from '@mui/material'
import { memo, useCallback } from 'react'
import { memo } from 'react'
import { useNavigate } from 'react-router-dom'
import urlcat from 'urlcat'
import { useMaskSharedTrans } from '../../../../shared-ui/index.js'
import { ConnectedWallet } from '../../../components/ConnectedWallet/index.js'
import { PersonaAvatar } from '../../../components/PersonaAvatar/index.js'
Expand Down Expand Up @@ -199,7 +191,6 @@ export const PersonaHomeUI = memo<PersonaHomeUIProps>(
onAccountClick,
bindingWallets,
hasProofs,
hasPaymentPassword,
}) => {
const theme = useTheme()
const t = useMaskSharedTrans()
Expand All @@ -209,20 +200,6 @@ export const PersonaHomeUI = memo<PersonaHomeUIProps>(

const [currentTab, onChange] = useParamTab<PopupHomeTabType>(PopupHomeTabType.SocialAccounts)

const onChangeTab = useCallback(
(event: object, value: PopupHomeTabType) => {
if (
currentMaskWalletLockStatusSettings.value === LockStatus.LOCKED &&
value === PopupHomeTabType.ConnectedWallets &&
hasPaymentPassword
) {
navigate(urlcat(PopupRoutes.Wallet, { from: PopupRoutes.Personas, goBack: true, popup: true }))
return
}
onChange(event, value)
},
[hasPaymentPassword],
)
return (
<div className={classes.container}>
{!isEmpty ?
Expand Down Expand Up @@ -263,7 +240,7 @@ export const PersonaHomeUI = memo<PersonaHomeUIProps>(
</Box>

<MaskTabList
onChange={onChangeTab}
onChange={onChange}
aria-label="persona-tabs"
classes={{ root: classes.tabs, grouped: classes.groupedButton }}>
<Tab label={t.popups_social_account()} value={PopupHomeTabType.SocialAccounts} />
Expand Down