diff --git a/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx b/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx index 1dd049428263..b407c2bb1d40 100644 --- a/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx +++ b/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx @@ -1,4 +1,4 @@ -import { memo, useCallback, useMemo } from 'react' +import { memo, useMemo } from 'react' import { useNavigate } from 'react-router-dom' import { makeStyles } from '@masknet/theme' import { openWindow, useRemoteControlledDialog } from '@masknet/shared-base-ui' @@ -45,12 +45,9 @@ export const FeaturePromotions = memo(() => { return !!linkedProfiles.find((profile) => profile.identifier.network === EnhanceableSite.Twitter) }, [currentPersona]) - const openTransakDialog = useCallback(() => { - setBuyDialog({ - open: true, - address: account ?? '', - }) - }, []) + const openTransakDialog = () => { + setBuyDialog({ open: true, address: account ?? '' }) + } const openTwitter = (pluginId: string) => async () => { if (!currentPersona) { diff --git a/packages/dashboard/src/hooks/useMnemonicWordsPuzzle.ts b/packages/dashboard/src/hooks/useMnemonicWordsPuzzle.ts index e4e7eab27190..ed1b12c6df72 100644 --- a/packages/dashboard/src/hooks/useMnemonicWordsPuzzle.ts +++ b/packages/dashboard/src/hooks/useMnemonicWordsPuzzle.ts @@ -53,10 +53,10 @@ export function useMnemonicWordsPuzzle() { [answerWords], ) - const resetCallback = useCallback(() => { + const resetCallback = () => { setAnswerWords([]) setSeed((x) => (x + 1) % 3) - }, []) + } const refreshCallback = wordsRetry diff --git a/packages/dashboard/src/pages/CreateMaskWallet/components/CreateMnemonic/index.tsx b/packages/dashboard/src/pages/CreateMaskWallet/components/CreateMnemonic/index.tsx index fc44340b5553..0bd48af56b24 100644 --- a/packages/dashboard/src/pages/CreateMaskWallet/components/CreateMnemonic/index.tsx +++ b/packages/dashboard/src/pages/CreateMaskWallet/components/CreateMnemonic/index.tsx @@ -86,9 +86,9 @@ const CreateMnemonic = memo(() => { WalletMessages.events.walletLockStatusUpdated.on(retry) }, [retry]) - const onVerifyClick = useCallback(() => { + const onVerifyClick = () => { setOpen(true) - }, []) + } const [walletState, onSubmit] = useAsyncFn(async () => { const name = new URLSearchParams(location.search).get('name') diff --git a/packages/mask/src/components/CompositionDialog/Composition.tsx b/packages/mask/src/components/CompositionDialog/Composition.tsx index 99bb69510111..613334d8607e 100644 --- a/packages/mask/src/components/CompositionDialog/Composition.tsx +++ b/packages/mask/src/components/CompositionDialog/Composition.tsx @@ -1,4 +1,4 @@ -import { useCallback, useEffect, useState, useRef } from 'react' +import { useEffect, useState, useRef } from 'react' import { DialogContent } from '@mui/material' import { DialogStackingProvider } from '@masknet/theme' import { activatedSocialNetworkUI, globalUIState } from '../../social-network' @@ -22,10 +22,10 @@ export function Composition({ type = 'timeline', requireClipboardPermission }: P const [reason, setReason] = useState<'timeline' | 'popup' | 'reply'>('timeline') // #region Open const [open, setOpen] = useState(false) - const onClose = useCallback(() => { + const onClose = () => { setOpen(false) UI.current?.reset() - }, []) + } useEffect(() => { if (openOnInitAnswered) return diff --git a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx index d53bbbbd27ac..b79d9747cf88 100644 --- a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx +++ b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx @@ -69,17 +69,13 @@ export function PurchaseDialog(props: ActionBarProps) { }) const [ToS_Checked, setToS_Checked] = useState(false) - const [purchaseState, purchaseCallback, resetCallback] = usePurchaseCallback( + const [purchaseState, onCheckout, resetCallback] = usePurchaseCallback( project.projectId, project.pricePerTokenInWei, token.value?.type, ) const { GEN_ART_721_MINTER: spender } = useArtBlocksConstants() - const onCheckout = useCallback(() => { - purchaseCallback() - }, [usePurchaseCallback]) - const price = useMemo(() => { return leftShift(project.pricePerTokenInWei, token.value?.decimals) }, [project.pricePerTokenInWei, token.value?.decimals]) @@ -190,7 +186,7 @@ export function PurchaseDialog(props: ActionBarProps) { disabled={!!validationMessage} color="primary" variant="contained" - onClick={purchaseCallback} + onClick={onCheckout} fullWidth> {validationMessage || isTransaction ? t('plugin_artblocks_purchase') diff --git a/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts b/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts index 94eff5a8e2e6..56737996434e 100644 --- a/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts +++ b/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts @@ -80,11 +80,9 @@ export function usePurchaseCallback(projectId: string, amount: string, tokenType }) }, [account, amount, chainId, genArt721MinterContract, tokenType]) - const resetCallback = useCallback(() => { - setPurchaseState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setPurchaseState({ type: TransactionStateType.UNKNOWN }) + } return [purchaseState, purchaseCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts b/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts index f31d5f64a5a5..d2fda9b902af 100644 --- a/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts +++ b/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts @@ -130,11 +130,9 @@ export function usePlaceBidCallback(is24Auction: boolean, editionNumber: string) [account, chainId, is24Auction, editionNumber, artistAcceptingBidsV2_contract, cANFTMarket_contract], ) - const resetCallback = useCallback(() => { - setPlaceBidState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setPlaceBidState({ type: TransactionStateType.UNKNOWN }) + } return [placeBidState, placeBidCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts b/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts index 6255c2f66e74..e38ba4b1f2f1 100644 --- a/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts +++ b/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts @@ -78,11 +78,9 @@ export function usePurchaseCallback(editionNumber: string, priceInWei: number) { }) }, [account, chainId, knownOriginDigitalAssetV2_contract]) - const resetCallback = useCallback(() => { - setPurchaseState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setPurchaseState({ type: TransactionStateType.UNKNOWN }) + } return [purchaseState, purchaseCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts b/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts index b1e20207f16a..bdedce47884c 100644 --- a/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts +++ b/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts @@ -100,11 +100,9 @@ export function useDonateCallback(address: string, amount: string, token?: Fungi }) }, [account, amount, token, donations]) - const resetCallback = useCallback(() => { - setDonateState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setDonateState({ type: TransactionStateType.UNKNOWN }) + } return [donateState, donateCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts index ef41fdea585c..91c4d814f541 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts @@ -88,9 +88,9 @@ export function useClaimCallback(pids: string[], contractAddress: string | undef }) }, [account, chainId, ITO_Contract, stringify(pids), isV1]) - const resetCallback = useCallback(() => { + const resetCallback = () => { setClaimState({ type: TransactionStateType.UNKNOWN }) - }, []) + } return [claimState, claimCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts index 2e736befd4e6..92bdf57f222f 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts @@ -73,11 +73,9 @@ export function useDestructCallback(ito_address: string) { [ITO_Contract], ) - const resetCallback = useCallback(() => { - setDestructState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setDestructState({ type: TransactionStateType.UNKNOWN }) + } return [destructState, destructCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useFill.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useFill.ts index cefaf4bad112..a9a33d177b60 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useFill.ts +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useFill.ts @@ -162,11 +162,9 @@ export function useFillCallback(poolSettings?: PoolSettings) { }) }, [web3, account, chainId, ITO_Contract, poolSettings, paramResult, setFillState]) - const resetCallback = useCallback(() => { - setFillState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setFillState({ type: TransactionStateType.UNKNOWN }) + } return [fillSettings, fillState, fillCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts index 5758f3e634cf..53e4b1f19e02 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts @@ -76,11 +76,9 @@ export function useMaskClaimCallback() { }) }, [account, chainId, MaskITO_Contract]) - const resetCallback = useCallback(() => { - setClaimState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setClaimState({ type: TransactionStateType.UNKNOWN }) + } return [claimState, claimCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useSwapCallback.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useSwapCallback.ts index 6fb7a13ffb29..52d9e253be60 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useSwapCallback.ts +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useSwapCallback.ts @@ -217,11 +217,9 @@ export function useSwapCallback( }) }, [ITO_Contract, chainId, qualificationContract, account, payload, total, token.address, isQualificationHasLucky]) - const resetCallback = useCallback(() => { - setSwapState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setSwapState({ type: TransactionStateType.UNKNOWN }) + } return [swapState, swapCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts b/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts index 689b6b20e68e..8e666aa1d606 100644 --- a/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts +++ b/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts @@ -84,11 +84,9 @@ export function useDepositCallback( }) }, [address, account, amount, token, referrer, controlledToken]) - const resetCallback = useCallback(() => { - setDepositState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setDepositState({ type: TransactionStateType.UNKNOWN }) + } return [depositState, depositCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index 919c9432e430..46ec3a0249e7 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -88,7 +88,7 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { const [, setValue] = state setValue(DialogTabs.create) props.onClose() - }, [props, state]) + }, [props.onClose, state]) const { address: publicKey, privateKey } = useMemo(() => web3.eth.accounts.create(), []) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx index 3a3bcd81b824..ff4127a2964e 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC721Form.tsx @@ -234,9 +234,9 @@ export function RedPacketERC721Form(props: RedPacketERC721FormProps) { setOpenConfirmDialog(false) }, [clearTokenDetailedOwnerList]) - const clearContract = useCallback(() => { + const clearContract = () => { setContract(undefined) - }, []) + } useEffect(() => { if (loadingOwnerList) { diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts index 08ba021a37b6..1c187482a715 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts @@ -80,11 +80,9 @@ export function useClaimCallback(version: number, from: string, id?: string, pas }) }, [id, password, from, redPacketContract]) - const resetCallback = useCallback(() => { - setClaimState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setClaimState({ type: TransactionStateType.UNKNOWN }) + } return [claimState, claimCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts index ce38c49247d7..bb2e79368f18 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts @@ -80,11 +80,9 @@ export function useClaimNftRedpacketCallback(id: string, totalAmount: number | u }) }, [id, signedMsg, account, chainId, totalAmount, claimState]) - const resetCallback = useCallback(() => { - setClaimState({ - type: TransactionStateType.UNKNOWN, - }) - }, [account]) + const resetCallback = () => { + setClaimState({ type: TransactionStateType.UNKNOWN }) + } return [claimState, claimCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx index 3407b9f19e71..79662d085619 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx @@ -216,11 +216,9 @@ export function useCreateCallback(redPacketSettings: RedPacketSettings, version: }) }, [account, redPacketContract, redPacketSettings, chainId, getCreateParams]) - const resetCallback = useCallback(() => { - setCreateState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setCreateState({ type: TransactionStateType.UNKNOWN }) + } return [createSettings, createState, createCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateNftRedpacketCallback.ts b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateNftRedpacketCallback.ts index 42b3d1094e65..94b322d2246e 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateNftRedpacketCallback.ts +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateNftRedpacketCallback.ts @@ -132,11 +132,9 @@ export function useCreateNftRedpacketCallback( }, [duration, message, name, contractAddress, tokenIdList, nftRedPacketContract, setCreateState, account, chainId], ) - const resetCallback = useCallback(() => { - setCreateState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setCreateState({ type: TransactionStateType.UNKNOWN }) + } return [createState, createCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts index 41de40d02399..589522db98bb 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts @@ -69,11 +69,9 @@ export function useRefundCallback(version: number, from: string, id?: string) { }) }, [id, redPacketContract, from]) - const resetCallback = useCallback(() => { - setRefundState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setRefundState({ type: TransactionStateType.UNKNOWN }) + } return [refundState, refundCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx index c3accaad1d32..3832aefeac47 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx @@ -261,10 +261,10 @@ export function Trader(props: TraderProps) { setTemporarySlippage(undefined) }, [tradeCallback]) - const onConfirmDialogClose = useCallback(() => { + const onConfirmDialogClose = () => { setOpenConfirmDialog(false) setTemporarySlippage(undefined) - }, []) + } // #endregion // #region the click handler of switch arrow diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/CoinMetadataTags.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/CoinMetadataTags.tsx index 15addd3a130a..8aa7be8e56b5 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/CoinMetadataTags.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/CoinMetadataTags.tsx @@ -1,6 +1,6 @@ import { Chip, DialogContent } from '@mui/material' import { makeStyles } from '@masknet/theme' -import { useCallback, useState } from 'react' +import { useState } from 'react' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' import { Linking } from './Linking' @@ -22,13 +22,13 @@ export function CoinMetadataTags(props: CoinMetadataTagsProps) { const { tags } = props const [open, setOpen] = useState(false) - const onClick = useCallback(() => { + const onClick = () => { setOpen((open) => !open) - }, []) + } - const onClose = useCallback(() => { + const onClose = () => { setOpen(false) - }, []) + } if (!tags) return null return ( diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx index e510b7861cbc..75be22e4f830 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx @@ -123,11 +123,7 @@ export function TrendingViewDeck(props: TrendingViewDeckProps) { const { setDialog: setBuyDialog } = useRemoteControlledDialog(PluginTransakMessages.buyTokenDialogUpdated) const onBuyButtonClicked = useCallback(() => { - setBuyDialog({ - open: true, - code: coin.symbol, - address: account, - }) + setBuyDialog({ open: true, code: coin.symbol, address: account }) }, [account, trending?.coin?.symbol]) // #endregion diff --git a/packages/mask/src/plugins/Trader/trader/0x/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/0x/useTradeCallback.ts index 50dffd19ff2b..e04e434fb12f 100644 --- a/packages/mask/src/plugins/Trader/trader/0x/useTradeCallback.ts +++ b/packages/mask/src/plugins/Trader/trader/0x/useTradeCallback.ts @@ -76,11 +76,9 @@ export function useTradeCallback(tradeComputed: TradeComputed }) }, [web3, account, chainId, stringify(config), gasConfig]) - const resetCallback = useCallback(() => { - setTradeState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTradeState({ type: TransactionStateType.UNKNOWN }) + } return [tradeState, tradeCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts index 3eea13675b96..8342f9c2214b 100644 --- a/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts +++ b/packages/mask/src/plugins/Trader/trader/balancer/useTradeCallback.ts @@ -139,11 +139,9 @@ export function useTradeCallback( }) }, [chainId, trade, tradeAmount, exchangeProxyContract, BALANCER_ETH_ADDRESS]) - const resetCallback = useCallback(() => { - setTradeState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTradeState({ type: TransactionStateType.UNKNOWN }) + } return [tradeState, tradeCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Trader/trader/bancor/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/bancor/useTradeCallback.ts index fc65f7159721..a951e34e0b0f 100644 --- a/packages/mask/src/plugins/Trader/trader/bancor/useTradeCallback.ts +++ b/packages/mask/src/plugins/Trader/trader/bancor/useTradeCallback.ts @@ -77,11 +77,9 @@ export function useTradeCallback(tradeComputed: TradeComputed }) }, [web3, account, chainId, stringify(trade), gasConfig]) - const resetCallback = useCallback(() => { - setTradeState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTradeState({ type: TransactionStateType.UNKNOWN }) + } return [tradeState, tradeCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Trader/trader/dodo/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/dodo/useTradeCallback.ts index d6c655e0b439..6009febed539 100644 --- a/packages/mask/src/plugins/Trader/trader/dodo/useTradeCallback.ts +++ b/packages/mask/src/plugins/Trader/trader/dodo/useTradeCallback.ts @@ -74,11 +74,9 @@ export function useTradeCallback( }) }, [web3, account, chainId, stringify(config), gasConfig]) - const resetCallback = useCallback(() => { - setTradeState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTradeState({ type: TransactionStateType.UNKNOWN }) + } return [tradeState, tradeCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Trader/trader/openocean/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/openocean/useTradeCallback.ts index 38d729d0a6bd..80619e6bd8bd 100644 --- a/packages/mask/src/plugins/Trader/trader/openocean/useTradeCallback.ts +++ b/packages/mask/src/plugins/Trader/trader/openocean/useTradeCallback.ts @@ -79,11 +79,11 @@ export function useTradeCallback( }) }, [web3, account, chainId, stringify(config)]) - const resetCallback = useCallback(() => { + const resetCallback = () => { setTradeState({ type: TransactionStateType.UNKNOWN, }) - }, []) + } return [tradeState, tradeCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Trader/trader/uniswap/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/uniswap/useTradeCallback.ts index 6a8a82e07e7d..9157d955dfb5 100644 --- a/packages/mask/src/plugins/Trader/trader/uniswap/useTradeCallback.ts +++ b/packages/mask/src/plugins/Trader/trader/uniswap/useTradeCallback.ts @@ -175,11 +175,9 @@ export function useTradeCallback( }) }, [web3, account, tradeParameters, gasConfig]) - const resetCallback = useCallback(() => { - setTradeState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTradeState({ type: TransactionStateType.UNKNOWN }) + } return [tradeState, tradeCallback, resetCallback] as const } diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx index a713935827df..835ad09f55b4 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx @@ -34,22 +34,11 @@ export function GasSettingBar(props: GasSettingBarProps) { const [gasOption, setGasOption] = useState(GasOption.Medium) const { setDialog: setGasSettingDialog } = useRemoteControlledDialog(WalletMessages.events.gasSettingDialogUpdated) const onOpenGasSettingDialog = useCallback(() => { - setGasSettingDialog( - isEIP1559Supported(chainId) - ? { - open: true, - gasLimit, - maxFee, - priorityFee, - gasOption, - } - : { - open: true, - gasLimit, - gasPrice, - gasOption, - }, - ) + if (isEIP1559Supported(chainId)) { + setGasSettingDialog({ open: true, gasLimit, gasOption, maxFee, priorityFee }) + } else { + setGasSettingDialog({ open: true, gasLimit, gasOption, gasPrice }) + } }, [chainId, gasLimit, gasPrice, maxFee, priorityFee, gasOption]) // set initial options diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx index 05e5c2826060..48208c1b1dd7 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx @@ -1,4 +1,4 @@ -import { useCallback, useState } from 'react' +import { useState } from 'react' import { Button, DialogContent, DialogActions, TextField } from '@mui/material' import { makeStyles } from '@masknet/theme' import type { Wallet } from '@masknet/web3-shared-evm' @@ -30,12 +30,9 @@ export function WalletRenameWalletDialog() { setName(data.wallet?.name ?? '') setWallet(data.wallet) }) - const handleClose = useCallback(() => { - setDialog({ - open: false, - wallet: null, - }) - }, []) + const handleClose = () => { + setDialog({ open: false, wallet: null }) + } const handleRename = useSnackbarCallback( () => { if (!wallet?.address) { diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx index 5c3ef92a33fc..c7a22225764a 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx @@ -27,9 +27,9 @@ export function RestoreLegacyWalletDialog() { // const navigate = useNavigate() const { open, setDialog } = useRemoteControlledDialog(WalletMessages.events.restoreLegacyWalletDialogUpdated) - const onClose = useCallback(() => { + const onClose = () => { setDialog({ open: false }) - }, [setDialog]) + } const { value: legacyWallets = [] } = useAsyncRetry(async () => { const now = new Date() diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx index 2572cabda523..9d9d72b19a5e 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx @@ -133,21 +133,14 @@ export function SelectNftContractDialog(props: SelectNftContractDialogProps) { const onSubmit = useCallback( (contract: ERC721ContractDetailed) => { setKeyword('') - setDialog({ - open: false, - uuid: id, - contract, - }) + setDialog({ open: false, uuid: id, contract }) }, [id, setDialog, setKeyword], ) const onClose = useCallback(() => { setKeyword('') - setDialog({ - open: false, - uuid: id, - }) - }, [id, setDialog]) + setDialog({ open: false, uuid: id }) + }, [id]) // #endregion const { data: assets, state: loadingCollectionState } = useCollections(account, chainId, open) diff --git a/packages/mask/src/plugins/Wallet/hooks/useMnemonicWordsPuzzle.ts b/packages/mask/src/plugins/Wallet/hooks/useMnemonicWordsPuzzle.ts index e04def8b9c73..7baacb4dee81 100644 --- a/packages/mask/src/plugins/Wallet/hooks/useMnemonicWordsPuzzle.ts +++ b/packages/mask/src/plugins/Wallet/hooks/useMnemonicWordsPuzzle.ts @@ -49,10 +49,10 @@ export function useMnemonicWordsPuzzle() { [answerWords], ) - const resetCallback = useCallback(() => { + const resetCallback = () => { setAnswerWords([]) setSeed((x) => (x + 1) % 3) - }, []) + } const refreshCallback = wordsRetry diff --git a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx index 96e30a9465bd..085a3ec3573f 100644 --- a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx +++ b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx @@ -92,9 +92,7 @@ export function InvestDialog() { open: true, uuid: id, disableNativeToken: true, - FungibleTokenListProps: { - whitelist: allowedTokens, - }, + FungibleTokenListProps: { whitelist: allowedTokens }, }) }, [id, token?.address, allowedTokens]) // #endregion diff --git a/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts b/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts index ab5f0b2a58dd..d784377e9cd7 100644 --- a/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts +++ b/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts @@ -83,11 +83,9 @@ export function useInvestCallback(pool: Pool | undefined, amount: string, token? }) }, [pool, account, amount, token]) - const resetCallback = useCallback(() => { - setInvestState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setInvestState({ type: TransactionStateType.UNKNOWN }) + } return [investState, investCallback, resetCallback] as const } diff --git a/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx b/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx index af8ab498b1d4..9833c10fdc27 100644 --- a/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx +++ b/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx @@ -126,12 +126,8 @@ export function ERC721ContractSelectPanel(props: ERC721TokenSelectPanelProps) { ) const openDialog = useCallback(() => { - setNftContractDialog({ - open: true, - chainId, - uuid: id, - }) - }, [setNftContractDialog, uuid, chainId]) + setNftContractDialog({ open: true, chainId, uuid: id }) + }, [id, chainId]) // #endregion return ( diff --git a/packages/web3-shared/evm/hooks/useERC20TokenTransferCallback.ts b/packages/web3-shared/evm/hooks/useERC20TokenTransferCallback.ts index a4093fa9d65b..8b797447cdc1 100644 --- a/packages/web3-shared/evm/hooks/useERC20TokenTransferCallback.ts +++ b/packages/web3-shared/evm/hooks/useERC20TokenTransferCallback.ts @@ -89,11 +89,9 @@ export function useERC20TokenTransferCallback(address?: string, amount?: string, [account, address, amount, recipient, erc20Contract], ) - const resetCallback = useCallback(() => { - setTransferState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTransferState({ type: TransactionStateType.UNKNOWN }) + } useEffect(() => { if (transferState.type !== TransactionStateType.CONFIRMED) return diff --git a/packages/web3-shared/evm/hooks/useERC721ContractSetApproveForAllCallback.ts b/packages/web3-shared/evm/hooks/useERC721ContractSetApproveForAllCallback.ts index 6eb6672de354..7defdf124e77 100644 --- a/packages/web3-shared/evm/hooks/useERC721ContractSetApproveForAllCallback.ts +++ b/packages/web3-shared/evm/hooks/useERC721ContractSetApproveForAllCallback.ts @@ -72,9 +72,9 @@ export function useERC721ContractSetApproveForAllCallback( }) }, [account, chainId, erc721TokenContract, approved, contractAddress, operator, setApproveState]) - const resetCallback = useCallback(() => { + const resetCallback = () => { setApproveState({ type: TransactionStateType.UNKNOWN }) - }, []) + } return [approveState, approveCallback, resetCallback] as const } diff --git a/packages/web3-shared/evm/hooks/useERC721TokenTransferCallback.ts b/packages/web3-shared/evm/hooks/useERC721TokenTransferCallback.ts index 3a02ac7e9644..a901d2fa0112 100644 --- a/packages/web3-shared/evm/hooks/useERC721TokenTransferCallback.ts +++ b/packages/web3-shared/evm/hooks/useERC721TokenTransferCallback.ts @@ -89,11 +89,9 @@ export function useERC721TokenTransferCallback(address?: string) { [account, erc721Contract], ) - const resetCallback = useCallback(() => { - setTransferState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTransferState({ type: TransactionStateType.UNKNOWN }) + } useEffect(() => { if (transferState.type !== TransactionStateType.CONFIRMED) return diff --git a/packages/web3-shared/evm/hooks/useNativeTokenTransferCallback.ts b/packages/web3-shared/evm/hooks/useNativeTokenTransferCallback.ts index c42fb81a9e8b..d6e3e09479a4 100644 --- a/packages/web3-shared/evm/hooks/useNativeTokenTransferCallback.ts +++ b/packages/web3-shared/evm/hooks/useNativeTokenTransferCallback.ts @@ -95,11 +95,9 @@ export function useNativeTransferCallback() { [web3, account, chainId], ) - const resetCallback = useCallback(() => { - setTransferState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTransferState({ type: TransactionStateType.UNKNOWN }) + } useEffect(() => { if (transferState.type !== TransactionStateType.CONFIRMED) return diff --git a/packages/web3-shared/evm/hooks/useNativeTokenWrapperCallback.ts b/packages/web3-shared/evm/hooks/useNativeTokenWrapperCallback.ts index 522cc4319931..f00bfb4b766b 100644 --- a/packages/web3-shared/evm/hooks/useNativeTokenWrapperCallback.ts +++ b/packages/web3-shared/evm/hooks/useNativeTokenWrapperCallback.ts @@ -155,11 +155,9 @@ export function useNativeTokenWrapperCallback(chainId?: ChainId) { [account, wrapperContract], ) - const resetCallback = useCallback(() => { - setTransactionState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setTransactionState({ type: TransactionStateType.UNKNOWN }) + } return [transactionState, wrapCallback, unwrapCallback, resetCallback] as const } diff --git a/packages/web3-shared/evm/hooks/useTransactionCallback.ts b/packages/web3-shared/evm/hooks/useTransactionCallback.ts index 7bb891671b27..3b38bd46cdae 100644 --- a/packages/web3-shared/evm/hooks/useTransactionCallback.ts +++ b/packages/web3-shared/evm/hooks/useTransactionCallback.ts @@ -79,11 +79,9 @@ export function useTransactionCallback( }) }, [type, config, method]) - const resetCallback = useCallback(() => { - setState({ - type: TransactionStateType.UNKNOWN, - }) - }, []) + const resetCallback = () => { + setState({ type: TransactionStateType.UNKNOWN }) + } return [state, updateCallback, resetCallback] as const }