Skip to content

Commit

Permalink
fix: fixup share text (#10493)
Browse files Browse the repository at this point in the history
  • Loading branch information
UncleBill committed Aug 19, 2023
1 parent d9f4dba commit 7637179
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
11 changes: 6 additions & 5 deletions packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { ChainId, signMessage } from '@masknet/web3-shared-evm'
import { RedPacketStatus, type RedPacketJSONPayload } from '@masknet/web3-providers/types'
import { formatBalance, isZero, TokenType } from '@masknet/web3-shared-base'
import { NetworkPluginID, isFacebook, isTwitter } from '@masknet/shared-base'
import { ChainResolver, NetworkResolver } from '@masknet/web3-providers'
import { useChainContext, useNetworkContext } from '@masknet/web3-hooks-base'
import { ChainResolver } from '@masknet/web3-providers'
import { useChainContext, useNetwork, useNetworkContext } from '@masknet/web3-hooks-base'
import { TransactionConfirmModal } from '@masknet/shared'
import { usePostLink, useSiteAdaptorContext } from '@masknet/plugin-infra/content-script'
import { useI18N } from '../../locales/index.js'
Expand Down Expand Up @@ -135,7 +135,7 @@ export function RedPacket(props: RedPacketProps) {
const token = payload.token
const { pluginID } = useNetworkContext()
const payloadChainId = token?.chainId ?? ChainResolver.chainId(payload.network ?? '') ?? ChainId.Mainnet
const { account, networkType } = useChainContext<NetworkPluginID.PLUGIN_EVM>({
const { account } = useChainContext<NetworkPluginID.PLUGIN_EVM>({
chainId: payloadChainId,
account: pluginID === NetworkPluginID.PLUGIN_EVM ? undefined : '',
})
Expand All @@ -162,13 +162,14 @@ export function RedPacket(props: RedPacketProps) {
payloadChainId,
)

const network = useNetwork(pluginID, payload.chainId)
const shareText = useMemo(() => {
const isOnTwitter = isTwitter()
const isOnFacebook = isFacebook()
const shareTextOption = {
sender: payload.sender.name,
payload: postLink.toString(),
network: NetworkResolver.networkName(networkType) ?? 'Mainnet',
network: network?.name ?? 'Mainnet',
account: isTwitter() ? t.twitter_account() : t.facebook_account(),
interpolation: { escapeValue: false },
}
Expand All @@ -181,7 +182,7 @@ export function RedPacket(props: RedPacketProps) {
return isOnTwitter || isOnFacebook
? t.share_unclaimed_message_official_account(shareTextOption)
: t.share_unclaimed_message_not_twitter(shareTextOption)
}, [payload, postLink, networkType, claimTxHash, listOfStatus, t])
}, [payload, postLink, claimTxHash, listOfStatus, t, network?.name])

const [{ loading: isRefunding }, _isRefunded, refundCallback] = useRefundCallback(
payload.contract_version,
Expand Down
10 changes: 5 additions & 5 deletions packages/plugins/RedPacket/src/SiteAdaptor/RedPacketNft.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {
NFTFallbackImage,
TransactionConfirmModal,
} from '@masknet/shared'
import { useChainContext, useNetworkContext, useNonFungibleAsset } from '@masknet/web3-hooks-base'
import { NetworkResolver } from '@masknet/web3-providers'
import { useChainContext, useNetwork, useNetworkContext, useNonFungibleAsset } from '@masknet/web3-hooks-base'
import { TokenType } from '@masknet/web3-shared-base'
import { usePostLink, useSiteAdaptorContext } from '@masknet/plugin-infra/content-script'
import { NetworkPluginID, CrossIsolationMessages, Sniffings } from '@masknet/shared-base'
Expand Down Expand Up @@ -189,7 +188,7 @@ export function RedPacketNft({ payload }: RedPacketNftProps) {
const t = useI18N()

const { pluginID } = useNetworkContext()
const { account, networkType } = useChainContext<NetworkPluginID.PLUGIN_EVM>(
const { account } = useChainContext<NetworkPluginID.PLUGIN_EVM>(
pluginID === NetworkPluginID.PLUGIN_EVM ? {} : { account: '' },
)
const { share } = useSiteAdaptorContext()
Expand All @@ -210,6 +209,7 @@ export function RedPacketNft({ payload }: RedPacketNftProps) {
useEffect(() => {
retryAvailability()
}, [account])
const network = useNetwork(pluginID, payload.chainId)

const outdated = !!(availability?.isClaimedAll || availability?.isCompleted || availability?.expired)
const { classes, cx } = useStyles({ claimed: !!availability?.isClaimed, outdated })
Expand All @@ -221,7 +221,7 @@ export function RedPacketNft({ payload }: RedPacketNftProps) {
const options = {
sender: payload.senderName,
payload: postLink.toString(),
network: NetworkResolver.networkName(networkType) || '',
network: network?.name || '',
account_promote: t.account_promote({
context: isOnTwitter ? 'twitter' : isOnFacebook ? 'facebook' : 'default',
}),
Expand All @@ -231,7 +231,7 @@ export function RedPacketNft({ payload }: RedPacketNftProps) {
return t.nft_share_claimed_message(options)
}
return t.nft_share_foreshow_message(options)
}, [availability?.isClaimed, t])
}, [availability?.isClaimed, t, network?.name])

const onShare = useCallback(() => {
if (shareText) share?.(shareText)
Expand Down

0 comments on commit 7637179

Please sign in to comment.