diff --git a/package.json b/package.json index 4e41f2bac220..a0dc2eebd474 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "yarn": ">=999.0.0", "npm": ">=999.0.0" }, - "version": "2.29.2", + "version": "2.29.3", "private": true, "license": "AGPL-3.0-or-later", "scripts": { diff --git a/packages/mask/content-script/site-adaptor-infra/utils/create-post-context.ts b/packages/mask/content-script/site-adaptor-infra/utils/create-post-context.ts index b50b2c20f8b6..566ff6a4f941 100644 --- a/packages/mask/content-script/site-adaptor-infra/utils/create-post-context.ts +++ b/packages/mask/content-script/site-adaptor-infra/utils/create-post-context.ts @@ -78,12 +78,12 @@ export function createSiteAdaptorSpecializedPostContext(site: EnhanceableSite, a const version = new ValueRef(undefined) return { author: author.author, - source: null, handle: NULL, coAuthors: opt.coAuthors, avatarURL: author.avatarURL, nickname: author.nickname, site, + source: opt.source, postID: author.postID, get rootNode() { diff --git a/packages/mask/content-script/site-adaptors/twitter.com/collecting/post.ts b/packages/mask/content-script/site-adaptors/twitter.com/collecting/post.ts index e26dbbd41650..ee572f9e4d42 100644 --- a/packages/mask/content-script/site-adaptors/twitter.com/collecting/post.ts +++ b/packages/mask/content-script/site-adaptors/twitter.com/collecting/post.ts @@ -93,6 +93,7 @@ function registerPostCollectorInner( isFocusing: isDetailTweet(tweetNode), suggestedInjectionPoint: tweetNode, ...refs.subscriptions, + source: 'Twitter', }) function run() { collectPostInfo(tweetNode, refs, cancel) diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx index f4deaeb7b768..ade25fb91b2a 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx +++ b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx @@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro' import { NetworkIcon, TokenIcon } from '@masknet/shared' import { NetworkPluginID } from '@masknet/shared-base' import { makeStyles } from '@masknet/theme' -import { formatBalance, type FungibleToken } from '@masknet/web3-shared-base' +import { formatBalance, isZero, type FungibleToken } from '@masknet/web3-shared-base' import { type ChainId, type SchemaType } from '@masknet/web3-shared-evm' import { Typography } from '@mui/material' import type { HTMLProps } from 'react' @@ -160,6 +160,7 @@ export function RedPacketEnvelope({ ...props }: Props) { const { classes, cx } = useStyles() + const claimedZero = isZero(claimedAmount) return (
@@ -181,18 +182,25 @@ export function RedPacketEnvelope({ chainId={token.chainId} />
- - {isClaimed ? - formatBalance(claimedAmount, token.decimals) - : `${formatBalance(totalClaimed, token.decimals)} / ${formatBalance(total, token.decimals)}` - }{' '} - {token.symbol} - + {isClaimed ? + + {claimedZero ? + You have already claimed this lucky drop. + : `${formatBalance(claimedAmount, token.decimals)} ${token.symbol}`} + + : + {`${formatBalance(totalClaimed, token.decimals)} / ${formatBalance(total, token.decimals)} `} + {token.symbol} + + }
{isClaimed ? - - Congratulations! - + claimedZero ? + null + : + Congratulations! + + : isEmpty ? <>
diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/index.tsx b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/index.tsx index e18710d7add3..47ac816e983a 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/index.tsx +++ b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/index.tsx @@ -100,7 +100,7 @@ export const RedPacket = memo(function RedPacket({ payload }: RedPacketProps) { const [{ loading: isClaiming, value: claimTxHash }, claimCallback] = useClaimCallback(account, payload) const site = usePostInfoDetails.site() const source = usePostInfoDetails.source() - const platform = source?.toLowerCase() as 'lens' | 'farcaster' + const platform = source?.toLowerCase() const isOnFirefly = site === EnhanceableSite.Firefly const postUrl = usePostInfoDetails.url() const handle = usePostInfoDetails.handle() diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useParseRedPacket.ts b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useParseRedPacket.ts index ab6cee30f62f..f468ddd5bd51 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useParseRedPacket.ts +++ b/packages/plugins/RedPacket/src/SiteAdaptor/hooks/useParseRedPacket.ts @@ -1,10 +1,9 @@ import { useLastRecognizedIdentity, usePostInfoPostMetadataImages, - usePostInfoSite, usePostInfoSource, } from '@masknet/plugin-infra/content-script' -import { EnhanceableSite, NetworkPluginID } from '@masknet/shared-base' +import { NetworkPluginID } from '@masknet/shared-base' import { useChainContext, useNetworkContext } from '@masknet/web3-hooks-base' import { FireflyRedPacket } from '@masknet/web3-providers' import type { FireflyRedPacketAPI } from '@masknet/web3-providers/types' @@ -25,12 +24,10 @@ export function useParseRedPacket(chainId: ChainId) { const source = usePostInfoSource() const me = useLastRecognizedIdentity() const myProfileId = me?.profileId - const site = usePostInfoSite() - const isOnFirefly = site === EnhanceableSite.Firefly const query = useQuery({ - enabled: images.length > 0 && isOnFirefly, - queryKey: ['red-packet', 'parse', source, images[0], account], + enabled: images.length > 0, + queryKey: ['red-packet', 'parse', source?.toLowerCase(), images[0], account], queryFn: async () => { const platform = source?.toLowerCase() as FireflyRedPacketAPI.PlatformType return FireflyRedPacket.parse({ diff --git a/packages/plugins/RedPacket/src/locale/en-US.json b/packages/plugins/RedPacket/src/locale/en-US.json index 87fe61eb1328..93b984b9fdba 100644 --- a/packages/plugins/RedPacket/src/locale/en-US.json +++ b/packages/plugins/RedPacket/src/locale/en-US.json @@ -201,6 +201,7 @@ "nJMj1z": ["You could refund ", ["0"], " ", ["1"], "."], "cBEQ5v": ["You got ", ["0"], " ", ["1"]], "0UMPI1": ["You got 1 ", ["0"]], + "MCw2oc": "You have already claimed this lucky drop.", "zEZe86": "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." } } diff --git a/packages/plugins/RedPacket/src/locale/en-US.po b/packages/plugins/RedPacket/src/locale/en-US.po index a4ee728e322f..dfa7c96b97ff 100644 --- a/packages/plugins/RedPacket/src/locale/en-US.po +++ b/packages/plugins/RedPacket/src/locale/en-US.po @@ -653,6 +653,10 @@ msgstr "" msgid "You got 1 {0}" msgstr "" +#: src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx +msgid "You have already claimed this lucky drop." +msgstr "" + #: src/SiteAdaptor/NftRedPacketHistoryList.tsx msgid "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." msgstr "" diff --git a/packages/plugins/RedPacket/src/locale/ja-JP.json b/packages/plugins/RedPacket/src/locale/ja-JP.json index 567f42525665..d1fc768a3fd6 100644 --- a/packages/plugins/RedPacket/src/locale/ja-JP.json +++ b/packages/plugins/RedPacket/src/locale/ja-JP.json @@ -200,6 +200,7 @@ "nJMj1z": [["0"], " ", ["1"], " を返金することができます。"], "cBEQ5v": ["You got ", ["0"], " ", ["1"]], "0UMPI1": ["You got 1 ", ["0"]], + "MCw2oc": "You have already claimed this lucky drop.", "zEZe86": "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." } } diff --git a/packages/plugins/RedPacket/src/locale/ja-JP.po b/packages/plugins/RedPacket/src/locale/ja-JP.po index ae59ecba58ba..bb1c4098ca87 100644 --- a/packages/plugins/RedPacket/src/locale/ja-JP.po +++ b/packages/plugins/RedPacket/src/locale/ja-JP.po @@ -658,6 +658,10 @@ msgstr "" msgid "You got 1 {0}" msgstr "" +#: src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx +msgid "You have already claimed this lucky drop." +msgstr "" + #: src/SiteAdaptor/NftRedPacketHistoryList.tsx msgid "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." msgstr "" diff --git a/packages/plugins/RedPacket/src/locale/ko-KR.json b/packages/plugins/RedPacket/src/locale/ko-KR.json index 3c719c01d282..b95692e2db61 100644 --- a/packages/plugins/RedPacket/src/locale/ko-KR.json +++ b/packages/plugins/RedPacket/src/locale/ko-KR.json @@ -201,6 +201,7 @@ "nJMj1z": [["0"], " ", ["1"], " 리펀 가능합니다."], "cBEQ5v": ["You got ", ["0"], " ", ["1"]], "0UMPI1": ["You got 1 ", ["0"]], + "MCw2oc": "You have already claimed this lucky drop.", "zEZe86": "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." } } diff --git a/packages/plugins/RedPacket/src/locale/ko-KR.po b/packages/plugins/RedPacket/src/locale/ko-KR.po index e779192db58b..561a0dec448e 100644 --- a/packages/plugins/RedPacket/src/locale/ko-KR.po +++ b/packages/plugins/RedPacket/src/locale/ko-KR.po @@ -658,6 +658,10 @@ msgstr "" msgid "You got 1 {0}" msgstr "" +#: src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx +msgid "You have already claimed this lucky drop." +msgstr "" + #: src/SiteAdaptor/NftRedPacketHistoryList.tsx msgid "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." msgstr "" diff --git a/packages/plugins/RedPacket/src/locale/zh-CN.json b/packages/plugins/RedPacket/src/locale/zh-CN.json index 7a1e1b56213c..799780de5e12 100644 --- a/packages/plugins/RedPacket/src/locale/zh-CN.json +++ b/packages/plugins/RedPacket/src/locale/zh-CN.json @@ -201,6 +201,7 @@ "nJMj1z": ["您可以退款 ", ["0"], " ", ["1"], "。"], "cBEQ5v": ["You got ", ["0"], " ", ["1"]], "0UMPI1": ["You got 1 ", ["0"]], + "MCw2oc": "You have already claimed this lucky drop.", "zEZe86": "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." } } diff --git a/packages/plugins/RedPacket/src/locale/zh-CN.po b/packages/plugins/RedPacket/src/locale/zh-CN.po index d348588c6517..282bb1f7121e 100644 --- a/packages/plugins/RedPacket/src/locale/zh-CN.po +++ b/packages/plugins/RedPacket/src/locale/zh-CN.po @@ -658,6 +658,10 @@ msgstr "" msgid "You got 1 {0}" msgstr "" +#: src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx +msgid "You have already claimed this lucky drop." +msgstr "" + #: src/SiteAdaptor/NftRedPacketHistoryList.tsx msgid "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." msgstr "" diff --git a/packages/plugins/RedPacket/src/locale/zh-TW.json b/packages/plugins/RedPacket/src/locale/zh-TW.json index debc1b0a314d..ce6359bb4b6a 100644 --- a/packages/plugins/RedPacket/src/locale/zh-TW.json +++ b/packages/plugins/RedPacket/src/locale/zh-TW.json @@ -201,6 +201,7 @@ "nJMj1z": ["您可以退款 ", ["0"], " ", ["1"], "。"], "cBEQ5v": ["You got ", ["0"], " ", ["1"]], "0UMPI1": ["You got 1 ", ["0"]], + "MCw2oc": "You have already claimed this lucky drop.", "zEZe86": "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." } } diff --git a/packages/plugins/RedPacket/src/locale/zh-TW.po b/packages/plugins/RedPacket/src/locale/zh-TW.po index deb9037d2138..750d597ad6c5 100644 --- a/packages/plugins/RedPacket/src/locale/zh-TW.po +++ b/packages/plugins/RedPacket/src/locale/zh-TW.po @@ -658,6 +658,10 @@ msgstr "" msgid "You got 1 {0}" msgstr "" +#: src/SiteAdaptor/RedPacket/RedPacketEnvelope.tsx +msgid "You have already claimed this lucky drop." +msgstr "" + #: src/SiteAdaptor/NftRedPacketHistoryList.tsx msgid "You haven't created any NFT lucky drop yet. Try to create one and share fortune with your friends." msgstr ""