diff --git a/packages/dashboard/src/components/Restore/steps/PhoneField.tsx b/packages/dashboard/src/components/Restore/steps/PhoneField.tsx
index 6b15229daa4b..a4c0db21f6ad 100644
--- a/packages/dashboard/src/components/Restore/steps/PhoneField.tsx
+++ b/packages/dashboard/src/components/Restore/steps/PhoneField.tsx
@@ -21,9 +21,8 @@ export const PhoneField = memo(({ toStep }: StepCommonProps) => {
}
const handleClick = useCallback(() => {
- if (phoneRegexp.test(account)) {
- toStep(ValidationCodeStep.AccountValidation, { account: account, type: AccountType.phone })
- }
+ if (!phoneRegexp.test(account)) return
+ toStep(ValidationCodeStep.AccountValidation, { account, type: AccountType.phone })
}, [account])
return (
diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/useNativeTokenPrice.ts b/packages/dashboard/src/pages/Wallets/components/Transfer/useNativeTokenPrice.ts
index 547d0e66fa84..e906bc79387e 100644
--- a/packages/dashboard/src/pages/Wallets/components/Transfer/useNativeTokenPrice.ts
+++ b/packages/dashboard/src/pages/Wallets/components/Transfer/useNativeTokenPrice.ts
@@ -18,12 +18,8 @@ export function useNativeTokenPrice() {
const [price, setPrice] = useState(0)
const trackPrice = useCallback(() => {
- if (!coinId) {
- return
- }
- getNativeTokenPrice(coinId, USD).then((result) => {
- setPrice(result[coinId][USD])
- })
+ if (!coinId) return
+ getNativeTokenPrice(coinId, USD).then((result) => setPrice(result[coinId][USD]))
}, [coinId])
useEffect(trackPrice, [trackPrice])
diff --git a/packages/mask/src/components/shared/WalletStatusBox.tsx b/packages/mask/src/components/shared/WalletStatusBox.tsx
index ebda5fe0b4e0..256564f8801e 100644
--- a/packages/mask/src/components/shared/WalletStatusBox.tsx
+++ b/packages/mask/src/components/shared/WalletStatusBox.tsx
@@ -150,10 +150,6 @@ export function WalletStatusBox(props: WalletStatusBox) {
}
}, [chainId, providerType, setWalletConnectDialog])
- const onChange = useCallback(() => {
- openSelectProviderDialog()
- }, [openSelectProviderDialog])
-
return account ? (
+ onClick={openSelectProviderDialog}>
{t('wallet_status_button_change')}
@@ -237,7 +233,7 @@ export function WalletStatusBox(props: WalletStatusBox) {
color="primary"
variant="contained"
size="small"
- onClick={onChange}>
+ onClick={openSelectProviderDialog}>
{t('plugin_wallet_on_connect')}
diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx
index bd4e1683115d..e629a535a458 100644
--- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx
+++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx
@@ -91,17 +91,13 @@ export function CheckoutDialog(props: CheckoutDialogProps) {
const selectedPaymentToken = first(paymentTokens)
const { token, balance } = useFungibleTokenWatched(selectedPaymentToken)
- const [purchaseState, purchaseCallback, resetCallback] = usePurchaseCallback(
+ const [purchaseState, onCheckout, resetCallback] = usePurchaseCallback(
asset?.value?.editionNumber ?? '0',
asset?.value?.priceInWei > 0
? asset?.value?.priceInWei
: new BigNumber(0.01).shiftedBy(selectedPaymentToken?.decimals ?? 18).toNumber(),
)
- const onCheckout = useCallback(() => {
- purchaseCallback()
- }, [purchaseCallback])
-
const assetLink = resolveAssetLinkOnCryptoartAI(asset?.value?.creator?.username, asset?.value?.token_id, chainId)
const shareText = token
? t(
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx
index 6beab8740f0e..f271fdc2402e 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx
@@ -1,5 +1,5 @@
import { useCurrentWeb3NetworkPluginID, PluginId, useActivatedPlugin } from '@masknet/plugin-infra'
-import { useCallback, useEffect, useState, useLayoutEffect, useRef } from 'react'
+import { useEffect, useState, useLayoutEffect, useRef } from 'react'
import { flatten, uniq } from 'lodash-unified'
import formatDateTime from 'date-fns/format'
import { SnackbarProvider, makeStyles } from '@masknet/theme'
@@ -269,10 +269,6 @@ export function ClaimAllDialog(props: ClaimAllDialogProps) {
setTimeout(() => setInitLoading(false), 1000)
}, [])
- const onClaimButtonClick = useCallback(() => {
- claimCallback()
- }, [claimCallback, chainId])
-
const { setDialog: setClaimTransactionDialog } = useRemoteControlledDialog(
WalletMessages.events.transactionDialogUpdated,
(ev) => {
@@ -392,7 +388,7 @@ export function ClaimAllDialog(props: ClaimAllDialogProps) {
].includes(claimState.type)
}
size="small"
- onClick={onClaimButtonClick}>
+ onClick={claimCallback}>
{t('plugin_ito_claim_all')}
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
index 2a09f23d9c3a..813936ebf513 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx
@@ -76,9 +76,6 @@ export function CompositionDialog(props: CompositionDialogProps) {
// #region blocking
const [fillSettings, fillState, fillCallback, resetFillCallback] = useFillCallback(poolSettings)
- const onDone = useCallback(() => {
- fillCallback()
- }, [fillCallback])
// #endregion
const { closeDialog: closeWalletStatusDialog } = useRemoteControlledDialog(
@@ -249,7 +246,12 @@ export function CompositionDialog(props: CompositionDialogProps) {
) : null}
{step === ITOCreateFormPageStep.ConfirmItoPage ? (
-
+
) : null}
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx
index 2e910ff9d7fb..bd51c8a124d0 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx
@@ -340,9 +340,6 @@ export function ITO(props: ITO_Props) {
// #region claim
const [claimState, claimCallback] = useClaimCallback([pid], payload.contract_address)
- const onClaimButtonClick = useCallback(() => {
- claimCallback()
- }, [claimCallback])
const { setDialog: setClaimTransactionDialog } = useRemoteControlledDialog(
WalletMessages.events.transactionDialogUpdated,
@@ -556,7 +553,7 @@ export function ITO(props: ITO_Props) {
if (!availability?.claimed) {
return (
{
- claimCallback()
- }, [claimCallback])
// #endregion
// #region transaction dialog
@@ -164,7 +161,7 @@ export function ITO_Card(props: ITO_CardProps) {
Number.parseInt(packet.unlockTime, 10) > Math.round(Date.now() / 1000) ||
packet.claimable === '0'
}
- onClick={onClaimButtonClick}>
+ onClick={claimCallback}>
{t('plugin_ito_claim')}
diff --git a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx
index 552221d0c1e5..d6005b4826e2 100644
--- a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx
+++ b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx
@@ -89,14 +89,14 @@ export function DepositDialog() {
const account = useAccount()
// #region remote controlled dialog
- const { open, closeDialog } = useRemoteControlledDialog(PluginPoolTogetherMessages.DepositDialogUpdated, (ev) => {
- if (!ev.open) return
- setPool(ev.pool)
- setToken(ev.token)
- })
- const onClose = useCallback(() => {
- closeDialog()
- }, [closeDialog])
+ const { open, closeDialog: onClose } = useRemoteControlledDialog(
+ PluginPoolTogetherMessages.DepositDialogUpdated,
+ (ev) => {
+ if (!ev.open) return
+ setPool(ev.pool)
+ setToken(ev.token)
+ },
+ )
// #endregion
// #region select token
diff --git a/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx b/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx
index 69027c34ecfd..8ec249548854 100644
--- a/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx
+++ b/packages/plugins/CyberConnect/src/SNSAdaptor/ConnectButton.tsx
@@ -115,9 +115,7 @@ export default function ConnectButton({
}, [web3, myAddress])
const handleClick = useCallback(() => {
- if (!cc) {
- return
- }
+ if (!cc) return
setLoading(true)
if (!isFollowing) {
cc.connect(address)