From a4d376fece671034c5d70189063ad5c87f38c695 Mon Sep 17 00:00:00 2001 From: Septs Date: Wed, 5 Jan 2022 15:49:19 +0800 Subject: [PATCH] chore: simplify is one --- .../mask/src/plugins/Collectible/SNSAdaptor/ListingTab.tsx | 4 ++-- .../mask/src/plugins/Collectible/SNSAdaptor/OfferTab.tsx | 5 ++--- .../mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx | 5 ++--- packages/web3-shared/base/utils/number.ts | 5 +++++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/ListingTab.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/ListingTab.tsx index 010882d5743a..bee179dd33d4 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/ListingTab.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/ListingTab.tsx @@ -9,7 +9,7 @@ import { OrderRow } from './OrderRow' import { TableListPagination } from './Pagination' import { LoadingTable } from './LoadingTable' import { NonFungibleAssetProvider, useAccount } from '@masknet/web3-shared-evm' -import { isZero } from '@masknet/web3-shared-base' +import { isOne, isZero } from '@masknet/web3-shared-base' const useStyles = makeStyles()((theme) => { return { @@ -50,7 +50,7 @@ export function ListingTab() { (item) => (item.payment_token_contract?.symbol !== 'WETH' && item.payment_token_contract?.symbol !== 'ETH') || - (item.quantity && new BigNumber(item.quantity).toString() !== '1'), + (item.quantity && !isOne(item.quantity)), ) && orders.value?.data.filter((item) => isZero(item.expiration_time ?? 0)).length === 0 ) } else { diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/OfferTab.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/OfferTab.tsx index 92b569d2b8ca..2d2453ffae63 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/OfferTab.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/OfferTab.tsx @@ -1,5 +1,4 @@ import { useMemo } from 'react' -import BigNumber from 'bignumber.js' import { Button, Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import { useI18N } from '../../../utils' @@ -8,7 +7,7 @@ import { CollectibleTab } from './CollectibleTab' import { OrderRow } from './OrderRow' import { TableListPagination } from './Pagination' import { LoadingTable } from './LoadingTable' -import { isZero } from '@masknet/web3-shared-base' +import { isOne, isZero } from '@masknet/web3-shared-base' import { NonFungibleAssetProvider } from '@masknet/web3-shared-evm' const useStyles = makeStyles()((theme) => { @@ -49,7 +48,7 @@ export function OfferTab() { (item) => (item.payment_token_contract?.symbol !== 'WETH' && item.payment_token_contract?.symbol !== 'ETH') || - (item.quantity && new BigNumber(item.quantity).toString() !== '1'), + (item.quantity && !isOne(item.quantity)), ) && offers.value.data.filter((item) => isZero(item.expiration_time ?? 0)).length === 0 ) } else { diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx index dc0fb3b57681..5bd6a4855a44 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/OrderRow.tsx @@ -1,5 +1,4 @@ import { useMemo } from 'react' -import BigNumber from 'bignumber.js' import { Avatar, Link, TableCell, TableRow, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' @@ -9,7 +8,7 @@ import { NonFungibleAssetProvider, resolveAddressLinkOnExplorer, } from '@masknet/web3-shared-evm' -import { isZero } from '@masknet/web3-shared-base' +import { isOne, isZero } from '@masknet/web3-shared-base' import { CollectibleState } from '../hooks/useCollectibleState' import { Account } from './Account' import { FormattedBalance } from '@masknet/shared' @@ -116,7 +115,7 @@ export function OrderRow({ order, isDifferenceToken }: IRowProps) { diff --git a/packages/web3-shared/base/utils/number.ts b/packages/web3-shared/base/utils/number.ts index b3b7b9570dc2..e33743a7c16f 100644 --- a/packages/web3-shared/base/utils/number.ts +++ b/packages/web3-shared/base/utils/number.ts @@ -8,6 +8,11 @@ export function isZero(n: BigNumber.Value) { return n === 0 || n === '0' || new BigNumber(n).isZero() } +/** n === 1 */ +export function isOne(n: BigNumber.Value) { + return n === 1 || n === '1' || new BigNumber(n).isEqualTo(ONE) +} + /** a > b */ export function isGreaterThan(a: BigNumber.Value, b: BigNumber.Value) { return new BigNumber(a).isGreaterThan(b)