Skip to content

Commit be6ff34

Browse files
guanbinruiguanbinrui
authored
[Release] Hotfix 2.31.2 => 2.31.3 (patch) (#12095)
1 parent c4b250e commit be6ff34

File tree

12 files changed

+63
-120
lines changed

12 files changed

+63
-120
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"yarn": ">=999.0.0",
99
"npm": ">=999.0.0"
1010
},
11-
"version": "2.31.1",
11+
"version": "2.31.3",
1212
"private": true,
1313
"license": "AGPL-3.0-or-later",
1414
"scripts": {

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

+5-40
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { msg } from '@lingui/core/macro'
22
import { useLingui } from '@lingui/react'
3-
import { useLastRecognizedIdentity, usePostInfoDetails, usePostLink } from '@masknet/plugin-infra/content-script'
4-
import { requestLogin, share } from '@masknet/plugin-infra/content-script/context'
3+
import { usePostInfoDetails, usePostLink } from '@masknet/plugin-infra/content-script'
4+
import { share } from '@masknet/plugin-infra/content-script/context'
55
import { LoadingStatus, TransactionConfirmModal } from '@masknet/shared'
66
import { EMPTY_LIST, NetworkPluginID, Sniffings } from '@masknet/shared-base'
77
import { queryClient } from '@masknet/shared-base-ui'
88
import { makeStyles } from '@masknet/theme'
99
import type { HappyRedPacketV4 } from '@masknet/web3-contracts/types/HappyRedPacketV4.js'
1010
import { NetworkContextProvider, useChainContext, useNetwork } from '@masknet/web3-hooks-base'
11-
import { EVMChainResolver, FireflyRedPacket } from '@masknet/web3-providers'
12-
import { FireflyRedPacketAPI, RedPacketStatus, type RedPacketJSONPayload } from '@masknet/web3-providers/types'
11+
import { EVMChainResolver } from '@masknet/web3-providers'
12+
import { RedPacketStatus, type RedPacketJSONPayload } from '@masknet/web3-providers/types'
1313
import { TokenType, formatBalance, isZero, minus } from '@masknet/web3-shared-base'
1414
import { ChainId } from '@masknet/web3-shared-evm'
1515
import { Card, Grow } from '@mui/material'
@@ -21,7 +21,6 @@ import { useClaimCallback } from '../hooks/useClaimCallback.js'
2121
import { useRedPacketContract } from '../hooks/useRedPacketContract.js'
2222
import { useRefundCallback } from '../hooks/useRefundCallback.js'
2323
import { OperationFooter } from './OperationFooter.js'
24-
import { RequestLoginFooter } from './RequestLoginFooter.js'
2524
import { useRedPacketCover } from './useRedPacketCover.js'
2625

2726
const useStyles = makeStyles()((theme) => {
@@ -166,9 +165,6 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
166165
}, [token, redPacketContract, payload.rpid, account, claimedShareText, source])
167166

168167
const [showRequirements, setShowRequirements] = useState(false)
169-
const me = useLastRecognizedIdentity()
170-
const myProfileId = me?.profileId
171-
const myHandle = me?.identifier?.userId
172168
const onClaimOrRefund = useCallback(async () => {
173169
let hash: string | undefined
174170
if (canClaim) {
@@ -178,15 +174,6 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
178174
return
179175
}
180176
hash = await claimCallback()
181-
if (myProfileId && myHandle && hash) {
182-
await FireflyRedPacket.finishClaiming(
183-
payload.rpid,
184-
FireflyRedPacketAPI.PlatformType.twitter,
185-
myProfileId,
186-
myHandle,
187-
hash,
188-
)
189-
}
190177
await checkResult()
191178
queryClient.invalidateQueries({
192179
queryKey: ['redpacket', 'history'],
@@ -197,17 +184,7 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
197184
if (typeof hash === 'string') {
198185
checkAvailability()
199186
}
200-
}, [
201-
canClaim,
202-
canRefund,
203-
claimCallback,
204-
checkResult,
205-
recheckClaimStatus,
206-
checkAvailability,
207-
payload.rpid,
208-
myProfileId,
209-
myHandle,
210-
])
187+
}, [canClaim, canRefund, claimCallback, checkResult, recheckClaimStatus, checkAvailability])
211188

212189
const outdated = isEmpty || (!canRefund && listOfStatus.includes(RedPacketStatus.expired))
213190

@@ -261,18 +238,6 @@ export const RedPacket = memo(function RedPacket({ payload, currentPluginID }: R
261238
)
262239

263240
if (outdated) return card
264-
if (!myHandle)
265-
return (
266-
<>
267-
{card}
268-
<RequestLoginFooter
269-
className={classes.footer}
270-
onRequest={() => {
271-
requestLogin?.(source)
272-
}}
273-
/>
274-
</>
275-
)
276241

277242
return (
278243
<>

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

+8-29
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { BN, web3 } from '@coral-xyz/anchor'
22
import { msg } from '@lingui/core/macro'
33
import { useLingui } from '@lingui/react'
4-
import { useLastRecognizedIdentity, usePostInfoDetails, usePostLink } from '@masknet/plugin-infra/content-script'
5-
import { requestLogin, share } from '@masknet/plugin-infra/content-script/context'
4+
import { usePostInfoDetails, usePostLink } from '@masknet/plugin-infra/content-script'
5+
import { share } from '@masknet/plugin-infra/content-script/context'
66
import { LoadingStatus, TransactionConfirmModal } from '@masknet/shared'
77
import { type NetworkPluginID, Sniffings } from '@masknet/shared-base'
88
import { queryClient } from '@masknet/shared-base-ui'
@@ -14,20 +14,19 @@ import {
1414
useNetwork,
1515
useNetworkContext,
1616
} from '@masknet/web3-hooks-base'
17-
import { FireflyRedPacket, SolanaChainResolver } from '@masknet/web3-providers'
18-
import { FireflyRedPacketAPI, RedPacketStatus, type SolanaRedPacketJSONPayload } from '@masknet/web3-providers/types'
17+
import { SolanaChainResolver } from '@masknet/web3-providers'
18+
import { RedPacketStatus, type SolanaRedPacketJSONPayload } from '@masknet/web3-providers/types'
1919
import { TokenType, formatBalance, minus } from '@masknet/web3-shared-base'
2020
import { ChainId } from '@masknet/web3-shared-solana'
2121
import { Card } from '@mui/material'
2222
import { memo, useCallback, useMemo } from 'react'
23+
import { useAsyncFn } from 'react-use'
2324
import { RedPacketEnvelope } from '../components/RedPacketEnvelope.js'
2425
import { getClaimRecord } from '../helpers/getClaimRecord.js'
2526
import { useSolanaAvailability } from './hooks/useAvailability.js'
2627
import { useClaimCallback } from './hooks/useClaimCallback.js'
2728
import { OperationFooter } from './OperationFooter.js'
28-
import { RequestLoginFooter } from './RequestLoginFooter.js'
2929
import { useRedPacketCover } from './useRedPacketCover.js'
30-
import { useAsyncFn } from 'react-use'
3130

3231
const useStyles = makeStyles()((theme) => {
3332
return {
@@ -126,9 +125,6 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
126125
)
127126
const claimedShareText = useMemo(() => getShareText(true), [getShareText])
128127

129-
const me = useLastRecognizedIdentity()
130-
const myProfileId = me?.profileId
131-
const myHandle = me?.identifier?.userId
132128
const [{ loading: isClaimingAndChecking }, onClaimOrRefund] = useAsyncFn(async () => {
133129
let hash: string | undefined
134130
if (canClaim) {
@@ -139,15 +135,6 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
139135
tokenAddress: payload.token!.address,
140136
tokenProgram: payload.tokenProgram ? new web3.PublicKey(payload.tokenProgram) : undefined,
141137
})
142-
if (myProfileId && myHandle && hash) {
143-
await FireflyRedPacket.finishClaiming(
144-
payload.rpid,
145-
FireflyRedPacketAPI.PlatformType.twitter,
146-
myProfileId,
147-
myHandle,
148-
hash,
149-
)
150-
}
151138
const claimRecord = await getClaimRecord({
152139
cluster: payload.network ?? 'mainnet-beta',
153140
accountId: payload.accountId,
@@ -173,7 +160,7 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
173160
if (typeof hash === 'string') {
174161
refreshRedPacket()
175162
}
176-
}, [canClaim, canRefund, claimCallback, refreshRedPacket, payload.rpid, myProfileId, myHandle, account])
163+
}, [canClaim, canRefund, claimCallback, refreshRedPacket, payload.rpid, account])
177164

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

@@ -214,9 +201,7 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
214201
/>
215202
</SOLWeb3ContextProvider>
216203
</Card>
217-
{outdated ?
218-
null
219-
: myHandle ?
204+
{outdated ? null : (
220205
<NetworkContextProvider initialNetwork={currentPluginID}>
221206
{/* ChainBoundary needs to know the current network */}
222207
<OperationFooter
@@ -229,13 +214,7 @@ export const SolanaRedPacketCard = memo(function SolanaRedPacketCard({
229214
onClaimOrRefund={onClaimOrRefund}
230215
/>
231216
</NetworkContextProvider>
232-
: <RequestLoginFooter
233-
className={classes.footer}
234-
onRequest={() => {
235-
requestLogin?.(source)
236-
}}
237-
/>
238-
}
217+
)}
239218
</>
240219
)
241220
})

‎packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedpacketDialog/CreateRedpacket.tsx

+11-11
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ export function CreateSolRedPacket() {
189189
customThemes,
190190
setCustomThemes,
191191
setTheme,
192-
message,
193-
setMessage,
192+
inputMessage,
193+
setInputMessage,
194194
shares,
195195
setShares,
196196
isRandom,
@@ -250,9 +250,9 @@ export function CreateSolRedPacket() {
250250
shares,
251251
// Avoid causing rpc rate limit due to too fast requests.
252252
new BigNumber('0.0001').toNumber(),
253-
!!isRandom,
253+
isRandom,
254254
publicKey,
255-
message,
255+
inputMessage,
256256
creator,
257257
token,
258258
cluster,
@@ -308,9 +308,9 @@ export function CreateSolRedPacket() {
308308
<>
309309
<div className={classes.fields}>
310310
<div className={classes.field}>
311-
<label className={classes.option} onClick={() => setIsRandom(1)}>
311+
<label className={classes.option} onClick={() => setIsRandom(true)}>
312312
<div className={classes.checkIconWrapper}>
313-
<RadioIndicator checked={!!isRandom} size={20} />
313+
<RadioIndicator checked={isRandom} size={20} />
314314
</div>
315315
<Typography
316316
color={isRandom ? theme.palette.maskColor.main : theme.palette.maskColor.second}
@@ -319,7 +319,7 @@ export function CreateSolRedPacket() {
319319
<Trans>Random Amount</Trans>
320320
</Typography>
321321
</label>
322-
<label className={classes.option} onClick={() => setIsRandom(0)}>
322+
<label className={classes.option} onClick={() => setIsRandom(false)}>
323323
<div className={classes.checkIconWrapper}>
324324
<RadioIndicator checked={!isRandom} size={20} />
325325
</div>
@@ -334,16 +334,16 @@ export function CreateSolRedPacket() {
334334
<InputBase
335335
className={classes.input}
336336
fullWidth
337-
value={message}
338-
onChange={(e) => setMessage(e.target.value)}
337+
value={inputMessage}
338+
onChange={(e) => setInputMessage(e.target.value)}
339339
startAdornment={
340340
<Typography className={classes.inputLabel}>
341341
<Trans>Message</Trans>
342342
</Typography>
343343
}
344344
endAdornment={
345345
<Typography className={classes.inputLabel} style={{ right: 12, left: 'auto' }}>
346-
{message.length}/{messageMaxLength}
346+
{inputMessage.length}/{messageMaxLength}
347347
</Typography>
348348
}
349349
placeholder={_(msg`Best Wishes!`)}
@@ -462,7 +462,7 @@ export function CreateSolRedPacket() {
462462
<PreviewRedPacket
463463
className={classes.envelope}
464464
theme={selectedTheme}
465-
message={message}
465+
message={inputMessage}
466466
token={token}
467467
creator={creator}
468468
shares={shares}

‎packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedpacketDialog/RedpacketConfirm.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export function SolanaRedPacketConfirm() {
9191
const { classes, cx } = useStyles()
9292
const { chainId } = useChainContext<NetworkPluginID.PLUGIN_SOLANA>()
9393
const navigate = useNavigate()
94-
const { settings, shares, isRandom, token, creator, publicKey, password, message, nativeToken, theme, rawAmount } =
94+
const { settings, isRandom, token, creator, publicKey, password, message, nativeToken, theme, rawAmount } =
9595
useSolRedpacket()
9696

9797
const solanaAccount = useAccount(NetworkPluginID.PLUGIN_SOLANA)
@@ -126,9 +126,9 @@ export function SolanaRedPacketConfirm() {
126126

127127
const cluster = SolanaChainResolver.network(chainId) as SolanaWeb3.Cluster
128128
const { data: defaultGasFee = ZERO, isLoading: estimateLoading } = useEstimateGasWithCreateSolRedpacket(
129-
shares,
129+
settings.shares,
130130
new BigNumber(settings.total).toNumber(),
131-
!!isRandom,
131+
isRandom,
132132
publicKey,
133133
message,
134134
creator,
@@ -152,7 +152,7 @@ export function SolanaRedPacketConfirm() {
152152
settings.shares,
153153
total,
154154
DEFAULT_DURATION,
155-
!!isRandom,
155+
isRandom,
156156
claimer,
157157
creator,
158158
message,
@@ -165,7 +165,7 @@ export function SolanaRedPacketConfirm() {
165165
settings.shares,
166166
total,
167167
DEFAULT_DURATION,
168-
!!isRandom,
168+
isRandom,
169169
claimer,
170170
creator,
171171
message,
@@ -181,8 +181,8 @@ export function SolanaRedPacketConfirm() {
181181
name: creator,
182182
message,
183183
},
184-
is_random: !!isRandom,
185-
shares,
184+
is_random: isRandom,
185+
shares: settings.shares,
186186
password,
187187
rpid: result.accountId.toBase58(),
188188
total: settings.total,
@@ -211,7 +211,7 @@ export function SolanaRedPacketConfirm() {
211211
<>
212212
<div className={classes.settings}>
213213
<Typography variant="h4" color="textPrimary" align="center" className={classes.message}>
214-
{settings.message}
214+
{message}
215215
</Typography>
216216
<div className={classes.field}>
217217
<Typography className={classes.fieldName}>
@@ -228,7 +228,7 @@ export function SolanaRedPacketConfirm() {
228228
<Trans>Share</Trans>
229229
</Typography>
230230
<Typography variant="body1" className={cx(classes.fieldValue, classes.value)}>
231-
{shares}
231+
{settings.shares}
232232
</Typography>
233233
</div>
234234
{isRandom ? null : (
@@ -297,7 +297,7 @@ export function SolanaRedPacketConfirm() {
297297
message={message}
298298
token={token}
299299
creator={creator}
300-
shares={shares}
300+
shares={settings.shares}
301301
isRandom={isRandom}
302302
rawAmount={rawAmount}
303303
/>

‎packages/plugins/RedPacket/src/SiteAdaptor/components/PreviewRedPacket.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface Props extends HTMLProps<HTMLDivElement> {
1111
token?: Web3Helper.FungibleTokenAll
1212
creator: string
1313
shares: number
14-
isRandom: 0 | 1
14+
isRandom: boolean
1515
rawAmount: string
1616
}
1717
export function PreviewRedPacket({ theme, message, token, creator, shares, isRandom, rawAmount, ...props }: Props) {

‎packages/plugins/RedPacket/src/SiteAdaptor/components/RedPacketRecord.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ const useStyles = makeStyles<{ background?: string; backgroundIcon?: string }>()
9797
},
9898
},
9999
symbol: {
100-
width: '6ch',
100+
maxWidth: '6ch',
101101
whiteSpace: 'nowrap',
102102
overflow: 'hidden',
103103
textOverflow: 'ellipsis',

0 commit comments

Comments
 (0)