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
19 changes: 14 additions & 5 deletions packages/mask/popups/pages/Wallet/SyncTwitterCookies/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Trans, useLingui } from '@lingui/react/macro'
import { CopyButton, FormattedAddress } from '@masknet/shared'
import { PersistentStorages } from '@masknet/shared-base'
import { makeStyles, useSnackbar } from '@masknet/theme'
import { makeStyles, usePopupCustomSnackbar } from '@masknet/theme'
import { formatEthereumAddress } from '@masknet/web3-shared-evm'
import { Box, Typography } from '@mui/material'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
Expand All @@ -14,6 +14,7 @@ import { useAsyncFn, useInterval } from 'react-use'
import { WalletAvatar } from '../../../components/WalletAvatar/index.js'
import { useTitle, useTokenParams } from '../../../hooks/index.js'
import Services from '#services'
import { Icons } from '@masknet/icons'

// Generate a 6-digit crypto key for encryption
function generateCryptoKey(): string {
Expand Down Expand Up @@ -240,7 +241,7 @@ export const Component = memo(function SyncTwitterCookies() {
const navigate = useNavigate()
const [params] = useSearchParams()
const fireflyAccount = useSubscription(PersistentStorages.Settings.storage.firefly_account.subscription)
const { enqueueSnackbar } = useSnackbar()
const { showSnackbar } = usePopupCustomSnackbar()

useTitle(t`Connect your Firefly App`)

Expand Down Expand Up @@ -363,10 +364,18 @@ export const Component = memo(function SyncTwitterCookies() {
await Services.Helper.syncTwitterCookies(session, cryptoKey, encryptedPayload, accessToken)

setChannelStatus(DesktopSyncChannelStatus.DataReady)
enqueueSnackbar(t`Twitter cookies synced successfully`, { variant: 'success' })
showSnackbar(
<Box display="flex" alignItems="center" gap="10px">
<Icons.FillSuccess size={16} />
<Trans>You have successfully logged in</Trans>
</Box>,
{
variant: 'success',
},
)
navigate(-1)
} catch (err) {
enqueueSnackbar((err as Error).message || t`Login failed. Please try again`, { variant: 'error' })
showSnackbar((err as Error).message || t`Login failed. Please try again`, { variant: 'error' })
}
}, [session, cryptoKey, accessToken, fireflyAccount])

Expand Down Expand Up @@ -400,7 +409,7 @@ export const Component = memo(function SyncTwitterCookies() {
if (session) setInvalidMap((x) => ({ ...x, [session]: true }))
}
} catch (error_) {
enqueueSnackbar((error_ as Error).message || t`Network error. Please try again later.`, {
showSnackbar((error_ as Error).message || t`Network error. Please try again later.`, {
variant: 'error',
})
}
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-base-ui/src/locale/en-US.json

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions packages/shared-base-ui/src/locale/en-US.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/shared-base-ui/src/locale/ja-JP.json

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions packages/shared-base-ui/src/locale/ja-JP.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/shared-base-ui/src/locale/ko-KR.json

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions packages/shared-base-ui/src/locale/ko-KR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/shared-base-ui/src/locale/zh-CN.json

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions packages/shared-base-ui/src/locale/zh-CN.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/shared-base-ui/src/locale/zh-TW.json

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions packages/shared-base-ui/src/locale/zh-TW.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/theme/src/Components/Snackbar/PopupSnackbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const useStyles = makeStyles()((theme) => ({
title: {
lineHeight: '18px',
padding: '0 8px',
display: 'flex',
alignItems: 'center',
},
message: {
textOverflow: 'ellipsis',
Expand Down