From 8ee90fe1247d47b931c6720a7b8a38f9e450bff0 Mon Sep 17 00:00:00 2001 From: nuanyang233 Date: Wed, 20 Mar 2024 00:43:23 -0700 Subject: [PATCH] feat: exchange (#11501) --- cspell.json | 4 +- package.json | 21 +- packages/mask/.webpack/config.ts | 16 +- .../injection/ProfileCard/index.tsx | 1 - packages/mask/package.json | 1 + .../mask/popups/pages/Swap/SwapBox/index.tsx | 45 - packages/mask/popups/pages/Swap/index.tsx | 9 +- .../Wallet/components/WalletAssets/index.tsx | 2 +- packages/mask/shared-ui/locales/en-US.json | 2 +- .../SiteAdaptor/components/FileBrowser.tsx | 2 +- .../modals/DonateModal/DonateDialog.tsx | 1 + .../modals/DonateModal/GiveBackSelect.tsx | 4 +- .../Savings/src/SiteAdaptor/SavingsDialog.tsx | 119 +- packages/plugins/Trader/package.json | 5 +- .../plugins/Trader/src/SiteAdaptor/index.tsx | 9 +- .../src/SiteAdaptor/trader/ConfirmDialog.tsx | 144 - .../src/SiteAdaptor/trader/ExchangeDialog.tsx | 123 + .../SiteAdaptor/trader/ExchangeInjection.tsx | 23 + .../SiteAdaptor/trader/InputTokenPanel.tsx | 56 - .../src/SiteAdaptor/trader/TradeForm.tsx | 464 -- .../src/SiteAdaptor/trader/TradeView.tsx | 59 - .../Trader/src/SiteAdaptor/trader/Trader.tsx | 474 -- .../src/SiteAdaptor/trader/TraderDialog.tsx | 245 - .../src/SiteAdaptor/trader/TraderInfo.tsx | 69 - .../src/SiteAdaptor/trader/TraderStateBar.tsx | 239 - .../trader/components/ConfirmDialogUI.tsx | 499 --- .../trader/components/PriceImpactDialogUI.tsx | 119 - .../trader/components/TraderInfoUI.tsx | 230 - .../hooks/useGreatThanSlippageSetting.ts | 24 - .../trader/hooks/useSortedTrades.ts | 95 - .../trader/hooks/useSwapErrorCallback.ts | 37 - .../trader/hooks/useUpdateBalance.ts | 54 - .../src/SiteAdaptor/trending/TrendingView.tsx | 60 +- .../SiteAdaptor/trending/TrendingViewDeck.tsx | 32 +- packages/plugins/Trader/src/constants/0x.ts | 2 - .../plugins/Trader/src/constants/arthswap.ts | 13 - .../Trader/src/constants/astarexchange.ts | 13 - .../plugins/Trader/src/constants/bancor.ts | 6 - .../plugins/Trader/src/constants/index.ts | 17 - packages/plugins/Trader/src/constants/mdex.ts | 14 - .../plugins/Trader/src/constants/openocean.ts | 14 - .../Trader/src/constants/pancakeswap.ts | 13 - .../Trader/src/constants/pangolindex.ts | 13 - .../plugins/Trader/src/constants/quickswap.ts | 13 - .../plugins/Trader/src/constants/sushiswap.ts | 37 - .../plugins/Trader/src/constants/trader.ts | 54 - .../plugins/Trader/src/constants/traderjoe.ts | 13 - .../Trader/src/constants/trisolaris.ts | 14 - .../plugins/Trader/src/constants/uniswap.ts | 35 - .../plugins/Trader/src/constants/versa.ts | 13 - .../plugins/Trader/src/constants/wannaswap.ts | 13 - .../plugins/Trader/src/constants/yumiswap.ts | 13 - .../contracts/uniswap/useRouterV2Contract.ts | 9 - .../uniswap/useSwapRouterContract.ts | 9 - .../Trader/src/helpers/ExtendedEther.ts | 16 - .../Trader/src/helpers/computeAllRoutes.ts | 43 - .../helpers/computeRealizedLPFeePercent.ts | 28 - .../helpers/getEVMAvailableTraderProviders.ts | 72 - .../Trader/src/helpers/getPairAddress.ts | 33 - .../Trader/src/helpers/getTradeContext.ts | 242 - packages/plugins/Trader/src/helpers/index.ts | 21 - .../src/helpers/isNativeTokenWrapper.ts | 9 - .../Trader/src/helpers/isTradeBetter.ts | 29 - .../src/helpers/resolveTradeProviderName.ts | 28 - .../Trader/src/helpers/swapCallParameters.ts | 34 - .../helpers/swapErrorToUserReadableMessage.ts | 35 - .../Trader/src/helpers/toUniswapChainId.ts | 5 - .../Trader/src/helpers/toUniswapCurrency.ts | 18 - .../src/helpers/toUniswapCurrencyAmount.ts | 17 - .../Trader/src/helpers/toUniswapPercent.ts | 5 - .../Trader/src/helpers/toUniswapToken.ts | 19 - .../Trader/src/helpers/uniswapChainIdTo.ts | 5 - .../src/helpers/uniswapCurrencyAmountTo.ts | 6 - .../Trader/src/helpers/uniswapPercentTo.ts | 6 - .../Trader/src/helpers/uniswapPriceTo.ts | 6 - .../Trader/src/helpers/uniswapTokenTo.ts | 19 - packages/plugins/Trader/src/index.ts | 2 - .../plugins/Trader/src/locales/en-US.json | 3 +- .../plugins/Trader/src/providers/Bancor.ts | 246 - .../plugins/Trader/src/providers/OpenOcean.ts | 227 - .../plugins/Trader/src/providers/UniSwapV2.ts | 496 -- .../plugins/Trader/src/providers/UniSwapV3.ts | 258 -- .../plugins/Trader/src/providers/ZeroX.ts | 254 -- packages/plugins/Trader/src/settings.ts | 7 - .../plugins/Trader/src/trader/0x/constants.ts | 3 - .../Trader/src/trader/0x/useTradeCallback.ts | 63 - .../src/trader/bancor/useTradeCallback.ts | 58 - .../src/trader/dodo/useTradeCallback.ts | 50 - .../Trader/src/trader/native/useTrade.ts | 25 - .../src/trader/native/useTradeCallback.ts | 35 - .../src/trader/native/useTradeComputed.ts | 11 - .../src/trader/openocean/useTradeCallback.ts | 50 - .../src/trader/uniswap/useTradeCallback.ts | 143 - .../src/trader/uniswap/useTradeParameters.ts | 102 - .../trader/uniswap/useTransactionDeadline.ts | 18 - .../src/trader/useAllProviderTradeContext.ts | 133 - .../Trader/src/trader/useAllTradeComputed.ts | 218 - .../plugins/Trader/src/trader/useBancor.ts | 51 - .../Trader/src/trader/useGetTradeContext.ts | 247 - .../plugins/Trader/src/trader/useOpenOcean.ts | 52 - .../Trader/src/trader/useSlippageTolerance.ts | 9 - .../src/trader/useTradeApproveComputed.ts | 38 - .../Trader/src/trader/useTradeCallback.ts | 121 - .../Trader/src/trader/useUniSwapV3Like.ts | 51 - .../Trader/src/trader/useUniswapV2Like.ts | 52 - .../plugins/Trader/src/trader/useZeroX.ts | 52 - .../trending/useAvailableTraderProviders.ts | 27 - packages/plugins/Trader/src/types/0x.ts | 158 - packages/plugins/Trader/src/types/bancor.ts | 43 - packages/plugins/Trader/src/types/dodo.ts | 24 - packages/plugins/Trader/src/types/index.ts | 7 +- .../plugins/Trader/src/types/openocean.ts | 39 - packages/plugins/Trader/src/types/trader.ts | 1 - packages/plugins/Trader/src/types/uniswap.ts | 41 - .../components/Farcaster/FarcasterPopup.tsx | 1 - .../SiteAdaptor/components/Lens/LensPopup.tsx | 1 - packages/public-api/src/web.ts | 21 - .../src/UI/components/AddressItem/index.tsx | 6 +- .../theme/src/Components/TextField/index.tsx | 11 +- packages/web3-constants/evm/trader.json | 472 -- .../web3-contracts/abis/BancorNetwork.json | 18 - .../web3-contracts/abis/DODORouteProxy.json | 67 - .../abis/OpenOceanExchangeV2.json | 111 - packages/web3-contracts/abis/Pair.json | 345 -- packages/web3-contracts/abis/Quoter.json | 193 - packages/web3-contracts/abis/RouterV2.json | 422 -- packages/web3-contracts/abis/SwapRouter.json | 232 - packages/web3-contracts/abis/ZeroXSwap.json | 216 - .../web3-contracts/types/BancorNetwork.d.ts | 40 - .../web3-contracts/types/DODORouteProxy.d.ts | 76 - .../types/OpenOceanExchangeV2.d.ts | 123 - packages/web3-contracts/types/RouterV2.d.ts | 295 -- packages/web3-contracts/types/SwapRouter.d.ts | 138 - .../UniswapV3MulticallFunctionExactInput.d.ts | 31 - ...apV3MulticallFunctionExactInputSingle.d.ts | 35 - packages/web3-contracts/types/ZeroXSwap.d.ts | 131 - packages/web3-contracts/types/index.d.ts | 8 - packages/web3-hooks/evm/src/index.ts | 2 - .../src/Web3/EVM/apis/ContractReadonlyAPI.ts | 24 - .../Web3/EVM/state/TransactionFormatter.ts | 2 - .../EVM/state/TransactionFormatter/abi.ts | 12 - .../TransactionFormatter/descriptors/Swap.ts | 478 -- packages/web3-providers/src/entry-types.ts | 1 - packages/web3-providers/src/types/Trader.ts | 74 - .../evm/src/constants/constants.ts | 6 - .../evm/src/helpers/getContractOwnerDomain.ts | 28 - patches/@lifi__widget@2.10.1.patch | Bin 0 -> 964268 bytes patches/@mui__base@5.0.0-beta.38.patch | 3992 +++++++++++++++++ patches/@mui__material@5.15.12.patch | 159 + patches/@uniswap__v3-sdk@3.9.0.patch | 61 - patches/README.md | 1 + pnpm-lock.yaml | 3432 +++++++------- 152 files changed, 6342 insertions(+), 12649 deletions(-) delete mode 100644 packages/mask/popups/pages/Swap/SwapBox/index.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/ConfirmDialog.tsx create mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/ExchangeDialog.tsx create mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/ExchangeInjection.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/InputTokenPanel.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/TradeForm.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/TradeView.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/Trader.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/TraderDialog.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/TraderInfo.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/TraderStateBar.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/components/ConfirmDialogUI.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/components/PriceImpactDialogUI.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/components/TraderInfoUI.tsx delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useGreatThanSlippageSetting.ts delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useSortedTrades.ts delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useSwapErrorCallback.ts delete mode 100644 packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useUpdateBalance.ts delete mode 100644 packages/plugins/Trader/src/constants/0x.ts delete mode 100644 packages/plugins/Trader/src/constants/arthswap.ts delete mode 100644 packages/plugins/Trader/src/constants/astarexchange.ts delete mode 100644 packages/plugins/Trader/src/constants/bancor.ts delete mode 100644 packages/plugins/Trader/src/constants/mdex.ts delete mode 100644 packages/plugins/Trader/src/constants/openocean.ts delete mode 100644 packages/plugins/Trader/src/constants/pancakeswap.ts delete mode 100644 packages/plugins/Trader/src/constants/pangolindex.ts delete mode 100644 packages/plugins/Trader/src/constants/quickswap.ts delete mode 100644 packages/plugins/Trader/src/constants/sushiswap.ts delete mode 100644 packages/plugins/Trader/src/constants/trader.ts delete mode 100644 packages/plugins/Trader/src/constants/traderjoe.ts delete mode 100644 packages/plugins/Trader/src/constants/trisolaris.ts delete mode 100644 packages/plugins/Trader/src/constants/uniswap.ts delete mode 100644 packages/plugins/Trader/src/constants/versa.ts delete mode 100644 packages/plugins/Trader/src/constants/wannaswap.ts delete mode 100644 packages/plugins/Trader/src/constants/yumiswap.ts delete mode 100644 packages/plugins/Trader/src/contracts/uniswap/useRouterV2Contract.ts delete mode 100644 packages/plugins/Trader/src/contracts/uniswap/useSwapRouterContract.ts delete mode 100644 packages/plugins/Trader/src/helpers/ExtendedEther.ts delete mode 100644 packages/plugins/Trader/src/helpers/computeAllRoutes.ts delete mode 100644 packages/plugins/Trader/src/helpers/computeRealizedLPFeePercent.ts delete mode 100644 packages/plugins/Trader/src/helpers/getEVMAvailableTraderProviders.ts delete mode 100644 packages/plugins/Trader/src/helpers/getPairAddress.ts delete mode 100644 packages/plugins/Trader/src/helpers/getTradeContext.ts delete mode 100644 packages/plugins/Trader/src/helpers/isNativeTokenWrapper.ts delete mode 100644 packages/plugins/Trader/src/helpers/isTradeBetter.ts delete mode 100644 packages/plugins/Trader/src/helpers/resolveTradeProviderName.ts delete mode 100644 packages/plugins/Trader/src/helpers/swapCallParameters.ts delete mode 100644 packages/plugins/Trader/src/helpers/swapErrorToUserReadableMessage.ts delete mode 100644 packages/plugins/Trader/src/helpers/toUniswapChainId.ts delete mode 100644 packages/plugins/Trader/src/helpers/toUniswapCurrency.ts delete mode 100644 packages/plugins/Trader/src/helpers/toUniswapCurrencyAmount.ts delete mode 100644 packages/plugins/Trader/src/helpers/toUniswapPercent.ts delete mode 100644 packages/plugins/Trader/src/helpers/toUniswapToken.ts delete mode 100644 packages/plugins/Trader/src/helpers/uniswapChainIdTo.ts delete mode 100644 packages/plugins/Trader/src/helpers/uniswapCurrencyAmountTo.ts delete mode 100644 packages/plugins/Trader/src/helpers/uniswapPercentTo.ts delete mode 100644 packages/plugins/Trader/src/helpers/uniswapPriceTo.ts delete mode 100644 packages/plugins/Trader/src/helpers/uniswapTokenTo.ts delete mode 100644 packages/plugins/Trader/src/providers/Bancor.ts delete mode 100644 packages/plugins/Trader/src/providers/OpenOcean.ts delete mode 100644 packages/plugins/Trader/src/providers/UniSwapV2.ts delete mode 100644 packages/plugins/Trader/src/providers/UniSwapV3.ts delete mode 100644 packages/plugins/Trader/src/providers/ZeroX.ts delete mode 100644 packages/plugins/Trader/src/settings.ts delete mode 100644 packages/plugins/Trader/src/trader/0x/constants.ts delete mode 100644 packages/plugins/Trader/src/trader/0x/useTradeCallback.ts delete mode 100644 packages/plugins/Trader/src/trader/bancor/useTradeCallback.ts delete mode 100644 packages/plugins/Trader/src/trader/dodo/useTradeCallback.ts delete mode 100644 packages/plugins/Trader/src/trader/native/useTrade.ts delete mode 100644 packages/plugins/Trader/src/trader/native/useTradeCallback.ts delete mode 100644 packages/plugins/Trader/src/trader/native/useTradeComputed.ts delete mode 100644 packages/plugins/Trader/src/trader/openocean/useTradeCallback.ts delete mode 100644 packages/plugins/Trader/src/trader/uniswap/useTradeCallback.ts delete mode 100644 packages/plugins/Trader/src/trader/uniswap/useTradeParameters.ts delete mode 100644 packages/plugins/Trader/src/trader/uniswap/useTransactionDeadline.ts delete mode 100644 packages/plugins/Trader/src/trader/useAllProviderTradeContext.ts delete mode 100644 packages/plugins/Trader/src/trader/useAllTradeComputed.ts delete mode 100644 packages/plugins/Trader/src/trader/useBancor.ts delete mode 100644 packages/plugins/Trader/src/trader/useGetTradeContext.ts delete mode 100644 packages/plugins/Trader/src/trader/useOpenOcean.ts delete mode 100644 packages/plugins/Trader/src/trader/useSlippageTolerance.ts delete mode 100644 packages/plugins/Trader/src/trader/useTradeApproveComputed.ts delete mode 100644 packages/plugins/Trader/src/trader/useTradeCallback.ts delete mode 100644 packages/plugins/Trader/src/trader/useUniSwapV3Like.ts delete mode 100644 packages/plugins/Trader/src/trader/useUniswapV2Like.ts delete mode 100644 packages/plugins/Trader/src/trader/useZeroX.ts delete mode 100644 packages/plugins/Trader/src/trending/useAvailableTraderProviders.ts delete mode 100644 packages/plugins/Trader/src/types/0x.ts delete mode 100644 packages/plugins/Trader/src/types/bancor.ts delete mode 100644 packages/plugins/Trader/src/types/dodo.ts delete mode 100644 packages/plugins/Trader/src/types/openocean.ts delete mode 100644 packages/plugins/Trader/src/types/uniswap.ts delete mode 100644 packages/web3-constants/evm/trader.json delete mode 100644 packages/web3-contracts/abis/BancorNetwork.json delete mode 100644 packages/web3-contracts/abis/DODORouteProxy.json delete mode 100644 packages/web3-contracts/abis/OpenOceanExchangeV2.json delete mode 100644 packages/web3-contracts/abis/Pair.json delete mode 100644 packages/web3-contracts/abis/Quoter.json delete mode 100644 packages/web3-contracts/abis/RouterV2.json delete mode 100644 packages/web3-contracts/abis/SwapRouter.json delete mode 100644 packages/web3-contracts/abis/ZeroXSwap.json delete mode 100644 packages/web3-contracts/types/BancorNetwork.d.ts delete mode 100644 packages/web3-contracts/types/DODORouteProxy.d.ts delete mode 100644 packages/web3-contracts/types/OpenOceanExchangeV2.d.ts delete mode 100644 packages/web3-contracts/types/RouterV2.d.ts delete mode 100644 packages/web3-contracts/types/SwapRouter.d.ts delete mode 100644 packages/web3-contracts/types/UniswapV3MulticallFunctionExactInput.d.ts delete mode 100644 packages/web3-contracts/types/UniswapV3MulticallFunctionExactInputSingle.d.ts delete mode 100644 packages/web3-contracts/types/ZeroXSwap.d.ts delete mode 100644 packages/web3-providers/src/Web3/EVM/state/TransactionFormatter/descriptors/Swap.ts delete mode 100644 packages/web3-providers/src/types/Trader.ts create mode 100644 patches/@lifi__widget@2.10.1.patch create mode 100644 patches/@mui__base@5.0.0-beta.38.patch create mode 100644 patches/@mui__material@5.15.12.patch delete mode 100644 patches/@uniswap__v3-sdk@3.9.0.patch diff --git a/cspell.json b/cspell.json index 77968446ba35..06a8752d50c0 100644 --- a/cspell.json +++ b/cspell.json @@ -151,6 +151,7 @@ "lensprotocol", "lenster", "lenstube", + "lifi", "linkify", "linkifyjs", "linkswap", @@ -372,11 +373,11 @@ "defi", "deletable", "devnet", - "dodoex", "drawed", "dsearch", "energi", "enjin", + "ethersproject", "ethjs", "fbclid", "frax", @@ -437,6 +438,7 @@ "redpackets", "rehype", "renfil", + "rpcs", "shapeclip", "simplehash", "splinecode", diff --git a/package.json b/package.json index 0382c86840d5..e3577416161a 100644 --- a/package.json +++ b/package.json @@ -35,11 +35,11 @@ "@emotion/serialize": "1.1.2", "@emotion/styled": "11.11.0", "@masknet/kit": "0.3.0", - "@mui/base": "5.0.0-alpha.100", - "@mui/icons-material": "5.10.6", - "@mui/lab": "5.0.0-alpha.102", - "@mui/material": "5.10.8", - "@mui/system": "5.10.8", + "@mui/base": "5.0.0-beta.38", + "@mui/icons-material": "5.15.12", + "@mui/lab": "5.0.0-alpha.167", + "@mui/material": "5.15.12", + "@mui/system": "5.15.12", "@tanstack/react-query": "^5.8.7", "@types/masknet__global-types": "workspace:^", "@types/react": "18.2.48", @@ -96,10 +96,10 @@ "cross-blob": "3.0.1", "i18next-translation-parser>html-parse-stringify2": "github:locize/html-parse-stringify2#d463109433b2c49c74a081044f54b2a6a1ccad7c", "web3@0.20.7>bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "@mui/base": "5.0.0-alpha.100", "@protobufjs/inquire": "1.1.0", "reflect-metadata": "0.1.13", - "webpack@5": "Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770" + "webpack@5": "Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770", + "@tanstack/react-query": "^5.8.7" }, "override comments": { "i18next-translation-parser": "see https://github.com/i18next/i18next-translation-parser/issues/11 we manually pin the commit" @@ -124,10 +124,8 @@ } }, "patchedDependencies": { - "@uniswap/v3-sdk@3.9.0": "patches/@uniswap__v3-sdk@3.9.0.patch", "@ceramicnetwork/rpc-transport@0.3.1": "patches/@ceramicnetwork__rpc-transport@0.3.1.patch", "gulp@4.0.2": "patches/gulp@4.0.2.patch", - "@mui/base@5.0.0-alpha.100": "patches/@mui__base@5.0.0-alpha.100.patch", "micromark@3.1.0": "patches/micromark@3.1.0.patch", "micromark-util-symbol@1.0.1": "patches/micromark-util-symbol@1.0.1.patch", "@types/react-avatar-editor@13.0.0": "patches/@types__react-avatar-editor@13.0.0.patch", @@ -146,7 +144,10 @@ "web3-core@1.10.2": "patches/web3-core@1.10.2.patch", "react-devtools-inline@4.28.5": "patches/react-devtools-inline@4.28.5.patch", "@tanstack/query-async-storage-persister@5.8.7": "patches/@tanstack__query-async-storage-persister@5.8.7.patch", - "eslint-plugin-i@2.29.1": "patches/eslint-plugin-i@2.29.1.patch" + "eslint-plugin-i@2.29.1": "patches/eslint-plugin-i@2.29.1.patch", + "@mui/material@5.15.12": "patches/@mui__material@5.15.12.patch", + "@lifi/widget@2.10.1": "patches/@lifi__widget@2.10.1.patch", + "@mui/base@5.0.0-beta.38": "patches/@mui__base@5.0.0-beta.38.patch" } } } diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts index dea538ac50f7..776be8e17ecc 100644 --- a/packages/mask/.webpack/config.ts +++ b/packages/mask/.webpack/config.ts @@ -152,6 +152,11 @@ export async function createConfiguration(_inputFlags: BuildFlags): Promise () - const params = new URLSearchParams(location.search) - const address = params.get('contract_address') - const name = params.get('name') - const symbol = params.get('symbol') - const decimals = params.get('decimals') - const isTokenSecurityDisabled = - useQuery({ - queryKey: ['Services.Settings.getPluginMinimalModeEnabledResolved(PluginID.GoPlusSecurity)'], - queryFn: () => Services.Settings.getPluginMinimalModeEnabledResolved(PluginID.GoPlusSecurity), - networkMode: 'always', - }).data ?? true - - const fallbackToken = useMemo(() => { - return createERC20Token( - chainId, - address ?? '', - name ? name : undefined, - symbol ? symbol : undefined, - Number.parseInt(decimals ?? '0', 10), - ) - }, [chainId, address, name, symbol, decimals]) - const { data: coin } = useFungibleToken(NetworkPluginID.PLUGIN_EVM, address ?? '', fallbackToken, { chainId }) - - return ( - - ) -} diff --git a/packages/mask/popups/pages/Swap/index.tsx b/packages/mask/popups/pages/Swap/index.tsx index 2539af73f74c..3402c043b972 100644 --- a/packages/mask/popups/pages/Swap/index.tsx +++ b/packages/mask/popups/pages/Swap/index.tsx @@ -1,4 +1,4 @@ -import { AllProviderTradeContext, languages } from '@masknet/plugin-trader' +import { languages } from '@masknet/plugin-trader' import { Appearance } from '@masknet/public-api' import { SharedContextProvider, SwapPageModals } from '@masknet/shared' import { applyMaskColorVars, makeStyles } from '@masknet/theme' @@ -7,7 +7,6 @@ import { Typography } from '@mui/material' import { useMaskSharedTrans } from '../../../shared-ui/index.js' import { NetworkSelector } from '../../components/NetworkSelector/index.js' import { useTokenParams } from '../../hooks/index.js' -import { SwapBox } from './SwapBox/index.js' import { NetworkPluginID, PluginID, createI18NBundle, i18NextInstance } from '@masknet/shared-base' import { useCallback } from 'react' @@ -84,11 +83,7 @@ export default function SwapPage() {
- - - - - +
diff --git a/packages/mask/popups/pages/Wallet/components/WalletAssets/index.tsx b/packages/mask/popups/pages/Wallet/components/WalletAssets/index.tsx index d5c081ecac31..d261e8ec3f54 100644 --- a/packages/mask/popups/pages/Wallet/components/WalletAssets/index.tsx +++ b/packages/mask/popups/pages/Wallet/components/WalletAssets/index.tsx @@ -124,7 +124,7 @@ const WalletAssetsUI = memo(function WalletAssetsUI({ onAdd
- + { { diff --git a/packages/plugins/Gitcoin/src/SiteAdaptor/modals/DonateModal/GiveBackSelect.tsx b/packages/plugins/Gitcoin/src/SiteAdaptor/modals/DonateModal/GiveBackSelect.tsx index 4bf648a9fa3a..d69a18c63875 100644 --- a/packages/plugins/Gitcoin/src/SiteAdaptor/modals/DonateModal/GiveBackSelect.tsx +++ b/packages/plugins/Gitcoin/src/SiteAdaptor/modals/DonateModal/GiveBackSelect.tsx @@ -1,10 +1,8 @@ import { memo } from 'react' import { MenuItem, Select, type SelectProps } from '@mui/material' -interface Props extends SelectProps {} - const OPTIONS = [0, 0.05, 0.1, 0.15] -export const GiveBackSelect = memo((props: Props) => { +export const GiveBackSelect = memo((props: SelectProps) => { return (