Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
useChainId,
useChainIdValid,
useTokenConstants,
isNativeTokenAddress,
} from '@masknet/web3-shared-evm'
import { isZero, ZERO, isGreaterThan } from '@masknet/web3-shared-base'
import { Box, Card, Grid, Link, Typography } from '@mui/material'
Expand Down Expand Up @@ -315,10 +316,9 @@ export function ITO(props: ITO_Props) {
.toString()
const canWithdraw = useMemo(
() =>
!availability?.destructed &&
isAccountSeller &&
!tradeInfo?.destructInfo &&
!loadingTradeInfo &&
!availability?.exchanged_tokens.every((t) => t === '0') &&
!availability?.exchanged_tokens.every(isZero) &&
(listOfStatus.includes(ITO_Status.expired) || noRemain),
[tradeInfo, listOfStatus, isAccountSeller, noRemain, loadingTradeInfo],
)
Expand Down Expand Up @@ -726,7 +726,8 @@ export function ITO(props: ITO_Props) {
className={classes.actionButton}>
{t('plugin_ito_withdraw')}
</ActionButton>
) : !ifQualified || !(ifQualified as Qual_V2).qualified ? (
) : (!ifQualified || !(ifQualified as Qual_V2).qualified) &&
!isNativeTokenAddress(qualificationAddress) ? (
<ActionButton
onClick={retryIfQualified}
loading={loadingIfQualified}
Expand All @@ -741,16 +742,7 @@ export function ITO(props: ITO_Props) {
? startCase((ifQualified as Qual_V2).errorMsg)
: null}
</ActionButton>
) : listOfStatus.includes(ITO_Status.expired) ? (
<ActionButton
disabled
onClick={() => undefined}
variant="contained"
size="large"
className={classes.actionButton}>
{t('plugin_ito_expired')}
</ActionButton>
) : listOfStatus.includes(ITO_Status.waited) ? (
) : listOfStatus.includes(ITO_Status.expired) ? null : listOfStatus.includes(ITO_Status.waited) ? (
<Grid container spacing={2}>
<Grid item xs={6}>
<ActionButton
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { compact } from 'lodash-unified'
import { useChainId, useITOConstants } from '@masknet/web3-shared-evm'
import isAfter from 'date-fns/isAfter'
import { JSON_PayloadInMask, JSON_PayloadFromChain, ITO_Status } from '../../types'
import { useAvailability } from './useAvailability'
import { useQualification } from './useQualification'
Expand Down Expand Up @@ -56,7 +57,7 @@ export function useAvailabilityComputed(payload: JSON_PayloadInMask | JSON_Paylo
unlockTime,
qualificationAddress,
hasLockTime,
isUnlocked: availability.unlocked,
isUnlocked: isAfter(Date.now(), unlockTime),
canFetch: payload.chain_id === chainId,
canSwap: isStarted && !isExpired && !isCompleted && payload.chain_id === chainId && payload.password,
canRefund: isExpired && payload.chain_id === chainId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
ChainId,
FungibleToken,
} from '@masknet/web3-shared-evm'
import isAfter from 'date-fns/isAfter'
import { useClaimablePoolsBySubgraph } from './useClaimablePoolsBySubgraph'
import { checkAvailability } from '../../Worker/apis/checkAvailability'
import { useMemo } from 'react'
Expand Down Expand Up @@ -81,12 +82,13 @@ export function useClaimablePools(chainId: ChainId, isMainnetOld = false) {
Number(raw.availability.end_time) * 1000 < Number(raw.availability.unlock_time) * 1000,
)
.map((raw) => {
const unlockTime = Number(raw.availability.unlock_time) * 1000
return {
pids: [raw.pid],
amount: Number(raw.availability.swapped),
token: raw.token,
isClaimable: raw.availability.unlocked,
unlockTime: new Date(Number(raw.availability.unlock_time) * 1000),
isClaimable: isAfter(Date.now(), unlockTime),
unlockTime: new Date(unlockTime),
}
})
.reduce((acc: SwappedToken[], cur) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function decodeResult(data: string, isV1: boolean): Availability {
remaining: +parseHexToInt(results[1]),
started: results[2],
expired: results[3],
unlocked: results[4],
destructed: results[4],
unlock_time: parseHexToInt(results[5]),
swapped: parseHexToInt(results[6]),
exchanged_tokens: parse(results[7]).map(parseHexToInt),
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/src/plugins/ITO/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export interface Availability {
remaining: number
started: boolean
expired: boolean
unlocked: boolean
destructed: boolean
unlock_time: string
swapped: string
exchanged_tokens: string[]
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-contracts/abis/ITO2.json
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
},
{
"internalType": "bool",
"name": "unlocked",
"name": "destructed",
"type": "bool"
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-contracts/types/ITO2.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export interface ITO2 extends BaseContract {
remaining: string
started: boolean
expired: boolean
unlocked: boolean
destructed: boolean
unlock_time: string
swapped: string
exchanged_tokens: string[]
Expand Down