Skip to content

Commit 2a14645

Browse files
authored
feat: cleanup unused code (#12261)
* feat(redpacket): cleanup unused code in SolanaRedPacketCard - remove unused imports and variables - simplify dependencies in claimedShareText - refine callback dependencies * refactor(redpacket): remove unused variables and optimize hook dependencies
1 parent ef753b7 commit 2a14645

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,9 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
106106
// #region remote controlled transaction dialog
107107
const postLink = usePostLink()
108108

109-
const [{ loading: isClaiming, value: claimTxHash }, claimCallback] = useClaimCallback(account, payload)
109+
const [{ loading: isClaiming }, claimCallback] = useClaimCallback(account, payload)
110110
const source = usePostInfoDetails.source()
111-
const platform = source?.toLowerCase()
112111
const postUrl = usePostInfoDetails.url()
113-
const handle = usePostInfoDetails.handle()
114112
const link = postLink.toString() || postUrl?.toString()
115113
const isFireflyRedpacket = useIsFireflyRedpacket()
116114
const postId = usePostInfoDetails.postID()
@@ -135,7 +133,7 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
135133
_(msg`${claimed} Follow @${shareTextOption.account} (mask.io) to claim lucky drops.`) +
136134
`\n${promote_short}\n#mask_io #LuckyDrop\n${shareTextOption.payload}`
137135
: `${claimed}\n${promote_short}\n${shareTextOption.payload}`
138-
}, [payload, link, claimTxHash, network?.name, platform, handle, _])
136+
}, [payload, link, network?.name, _])
139137

140138
const [{ loading: isRefunding }, _isRefunded, refundCallback] = useRefundCallback(
141139
payload.contract_version,
@@ -162,7 +160,7 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
162160
title: _(msg`Lucky Drop`),
163161
share: (text) => share?.(text, source ? source : undefined),
164162
})
165-
}, [token, redPacketContract, payload.rpid, account, claimedShareText, source])
163+
}, [redPacketContract.methods, payload.rpid, account, claimedShareText, token, _, source])
166164

167165
const [showRequirements, setShowRequirements] = useState(false)
168166
const onClaimOrRefund = useCallback(async () => {
@@ -184,7 +182,7 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
184182
if (typeof hash === 'string') {
185183
checkAvailability()
186184
}
187-
}, [canClaim, canRefund, claimCallback, checkResult, recheckClaimStatus, checkAvailability])
185+
}, [canClaim, canRefund, recheckClaimStatus, claimCallback, checkResult, refundCallback, checkAvailability])
188186

189187
const outdated = isEmpty || (!canRefund && listOfStatus.includes(RedPacketStatus.expired))
190188

packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedPacket/SolanaRedPacketCard.tsx

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@ import { LoadingStatus, TransactionConfirmModal } from '@masknet/shared'
77
import { type NetworkPluginID, Sniffings } from '@masknet/shared-base'
88
import { queryClient } from '@masknet/shared-base-ui'
99
import { makeStyles } from '@masknet/theme'
10-
import {
11-
NetworkContextProvider,
12-
SOLWeb3ContextProvider,
13-
useChainContext,
14-
useNetwork,
15-
useNetworkContext,
16-
} from '@masknet/web3-hooks-base'
10+
import { NetworkContextProvider, SOLWeb3ContextProvider, useChainContext } from '@masknet/web3-hooks-base'
1711
import { SolanaChainResolver } from '@masknet/web3-providers'
1812
import { RedPacketStatus, type SolanaRedPacketJSONPayload } from '@masknet/web3-providers/types'
1913
import { TokenType, formatBalance, minus } from '@masknet/web3-shared-base'
@@ -71,7 +65,6 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
7165
}: SolanaRedPacketCardProps) {
7266
const { _ } = useLingui()
7367
const token = payload.token
74-
const { pluginID } = useNetworkContext()
7568

7669
const payloadChainId = token?.chainId ?? SolanaChainResolver.chainId(payload.network ?? '') ?? ChainId.Mainnet
7770
const { account } = useChainContext<NetworkPluginID.PLUGIN_SOLANA>()
@@ -90,15 +83,11 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
9083
// #region remote controlled transaction dialog
9184
const postLink = usePostLink()
9285

93-
const [{ loading: isClaiming, value: claimTxHash }, claimCallback] = useClaimCallback(payload)
86+
const [{ loading: isClaiming }, claimCallback] = useClaimCallback(payload)
9487
const source = usePostInfoDetails.source()
95-
const platform = source?.toLowerCase()
9688
const postUrl = usePostInfoDetails.url()
9789
const link = postLink.toString() || postUrl?.toString()
9890

99-
// TODO payload.chainId is undefined on production mode
100-
const network = useNetwork(pluginID, payload.chainId || payload.token?.chainId)
101-
10291
const claimedShareText = useMemo(() => {
10392
const promote_short = _(msg`🧧🧧🧧 Try sending Lucky Drop to your friends with Mask.io.`)
10493
const isOnTwitter = Sniffings.is_twitter_page
@@ -111,7 +100,7 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
111100
_(msg`${claimed} Follow @${account} (mask.io) to claim lucky drops.`) +
112101
`\n${promote_short}\n#mask_io #LuckyDrop\n${link}`
113102
: `${claimed}\n${promote_short}\n${link}`
114-
}, [payload, link, claimTxHash, network?.name, platform, _])
103+
}, [payload, link, _])
115104

116105
const [{ loading: isClaimingAndChecking }, onClaimOrRefund] = useAsyncFn(async () => {
117106
let hash: string | undefined
@@ -148,7 +137,7 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
148137
if (typeof hash === 'string') {
149138
refreshRedPacket()
150139
}
151-
}, [canClaim, canRefund, claimCallback, refreshRedPacket, payload.rpid, account])
140+
}, [canClaim, claimCallback, payload, account, claimedShareText, token, _, source, refreshRedPacket])
152141

153142
const outdated = availability?.isEmpty || (!canRefund && listOfStatus.includes(RedPacketStatus.expired))
154143

0 commit comments

Comments
 (0)