Skip to content

Commit c0bcbc7

Browse files
committed
fix: remove legacy redpacket dialog
1 parent 241b8d8 commit c0bcbc7

File tree

22 files changed

+602
-76
lines changed

22 files changed

+602
-76
lines changed

packages/mask/shared-ui/initialization/fetch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function canAccessAsContent(url: string) {
6060
if (target.origin.includes('maskbook-backup')) return true
6161
if (isHostName(location, 'mirror.xyz') && isHostName(target, 'mirror-api.com')) return true
6262
// aws s3
63-
if (target.origin.includes('amazonaws.com') && url.includes('x-id=PutObject')) return true
63+
if (isDomainOrSubdomainOf('amazonaws.com') && url.includes('x-id=PutObject')) return true
6464
if (extensionOrigin === target.origin) return true
6565
return target.origin === location.origin
6666
}

packages/plugins/RedPacket/src/SiteAdaptor/RedPacketInjection.tsx

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,32 @@
1-
import { CrossIsolationMessages, type PluginID } from '@masknet/shared-base'
1+
import { CrossIsolationMessages } from '@masknet/shared-base'
22
import { createContext, useCallback, useEffect, useState } from 'react'
33

44
import type { CompositionType } from '@masknet/plugin-infra/content-script'
55
import { EVMWeb3ContextProvider } from '@masknet/web3-hooks-base'
6-
import type { FireflyContext } from '../types.js'
7-
import RedPacketDialog from './RedPacketDialog.js'
86
import { RedPacketMainDialog } from './MainDialog.js'
97

108
export const CompositionTypeContext = createContext<CompositionType>('timeline')
119

1210
export function RedPacketInjection() {
1311
const [open, setOpen] = useState(false)
14-
const [source, setSource] = useState<PluginID>()
1512
const [compositionType, setCompositionType] = useState<CompositionType>('timeline')
1613

17-
const [fireflyContext, setFireflyContext] = useState<FireflyContext>()
1814
useEffect(() => {
19-
return CrossIsolationMessages.events.redpacketDialogEvent.on(
20-
({ open, source: pluginId, fireflyContext, compositionType = 'timeline' }) => {
21-
setOpen(open)
22-
setSource(pluginId)
23-
setFireflyContext(fireflyContext)
24-
setCompositionType(compositionType)
25-
},
26-
)
15+
return CrossIsolationMessages.events.redpacketDialogEvent.on(({ open, compositionType = 'timeline' }) => {
16+
setOpen(open)
17+
setCompositionType(compositionType)
18+
})
2719
}, [])
2820

2921
const handleClose = useCallback(() => {
3022
setOpen(false)
3123
}, [])
3224

33-
const [status, setStatus] = useState(false)
34-
useEffect(() => {
35-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
36-
// @ts-ignore
37-
window.toggleRedPacketDialog = () => {
38-
setStatus((v) => !v)
39-
}
40-
}, [])
41-
4225
if (!open) return null
4326
return (
4427
<EVMWeb3ContextProvider>
4528
<CompositionTypeContext value={compositionType}>
46-
{status ?
47-
<RedPacketDialog open onClose={handleClose} source={source} fireflyContext={fireflyContext} />
48-
: <RedPacketMainDialog open onClose={handleClose} />}
29+
<RedPacketMainDialog open onClose={handleClose} />
4930
</CompositionTypeContext>
5031
</EVMWeb3ContextProvider>
5132
)

packages/plugins/RedPacket/src/locale/en-US.json

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)