From 147df07d49df2f02925c0487ff840d01728c0393 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Thu, 17 Mar 2022 19:04:03 +0800 Subject: [PATCH 1/5] refator: resolve dependence problem --- .i18n-codegen.json | 12 +++++++ .../src/components/DashboardFrame/index.tsx | 2 +- .../PageFrame/FeaturePromotions/index.tsx | 2 +- .../src/components/PageFrame/index.tsx | 3 +- .../src/initialization/Dashboard.tsx | 3 +- packages/dashboard/src/pages/Labs/index.tsx | 2 +- packages/dashboard/src/pages/Personas/api.ts | 2 +- packages/dashboard/src/pages/Settings/api.ts | 2 +- .../dashboard/src/pages/Wallets/StartUp.tsx | 2 +- packages/dashboard/src/pages/Wallets/api.ts | 2 +- .../pages/Wallets/components/Assets/index.tsx | 2 +- .../components/FungibleTokenTable/index.tsx | 2 +- .../components/Transfer/TransferERC20.tsx | 3 +- .../components/Transfer/TransferERC721.tsx | 4 +-- .../components/WalletStateBar/index.tsx | 3 +- .../src/pages/Wallets/hooks/useGasConfig.ts | 2 +- .../dashboard/src/pages/Wallets/index.tsx | 2 +- packages/mask/src/UIRoot.tsx | 3 +- .../CompositionDialog/CompositionUI.tsx | 2 +- .../CompositionDialog/PluginEntryRender.tsx | 2 +- .../components/DataSource/useActivatedUI.ts | 2 +- .../components/DataSource/useMyPersonas.ts | 2 +- .../src/components/DataSource/useNextID.ts | 2 +- .../mask/src/components/GuideStep/index.tsx | 2 +- .../InjectedComponents/PostComments.tsx | 2 +- .../InjectedComponents/PostDialogHint.tsx | 2 +- .../InjectedComponents/PostInspector.tsx | 2 +- .../InjectedComponents/SetupGuide.tsx | 2 +- .../InjectedComponents/ToolboxUnstyled.tsx | 3 +- .../components/shared/ApplicationBoard.tsx | 2 +- .../src/components/shared/ErrorBoundary.tsx | 2 +- .../src/components/shared/InjectedDialog.tsx | 3 +- .../src/components/shared/WalletStatusBox.tsx | 4 +-- .../CollectibleList/index.tsx | 2 +- .../DashboardDialogs/Wallet/TransferNFT.tsx | 2 +- .../components/NetworkSelector/index.tsx | 3 +- .../pages/Personas/hooks/usePersonaContext.ts | 2 +- .../pages/Wallet/WalletRecovery/index.tsx | 3 +- .../ArtBlocks/SNSAdaptor/PurchaseDialog.tsx | 3 +- .../plugins/Avatar/SNSAdaptor/NFTAvatar.tsx | 2 +- .../Collectible/SNSAdaptor/CheckoutDialog.tsx | 2 +- .../SNSAdaptor/MakeOfferDialog.tsx | 2 +- .../CryptoartAI/SNSAdaptor/CheckoutDialog.tsx | 2 +- .../SNSAdaptor/MakeOfferDialog.tsx | 2 +- .../UI/components/NetworkIconClickBait.tsx | 2 +- .../UI/components/ProviderIconClickBait.tsx | 2 +- .../Gitcoin/SNSAdaptor/DonateDialog.tsx | 2 +- .../Gitcoin/SNSAdaptor/PreviewCard.tsx | 2 +- .../plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx | 3 +- .../ITO/SNSAdaptor/CompositionDialog.tsx | 2 +- .../ITO/SNSAdaptor/ExchangeTokenPanel.tsx | 2 +- .../mask/src/plugins/ITO/SNSAdaptor/ITO.tsx | 3 +- .../src/plugins/ITO/SNSAdaptor/ITO_Card.tsx | 2 +- .../ITO/SNSAdaptor/SelectTokenAmountPanel.tsx | 3 +- .../src/plugins/ITO/SNSAdaptor/SwapDialog.tsx | 2 +- .../plugins/ITO/SNSAdaptor/UnlockDialog.tsx | 2 +- .../SNSAdaptor/components/PreviewCard.tsx | 2 +- .../plugins/NextID/components/tip/TipForm.tsx | 2 +- .../src/plugins/Pets/SNSAdaptor/Animate.tsx | 2 +- .../src/plugins/Pets/SNSAdaptor/PetDialog.tsx | 2 +- .../plugins/Pets/SNSAdaptor/PetSetDialog.tsx | 2 +- .../plugins/PoolTogether/UI/DepositDialog.tsx | 2 +- .../src/plugins/PoolTogether/UI/PoolView.tsx | 3 +- .../SNSAdaptor/NftRedPacketHistoryItem.tsx | 3 +- .../SNSAdaptor/NftRedPacketHistoryList.tsx | 2 +- .../SNSAdaptor/RedPacket/OperationFooter.tsx | 2 +- .../RedPacket/SNSAdaptor/RedPacket/index.tsx | 2 +- .../RedPacket/SNSAdaptor/RedPacketDialog.tsx | 2 +- .../SNSAdaptor/RedPacketERC20Form.tsx | 2 +- .../SNSAdaptor/RedPacketInHistoryList.tsx | 3 +- .../SNSAdaptor/RedpacketNftConfirmDialog.tsx | 3 +- .../Savings/SNSAdaptor/SavingsForm.tsx | 3 +- .../SNSAdaptor/trader/ConfirmDialog.tsx | 4 +-- .../SNSAdaptor/trader/SettingsDialog.tsx | 3 +- .../Trader/SNSAdaptor/trader/TradeForm.tsx | 3 +- .../Trader/SNSAdaptor/trader/Trader.tsx | 2 +- .../Trader/SNSAdaptor/trader/TraderDialog.tsx | 2 +- .../hooks/useGreatThanSlippageSetting.ts | 2 +- .../SNSAdaptor/trending/TrendingPopper.tsx | 2 +- .../SNSAdaptor/trending/TrendingViewDeck.tsx | 3 +- .../Trader/trader/0x/useSlippageTolerance.ts | 2 +- .../trader/bancor/useSlippageTolerance.ts | 2 +- .../trader/dodo/useSlippageTolerance.ts | 2 +- .../trader/openocean/useSlippageTolerance.ts | 2 +- .../Trader/trader/uniswap/useSingleHopOnly.ts | 2 +- .../trader/uniswap/useSlippageTolerance.ts | 2 +- .../Trader/trending/useApprovedTokens.ts | 2 +- .../Trader/trending/useCurrentCoinId.ts | 2 +- .../Trader/trending/useCurrentDataProvider.ts | 2 +- .../Transak/SNSAdaptor/BuyTokenDialog.tsx | 2 +- .../SNSAdaptor/ConnectWalletDialog/index.tsx | 2 +- .../GasSettingDialog/GasSettingBar.tsx | 2 +- .../SNSAdaptor/GasSettingDialog/index.tsx | 2 +- .../Wallet/SNSAdaptor/RenameWalletDialog.tsx | 3 +- .../RestoreLegacyWalletDialog/index.tsx | 2 +- .../SNSAdaptor/RiskWarningDialog/index.tsx | 2 +- .../SNSAdaptor/SelectNftContractDialog.tsx | 2 +- .../SNSAdaptor/SelectProviderDialog/index.tsx | 3 +- .../Wallet/SNSAdaptor/SelectTokenDialog.tsx | 3 +- .../Wallet/SNSAdaptor/SelectWalletDialog.tsx | 2 +- .../Wallet/SNSAdaptor/TransactionDialog.tsx | 2 +- .../WalletConnectQRCodeDialog/index.tsx | 2 +- .../SNSAdaptor/WalletStatusDialog/index.tsx | 2 +- .../hooks/useWalletRiskWarningDialog.ts | 2 +- .../src/plugins/dHEDGE/UI/InvestDialog.tsx | 2 +- .../src/plugins/dHEDGE/UI/PoolViewDeck.tsx | 2 +- .../facebook.com/customization/custom.ts | 2 +- .../minds.com/customization/custom.ts | 2 +- .../twitter.com/customization/custom.ts | 2 +- .../src/utils/hooks/useSettingSwitcher.tsx | 2 +- packages/mask/src/utils/theme.ts | 2 +- .../src/web3/UI/ERC721ContractSelectPanel.tsx | 2 +- .../src/web3/UI/EthereumChainBoundary.tsx | 2 +- .../UI/EthereumWalletConnectedBoundary.tsx | 2 +- .../src/web3/hooks/useTransactionDialog.ts | 2 +- packages/plugin-infra/package.json | 1 - packages/plugin-infra/src/PostContext.ts | 3 +- .../src/utils/createInjectHooksRenderer.tsx | 6 ++-- packages/plugin-infra/tsconfig.json | 1 - .../FileService/src/SNSAdaptor/MainDialog.tsx | 2 +- .../plugins/template/src/locales/languages.ts | 27 +++++++++++---- packages/shared-base/package.json | 2 ++ .../UI/components/ErrorBoundary/CrashUI.tsx | 8 ++--- .../ErrorBoundary/ErrorBoundary.tsx | 0 .../UI/components/ErrorBoundary/context.ts | 0 .../src/UI/components/ErrorBoundary/index.ts | 0 .../shared-base/src/UI/components/index.ts | 1 + .../src/UI}/hooks/createGlobalState.ts | 0 packages/shared-base/src/UI/hooks/index.ts | 5 +++ .../src/UI}/hooks/useObservableMapSet.ts | 4 +-- .../UI}/hooks/useRemoteControlledDialog.ts | 0 .../src/UI}/hooks/useScrollBottomEvent.ts | 0 .../src/UI}/hooks/useValueRef.ts | 4 +-- .../shared-base/src/UI/locales/en-US.json | 27 +++++++++++++++ packages/shared-base/src/UI/locales/index.ts | 6 ++++ .../shared-base/src/UI/locales/ja-JP.json | 4 +++ .../shared-base/src/UI/locales/ko-KR.json | 11 +++++++ .../shared-base/src/UI/locales/languages.ts | 33 +++++++++++++++++++ .../shared-base/src/UI/locales/qya-AA.json | 26 +++++++++++++++ .../shared-base/src/UI/locales/zh-CN.json | 23 +++++++++++++ .../shared-base/src/UI/locales/zh-TW.json | 12 +++++++ packages/shared-base/src/index.ts | 2 ++ packages/shared/src/UI/components/index.ts | 1 - packages/shared/src/hooks/index.ts | 5 --- pnpm-lock.yaml | 6 ++-- 145 files changed, 341 insertions(+), 149 deletions(-) rename packages/{shared => shared-base}/src/UI/components/ErrorBoundary/CrashUI.tsx (97%) rename packages/{shared => shared-base}/src/UI/components/ErrorBoundary/ErrorBoundary.tsx (100%) rename packages/{shared => shared-base}/src/UI/components/ErrorBoundary/context.ts (100%) rename packages/{shared => shared-base}/src/UI/components/ErrorBoundary/index.ts (100%) create mode 100644 packages/shared-base/src/UI/components/index.ts rename packages/{shared/src => shared-base/src/UI}/hooks/createGlobalState.ts (100%) create mode 100644 packages/shared-base/src/UI/hooks/index.ts rename packages/{shared/src => shared-base/src/UI}/hooks/useObservableMapSet.ts (86%) rename packages/{shared/src => shared-base/src/UI}/hooks/useRemoteControlledDialog.ts (100%) rename packages/{shared/src => shared-base/src/UI}/hooks/useScrollBottomEvent.ts (100%) rename packages/{shared/src => shared-base/src/UI}/hooks/useValueRef.ts (100%) create mode 100644 packages/shared-base/src/UI/locales/en-US.json create mode 100644 packages/shared-base/src/UI/locales/index.ts create mode 100644 packages/shared-base/src/UI/locales/ja-JP.json create mode 100644 packages/shared-base/src/UI/locales/ko-KR.json create mode 100644 packages/shared-base/src/UI/locales/languages.ts create mode 100644 packages/shared-base/src/UI/locales/qya-AA.json create mode 100644 packages/shared-base/src/UI/locales/zh-CN.json create mode 100644 packages/shared-base/src/UI/locales/zh-TW.json diff --git a/.i18n-codegen.json b/.i18n-codegen.json index 807ea0027cc4..408474ea482c 100644 --- a/.i18n-codegen.json +++ b/.i18n-codegen.json @@ -38,6 +38,18 @@ "sourceMap": "inline" } }, + { + "input": "./packages/shared-base/src/UI/locales/en-US.json", + "output": "./packages/shared-base/src/UI/locales/i18n_generated", + "parser": "i18next", + "generator": { + "type": "i18next/react-hooks", + "hooks": "useSharedBaseI18N", + "namespace": "shareBase", + "trans": "SharedBaseTrans", + "sourceMap": "inline" + } + }, { "input": "./packages/dashboard/src/locales/en-US.json", "output": "./packages/dashboard/src/locales/i18n_generated", diff --git a/packages/dashboard/src/components/DashboardFrame/index.tsx b/packages/dashboard/src/components/DashboardFrame/index.tsx index 9808e9622c47..6b05f8c2a8f0 100644 --- a/packages/dashboard/src/components/DashboardFrame/index.tsx +++ b/packages/dashboard/src/components/DashboardFrame/index.tsx @@ -1,7 +1,7 @@ import { memo, Suspense, useMemo, useState } from 'react' import { Grid, styled, Theme, useMediaQuery } from '@mui/material' import { MaskColorVar } from '@masknet/theme' -import { ErrorBoundary } from '@masknet/shared' +import { ErrorBoundary } from '@masknet/shared-base' import { DashboardContext } from './context' import { Navigation } from './Navigation' import { NavigationVersionFooter } from '../NavigationVersionFooter' diff --git a/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx b/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx index b9db9eee3873..102bd27dfcf8 100644 --- a/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx +++ b/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx @@ -1,7 +1,7 @@ import { memo, useCallback, useMemo } from 'react' import { useNavigate } from 'react-router-dom' import { makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useAccount } from '@masknet/web3-shared-evm' import { PluginMessages, Services } from '../../../API' import { PersonaContext } from '../../../pages/Personas/hooks/usePersonaContext' diff --git a/packages/dashboard/src/components/PageFrame/index.tsx b/packages/dashboard/src/components/PageFrame/index.tsx index 363329cd1cf0..bc2b8ef07c94 100644 --- a/packages/dashboard/src/components/PageFrame/index.tsx +++ b/packages/dashboard/src/components/PageFrame/index.tsx @@ -17,12 +17,11 @@ import { import { makeStyles, MaskColorVar } from '@masknet/theme' import { Close as CloseIcon, Menu as MenuIcon } from '@mui/icons-material' import Color from 'color' -import { ErrorBoundary } from '@masknet/shared' import { DashboardContext } from '../DashboardFrame/context' import { Navigation } from '../DashboardFrame/Navigation' import { MaskBannerIcon, MaskNotSquareIcon } from '@masknet/icons' import { FeaturePromotions } from './FeaturePromotions' -import { DashboardRoutes } from '@masknet/shared-base' +import { DashboardRoutes, ErrorBoundary } from '@masknet/shared-base' import { NavigationVersionFooter } from '../NavigationVersionFooter' const featurePromotionsEnabled = [ diff --git a/packages/dashboard/src/initialization/Dashboard.tsx b/packages/dashboard/src/initialization/Dashboard.tsx index 3afb48ae4489..44152b1919ca 100644 --- a/packages/dashboard/src/initialization/Dashboard.tsx +++ b/packages/dashboard/src/initialization/Dashboard.tsx @@ -7,7 +7,8 @@ import { MaskDarkTheme, useSystemPreferencePalette, } from '@masknet/theme' -import { ErrorBoundary, I18NextProviderHMR } from '@masknet/shared' +import { I18NextProviderHMR } from '@masknet/shared' +import { ErrorBoundary } from '@masknet/shared-base' import { createInjectHooksRenderer, NetworkPluginID, diff --git a/packages/dashboard/src/pages/Labs/index.tsx b/packages/dashboard/src/pages/Labs/index.tsx index 757bc11e7698..730f7df0d109 100644 --- a/packages/dashboard/src/pages/Labs/index.tsx +++ b/packages/dashboard/src/pages/Labs/index.tsx @@ -23,7 +23,7 @@ import { useDashboardI18N } from '../../locales' import MarketTrendSettingDialog from './components/MarketTrendSettingDialog' import { useAccount } from '@masknet/web3-shared-evm' import { Messages, Services, PluginMessages } from '../../API' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { TUTORIAL_URLS_EN } from './constants' import { ContentContainer } from '../../components/ContentContainer' import { WalletStateBar } from '../Wallets/components/WalletStateBar' diff --git a/packages/dashboard/src/pages/Personas/api.ts b/packages/dashboard/src/pages/Personas/api.ts index 7033fdfb46b4..1462e8247e11 100644 --- a/packages/dashboard/src/pages/Personas/api.ts +++ b/packages/dashboard/src/pages/Personas/api.ts @@ -1,4 +1,4 @@ -import { createGlobalState } from '@masknet/shared' +import { createGlobalState } from '@masknet/shared-base' import { Services, Messages } from '../../API' export type SocialNetwork = { diff --git a/packages/dashboard/src/pages/Settings/api.ts b/packages/dashboard/src/pages/Settings/api.ts index 806d43ed71c9..c6d5570a86fe 100644 --- a/packages/dashboard/src/pages/Settings/api.ts +++ b/packages/dashboard/src/pages/Settings/api.ts @@ -1,4 +1,4 @@ -import { createGlobalState } from '@masknet/shared' +import { createGlobalState } from '@masknet/shared-base' import { Messages, Services } from '../../API' import type { DataProvider } from '@masknet/public-api' import type { AccountType, BackupFileInfo, Scenario, Locale } from './type' diff --git a/packages/dashboard/src/pages/Wallets/StartUp.tsx b/packages/dashboard/src/pages/Wallets/StartUp.tsx index 52d0cd2988a3..7213161a14d2 100644 --- a/packages/dashboard/src/pages/Wallets/StartUp.tsx +++ b/packages/dashboard/src/pages/Wallets/StartUp.tsx @@ -3,7 +3,7 @@ import { CloudLinkIcon } from '@masknet/icons' import { useDashboardI18N } from '../../locales' import { Paper, Stack, Box } from '@mui/material' import { ActionCard } from '../../components/ActionCard' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { PluginMessages } from '../../API' const Container = styled('div')` diff --git a/packages/dashboard/src/pages/Wallets/api.ts b/packages/dashboard/src/pages/Wallets/api.ts index 4a2052f6e3ea..4463eb5957ea 100644 --- a/packages/dashboard/src/pages/Wallets/api.ts +++ b/packages/dashboard/src/pages/Wallets/api.ts @@ -1,4 +1,4 @@ -import { createGlobalState } from '@masknet/shared' +import { createGlobalState } from '@masknet/shared-base' import { Messages, Services } from '../../API' export const [useCurrentCollectibleDataProvider] = createGlobalState( diff --git a/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx b/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx index 0bc01d6f38a7..67be6505d17d 100644 --- a/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx @@ -7,7 +7,7 @@ import { FungibleTokenTable } from '../FungibleTokenTable' import { useDashboardI18N } from '../../../../locales' import { CollectibleList } from '../CollectibleList' import { AddCollectibleDialog } from '../AddCollectibleDialog' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { PluginMessages } from '../../../../API' import type { Web3Plugin } from '@masknet/plugin-infra' import { NetworkPluginID, usePluginIDContext } from '@masknet/plugin-infra' diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx index 83d0ae4b7bc3..e3b5da94e41e 100644 --- a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx @@ -7,7 +7,7 @@ import { LoadingPlaceholder } from '../../../../components/LoadingPlaceholder' import { FungibleTokenTableRow } from '../FungibleTokenTableRow' import { useWeb3State } from '@masknet/web3-shared-evm' import BigNumber from 'bignumber.js' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { PluginMessages } from '../../../../API' import { DashboardRoutes } from '@masknet/shared-base' import { useNavigate } from 'react-router-dom' diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx index 10d552a65597..d43eb17da35b 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx @@ -17,6 +17,7 @@ import { useTokenConstants, useTokenTransferCallback, } from '@masknet/web3-shared-evm' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { isGreaterThan, isZero, multipliedBy, rightShift } from '@masknet/web3-shared-base' import BigNumber from 'bignumber.js' import { @@ -27,7 +28,7 @@ import { useWeb3State, Web3Plugin, } from '@masknet/plugin-infra' -import { FormattedAddress, TokenAmountPanel, useRemoteControlledDialog } from '@masknet/shared' +import { FormattedAddress, TokenAmountPanel } from '@masknet/shared' import TuneIcon from '@mui/icons-material/Tune' import { EthereumAddress } from 'wallet.ts' import { useDashboardI18N } from '../../../../locales' diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx index 44c193e60884..09370bcf1cc0 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx @@ -18,7 +18,7 @@ import { useTokenTransferCallback, } from '@masknet/web3-shared-evm' import { useERC721TokenDetailedOwnerList } from '@masknet/web3-providers' -import { FormattedAddress, useRemoteControlledDialog } from '@masknet/shared' +import { FormattedAddress } from '@masknet/shared' import { useDashboardI18N } from '../../../../locales' import { WalletMessages } from '@masknet/plugin-wallet' import { SelectNFTList } from './SelectNFTList' @@ -31,7 +31,7 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' import TuneIcon from '@mui/icons-material/Tune' import { useNativeTokenPrice } from './useNativeTokenPrice' import { useNavigate, useLocation } from 'react-router-dom' -import { DashboardRoutes } from '@masknet/shared-base' +import { DashboardRoutes, useRemoteControlledDialog } from '@masknet/shared-base' import { useGasConfig } from '../../hooks/useGasConfig' import { unionBy } from 'lodash-unified' import { TransferTab } from './types' diff --git a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx index e81fe2bf0dc4..62e17c489626 100644 --- a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx @@ -2,7 +2,8 @@ import { FC, memo } from 'react' import { Box, Button, Stack, Typography } from '@mui/material' import { EMPTY_LIST, ProviderType, TransactionStatusType } from '@masknet/web3-shared-evm' import { makeStyles, MaskColorVar } from '@masknet/theme' -import { FormattedAddress, LoadingAnimation, useRemoteControlledDialog, WalletIcon } from '@masknet/shared' +import { FormattedAddress, LoadingAnimation, WalletIcon } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useNetworkDescriptor, useProviderDescriptor, diff --git a/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts b/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts index 23765c2b119a..d7e0aa3dea26 100644 --- a/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts +++ b/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts @@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react' import { toHex } from 'web3-utils' import BigNumber from 'bignumber.js' import { formatGweiToWei, GasOption, isEIP1559Supported, useChainId, useGasPrice } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '@masknet/plugin-wallet' import { useGasOptions } from '../../../hooks/useGasOptions' diff --git a/packages/dashboard/src/pages/Wallets/index.tsx b/packages/dashboard/src/pages/Wallets/index.tsx index 3b4280e9ad89..cd77aafa01a2 100644 --- a/packages/dashboard/src/pages/Wallets/index.tsx +++ b/packages/dashboard/src/pages/Wallets/index.tsx @@ -10,7 +10,7 @@ import { useWeb3State as useWeb3PluginState, Web3Plugin, } from '@masknet/plugin-infra' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { DashboardRoutes, relativeRouteOf } from '@masknet/shared-base' import { useWeb3State } from '@masknet/web3-shared-evm' import BigNumber from 'bignumber.js' diff --git a/packages/mask/src/UIRoot.tsx b/packages/mask/src/UIRoot.tsx index 1d6c6f6251e8..4609e9b0efe0 100644 --- a/packages/mask/src/UIRoot.tsx +++ b/packages/mask/src/UIRoot.tsx @@ -3,7 +3,8 @@ import { CustomSnackbarProvider } from '@masknet/theme' import { Web3Provider } from '@masknet/web3-shared-evm' import { CssBaseline, StyledEngineProvider, Theme, ThemeProvider } from '@mui/material' import { NetworkPluginID, PluginsWeb3ContextProvider, useAllPluginsWeb3State } from '@masknet/plugin-infra' -import { ErrorBoundary, ErrorBoundaryBuildInfoContext, useValueRef, I18NextProviderHMR } from '@masknet/shared' +import { I18NextProviderHMR } from '@masknet/shared' +import { ErrorBoundary, ErrorBoundaryBuildInfoContext, useValueRef } from '@masknet/shared-base' import i18nNextInstance from '../shared-ui/locales_legacy' import { Web3Context } from './web3/context' import { buildInfoMarkdown } from './utils/BuildInfoMarkdown' diff --git a/packages/mask/src/components/CompositionDialog/CompositionUI.tsx b/packages/mask/src/components/CompositionDialog/CompositionUI.tsx index 7cb00b1b1bc9..05f5ea261ee5 100644 --- a/packages/mask/src/components/CompositionDialog/CompositionUI.tsx +++ b/packages/mask/src/components/CompositionDialog/CompositionUI.tsx @@ -2,7 +2,7 @@ import { forwardRef, useImperativeHandle, useMemo, useRef, useState, startTransi import { Typography, Chip, Button } from '@mui/material' import { LoadingButton } from '@mui/lab' import type { TypedMessage } from '@masknet/typed-message' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { makeStyles } from '@masknet/theme' import { ImagePayloadIcon } from '@masknet/icons' import { Send } from '@mui/icons-material' diff --git a/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx b/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx index 33f3b5495d1b..ee3643b5245e 100644 --- a/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx +++ b/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx @@ -6,7 +6,7 @@ import { PluginI18NFieldRender, usePluginI18NField, } from '@masknet/plugin-infra' -import { ErrorBoundary } from '@masknet/shared' +import { ErrorBoundary } from '@masknet/shared-base' import { Result } from 'ts-results' import { RedPacketPluginID } from '../../plugins/RedPacket/constants' import { ITO_PluginID } from '../../plugins/ITO/constants' diff --git a/packages/mask/src/components/DataSource/useActivatedUI.ts b/packages/mask/src/components/DataSource/useActivatedUI.ts index b9162718bfc5..67975dc3accb 100644 --- a/packages/mask/src/components/DataSource/useActivatedUI.ts +++ b/packages/mask/src/components/DataSource/useActivatedUI.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' import { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { ProfileIdentifier } from '@masknet/shared-base' import type { Profile } from '../../database' import type { SocialNetworkUI } from '../../social-network' diff --git a/packages/mask/src/components/DataSource/useMyPersonas.ts b/packages/mask/src/components/DataSource/useMyPersonas.ts index 04d05327332e..0dadbff6b1c9 100644 --- a/packages/mask/src/components/DataSource/useMyPersonas.ts +++ b/packages/mask/src/components/DataSource/useMyPersonas.ts @@ -1,5 +1,5 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import Services from '../../extension/service' import { PersonaArrayComparer } from '../../utils/comparer' import { MaskMessages } from '../../utils/messages' diff --git a/packages/mask/src/components/DataSource/useNextID.ts b/packages/mask/src/components/DataSource/useNextID.ts index cc57b68e16ac..7533e8ae5ac7 100644 --- a/packages/mask/src/components/DataSource/useNextID.ts +++ b/packages/mask/src/components/DataSource/useNextID.ts @@ -9,7 +9,7 @@ import stringify from 'json-stable-stringify' import { SetupGuideStep } from '../InjectedComponents/SetupGuide/types' import type { SetupGuideCrossContextStatus } from '../../settings/types' import { useLastRecognizedIdentity } from './useActivatedUI' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { queryExistedBindingByPersona, queryExistedBindingByPlatform, queryIsBound } from '@masknet/web3-providers' export const usePersonaBoundPlatform = (personaPublicKey: string) => { diff --git a/packages/mask/src/components/GuideStep/index.tsx b/packages/mask/src/components/GuideStep/index.tsx index e5fb5dc98188..76239bc24cb3 100644 --- a/packages/mask/src/components/GuideStep/index.tsx +++ b/packages/mask/src/components/GuideStep/index.tsx @@ -1,4 +1,4 @@ -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { makeStyles, usePortalShadowRoot } from '@masknet/theme' import { Box, Typography, styled, Portal } from '@mui/material' import classNames from 'classnames' diff --git a/packages/mask/src/components/InjectedComponents/PostComments.tsx b/packages/mask/src/components/InjectedComponents/PostComments.tsx index cf9b049449d4..5c9b677dcfc0 100644 --- a/packages/mask/src/components/InjectedComponents/PostComments.tsx +++ b/packages/mask/src/components/InjectedComponents/PostComments.tsx @@ -1,5 +1,5 @@ import type { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { Chip } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import type { ChipProps } from '@mui/material/Chip' diff --git a/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx b/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx index 0cad752b07ab..ed5608c77207 100644 --- a/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx +++ b/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx @@ -3,7 +3,7 @@ import { IconButton, Tooltip } from '@mui/material' import { useStylesExtends, makeStyles } from '@masknet/theme' import { useI18N } from '../../utils' import type { BannerProps } from '../Welcomes/Banner' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { isMobileFacebook } from '../../social-network-adaptor/facebook.com/utils/isMobile' import { MaskSharpIcon } from '../../resources/MaskIcon' import { useMyIdentities } from '../DataSource/useActivatedUI' diff --git a/packages/mask/src/components/InjectedComponents/PostInspector.tsx b/packages/mask/src/components/InjectedComponents/PostInspector.tsx index a40101905e92..a79cfd2efebb 100644 --- a/packages/mask/src/components/InjectedComponents/PostInspector.tsx +++ b/packages/mask/src/components/InjectedComponents/PostInspector.tsx @@ -6,7 +6,7 @@ import { ProfileIdentifier, type PayloadAlpha40_Or_Alpha39, type PayloadAlpha38 import type { TypedMessageTuple } from '@masknet/typed-message' import type { Profile } from '../../database' import { useCurrentIdentity, useFriendsList } from '../DataSource/useActivatedUI' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { debugModeSetting } from '../../settings/settings' import { usePostInfoDetails } from '../DataSource/usePostInfo' import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' diff --git a/packages/mask/src/components/InjectedComponents/SetupGuide.tsx b/packages/mask/src/components/InjectedComponents/SetupGuide.tsx index 8af270978eff..99b3dd7a8c06 100644 --- a/packages/mask/src/components/InjectedComponents/SetupGuide.tsx +++ b/packages/mask/src/components/InjectedComponents/SetupGuide.tsx @@ -1,6 +1,6 @@ import { useMemo, useState, useEffect, useRef } from 'react' import { makeStyles } from '@masknet/theme' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { useI18N, MaskMessages } from '../../utils' import { activatedSocialNetworkUI, SocialNetworkUI } from '../../social-network' import { currentSetupGuideStatus, dismissPinExtensionTip, userGuideStatus } from '../../settings/settings' diff --git a/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx b/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx index 79728142ea19..39ea01b47133 100644 --- a/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx +++ b/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx @@ -23,7 +23,8 @@ import { useReverseAddress, } from '@masknet/plugin-infra' import { useCallback, useMemo } from 'react' -import { useRemoteControlledDialog, WalletIcon } from '@masknet/shared' +import { WalletIcon } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' import { hasNativeAPI, nativeAPI } from '../../../shared/native-rpc' diff --git a/packages/mask/src/components/shared/ApplicationBoard.tsx b/packages/mask/src/components/shared/ApplicationBoard.tsx index d30e2849a02f..d0cfe5abf403 100644 --- a/packages/mask/src/components/shared/ApplicationBoard.tsx +++ b/packages/mask/src/components/shared/ApplicationBoard.tsx @@ -3,7 +3,7 @@ import classNames from 'classnames' import { Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import { ChainId, useChainId, useAccount, useWallet } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { MaskMessages } from '../../utils/messages' import { useControlledDialog } from '../../utils/hooks/useControlledDialog' import { RedPacketPluginID } from '../../plugins/RedPacket/constants' diff --git a/packages/mask/src/components/shared/ErrorBoundary.tsx b/packages/mask/src/components/shared/ErrorBoundary.tsx index 581aca2b7081..a33350327777 100644 --- a/packages/mask/src/components/shared/ErrorBoundary.tsx +++ b/packages/mask/src/components/shared/ErrorBoundary.tsx @@ -1 +1 @@ -export { ErrorBoundary, withErrorBoundary } from '@masknet/shared' +export { ErrorBoundary, withErrorBoundary } from '@masknet/shared-base' diff --git a/packages/mask/src/components/shared/InjectedDialog.tsx b/packages/mask/src/components/shared/InjectedDialog.tsx index 89f207caa45d..f38d05777d1f 100644 --- a/packages/mask/src/components/shared/InjectedDialog.tsx +++ b/packages/mask/src/components/shared/InjectedDialog.tsx @@ -13,8 +13,7 @@ import { useMediaQuery, } from '@mui/material' import { makeStyles, useDialogStackActor, useStylesExtends, mergeClasses } from '@masknet/theme' -import { ErrorBoundary } from '@masknet/shared' -import { isDashboardPage } from '@masknet/shared-base' +import { isDashboardPage, ErrorBoundary } from '@masknet/shared-base' import { useI18N, usePortalShadowRoot } from '../../utils' import { DialogDismissIconUI } from '../InjectedComponents/DialogDismissIcon' import { activatedSocialNetworkUI } from '../../social-network' diff --git a/packages/mask/src/components/shared/WalletStatusBox.tsx b/packages/mask/src/components/shared/WalletStatusBox.tsx index e5e1fbd62b9e..2845f37d753a 100644 --- a/packages/mask/src/components/shared/WalletStatusBox.tsx +++ b/packages/mask/src/components/shared/WalletStatusBox.tsx @@ -5,7 +5,7 @@ import classNames from 'classnames' import { ProviderType } from '@masknet/web3-shared-evm' import { Button, Link, Typography } from '@mui/material' import { getMaskColor, makeStyles } from '@masknet/theme' -import { isDashboardPage } from '@masknet/shared-base' +import { isDashboardPage, useRemoteControlledDialog } from '@masknet/shared-base' import { useAccount, useWeb3State, @@ -16,7 +16,7 @@ import { useReverseAddress, useWallet, } from '@masknet/plugin-infra' -import { FormattedAddress, useRemoteControlledDialog, useSnackbarCallback, WalletIcon } from '@masknet/shared' +import { FormattedAddress, useSnackbarCallback, WalletIcon } from '@masknet/shared' import { WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' import Services from '../../extension/service' diff --git a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx index 0dd592250c51..a86b03a490ea 100644 --- a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx +++ b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx @@ -1,5 +1,5 @@ import { createContext, useEffect, useMemo, useState } from 'react' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { AddressName, ChainId, diff --git a/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx b/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx index 0395997f6091..2e498c96a891 100644 --- a/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx +++ b/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx @@ -9,7 +9,7 @@ import { useTokenTransferCallback, } from '@masknet/web3-shared-evm' import { useI18N } from '../../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { Image } from '../../../../components/shared/Image' import { WalletMessages } from '../../../../plugins/Wallet/messages' import { MaskIconOutlined } from '../../../../resources/MaskIcon' diff --git a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx index c99c63fc9ec7..911da9cb9c38 100644 --- a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx +++ b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx @@ -5,7 +5,8 @@ import { Flags } from '../../../../../shared' import { ChainId, ProviderType, useAccount, useChainId } from '@masknet/web3-shared-evm' import { getRegisteredWeb3Networks, NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra' import { currentMaskWalletAccountSettings, currentProviderSettings } from '../../../../plugins/Wallet/settings' -import { ChainIcon, useMenuConfig, useValueRef, WalletIcon } from '@masknet/shared' +import { ChainIcon, useMenuConfig, WalletIcon } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { ArrowDownRound } from '@masknet/icons' import { WalletRPC } from '../../../../plugins/Wallet/messages' diff --git a/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts b/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts index 49743f79afee..0d03bbefa912 100644 --- a/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts +++ b/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts @@ -1,5 +1,5 @@ import { createContainer } from 'unstated-next' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { ECKeyIdentifier, Identifier, PersonaInformation } from '@masknet/shared-base' import { currentPersonaIdentifier } from '../../../../../settings/settings' import { useAsyncRetry } from 'react-use' diff --git a/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx index 4aaad7ec18b9..381f70195bcc 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx @@ -8,7 +8,8 @@ import { formatEthereumAddress } from '@masknet/web3-shared-evm' import Services from '../../../../service' import { LoadingPlaceholder } from '../../../components/LoadingPlaceholder' import { Typography } from '@mui/material' -import { FormattedAddress, useValueRef } from '@masknet/shared' +import { FormattedAddress } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { useHasPassword } from '../../../hook/useHasPassword' import type { z as zod } from 'zod' import { Controller } from 'react-hook-form' diff --git a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx index abae0b0f79e8..49490eee7809 100644 --- a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx +++ b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx @@ -24,9 +24,10 @@ import { } from '@masknet/web3-shared-evm' import { Trans } from 'react-i18next' import { usePurchaseCallback } from '../hooks/usePurchaseCallback' -import { TokenAmountPanel, useRemoteControlledDialog } from '@masknet/shared' +import { TokenAmountPanel } from '@masknet/shared' import { EthereumERC20TokenApprovedBoundary } from '../../../web3/UI/EthereumERC20TokenApprovedBoundary' import { leftShift } from '@masknet/web3-shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '../../Wallet/messages' import type { Project } from '../types' diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx index e015d3ab5d82..1d387e22b933 100644 --- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx +++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' import { uniqBy } from 'lodash-unified' import { WalletMessages } from '@masknet/plugin-wallet' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { makeStyles, useStylesExtends } from '@masknet/theme' import { ChainId, diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx index ea97cf7c8fb3..8ecaf50edbcf 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx @@ -16,7 +16,7 @@ import { EthereumTokenType, useAccount, useFungibleTokenWatched } from '@masknet import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { UnreviewedWarning } from './UnreviewedWarning' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import ActionButton, { ActionButtonPromise } from '../../../extension/options-page/DashboardComponents/ActionButton' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' import { PluginCollectibleRPC } from '../messages' diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx index da5b8bc165e5..44863372fc53 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx @@ -16,7 +16,7 @@ import BigNumber from 'bignumber.js' import { FungibleTokenDetailed, EthereumTokenType, useAccount, useFungibleTokenWatched } from '@masknet/web3-shared-evm' import formatDateTime from 'date-fns/format' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { UnreviewedWarning } from './UnreviewedWarning' import ActionButton, { ActionButtonPromise } from '../../../extension/options-page/DashboardComponents/ActionButton' diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx index f0065faa3348..76b47c20f2a3 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx @@ -8,7 +8,7 @@ import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { useI18N } from '../../../utils' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '../../Wallet/messages' import type { useAsset } from '../hooks/useAsset' import { resolvePaymentTokensOnCryptoartAI, resolveAssetLinkOnCryptoartAI } from '../pipes' diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx index 5eb49a78a0af..736dd46077f2 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx @@ -16,7 +16,7 @@ import { InjectedDialog } from '../../../components/shared/InjectedDialog' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { SelectTokenAmountPanel } from '../../ITO/SNSAdaptor/SelectTokenAmountPanel' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '../../Wallet/messages' import type { useAsset } from '../hooks/useAsset' import { resolvePaymentTokensOnCryptoartAI, resolveAssetLinkOnCryptoartAI } from '../pipes' diff --git a/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx b/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx index cebf5ea7873c..55cf6a9e91f2 100644 --- a/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx @@ -1,7 +1,7 @@ import { useCallback, cloneElement, isValidElement } from 'react' import { unreachable } from '@dimensiondev/kit' import type { Web3Plugin } from '@masknet/plugin-infra' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { getChainIdFromNetworkType, isFortmaticSupported, NetworkType, ProviderType } from '@masknet/web3-shared-evm' import { WalletMessages } from '../../../Wallet/messages' diff --git a/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx b/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx index 91c5b4d0178c..7836b0095539 100644 --- a/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx @@ -1,7 +1,7 @@ import { useCallback, cloneElement, isValidElement } from 'react' import { unreachable } from '@dimensiondev/kit' import type { Web3Plugin } from '@masknet/plugin-infra' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { isDashboardPage } from '@masknet/shared-base' import { getChainIdFromNetworkType, diff --git a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx index 9a17ec04a39b..1f0811c7d034 100644 --- a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx +++ b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx @@ -20,7 +20,7 @@ import { activatedSocialNetworkUI } from '../../../social-network' import { isTwitter } from '../../../social-network-adaptor/twitter.com/base' import { isFacebook } from '../../../social-network-adaptor/facebook.com/base' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { EthereumERC20TokenApprovedBoundary } from '../../../web3/UI/EthereumERC20TokenApprovedBoundary' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' import { TokenAmountPanel } from '../../../web3/UI/TokenAmountPanel' diff --git a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx index 716eadc64f3b..dec606c896f9 100644 --- a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx +++ b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx @@ -4,7 +4,7 @@ import { makeStyles } from '@masknet/theme' import QueryBuilderIcon from '@mui/icons-material/QueryBuilder' import VerifiedUserIcon from '@mui/icons-material/VerifiedUser' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useGrant } from '../hooks/useGrant' import { PluginGitcoinMessages } from '../messages' import urlcat from 'urlcat' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx index f5bf8b08116c..48c5b7b333d7 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx @@ -3,7 +3,8 @@ import { useCallback, useEffect, useState, useLayoutEffect, useRef } from 'react import { flatten, uniq } from 'lodash-unified' import formatDateTime from 'date-fns/format' import { SnackbarProvider, makeStyles } from '@masknet/theme' -import { FormattedBalance, useRemoteControlledDialog } from '@masknet/shared' +import { FormattedBalance } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { DialogContent, CircularProgress, Typography, List, ListItem, useTheme } from '@mui/material' import { formatBalance, diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx index 70e36f80b125..d1a783451a28 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx @@ -3,7 +3,7 @@ import Web3Utils from 'web3-utils' import { DialogContent } from '@mui/material' import { makeStyles } from '@masknet/theme' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { InjectedDialog, InjectedDialogProps } from '../../../components/shared/InjectedDialog' import { ITO_MetaKey_2, MSG_DELIMITER } from '../constants' import { DialogTabs, JSON_PayloadInMask } from '../types' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx index b5a3304dcbe9..9080417859ed 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx @@ -6,7 +6,7 @@ import RemoveIcon from '@mui/icons-material/RemoveOutlined' import { useCallback, useEffect, useState } from 'react' import { v4 as uuid } from 'uuid' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import type { TokenAmountPanelProps } from '../../../web3/UI/TokenAmountPanel' import { TokenAmountPanel } from '../../../web3/UI/TokenAmountPanel' import { SelectTokenDialogEvent, WalletMessages } from '../../Wallet/messages' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx index b0a415b0ad25..f2a35914a8b8 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx @@ -14,6 +14,7 @@ import { isNativeTokenAddress, } from '@masknet/web3-shared-evm' import { isZero, ZERO, isGreaterThan } from '@masknet/web3-shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { Box, Card, Grid, Link, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import OpenInNewIcon from '@mui/icons-material/OpenInNew' @@ -23,7 +24,7 @@ import formatDateTime from 'date-fns/format' import { useCallback, useEffect, useMemo, useState } from 'react' import { usePostLink } from '../../../components/DataSource/usePostInfo' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' -import { TokenIcon, useRemoteControlledDialog } from '@masknet/shared' +import { TokenIcon } from '@masknet/shared' import { activatedSocialNetworkUI } from '../../../social-network' import { getAssetAsBlobURL, getTextUILength, useI18N } from '../../../utils' import { WalletMessages } from '../../Wallet/messages' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx index 0e17bda0c6f0..7f374fa920b4 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx @@ -7,7 +7,7 @@ import ActionButton from '../../../extension/options-page/DashboardComponents/Ac import { activatedSocialNetworkUI } from '../../../social-network' import { isTwitter } from '../../../social-network-adaptor/twitter.com/base' import { isFacebook } from '../../../social-network-adaptor/facebook.com/base' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '../../Wallet/messages' import { useMaskClaimCallback } from './hooks/useMaskClaimCallback' import { useMaskITO_Packet } from './hooks/useMaskITO_Packet' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx index 9c581213ea2f..1fc96bc2e6dd 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx @@ -1,7 +1,8 @@ import { useState, useCallback } from 'react' import { v4 as uuid } from 'uuid' import type { FungibleTokenDetailed } from '@masknet/web3-shared-evm' -import { ERC20TokenListProps, useRemoteControlledDialog } from '@masknet/shared' +import type { ERC20TokenListProps } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { SelectTokenDialogEvent, WalletMessages } from '../../Wallet/messages' import { TokenAmountPanel, TokenAmountPanelProps } from '../../../web3/UI/TokenAmountPanel' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx index 5c35b13d4544..75b70c13da97 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx @@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid' import { CircularProgress, Slider, Typography } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { ChainId, diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx index 8df9f227df83..e4a2948dc0a2 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx @@ -2,7 +2,7 @@ import { Link, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import { useCallback, useState } from 'react' import { v4 as uuid } from 'uuid' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useI18N } from '../../../utils' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { diff --git a/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx b/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx index d1bb7ccf4ae8..a8cf148a0b66 100644 --- a/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx +++ b/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx @@ -12,7 +12,7 @@ import { BoxState, CardTab } from '../../type' import { ArticlesTab } from './ArticlesTab' import { DetailsTab } from './DetailsTab' import { DrawResultDialog } from './DrawResultDialog' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '../../../Wallet/messages' const useTabsStyles = makeStyles()((theme) => ({ diff --git a/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx b/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx index 92c059f21a12..6d11cddd67ee 100644 --- a/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx +++ b/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx @@ -1,6 +1,6 @@ import { useWeb3State } from '@masknet/plugin-infra' import { SelectTokenDialogEvent, WalletMessages } from '@masknet/plugin-wallet' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { makeStyles } from '@masknet/theme' import { EthereumTokenType, useFungibleTokenBalance } from '@masknet/web3-shared-evm' import { Box, FormControl, FormControlLabel, MenuItem, Radio, RadioGroup, Select, Typography } from '@mui/material' diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx index f1503442c4da..3d6626858bcd 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import { makeStyles, useStylesExtends } from '@masknet/theme' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { useEssay, useDefaultEssay, useCurrentVisitingUser } from '../hooks' import { ModelNFT } from './ModelNFT' import { NormalNFT } from './NormalNFT' diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx index c41972abf26a..c04aac922a23 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx @@ -1,7 +1,7 @@ import { useState } from 'react' import { useAsync, useTimeout } from 'react-use' import type { Constant } from '@masknet/web3-shared-evm/constants/utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { DialogContent } from '@mui/material' import { PluginPetMessages, PluginPetRPC } from '../messages' import { InjectedDialog } from '../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx index 242bc40bcc05..d9a9403a8839 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx @@ -2,7 +2,7 @@ import { useState, useMemo, ReactNode } from 'react' import { useTimeout } from 'react-use' import { isSameAddress } from '@masknet/web3-shared-evm' import { makeStyles, useStylesExtends, useCustomSnackbar, ShadowRootPopper } from '@masknet/theme' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { TextField, Typography, diff --git a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx index e2d4eb132240..9cf803fe2c43 100644 --- a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx +++ b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx @@ -1,4 +1,4 @@ -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { EthereumTokenType, formatBalance, diff --git a/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx b/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx index d76ec6f62a5f..b45408fba360 100644 --- a/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx +++ b/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx @@ -11,7 +11,8 @@ import { useCallback, useEffect, useState } from 'react' import { calculateNextPrize, calculateSecondsRemaining, getPrizePeriod } from '../utils' import { NetworkView } from './NetworkView' import { useI18N } from '../../../utils' -import { TokenIcon, useRemoteControlledDialog } from '@masknet/shared' +import { TokenIcon } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' const useStyles = makeStyles()((theme) => ({ root: { diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx index 5d59cfc9a9e3..8e69aef4bc90 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx @@ -2,7 +2,8 @@ import { FC, memo, MouseEventHandler, useCallback } from 'react' import { Trans } from 'react-i18next' import classNames from 'classnames' import { fill } from 'lodash-unified' -import { TokenIcon, useRemoteControlledDialog } from '@masknet/shared' +import { TokenIcon } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { makeStyles } from '@masknet/theme' import { WalletMessages } from '@masknet/plugin-wallet' import { ERC721ContractDetailed, useAccount, useERC721ContractDetailed } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx index 68551eed9246..9173b9d6a0ab 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx @@ -1,4 +1,4 @@ -import { useScrollBottomEvent } from '@masknet/shared' +import { useScrollBottomEvent } from '@masknet/shared-base' import { makeStyles } from '@masknet/theme' import classNames from 'classnames' import { ERC721ContractDetailed, useAccount, useChainId, ChainId } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx index 38beb8005479..5d21fbe909e1 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx @@ -1,5 +1,5 @@ import { WalletMessages } from '@masknet/plugin-wallet' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { TransactionState, TransactionStateType, useAccount, useChainIdValid } from '@masknet/web3-shared-evm' import { Box } from '@mui/material' import { useCallback } from 'react' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx index a483e538b4ed..3ee42abd18ee 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames' import { useCallback, useEffect, useMemo } from 'react' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { Card, Typography } from '@mui/material' import { ChainId, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index e0cba531074b..5057658122d2 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -1,7 +1,7 @@ import { useState, useCallback, useRef, useMemo, useEffect } from 'react' import { DialogContent } from '@mui/material' import { usePortalShadowRoot, makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useI18N } from '../../../utils' import AbstractTab, { AbstractTabProps } from '../../../components/shared/AbstractTab' import { RedPacketJSONPayload, DialogTabs, RedPacketRecord, RpTypeTabs } from '../types' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx index 3e2d45bbf009..55af96c842ce 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx @@ -1,4 +1,4 @@ -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { EthereumTokenType, formatBalance, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx index 4c858fdb8cf2..233833e971e0 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx @@ -5,7 +5,8 @@ import { Box, ListItem, Typography, Popper, useMediaQuery, Theme } from '@mui/ma import { makeStyles } from '@masknet/theme' import { Trans } from 'react-i18next' import { RedPacketJSONPayload, RedPacketStatus, RedPacketJSONPayloadFromChain } from '../types' -import { useRemoteControlledDialog, TokenIcon } from '@masknet/shared' +import { TokenIcon } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useI18N } from '../../../utils' import { formatBalance, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx index ae40203c388d..7365c6a0bb44 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx @@ -13,7 +13,8 @@ import { isNativeTokenAddress, formatNFT_TokenId, } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog, NFTCardStyledAssetPlayer } from '@masknet/shared' +import { NFTCardStyledAssetPlayer } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import classNames from 'classnames' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { Button, Grid, Link, Typography, DialogContent, List, ListItem } from '@mui/material' diff --git a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx index 27e8febf9945..d1f0e530c47d 100644 --- a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx +++ b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx @@ -12,7 +12,8 @@ import { formatCurrency, formatBalance, } from '@masknet/web3-shared-evm' -import { TokenAmountPanel, FormattedCurrency, LoadingAnimation, useRemoteControlledDialog } from '@masknet/shared' +import { TokenAmountPanel, FormattedCurrency, LoadingAnimation } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useTokenPrice } from '../../Wallet/hooks/useTokenPrice' import { useI18N } from '../../../utils' import { useStyles } from './SavingsFormStyles' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx index 557f9799ba16..506d6baafe29 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx @@ -3,7 +3,7 @@ import { ExternalLink } from 'react-feather' import BigNumber from 'bignumber.js' import { Alert, Box, Button, DialogActions, DialogContent, Link, Typography } from '@mui/material' import { makeStyles, MaskColorVar, useStylesExtends } from '@masknet/theme' -import { FormattedAddress, FormattedBalance, useValueRef, TokenIcon } from '@masknet/shared' +import { FormattedAddress, FormattedBalance, TokenIcon } from '@masknet/shared' import type { TradeComputed } from '../../types' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' import type { FungibleTokenDetailed, Wallet } from '@masknet/web3-shared-evm' @@ -18,7 +18,7 @@ import { import { useI18N } from '../../../../utils' import { InfoIcon, RetweetIcon, CramIcon } from '@masknet/icons' import { isZero, multipliedBy } from '@masknet/web3-shared-base' -import { isDashboardPage } from '@masknet/shared-base' +import { isDashboardPage, useValueRef } from '@masknet/shared-base' import { TargetChainIdContext } from '../../trader/useTargetChainIdContext' import { currentSlippageSettings } from '../../settings' import { useNativeTokenPrice } from '../../../Wallet/hooks/useTokenPrice' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx index 710f2561667b..150b100054d6 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx @@ -1,7 +1,8 @@ import { useState, useCallback, useEffect } from 'react' import { Accordion, AccordionDetails, AccordionSummary, Alert, DialogContent, Typography } from '@mui/material' import { makeStyles, MaskColorVar, useStylesExtends } from '@masknet/theme' -import { useValueRef, useRemoteControlledDialog } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useI18N } from '../../../../utils' import { SlippageSlider } from './SlippageSlider' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx index d12e0bba63fe..eece9e87f0f5 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx @@ -3,13 +3,14 @@ import { useI18N } from '../../../../utils' import { makeStyles, MaskColorVar } from '@masknet/theme' import { InputTokenPanel } from './InputTokenPanel' import { Box, chipClasses, Collapse, IconButton, Tooltip, Typography } from '@mui/material' +import { useRemoteControlledDialog } from '@masknet/shared-base' import type { FungibleTokenDetailed, Wallet } from '@masknet/web3-shared-evm' import { EthereumTokenType, formatBalance, formatPercentage } from '@masknet/web3-shared-evm' import { isLessThan, rightShift } from '@masknet/web3-shared-base' import { TokenPanelType, TradeInfo } from '../../types' import BigNumber from 'bignumber.js' import { first, noop } from 'lodash-unified' -import { FormattedBalance, SelectTokenChip, useRemoteControlledDialog } from '@masknet/shared' +import { FormattedBalance, SelectTokenChip } from '@masknet/shared' import { ChevronUpIcon, DropIcon } from '@masknet/icons' import classnames from 'classnames' import { TraderInfo } from './TraderInfo' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx index e6c950b55686..80737910a3d7 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx @@ -16,7 +16,7 @@ import { useWallet, UST, } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { delay } from '@dimensiondev/kit' import { useGasConfig } from './hooks/useGasConfig' import type { Coin } from '../../types' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx index 23f077ff798d..7da012e282d9 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx @@ -3,7 +3,7 @@ import { usePluginIDContext, useActivatedPlugin, PluginId } from '@masknet/plugi import { ChainId, useChainId, useChainIdValid } from '@masknet/web3-shared-evm' import { DialogContent } from '@mui/material' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { AllProviderTradeContext } from '../../trader/useAllProviderTradeContext' import { TargetChainIdContext } from '../../trader/useTargetChainIdContext' import { PluginTraderMessages } from '../../messages' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts index b35d52dca72c..70d9c8dd6fde 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts @@ -1,5 +1,5 @@ import type BigNumber from 'bignumber.js' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { currentSlippageSettings } from '../../../settings' import { useMemo } from 'react' import { multipliedBy, isGreaterThan } from '@masknet/web3-shared-base' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx index 912a03892080..f090a304fae8 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx @@ -5,7 +5,7 @@ import { PluginTraderMessages } from '../../messages' import { WalletMessages } from '../../../Wallet/messages' import type { TagType } from '../../types' import type { DataProvider } from '@masknet/public-api' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { PluginTransakMessages } from '../../../Transak/messages' export interface TrendingPopperProps { diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx index e17f8d7e3ea7..ee58f518dfe2 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx @@ -5,7 +5,8 @@ import MonetizationOnOutlinedIcon from '@mui/icons-material/MonetizationOnOutlin import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' import stringify from 'json-stable-stringify' import { first, last } from 'lodash-unified' -import { FormattedCurrency, useValueRef, useRemoteControlledDialog, TokenIcon } from '@masknet/shared' +import { FormattedCurrency, TokenIcon } from '@masknet/shared' +import { useValueRef, useRemoteControlledDialog } from '@masknet/shared-base' import { useI18N } from '../../../../utils' import type { Coin, Currency, Stat, Trending } from '../../types' import { DataProvider } from '@masknet/public-api' diff --git a/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts index f54692e3703f..7decd9f27180 100644 --- a/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts index f54692e3703f..7decd9f27180 100644 --- a/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts index f54692e3703f..7decd9f27180 100644 --- a/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts index f54692e3703f..7decd9f27180 100644 --- a/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts b/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts index 1c67c18b0854..4a045d16926f 100644 --- a/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts +++ b/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts @@ -1,4 +1,4 @@ -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { currentSingleHopOnlySettings } from '../../settings' export function useSingleHopOnly() { diff --git a/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts index 8383b81a8e5a..5c3cb07691dc 100644 --- a/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { toUniswapPercent } from '../../helpers' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts b/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts index 075906dca163..1788b3c20d06 100644 --- a/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts +++ b/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect, useState } from 'react' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import stringify from 'json-stable-stringify' import { approvedTokensFromUniswap } from '../settings' import { APPROVED_TOKENS_MAX } from '../constants' diff --git a/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts b/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts index 68a4e8e88e4a..ce37e7f27f75 100644 --- a/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts +++ b/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { getCurrentPreferredCoinIdSettings } from '../settings' import type { DataProvider } from '@masknet/public-api' diff --git a/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts b/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts index fc62f6b0cd10..93b5d5adc177 100644 --- a/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts +++ b/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react' import type { DataProvider } from '@masknet/public-api' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { currentDataProviderSettings } from '../settings' export function useCurrentDataProvider(availableDataProviders: DataProvider[]) { diff --git a/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx b/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx index 02c3b570a5c2..b7908f00b171 100644 --- a/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx +++ b/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx @@ -1,4 +1,4 @@ -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { DialogContent, IconButton } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import CloseIcon from '@mui/icons-material/Close' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx index 0798c1e03eb5..fd56115c1935 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx @@ -12,7 +12,7 @@ import { resolveNetworkName, resolveProviderName, } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' import { WalletMessages, WalletRPC } from '../../messages' import { ConnectionProgress } from './ConnectionProgress' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx index 76b3ab4c6fb5..81c8588ae47c 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx @@ -9,7 +9,7 @@ import { useNativeTokenDetailed, } from '@masknet/web3-shared-evm' import { Tune } from '@mui/icons-material' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import type { NonPayableTx } from '@masknet/web3-contracts/types/types' import { Box, IconButton, Typography } from '@mui/material' import { WalletMessages } from '../../messages' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx index 4dfa0ddb36b8..e58fabcb5384 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx @@ -2,7 +2,7 @@ import { FC, useState } from 'react' import { DialogContent } from '@mui/material' import { WalletMessages } from '@masknet/plugin-wallet' import { makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { GasOption } from '@masknet/web3-shared-evm' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' import { useI18N } from '../../../../utils' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx index e03993550b4c..6994ed759420 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx @@ -5,7 +5,8 @@ import type { Wallet } from '@masknet/web3-shared-evm' import { WalletMessages, WalletRPC } from '../messages' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { useI18N } from '../../../utils/i18n-next-ui' -import { useRemoteControlledDialog, useSnackbarCallback } from '@masknet/shared' +import { useSnackbarCallback } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' const useStyles = makeStyles()((theme) => ({ content: { diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx index 64c799d92641..249dbfb94e50 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' import { useAsyncRetry } from 'react-use' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { Box } from '@mui/system' import { makeStyles } from '@masknet/theme' import { ProviderType } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx index 4177f911a102..5bd1cfb9dd52 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' import classnames from 'classnames' import { Trans } from 'react-i18next' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { formatEthereumAddress, useAccount } from '@masknet/web3-shared-evm' import PriorityHighIcon from '@mui/icons-material/PriorityHigh' import { Avatar, Button, DialogActions, DialogContent, Paper, Typography } from '@mui/material' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx index 48dc38224803..ee0feb193d35 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx @@ -17,7 +17,7 @@ import { import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { WalletMessages } from '../messages' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { EthereumAddress } from 'wallet.ts' import { SearchInput } from '../../../extension/options-page/DashboardComponents/SearchInput' import OpenInNewIcon from '@mui/icons-material/OpenInNew' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx index c7a4af5841bd..24fa8d184bd8 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx @@ -1,7 +1,6 @@ import { useCallback, useEffect, useState } from 'react' import { makeStyles } from '@masknet/theme' import { DialogContent } from '@mui/material' -import { useRemoteControlledDialog, useValueRef } from '@masknet/shared' import { getRegisteredWeb3Networks, getRegisteredWeb3Providers, @@ -10,7 +9,7 @@ import { useNetworkType, useWeb3UI, } from '@masknet/plugin-infra' -import { isDashboardPage } from '@masknet/shared-base' +import { isDashboardPage, useRemoteControlledDialog, useValueRef } from '@masknet/shared-base' import { useI18N } from '../../../../utils/i18n-next-ui' import { WalletMessages } from '../../messages' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx index 71003d0953d9..ecb721229697 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx @@ -5,7 +5,8 @@ import { FungibleTokenDetailed, useChainId, ChainId, useTokenConstants } from '@ import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { WalletMessages } from '../../Wallet/messages' import { useI18N } from '../../../utils' -import { ERC20TokenList, ERC20TokenListProps, useRemoteControlledDialog } from '@masknet/shared' +import { ERC20TokenList, ERC20TokenListProps } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { delay } from '@dimensiondev/kit' import { MINDS_ID } from '../../../social-network-adaptor/minds.com/base' import { activatedSocialNetworkUI } from '../../../social-network' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx index 157fc08bef2c..f8cac519b7a9 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx @@ -2,7 +2,7 @@ import { useState, useCallback } from 'react' import { Button, DialogActions, DialogContent } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import { ProviderType, useWallets, useWallet, NetworkType } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { DashboardRoutes } from '@masknet/shared-base' import { useI18N } from '../../../utils' import { WalletMessages, WalletRPC } from '../messages' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx index 36bf4936fb78..9cf66a8e2e1c 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx @@ -10,7 +10,7 @@ import { resolveTransactionLinkOnExplorer, } from '@masknet/web3-shared-evm' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { WalletMessages } from '../messages' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx index aceec74af2b5..1ca110ddcf8c 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { Button, DialogActions, DialogContent } from '@mui/material' import { makeStyles } from '@masknet/theme' import { useI18N } from '../../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { WalletMessages } from '../../messages' import Services from '../../../../extension/service' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx index 56973caf69dd..4535a95b64b3 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' import { DialogActions, DialogContent, Typography } from '@mui/material' import ErrorIcon from '@mui/icons-material/Error' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useChainIdValid } from '@masknet/web3-shared-evm' import { makeStyles } from '@masknet/theme' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts b/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts index 080c67c646a8..afc2859b6c64 100644 --- a/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts +++ b/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useAccount } from '@masknet/web3-shared-evm' import { WalletMessages, WalletRPC } from '../messages' diff --git a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx index 49a506ffc771..d8304290d439 100644 --- a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx +++ b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx @@ -16,7 +16,7 @@ import ActionButton from '../../../extension/options-page/DashboardComponents/Ac import { activatedSocialNetworkUI } from '../../../social-network' import { isTwitter } from '../../../social-network-adaptor/twitter.com/base' import { isFacebook } from '../../../social-network-adaptor/facebook.com/base' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useI18N } from '../../../utils/i18n-next-ui' import { EthereumERC20TokenApprovedBoundary } from '../../../web3/UI/EthereumERC20TokenApprovedBoundary' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' diff --git a/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx b/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx index 69907d8a0750..64ea76575c1c 100644 --- a/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx +++ b/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx @@ -4,7 +4,7 @@ import { makeStyles } from '@masknet/theme' import BigNumber from 'bignumber.js' import { useCallback } from 'react' import { Trans } from 'react-i18next' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { useI18N } from '../../../utils/i18n-next-ui' import { useAvatar } from '../hooks/useManager' import { PluginDHedgeMessages } from '../messages' diff --git a/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts b/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts index df642d9f5347..256962ff9166 100644 --- a/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts +++ b/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts @@ -2,7 +2,7 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' import { PaletteMode, Theme, unstable_createMuiStrictModeTheme } from '@mui/material' import produce, { setAutoFreeze } from 'immer' import { useMemo } from 'react' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SubscriptionFromValueRef } from '@masknet/shared-base' import type { SocialNetworkUI } from '../../../social-network' import { fromRGB, isDark, shade, toRGB } from '../../../utils/theme-tools' diff --git a/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts b/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts index 8d3405c9f050..0d87363ebf9c 100644 --- a/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts +++ b/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts @@ -2,7 +2,7 @@ import { MutationObserverWatcher, ValueRef } from '@dimensiondev/holoflows-kit' import { PaletteMode, Theme, unstable_createMuiStrictModeTheme } from '@mui/material' import produce, { setAutoFreeze } from 'immer' import { useMemo } from 'react' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SubscriptionFromValueRef } from '@masknet/shared-base' import type { SocialNetworkUI } from '../../../social-network' import { fromRGB, getBackgroundColor, getForegroundColor, shade, toRGB } from '../../../utils/theme-tools' diff --git a/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts b/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts index c535d0e8209b..a6af92c2d0ad 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts +++ b/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts @@ -1,6 +1,6 @@ import { MutationObserverWatcher, ValueRef } from '@dimensiondev/holoflows-kit' import { SubscriptionFromValueRef } from '@masknet/shared-base' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { PaletteMode, Theme, unstable_createMuiStrictModeTheme } from '@mui/material' import produce, { setAutoFreeze } from 'immer' import { useMemo } from 'react' diff --git a/packages/mask/src/utils/hooks/useSettingSwitcher.tsx b/packages/mask/src/utils/hooks/useSettingSwitcher.tsx index 9b06f730282f..2389c695ce6d 100644 --- a/packages/mask/src/utils/hooks/useSettingSwitcher.tsx +++ b/packages/mask/src/utils/hooks/useSettingSwitcher.tsx @@ -1,5 +1,5 @@ import { useMemo, useCallback } from 'react' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import ActionButton from '../../extension/options-page/DashboardComponents/ActionButton' import type { InternalSettings } from '../../settings/createSettings' diff --git a/packages/mask/src/utils/theme.ts b/packages/mask/src/utils/theme.ts index 70658497017f..b0a79275441a 100644 --- a/packages/mask/src/utils/theme.ts +++ b/packages/mask/src/utils/theme.ts @@ -1,5 +1,5 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared' +import { useValueRef } from '@masknet/shared-base' import { SubscriptionFromValueRef } from '@masknet/shared-base' import { Appearance, or, makeStyles, parseColor } from '@masknet/theme' import { LanguageOptions, SupportedLanguages } from '@masknet/public-api' diff --git a/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx b/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx index 356556aee376..f9f58cc6657a 100644 --- a/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx +++ b/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx @@ -14,7 +14,7 @@ import classNames from 'classnames' import { EthereumAddress } from 'wallet.ts' import { Box, CircularProgress, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import ExpandMoreIcon from '@mui/icons-material/ExpandMore' import { SelectNftContractDialogEvent, WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' diff --git a/packages/mask/src/web3/UI/EthereumChainBoundary.tsx b/packages/mask/src/web3/UI/EthereumChainBoundary.tsx index 3d4102b98f24..ebbeb66a2980 100644 --- a/packages/mask/src/web3/UI/EthereumChainBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumChainBoundary.tsx @@ -16,7 +16,7 @@ import { useAllowTestnet, useChainId, } from '@masknet/web3-shared-evm' -import { useValueRef, useRemoteControlledDialog } from '@masknet/shared' +import { useValueRef, useRemoteControlledDialog } from '@masknet/shared-base' import { delay } from '@dimensiondev/kit' import ActionButton, { ActionButtonPromise, diff --git a/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx b/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx index 7ab054cb69e6..4256aff4e5a4 100644 --- a/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx @@ -1,7 +1,7 @@ import { Grid } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import classNames from 'classnames' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import ActionButton, { ActionButtonProps } from '../../extension/options-page/DashboardComponents/ActionButton' import { WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' diff --git a/packages/mask/src/web3/hooks/useTransactionDialog.ts b/packages/mask/src/web3/hooks/useTransactionDialog.ts index 41f6504b17e8..7906a865bc1a 100644 --- a/packages/mask/src/web3/hooks/useTransactionDialog.ts +++ b/packages/mask/src/web3/hooks/useTransactionDialog.ts @@ -1,5 +1,5 @@ import { useEffect } from 'react' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { TransactionState, TransactionStateType } from '@masknet/web3-shared-evm' import { WalletMessages } from '../../plugins/Wallet/messages' diff --git a/packages/plugin-infra/package.json b/packages/plugin-infra/package.json index 38d8c1b95f87..7af1b1c3edd4 100644 --- a/packages/plugin-infra/package.json +++ b/packages/plugin-infra/package.json @@ -7,7 +7,6 @@ "scripts": {}, "dependencies": { "@dimensiondev/holoflows-kit": "^0.9.0-20210902104757-7c3d0d0", - "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/typed-message": "workspace:*", diff --git a/packages/plugin-infra/src/PostContext.ts b/packages/plugin-infra/src/PostContext.ts index 4f9aff400bf8..9daa93e75e89 100644 --- a/packages/plugin-infra/src/PostContext.ts +++ b/packages/plugin-infra/src/PostContext.ts @@ -1,5 +1,6 @@ -import { useObservableValues, useValueRef } from '@masknet/shared' import { + useObservableValues, + useValueRef, ObservableMap, ObservableSet, type Payload, diff --git a/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx b/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx index bee947d9aaae..45ff800533f6 100644 --- a/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx +++ b/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx @@ -1,9 +1,9 @@ -import type { Plugin } from '../types' import { useEffect, useState, useRef, memo, createContext, useContext } from 'react' -import { ErrorBoundary } from '@masknet/shared' +import { ErrorBoundary } from '@masknet/shared-base' +import { ShadowRootIsolation } from '@masknet/theme' +import type { Plugin } from '../types' import { usePluginI18NField, PluginWrapperComponent, PluginWrapperMethods } from '../hooks' import { PluginWrapperMethodsContext } from '../hooks/usePluginWrapper' -import { ShadowRootIsolation } from '@masknet/theme' type Inject = Plugin.InjectUI type Raw = Plugin.InjectUIRaw diff --git a/packages/plugin-infra/tsconfig.json b/packages/plugin-infra/tsconfig.json index d754a36a1237..b986cab80191 100644 --- a/packages/plugin-infra/tsconfig.json +++ b/packages/plugin-infra/tsconfig.json @@ -7,7 +7,6 @@ }, "include": ["./src"], "references": [ - { "path": "../shared/" }, { "path": "../shared-base" }, { "path": "../theme" }, { "path": "../web3-shared/base" }, diff --git a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx index 54b3ee036f65..57c0cf329d36 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx @@ -1,6 +1,6 @@ import { Button, DialogActions, DialogContent } from '@mui/material' import { makeStyles, MaskDialog, useCustomSnackbar } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { isNil } from 'lodash-unified' import { useState } from 'react' import { useI18N } from '../locales/i18n_generated' diff --git a/packages/plugins/template/src/locales/languages.ts b/packages/plugins/template/src/locales/languages.ts index ae368751ee48..cff1155ab4cb 100644 --- a/packages/plugins/template/src/locales/languages.ts +++ b/packages/plugins/template/src/locales/languages.ts @@ -3,19 +3,34 @@ // Default fallback language in a family of languages are chosen by the alphabet order // To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts import en_US from './en-US.json' +import ja_JP from './ja-JP.json' +import ko_KR from './ko-KR.json' +import qya_AA from './qya-AA.json' +import zh_CN from './zh-CN.json' +import zh_TW from './zh-TW.json' export const languages = { en: en_US, + ja: ja_JP, + ko: ko_KR, + qy: qya_AA, + 'zh-CN': zh_CN, + zh: zh_TW, } import { createI18NBundle } from '@masknet/shared-base' export const add__template__I18N = createI18NBundle('__template__', languages) // @ts-ignore if (import.meta.webpackHot) { // @ts-ignore - import.meta.webpackHot.accept(['./en-US.json'], () => - globalThis.dispatchEvent?.( - new CustomEvent('MASK_I18N_HMR', { - detail: ['__template__', { en: en_US }], - }), - ), + import.meta.webpackHot.accept( + ['./en-US.json', './ja-JP.json', './ko-KR.json', './qya-AA.json', './zh-CN.json', './zh-TW.json'], + () => + globalThis.dispatchEvent?.( + new CustomEvent('MASK_I18N_HMR', { + detail: [ + '__template__', + { en: en_US, ja: ja_JP, ko: ko_KR, qy: qya_AA, 'zh-CN': zh_CN, zh: zh_TW }, + ], + }), + ), ) } diff --git a/packages/shared-base/package.json b/packages/shared-base/package.json index d4058ae2ba3c..f4af7f655c51 100644 --- a/packages/shared-base/package.json +++ b/packages/shared-base/package.json @@ -21,10 +21,12 @@ "immer": "^9.0.12", "pvtsutils": "^1.2.2", "react": "../empty", + "react-use": "^17.3.2", "tiny-secp256k1": "^2.2.1", "typeson": "^7.0.1", "typeson-registry": "^2.0.0", "use-subscription": "^1.5.1", + "uuid": "^8.3.2", "z-schema": "^5.0.2" } } diff --git a/packages/shared/src/UI/components/ErrorBoundary/CrashUI.tsx b/packages/shared-base/src/UI/components/ErrorBoundary/CrashUI.tsx similarity index 97% rename from packages/shared/src/UI/components/ErrorBoundary/CrashUI.tsx rename to packages/shared-base/src/UI/components/ErrorBoundary/CrashUI.tsx index 2cef53532400..597585ac980f 100644 --- a/packages/shared/src/UI/components/ErrorBoundary/CrashUI.tsx +++ b/packages/shared-base/src/UI/components/ErrorBoundary/CrashUI.tsx @@ -1,10 +1,10 @@ -import { Box, Button, IconButton, Typography, Alert, AlertTitle, styled } from '@mui/material' -import { useMemo, useState, useContext } from 'react' import { useTimeoutFn } from 'react-use' +import { useMemo, useState, useContext } from 'react' +import { Box, Button, IconButton, Typography, Alert, AlertTitle, styled } from '@mui/material' import ExpandLess from '@mui/icons-material/ExpandLess' import ExpandMore from '@mui/icons-material/ExpandMore' import { ErrorBoundaryBuildInfoContext, ErrorBoundaryError } from './context' -import { useSharedI18N } from '../../../locales' +import { useSharedBaseI18N } from '../../locales' export type CrashUIProps = ErrorBoundaryError & { /** Type of the Error */ @@ -19,7 +19,7 @@ export type CrashUIProps = ErrorBoundaryError & { } export function CrashUI({ onRetry, subject, ...error }: CrashUIProps) { const context = useContext(ErrorBoundaryBuildInfoContext) - const t = useSharedI18N() + const t = useSharedBaseI18N() const [showStack, setShowStack] = useState(false) diff --git a/packages/shared/src/UI/components/ErrorBoundary/ErrorBoundary.tsx b/packages/shared-base/src/UI/components/ErrorBoundary/ErrorBoundary.tsx similarity index 100% rename from packages/shared/src/UI/components/ErrorBoundary/ErrorBoundary.tsx rename to packages/shared-base/src/UI/components/ErrorBoundary/ErrorBoundary.tsx diff --git a/packages/shared/src/UI/components/ErrorBoundary/context.ts b/packages/shared-base/src/UI/components/ErrorBoundary/context.ts similarity index 100% rename from packages/shared/src/UI/components/ErrorBoundary/context.ts rename to packages/shared-base/src/UI/components/ErrorBoundary/context.ts diff --git a/packages/shared/src/UI/components/ErrorBoundary/index.ts b/packages/shared-base/src/UI/components/ErrorBoundary/index.ts similarity index 100% rename from packages/shared/src/UI/components/ErrorBoundary/index.ts rename to packages/shared-base/src/UI/components/ErrorBoundary/index.ts diff --git a/packages/shared-base/src/UI/components/index.ts b/packages/shared-base/src/UI/components/index.ts new file mode 100644 index 000000000000..2bca71da1076 --- /dev/null +++ b/packages/shared-base/src/UI/components/index.ts @@ -0,0 +1 @@ +export * from './ErrorBoundary' diff --git a/packages/shared/src/hooks/createGlobalState.ts b/packages/shared-base/src/UI/hooks/createGlobalState.ts similarity index 100% rename from packages/shared/src/hooks/createGlobalState.ts rename to packages/shared-base/src/UI/hooks/createGlobalState.ts diff --git a/packages/shared-base/src/UI/hooks/index.ts b/packages/shared-base/src/UI/hooks/index.ts new file mode 100644 index 000000000000..6760c1261a5b --- /dev/null +++ b/packages/shared-base/src/UI/hooks/index.ts @@ -0,0 +1,5 @@ +export * from './useValueRef' +export * from './useObservableMapSet' +export * from './useRemoteControlledDialog' +export * from './useScrollBottomEvent' +export * from './createGlobalState' diff --git a/packages/shared/src/hooks/useObservableMapSet.ts b/packages/shared-base/src/UI/hooks/useObservableMapSet.ts similarity index 86% rename from packages/shared/src/hooks/useObservableMapSet.ts rename to packages/shared-base/src/UI/hooks/useObservableMapSet.ts index f8a44be6be66..2f46b2698b28 100644 --- a/packages/shared/src/hooks/useObservableMapSet.ts +++ b/packages/shared-base/src/UI/hooks/useObservableMapSet.ts @@ -1,6 +1,6 @@ -import { useSubscription, Subscription } from 'use-subscription' import { useMemo } from 'react' -import { ALL_EVENTS, ObservableMap, ObservableSet } from '@masknet/shared-base' +import { useSubscription, Subscription } from 'use-subscription' +import { ALL_EVENTS, ObservableMap, ObservableSet } from '../../collections' export function useObservableValues(map: ObservableMap | ObservableSet) { const subscription = useMemo>( diff --git a/packages/shared/src/hooks/useRemoteControlledDialog.ts b/packages/shared-base/src/UI/hooks/useRemoteControlledDialog.ts similarity index 100% rename from packages/shared/src/hooks/useRemoteControlledDialog.ts rename to packages/shared-base/src/UI/hooks/useRemoteControlledDialog.ts diff --git a/packages/shared/src/hooks/useScrollBottomEvent.ts b/packages/shared-base/src/UI/hooks/useScrollBottomEvent.ts similarity index 100% rename from packages/shared/src/hooks/useScrollBottomEvent.ts rename to packages/shared-base/src/UI/hooks/useScrollBottomEvent.ts diff --git a/packages/shared/src/hooks/useValueRef.ts b/packages/shared-base/src/UI/hooks/useValueRef.ts similarity index 100% rename from packages/shared/src/hooks/useValueRef.ts rename to packages/shared-base/src/UI/hooks/useValueRef.ts index e8a9d23b5e09..167019a75d3f 100644 --- a/packages/shared/src/hooks/useValueRef.ts +++ b/packages/shared-base/src/UI/hooks/useValueRef.ts @@ -1,6 +1,6 @@ -import type { ValueRef } from '@dimensiondev/holoflows-kit' -import { Subscription, useSubscription } from 'use-subscription' import { useMemo } from 'react' +import { Subscription, useSubscription } from 'use-subscription' +import type { ValueRef } from '@dimensiondev/holoflows-kit' export function useValueRef(ref: ValueRef) { const subscription = useMemo>( diff --git a/packages/shared-base/src/UI/locales/en-US.json b/packages/shared-base/src/UI/locales/en-US.json new file mode 100644 index 000000000000..4f6abc652675 --- /dev/null +++ b/packages/shared-base/src/UI/locales/en-US.json @@ -0,0 +1,27 @@ +{ + "error_boundary_crash_title": "{{subject}} has an error", + "error_boundary_try_to_recover": "Try to recover", + "error_boundary_report_github": "Report on GitHub", + "error_boundary_report_email": "Report by Email", + "snackbar_done": "Done", + "import": "Import", + "balance": "Balance", + "select_token": "Select a Token", + "erc20_token_list_placeholder": "Token name or contract address", + "erc20_token_list_loading": "Loading token lists..", + "erc20_search_token_loading": "Loading token...", + "erc20_search_not_token_found": "No results or contract address does not meet the query criteria.", + "address_viewer_binding_rules_title": "The NFT gallary will show NFTs as below rules:", + "address_viewer_binding_rule1": "The nickname is ENS or RNS.", + "address_viewer_binding_rule2": "The bio contains ENS, RNS or a valid address.", + "address_viewer_binding_rule3": "The ID + suffix is ENS or RNS.", + "address_viewer_binding_rule4": "The address used to sign the PFP NFTs.", + "address_viewer_current_display_of": "Current display of {{type}}: ", + "address_viewer_loading": "Loading...", + "address_viewer_address_name_ens": "ENS", + "address_viewer_address_name_uns": "UNS", + "address_viewer_address_name_dns": "DNS", + "address_viewer_address_name_rns": "RNS", + "address_viewer_address_name_address": "address", + "address_viewer_address_name_twitter": "twitter blue" +} diff --git a/packages/shared-base/src/UI/locales/index.ts b/packages/shared-base/src/UI/locales/index.ts new file mode 100644 index 000000000000..d6ead60252e4 --- /dev/null +++ b/packages/shared-base/src/UI/locales/index.ts @@ -0,0 +1,6 @@ +// This file is auto generated. DO NOT EDIT +// Run `npx gulp sync-languages` to regenerate. +// Default fallback language in a family of languages are chosen by the alphabet order +// To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts + +export * from './i18n_generated' diff --git a/packages/shared-base/src/UI/locales/ja-JP.json b/packages/shared-base/src/UI/locales/ja-JP.json new file mode 100644 index 000000000000..ddcc197a4314 --- /dev/null +++ b/packages/shared-base/src/UI/locales/ja-JP.json @@ -0,0 +1,4 @@ +{ + "error_boundary_crash_title": "{{subject}} にエラーが発生しました。", + "error_boundary_try_to_recover": "修復する" +} diff --git a/packages/shared-base/src/UI/locales/ko-KR.json b/packages/shared-base/src/UI/locales/ko-KR.json new file mode 100644 index 000000000000..7b1a86fe0274 --- /dev/null +++ b/packages/shared-base/src/UI/locales/ko-KR.json @@ -0,0 +1,11 @@ +{ + "error_boundary_crash_title": "{{subject}} 오류가 발생합니다.", + "error_boundary_try_to_recover": "복구하기", + "error_boundary_report_github": "GitHub에서 보고하기", + "error_boundary_report_email": "이메일로 보고하기", + "snackbar_done": "완료", + "import": "불러오기", + "balance": "잔액", + "select_token": "토큰 선택", + "erc20_token_list_placeholder": "토큰 이름이나 컨트렉트 주소" +} diff --git a/packages/shared-base/src/UI/locales/languages.ts b/packages/shared-base/src/UI/locales/languages.ts new file mode 100644 index 000000000000..a375705d498a --- /dev/null +++ b/packages/shared-base/src/UI/locales/languages.ts @@ -0,0 +1,33 @@ +// This file is auto generated. DO NOT EDIT +// Run `npx gulp sync-languages` to regenerate. +// Default fallback language in a family of languages are chosen by the alphabet order +// To overwrite this, please overwrite packages/scripts/src/locale-kit-next/index.ts +import en_US from './en-US.json' +import ja_JP from './ja-JP.json' +import ko_KR from './ko-KR.json' +import qya_AA from './qya-AA.json' +import zh_CN from './zh-CN.json' +import zh_TW from './zh-TW.json' +export const languages = { + en: en_US, + ja: ja_JP, + ko: ko_KR, + qy: qya_AA, + 'zh-CN': zh_CN, + zh: zh_TW, +} +import { createI18NBundle } from '@masknet/shared-base' +export const addShareBaseI18N = createI18NBundle('shareBase', languages) +// @ts-ignore +if (import.meta.webpackHot) { + // @ts-ignore + import.meta.webpackHot.accept( + ['./en-US.json', './ja-JP.json', './ko-KR.json', './qya-AA.json', './zh-CN.json', './zh-TW.json'], + () => + globalThis.dispatchEvent?.( + new CustomEvent('MASK_I18N_HMR', { + detail: ['shareBase', { en: en_US, ja: ja_JP, ko: ko_KR, qy: qya_AA, 'zh-CN': zh_CN, zh: zh_TW }], + }), + ), + ) +} diff --git a/packages/shared-base/src/UI/locales/qya-AA.json b/packages/shared-base/src/UI/locales/qya-AA.json new file mode 100644 index 000000000000..ee455e290550 --- /dev/null +++ b/packages/shared-base/src/UI/locales/qya-AA.json @@ -0,0 +1,26 @@ +{ + "error_boundary_crash_title": "crwdns1969:0{{subject}}crwdne1969:0", + "error_boundary_try_to_recover": "crwdns1971:0crwdne1971:0", + "error_boundary_report_github": "crwdns1973:0crwdne1973:0", + "error_boundary_report_email": "crwdns1975:0crwdne1975:0", + "snackbar_done": "crwdns1977:0crwdne1977:0", + "import": "crwdns8001:0crwdne8001:0", + "balance": "crwdns8023:0crwdne8023:0", + "select_token": "crwdns8025:0crwdne8025:0", + "erc20_token_list_placeholder": "crwdns9007:0crwdne9007:0", + "erc20_token_list_loading": "crwdns10623:0crwdne10623:0", + "erc20_search_token_loading": "crwdns10625:0crwdne10625:0", + "erc20_search_not_token_found": "crwdns10627:0crwdne10627:0", + "address_viewer_binding_rules_title": "crwdns10781:0crwdne10781:0", + "address_viewer_binding_rule1": "crwdns10783:0crwdne10783:0", + "address_viewer_binding_rule2": "crwdns10785:0crwdne10785:0", + "address_viewer_binding_rule3": "crwdns10787:0crwdne10787:0", + "address_viewer_binding_rule4": "crwdns10789:0crwdne10789:0", + "address_viewer_current_display_of": "crwdns10791:0{{type}}crwdne10791:0", + "address_viewer_loading": "crwdns10793:0crwdne10793:0", + "address_viewer_address_name_ens": "crwdns10795:0crwdne10795:0", + "address_viewer_address_name_uns": "crwdns10797:0crwdne10797:0", + "address_viewer_address_name_dns": "crwdns10799:0crwdne10799:0", + "address_viewer_address_name_rns": "crwdns10801:0crwdne10801:0", + "address_viewer_address_name_address": "crwdns10803:0crwdne10803:0" +} diff --git a/packages/shared-base/src/UI/locales/zh-CN.json b/packages/shared-base/src/UI/locales/zh-CN.json new file mode 100644 index 000000000000..07926405190c --- /dev/null +++ b/packages/shared-base/src/UI/locales/zh-CN.json @@ -0,0 +1,23 @@ +{ + "error_boundary_crash_title": "{{subject}} 发生错误", + "error_boundary_try_to_recover": "尝试恢复", + "error_boundary_report_github": "在 GitHub 上报告", + "error_boundary_report_email": "通过电子邮件报告", + "snackbar_done": "完成", + "import": "导入", + "balance": "余额", + "select_token": "选择代币", + "erc20_token_list_placeholder": "代币代号名称或合约地址", + "erc20_token_list_loading": "正在加载代币列表...", + "erc20_search_token_loading": "正在加载代币...", + "erc20_search_not_token_found": "没有任何结果或合约地址不符合查询标准。", + "address_viewer_binding_rules_title": "NFT 相册按如下规则展示 NFT：", + "address_viewer_binding_rule1": "昵称是 ENS 或 RNS。", + "address_viewer_binding_rule2": "您的 Twitter 资料包含 ENS、RNS 或有效地址。", + "address_viewer_binding_rule3": "您的twitter ID + 后缀是ENS 或 RNS。", + "address_viewer_binding_rule4": "该地址用于签名头像 NFT。", + "address_viewer_current_display_of": "当前显示{{type}}： ", + "address_viewer_loading": "加载中...", + "address_viewer_address_name_address": "地址", + "address_viewer_address_name_twitter": "Twitter Blue" +} diff --git a/packages/shared-base/src/UI/locales/zh-TW.json b/packages/shared-base/src/UI/locales/zh-TW.json new file mode 100644 index 000000000000..29c63fb97226 --- /dev/null +++ b/packages/shared-base/src/UI/locales/zh-TW.json @@ -0,0 +1,12 @@ +{ + "error_boundary_crash_title": "{{subject}} 遇到了一個錯誤：", + "error_boundary_try_to_recover": "嘗試恢復", + "error_boundary_report_github": "透過 GitHub 反饋", + "error_boundary_report_email": "透過 Email 反饋", + "snackbar_done": "完成", + "import": "導入", + "balance": "餘額", + "select_token": "選擇一種代幣", + "erc20_token_list_placeholder": "代幣名稱或合約地址", + "erc20_search_token_loading": "讀取代幣中..." +} diff --git a/packages/shared-base/src/index.ts b/packages/shared-base/src/index.ts index bf8b3701eae3..fd9d20630a8c 100644 --- a/packages/shared-base/src/index.ts +++ b/packages/shared-base/src/index.ts @@ -15,3 +15,5 @@ export * from './Messages/Mask' export * from './Results' export * from './convert' export * from './NextID/type' +export * from './UI/components' +export * from './UI/hooks' diff --git a/packages/shared/src/UI/components/index.ts b/packages/shared/src/UI/components/index.ts index a01336a79647..0b27e040b719 100644 --- a/packages/shared/src/UI/components/index.ts +++ b/packages/shared/src/UI/components/index.ts @@ -4,7 +4,6 @@ export * from './ImageIcon' export * from './WalletIcon' export * from './ERC20TokenList' export * from './QRCode' -export * from './ErrorBoundary' export * from './SelectTokenChip' export * from './TokenAmountPanel' export * from './LoadingAnimation' diff --git a/packages/shared/src/hooks/index.ts b/packages/shared/src/hooks/index.ts index 2a686e0f3a36..fc88893b7ce8 100644 --- a/packages/shared/src/hooks/index.ts +++ b/packages/shared/src/hooks/index.ts @@ -1,7 +1,2 @@ -export * from './useValueRef' -export * from './useObservableMapSet' export * from './useMenu' -export * from './useRemoteControlledDialog' export * from './useSnackbarCallback' -export * from './useScrollBottomEvent' -export * from './createGlobalState' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 83dabc3c15ae..1ed3067dc12a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -582,7 +582,6 @@ importers: packages/plugin-infra: specifiers: '@dimensiondev/holoflows-kit': ^0.9.0-20210902104757-7c3d0d0 - '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* '@masknet/theme': workspace:* '@masknet/typed-message': workspace:* @@ -597,7 +596,6 @@ importers: use-subscription: ^1.5.1 dependencies: '@dimensiondev/holoflows-kit': 0.9.0-20210902104757-7c3d0d0 - '@masknet/shared': link:../shared '@masknet/shared-base': link:../shared-base '@masknet/theme': link:../theme '@masknet/typed-message': link:../typed-message @@ -1013,10 +1011,12 @@ importers: immer: ^9.0.12 pvtsutils: ^1.2.2 react: ../empty + react-use: ^17.3.2 tiny-secp256k1: ^2.2.1 typeson: ^7.0.1 typeson-registry: ^2.0.0 use-subscription: ^1.5.1 + uuid: ^8.3.2 z-schema: ^5.0.2 dependencies: '@dimensiondev/holoflows-kit': 0.9.0-20210902104757-7c3d0d0 @@ -1035,10 +1035,12 @@ importers: immer: 9.0.12 pvtsutils: 1.2.2 react: link:../empty + react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5 tiny-secp256k1: 2.2.1 typeson: 7.0.1 typeson-registry: 2.0.0 use-subscription: 1.5.1_react@18.0.0-rc.2 + uuid: 8.3.2 z-schema: 5.0.2 packages/storybook-shared: From d14aa514d72aa232fd735b2d6ff3c66cc18eaa98 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Thu, 17 Mar 2022 19:17:28 +0800 Subject: [PATCH 2/5] refactor: remove i18n keys --- .../shared-base/src/UI/locales/en-US.json | 2 -- .../shared-base/src/UI/locales/ko-KR.json | 2 -- .../shared-base/src/UI/locales/qya-AA.json | 22 +------------------ .../shared-base/src/UI/locales/zh-CN.json | 2 -- .../shared-base/src/UI/locales/zh-TW.json | 2 -- packages/shared/src/locales/en-US.json | 4 ---- packages/shared/src/locales/ja-JP.json | 5 +---- packages/shared/src/locales/ko-KR.json | 4 ---- packages/shared/src/locales/qya-AA.json | 4 ---- packages/shared/src/locales/zh-CN.json | 4 ---- packages/shared/src/locales/zh-TW.json | 4 ---- 11 files changed, 2 insertions(+), 53 deletions(-) diff --git a/packages/shared-base/src/UI/locales/en-US.json b/packages/shared-base/src/UI/locales/en-US.json index 4f6abc652675..db545bfa3e89 100644 --- a/packages/shared-base/src/UI/locales/en-US.json +++ b/packages/shared-base/src/UI/locales/en-US.json @@ -3,8 +3,6 @@ "error_boundary_try_to_recover": "Try to recover", "error_boundary_report_github": "Report on GitHub", "error_boundary_report_email": "Report by Email", - "snackbar_done": "Done", - "import": "Import", "balance": "Balance", "select_token": "Select a Token", "erc20_token_list_placeholder": "Token name or contract address", diff --git a/packages/shared-base/src/UI/locales/ko-KR.json b/packages/shared-base/src/UI/locales/ko-KR.json index 7b1a86fe0274..85ee53957f61 100644 --- a/packages/shared-base/src/UI/locales/ko-KR.json +++ b/packages/shared-base/src/UI/locales/ko-KR.json @@ -3,8 +3,6 @@ "error_boundary_try_to_recover": "복구하기", "error_boundary_report_github": "GitHub에서 보고하기", "error_boundary_report_email": "이메일로 보고하기", - "snackbar_done": "완료", - "import": "불러오기", "balance": "잔액", "select_token": "토큰 선택", "erc20_token_list_placeholder": "토큰 이름이나 컨트렉트 주소" diff --git a/packages/shared-base/src/UI/locales/qya-AA.json b/packages/shared-base/src/UI/locales/qya-AA.json index ee455e290550..d432c014de75 100644 --- a/packages/shared-base/src/UI/locales/qya-AA.json +++ b/packages/shared-base/src/UI/locales/qya-AA.json @@ -2,25 +2,5 @@ "error_boundary_crash_title": "crwdns1969:0{{subject}}crwdne1969:0", "error_boundary_try_to_recover": "crwdns1971:0crwdne1971:0", "error_boundary_report_github": "crwdns1973:0crwdne1973:0", - "error_boundary_report_email": "crwdns1975:0crwdne1975:0", - "snackbar_done": "crwdns1977:0crwdne1977:0", - "import": "crwdns8001:0crwdne8001:0", - "balance": "crwdns8023:0crwdne8023:0", - "select_token": "crwdns8025:0crwdne8025:0", - "erc20_token_list_placeholder": "crwdns9007:0crwdne9007:0", - "erc20_token_list_loading": "crwdns10623:0crwdne10623:0", - "erc20_search_token_loading": "crwdns10625:0crwdne10625:0", - "erc20_search_not_token_found": "crwdns10627:0crwdne10627:0", - "address_viewer_binding_rules_title": "crwdns10781:0crwdne10781:0", - "address_viewer_binding_rule1": "crwdns10783:0crwdne10783:0", - "address_viewer_binding_rule2": "crwdns10785:0crwdne10785:0", - "address_viewer_binding_rule3": "crwdns10787:0crwdne10787:0", - "address_viewer_binding_rule4": "crwdns10789:0crwdne10789:0", - "address_viewer_current_display_of": "crwdns10791:0{{type}}crwdne10791:0", - "address_viewer_loading": "crwdns10793:0crwdne10793:0", - "address_viewer_address_name_ens": "crwdns10795:0crwdne10795:0", - "address_viewer_address_name_uns": "crwdns10797:0crwdne10797:0", - "address_viewer_address_name_dns": "crwdns10799:0crwdne10799:0", - "address_viewer_address_name_rns": "crwdns10801:0crwdne10801:0", - "address_viewer_address_name_address": "crwdns10803:0crwdne10803:0" + "error_boundary_report_email": "crwdns1975:0crwdne1975:0" } diff --git a/packages/shared-base/src/UI/locales/zh-CN.json b/packages/shared-base/src/UI/locales/zh-CN.json index 07926405190c..c46ebc218a2c 100644 --- a/packages/shared-base/src/UI/locales/zh-CN.json +++ b/packages/shared-base/src/UI/locales/zh-CN.json @@ -3,8 +3,6 @@ "error_boundary_try_to_recover": "尝试恢复", "error_boundary_report_github": "在 GitHub 上报告", "error_boundary_report_email": "通过电子邮件报告", - "snackbar_done": "完成", - "import": "导入", "balance": "余额", "select_token": "选择代币", "erc20_token_list_placeholder": "代币代号名称或合约地址", diff --git a/packages/shared-base/src/UI/locales/zh-TW.json b/packages/shared-base/src/UI/locales/zh-TW.json index 29c63fb97226..729bec7949e2 100644 --- a/packages/shared-base/src/UI/locales/zh-TW.json +++ b/packages/shared-base/src/UI/locales/zh-TW.json @@ -3,8 +3,6 @@ "error_boundary_try_to_recover": "嘗試恢復", "error_boundary_report_github": "透過 GitHub 反饋", "error_boundary_report_email": "透過 Email 反饋", - "snackbar_done": "完成", - "import": "導入", "balance": "餘額", "select_token": "選擇一種代幣", "erc20_token_list_placeholder": "代幣名稱或合約地址", diff --git a/packages/shared/src/locales/en-US.json b/packages/shared/src/locales/en-US.json index 4f6abc652675..11514454ef72 100644 --- a/packages/shared/src/locales/en-US.json +++ b/packages/shared/src/locales/en-US.json @@ -1,8 +1,4 @@ { - "error_boundary_crash_title": "{{subject}} has an error", - "error_boundary_try_to_recover": "Try to recover", - "error_boundary_report_github": "Report on GitHub", - "error_boundary_report_email": "Report by Email", "snackbar_done": "Done", "import": "Import", "balance": "Balance", diff --git a/packages/shared/src/locales/ja-JP.json b/packages/shared/src/locales/ja-JP.json index ddcc197a4314..0967ef424bce 100644 --- a/packages/shared/src/locales/ja-JP.json +++ b/packages/shared/src/locales/ja-JP.json @@ -1,4 +1 @@ -{ - "error_boundary_crash_title": "{{subject}} にエラーが発生しました。", - "error_boundary_try_to_recover": "修復する" -} +{} diff --git a/packages/shared/src/locales/ko-KR.json b/packages/shared/src/locales/ko-KR.json index 7b1a86fe0274..24540a928793 100644 --- a/packages/shared/src/locales/ko-KR.json +++ b/packages/shared/src/locales/ko-KR.json @@ -1,8 +1,4 @@ { - "error_boundary_crash_title": "{{subject}} 오류가 발생합니다.", - "error_boundary_try_to_recover": "복구하기", - "error_boundary_report_github": "GitHub에서 보고하기", - "error_boundary_report_email": "이메일로 보고하기", "snackbar_done": "완료", "import": "불러오기", "balance": "잔액", diff --git a/packages/shared/src/locales/qya-AA.json b/packages/shared/src/locales/qya-AA.json index ee455e290550..e615af26d42c 100644 --- a/packages/shared/src/locales/qya-AA.json +++ b/packages/shared/src/locales/qya-AA.json @@ -1,8 +1,4 @@ { - "error_boundary_crash_title": "crwdns1969:0{{subject}}crwdne1969:0", - "error_boundary_try_to_recover": "crwdns1971:0crwdne1971:0", - "error_boundary_report_github": "crwdns1973:0crwdne1973:0", - "error_boundary_report_email": "crwdns1975:0crwdne1975:0", "snackbar_done": "crwdns1977:0crwdne1977:0", "import": "crwdns8001:0crwdne8001:0", "balance": "crwdns8023:0crwdne8023:0", diff --git a/packages/shared/src/locales/zh-CN.json b/packages/shared/src/locales/zh-CN.json index 07926405190c..011efe03fca5 100644 --- a/packages/shared/src/locales/zh-CN.json +++ b/packages/shared/src/locales/zh-CN.json @@ -1,8 +1,4 @@ { - "error_boundary_crash_title": "{{subject}} 发生错误", - "error_boundary_try_to_recover": "尝试恢复", - "error_boundary_report_github": "在 GitHub 上报告", - "error_boundary_report_email": "通过电子邮件报告", "snackbar_done": "完成", "import": "导入", "balance": "余额", diff --git a/packages/shared/src/locales/zh-TW.json b/packages/shared/src/locales/zh-TW.json index 29c63fb97226..647e7142ec2a 100644 --- a/packages/shared/src/locales/zh-TW.json +++ b/packages/shared/src/locales/zh-TW.json @@ -1,8 +1,4 @@ { - "error_boundary_crash_title": "{{subject}} 遇到了一個錯誤：", - "error_boundary_try_to_recover": "嘗試恢復", - "error_boundary_report_github": "透過 GitHub 反饋", - "error_boundary_report_email": "透過 Email 反饋", "snackbar_done": "完成", "import": "導入", "balance": "餘額", From 12cb63866df09ed60bf76edb04765ba870d2f4e3 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Thu, 17 Mar 2022 19:18:03 +0800 Subject: [PATCH 3/5] fix: ts error --- .../stories/components/Shared/CrashUI.tsx | 2 +- .../Profile/SNSAdaptor/WalletsPage.tsx | 3 ++- .../shared-base/src/UI/locales/en-US.json | 21 +------------------ .../shared-base/src/UI/locales/ko-KR.json | 5 +---- .../shared-base/src/UI/locales/zh-CN.json | 17 +-------------- .../shared-base/src/UI/locales/zh-TW.json | 6 +----- 6 files changed, 7 insertions(+), 47 deletions(-) diff --git a/packages/dashboard/stories/components/Shared/CrashUI.tsx b/packages/dashboard/stories/components/Shared/CrashUI.tsx index 060da70ce0b0..635823ad81e3 100644 --- a/packages/dashboard/stories/components/Shared/CrashUI.tsx +++ b/packages/dashboard/stories/components/Shared/CrashUI.tsx @@ -1,4 +1,4 @@ -import { CrashUI as C } from '@masknet/shared' +import { CrashUI as C } from '@masknet/shared-base' import { story } from '@masknet/storybook-shared' const { meta, of } = story(C) diff --git a/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx b/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx index 02ecca1d71fa..d1a0635be61e 100644 --- a/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx +++ b/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx @@ -6,7 +6,8 @@ import { RewardIcon } from '@masknet/icons' import { makeStyles } from '@masknet/theme' import { WalletMessages } from '@masknet/plugin-wallet' import { NetworkPluginID, useNetworkDescriptor } from '@masknet/plugin-infra' -import { ImageIcon, useRemoteControlledDialog, useSnackbarCallback } from '@masknet/shared' +import { ImageIcon, useSnackbarCallback } from '@masknet/shared' +import { useRemoteControlledDialog } from '@masknet/shared-base' import { formatEthereumAddress, resolveAddressLinkOnExplorer, useChainId, useWallets } from '@masknet/web3-shared-evm' import { Button, Link, List, ListItem, ListItemIcon, ListItemText, Typography } from '@mui/material' import { useI18N } from '../../../utils' diff --git a/packages/shared-base/src/UI/locales/en-US.json b/packages/shared-base/src/UI/locales/en-US.json index db545bfa3e89..e932bf9ee27c 100644 --- a/packages/shared-base/src/UI/locales/en-US.json +++ b/packages/shared-base/src/UI/locales/en-US.json @@ -2,24 +2,5 @@ "error_boundary_crash_title": "{{subject}} has an error", "error_boundary_try_to_recover": "Try to recover", "error_boundary_report_github": "Report on GitHub", - "error_boundary_report_email": "Report by Email", - "balance": "Balance", - "select_token": "Select a Token", - "erc20_token_list_placeholder": "Token name or contract address", - "erc20_token_list_loading": "Loading token lists..", - "erc20_search_token_loading": "Loading token...", - "erc20_search_not_token_found": "No results or contract address does not meet the query criteria.", - "address_viewer_binding_rules_title": "The NFT gallary will show NFTs as below rules:", - "address_viewer_binding_rule1": "The nickname is ENS or RNS.", - "address_viewer_binding_rule2": "The bio contains ENS, RNS or a valid address.", - "address_viewer_binding_rule3": "The ID + suffix is ENS or RNS.", - "address_viewer_binding_rule4": "The address used to sign the PFP NFTs.", - "address_viewer_current_display_of": "Current display of {{type}}: ", - "address_viewer_loading": "Loading...", - "address_viewer_address_name_ens": "ENS", - "address_viewer_address_name_uns": "UNS", - "address_viewer_address_name_dns": "DNS", - "address_viewer_address_name_rns": "RNS", - "address_viewer_address_name_address": "address", - "address_viewer_address_name_twitter": "twitter blue" + "error_boundary_report_email": "Report by Email" } diff --git a/packages/shared-base/src/UI/locales/ko-KR.json b/packages/shared-base/src/UI/locales/ko-KR.json index 85ee53957f61..150292577eac 100644 --- a/packages/shared-base/src/UI/locales/ko-KR.json +++ b/packages/shared-base/src/UI/locales/ko-KR.json @@ -2,8 +2,5 @@ "error_boundary_crash_title": "{{subject}} 오류가 발생합니다.", "error_boundary_try_to_recover": "복구하기", "error_boundary_report_github": "GitHub에서 보고하기", - "error_boundary_report_email": "이메일로 보고하기", - "balance": "잔액", - "select_token": "토큰 선택", - "erc20_token_list_placeholder": "토큰 이름이나 컨트렉트 주소" + "error_boundary_report_email": "이메일로 보고하기" } diff --git a/packages/shared-base/src/UI/locales/zh-CN.json b/packages/shared-base/src/UI/locales/zh-CN.json index c46ebc218a2c..8f955f406017 100644 --- a/packages/shared-base/src/UI/locales/zh-CN.json +++ b/packages/shared-base/src/UI/locales/zh-CN.json @@ -2,20 +2,5 @@ "error_boundary_crash_title": "{{subject}} 发生错误", "error_boundary_try_to_recover": "尝试恢复", "error_boundary_report_github": "在 GitHub 上报告", - "error_boundary_report_email": "通过电子邮件报告", - "balance": "余额", - "select_token": "选择代币", - "erc20_token_list_placeholder": "代币代号名称或合约地址", - "erc20_token_list_loading": "正在加载代币列表...", - "erc20_search_token_loading": "正在加载代币...", - "erc20_search_not_token_found": "没有任何结果或合约地址不符合查询标准。", - "address_viewer_binding_rules_title": "NFT 相册按如下规则展示 NFT：", - "address_viewer_binding_rule1": "昵称是 ENS 或 RNS。", - "address_viewer_binding_rule2": "您的 Twitter 资料包含 ENS、RNS 或有效地址。", - "address_viewer_binding_rule3": "您的twitter ID + 后缀是ENS 或 RNS。", - "address_viewer_binding_rule4": "该地址用于签名头像 NFT。", - "address_viewer_current_display_of": "当前显示{{type}}： ", - "address_viewer_loading": "加载中...", - "address_viewer_address_name_address": "地址", - "address_viewer_address_name_twitter": "Twitter Blue" + "error_boundary_report_email": "通过电子邮件报告" } diff --git a/packages/shared-base/src/UI/locales/zh-TW.json b/packages/shared-base/src/UI/locales/zh-TW.json index 729bec7949e2..65c15cb485c2 100644 --- a/packages/shared-base/src/UI/locales/zh-TW.json +++ b/packages/shared-base/src/UI/locales/zh-TW.json @@ -2,9 +2,5 @@ "error_boundary_crash_title": "{{subject}} 遇到了一個錯誤：", "error_boundary_try_to_recover": "嘗試恢復", "error_boundary_report_github": "透過 GitHub 反饋", - "error_boundary_report_email": "透過 Email 反饋", - "balance": "餘額", - "select_token": "選擇一種代幣", - "erc20_token_list_placeholder": "代幣名稱或合約地址", - "erc20_search_token_loading": "讀取代幣中..." + "error_boundary_report_email": "透過 Email 反饋" } From ccb8d9a3f81f0033514d8914e016191219540ea2 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Thu, 17 Mar 2022 21:03:59 +0800 Subject: [PATCH 4/5] refactor: add @masknet/shared-base-ui --- .i18n-codegen.json | 4 +- packages/dashboard/package.json | 1 + .../src/components/DashboardFrame/index.tsx | 2 +- .../PageFrame/FeaturePromotions/index.tsx | 2 +- .../src/components/PageFrame/index.tsx | 3 +- .../src/initialization/Dashboard.tsx | 2 +- packages/dashboard/src/pages/Labs/index.tsx | 2 +- packages/dashboard/src/pages/Personas/api.ts | 2 +- packages/dashboard/src/pages/Settings/api.ts | 2 +- .../dashboard/src/pages/Wallets/StartUp.tsx | 2 +- packages/dashboard/src/pages/Wallets/api.ts | 2 +- .../pages/Wallets/components/Assets/index.tsx | 2 +- .../components/FungibleTokenTable/index.tsx | 2 +- .../components/Transfer/TransferERC20.tsx | 2 +- .../components/Transfer/TransferERC721.tsx | 3 +- .../components/WalletStateBar/index.tsx | 2 +- .../src/pages/Wallets/hooks/useGasConfig.ts | 2 +- .../dashboard/src/pages/Wallets/index.tsx | 2 +- .../stories/components/Shared/CrashUI.tsx | 2 +- packages/dashboard/tsconfig.json | 3 +- packages/encryption/package.json | 1 + packages/encryption/tsconfig.json | 2 +- packages/mask/package.json | 1 + packages/mask/shared-ui/tsconfig.json | 3 +- packages/mask/src/UIRoot.tsx | 2 +- .../CompositionDialog/CompositionUI.tsx | 2 +- .../CompositionDialog/PluginEntryRender.tsx | 2 +- .../components/DataSource/useActivatedUI.ts | 2 +- .../components/DataSource/useMyPersonas.ts | 2 +- .../src/components/DataSource/useNextID.ts | 2 +- .../mask/src/components/GuideStep/index.tsx | 2 +- .../InjectedComponents/PostComments.tsx | 2 +- .../InjectedComponents/PostDialogHint.tsx | 2 +- .../InjectedComponents/PostInspector.tsx | 2 +- .../InjectedComponents/SetupGuide.tsx | 2 +- .../InjectedComponents/ToolboxUnstyled.tsx | 2 +- .../components/shared/ApplicationBoard.tsx | 2 +- .../src/components/shared/ErrorBoundary.tsx | 1 - .../src/components/shared/InjectedDialog.tsx | 3 +- .../src/components/shared/WalletStatusBox.tsx | 3 +- .../CollectibleList/index.tsx | 2 +- .../DashboardDialogs/Wallet/TransferNFT.tsx | 2 +- .../components/NetworkSelector/index.tsx | 2 +- .../pages/Personas/hooks/usePersonaContext.ts | 2 +- .../pages/Wallet/WalletRecovery/index.tsx | 2 +- .../ArtBlocks/SNSAdaptor/PurchaseDialog.tsx | 2 +- .../plugins/Avatar/SNSAdaptor/NFTAvatar.tsx | 2 +- .../Collectible/SNSAdaptor/CheckoutDialog.tsx | 2 +- .../SNSAdaptor/MakeOfferDialog.tsx | 2 +- .../CryptoartAI/SNSAdaptor/CheckoutDialog.tsx | 2 +- .../SNSAdaptor/MakeOfferDialog.tsx | 2 +- .../UI/components/NetworkIconClickBait.tsx | 2 +- .../UI/components/ProviderIconClickBait.tsx | 2 +- .../Gitcoin/SNSAdaptor/DonateDialog.tsx | 2 +- .../Gitcoin/SNSAdaptor/PreviewCard.tsx | 2 +- .../plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx | 2 +- .../ITO/SNSAdaptor/CompositionDialog.tsx | 2 +- .../ITO/SNSAdaptor/ExchangeTokenPanel.tsx | 2 +- .../mask/src/plugins/ITO/SNSAdaptor/ITO.tsx | 2 +- .../src/plugins/ITO/SNSAdaptor/ITO_Card.tsx | 2 +- .../ITO/SNSAdaptor/SelectTokenAmountPanel.tsx | 2 +- .../src/plugins/ITO/SNSAdaptor/SwapDialog.tsx | 2 +- .../plugins/ITO/SNSAdaptor/UnlockDialog.tsx | 2 +- .../SNSAdaptor/components/PreviewCard.tsx | 2 +- .../plugins/NextID/components/tip/TipForm.tsx | 2 +- .../src/plugins/Pets/SNSAdaptor/Animate.tsx | 2 +- .../src/plugins/Pets/SNSAdaptor/PetDialog.tsx | 2 +- .../plugins/Pets/SNSAdaptor/PetSetDialog.tsx | 2 +- .../plugins/PoolTogether/UI/DepositDialog.tsx | 2 +- .../src/plugins/PoolTogether/UI/PoolView.tsx | 2 +- .../Profile/SNSAdaptor/WalletsPage.tsx | 2 +- .../SNSAdaptor/NftRedPacketHistoryItem.tsx | 2 +- .../SNSAdaptor/NftRedPacketHistoryList.tsx | 2 +- .../SNSAdaptor/RedPacket/OperationFooter.tsx | 2 +- .../RedPacket/SNSAdaptor/RedPacket/index.tsx | 2 +- .../RedPacket/SNSAdaptor/RedPacketDialog.tsx | 2 +- .../SNSAdaptor/RedPacketERC20Form.tsx | 2 +- .../SNSAdaptor/RedPacketInHistoryList.tsx | 2 +- .../SNSAdaptor/RedpacketNftConfirmDialog.tsx | 2 +- .../Savings/SNSAdaptor/SavingsForm.tsx | 2 +- .../SNSAdaptor/trader/ConfirmDialog.tsx | 3 +- .../SNSAdaptor/trader/SettingsDialog.tsx | 4 +- .../Trader/SNSAdaptor/trader/TradeForm.tsx | 2 +- .../Trader/SNSAdaptor/trader/Trader.tsx | 2 +- .../Trader/SNSAdaptor/trader/TraderDialog.tsx | 2 +- .../hooks/useGreatThanSlippageSetting.ts | 2 +- .../SNSAdaptor/trending/TrendingPopper.tsx | 2 +- .../SNSAdaptor/trending/TrendingViewDeck.tsx | 2 +- .../Trader/trader/0x/useSlippageTolerance.ts | 2 +- .../trader/bancor/useSlippageTolerance.ts | 2 +- .../trader/dodo/useSlippageTolerance.ts | 2 +- .../trader/openocean/useSlippageTolerance.ts | 2 +- .../Trader/trader/uniswap/useSingleHopOnly.ts | 2 +- .../trader/uniswap/useSlippageTolerance.ts | 2 +- .../Trader/trending/useApprovedTokens.ts | 2 +- .../Trader/trending/useCurrentCoinId.ts | 2 +- .../Trader/trending/useCurrentDataProvider.ts | 2 +- .../Transak/SNSAdaptor/BuyTokenDialog.tsx | 2 +- .../SNSAdaptor/ConnectWalletDialog/index.tsx | 2 +- .../GasSettingDialog/GasSettingBar.tsx | 2 +- .../SNSAdaptor/GasSettingDialog/index.tsx | 2 +- .../Wallet/SNSAdaptor/RenameWalletDialog.tsx | 2 +- .../RestoreLegacyWalletDialog/index.tsx | 2 +- .../SNSAdaptor/RiskWarningDialog/index.tsx | 2 +- .../SNSAdaptor/SelectNftContractDialog.tsx | 2 +- .../SNSAdaptor/SelectProviderDialog/index.tsx | 3 +- .../Wallet/SNSAdaptor/SelectTokenDialog.tsx | 2 +- .../Wallet/SNSAdaptor/SelectWalletDialog.tsx | 2 +- .../Wallet/SNSAdaptor/TransactionDialog.tsx | 2 +- .../WalletConnectQRCodeDialog/index.tsx | 2 +- .../SNSAdaptor/WalletStatusDialog/index.tsx | 2 +- .../hooks/useWalletRiskWarningDialog.ts | 2 +- .../src/plugins/dHEDGE/UI/InvestDialog.tsx | 2 +- .../src/plugins/dHEDGE/UI/PoolViewDeck.tsx | 2 +- .../facebook.com/customization/custom.ts | 2 +- .../minds.com/customization/custom.ts | 2 +- .../twitter.com/customization/custom.ts | 2 +- packages/mask/src/tsconfig.json | 1 + .../mask/src/utils/createNormalReactRoot.tsx | 2 +- .../src/utils/hooks/useSettingSwitcher.tsx | 2 +- packages/mask/src/utils/theme.ts | 2 +- .../src/web3/UI/ERC721ContractSelectPanel.tsx | 2 +- .../src/web3/UI/EthereumChainBoundary.tsx | 2 +- .../UI/EthereumWalletConnectedBoundary.tsx | 2 +- .../src/web3/hooks/useTransactionDialog.ts | 2 +- packages/plugin-infra/package.json | 1 + packages/plugin-infra/src/PostContext.ts | 3 +- .../src/utils/createInjectHooksRenderer.tsx | 2 +- packages/plugin-infra/tsconfig.json | 1 + packages/plugins/CyberConnect/package.json | 1 + packages/plugins/CyberConnect/tsconfig.json | 1 + packages/plugins/DAO/package.json | 1 + packages/plugins/DAO/tsconfig.json | 1 + packages/plugins/Debugger/package.json | 1 + packages/plugins/FileService/package.json | 1 + .../FileService/src/SNSAdaptor/MainDialog.tsx | 2 +- packages/plugins/FileService/tsconfig.json | 1 + packages/plugins/Flow/package.json | 1 + packages/plugins/Flow/tsconfig.json | 1 + packages/plugins/RSS3/package.json | 1 + packages/plugins/RSS3/tsconfig.json | 1 + packages/plugins/Solana/package.json | 1 + packages/plugins/Solana/tsconfig.json | 1 + packages/plugins/template/package.json | 1 + packages/shared-base-ui/package.json | 14 ++++++ .../src}/components/ErrorBoundary/CrashUI.tsx | 0 .../ErrorBoundary/ErrorBoundary.tsx | 0 .../src}/components/ErrorBoundary/context.ts | 0 .../src}/components/ErrorBoundary/index.ts | 0 .../src}/components/index.ts | 0 .../src}/hooks/createGlobalState.ts | 0 .../UI => shared-base-ui/src}/hooks/index.ts | 0 .../src}/hooks/useObservableMapSet.ts | 2 +- .../src}/hooks/useRemoteControlledDialog.ts | 0 .../src}/hooks/useScrollBottomEvent.ts | 0 .../src}/hooks/useValueRef.ts | 0 packages/shared-base-ui/src/index.ts | 2 + .../src}/locales/en-US.json | 0 .../src}/locales/index.ts | 0 .../src}/locales/ja-JP.json | 0 .../src}/locales/ko-KR.json | 0 .../src}/locales/languages.ts | 0 .../src}/locales/qya-AA.json | 0 .../src}/locales/zh-CN.json | 0 .../src}/locales/zh-TW.json | 0 packages/shared-base-ui/tsconfig.json | 11 +++++ packages/shared-base/package.json | 2 - packages/shared-base/src/index.ts | 2 - packages/shared/package.json | 1 + packages/shared/tsconfig.json | 1 + packages/web3-shared/evm/package.json | 1 + pnpm-lock.yaml | 46 +++++++++++++++++-- tsconfig.json | 1 + 173 files changed, 227 insertions(+), 136 deletions(-) delete mode 100644 packages/mask/src/components/shared/ErrorBoundary.tsx create mode 100644 packages/shared-base-ui/package.json rename packages/{shared-base/src/UI => shared-base-ui/src}/components/ErrorBoundary/CrashUI.tsx (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/components/ErrorBoundary/ErrorBoundary.tsx (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/components/ErrorBoundary/context.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/components/ErrorBoundary/index.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/components/index.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/hooks/createGlobalState.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/hooks/index.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/hooks/useObservableMapSet.ts (86%) rename packages/{shared-base/src/UI => shared-base-ui/src}/hooks/useRemoteControlledDialog.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/hooks/useScrollBottomEvent.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/hooks/useValueRef.ts (100%) create mode 100644 packages/shared-base-ui/src/index.ts rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/en-US.json (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/index.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/ja-JP.json (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/ko-KR.json (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/languages.ts (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/qya-AA.json (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/zh-CN.json (100%) rename packages/{shared-base/src/UI => shared-base-ui/src}/locales/zh-TW.json (100%) create mode 100644 packages/shared-base-ui/tsconfig.json diff --git a/.i18n-codegen.json b/.i18n-codegen.json index 408474ea482c..0e88dbae02d2 100644 --- a/.i18n-codegen.json +++ b/.i18n-codegen.json @@ -39,8 +39,8 @@ } }, { - "input": "./packages/shared-base/src/UI/locales/en-US.json", - "output": "./packages/shared-base/src/UI/locales/i18n_generated", + "input": "./packages/shared-base-ui/src/locales/en-US.json", + "output": "./packages/shared-base-ui/src/locales/i18n_generated", "parser": "i18next", "generator": { "type": "i18next/react-hooks", diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json index da17ab65b9bd..02ec01b6f2be 100644 --- a/packages/dashboard/package.json +++ b/packages/dashboard/package.json @@ -20,6 +20,7 @@ "@masknet/public-api": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/storybook-shared": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/web3-providers": "workspace:*", diff --git a/packages/dashboard/src/components/DashboardFrame/index.tsx b/packages/dashboard/src/components/DashboardFrame/index.tsx index 6b05f8c2a8f0..fd897707952f 100644 --- a/packages/dashboard/src/components/DashboardFrame/index.tsx +++ b/packages/dashboard/src/components/DashboardFrame/index.tsx @@ -1,7 +1,7 @@ import { memo, Suspense, useMemo, useState } from 'react' import { Grid, styled, Theme, useMediaQuery } from '@mui/material' import { MaskColorVar } from '@masknet/theme' -import { ErrorBoundary } from '@masknet/shared-base' +import { ErrorBoundary } from '@masknet/shared-base-ui' import { DashboardContext } from './context' import { Navigation } from './Navigation' import { NavigationVersionFooter } from '../NavigationVersionFooter' diff --git a/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx b/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx index 102bd27dfcf8..ea9e1073fc29 100644 --- a/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx +++ b/packages/dashboard/src/components/PageFrame/FeaturePromotions/index.tsx @@ -1,7 +1,7 @@ import { memo, useCallback, useMemo } from 'react' import { useNavigate } from 'react-router-dom' import { makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useAccount } from '@masknet/web3-shared-evm' import { PluginMessages, Services } from '../../../API' import { PersonaContext } from '../../../pages/Personas/hooks/usePersonaContext' diff --git a/packages/dashboard/src/components/PageFrame/index.tsx b/packages/dashboard/src/components/PageFrame/index.tsx index bc2b8ef07c94..ea442b3b07fe 100644 --- a/packages/dashboard/src/components/PageFrame/index.tsx +++ b/packages/dashboard/src/components/PageFrame/index.tsx @@ -21,7 +21,8 @@ import { DashboardContext } from '../DashboardFrame/context' import { Navigation } from '../DashboardFrame/Navigation' import { MaskBannerIcon, MaskNotSquareIcon } from '@masknet/icons' import { FeaturePromotions } from './FeaturePromotions' -import { DashboardRoutes, ErrorBoundary } from '@masknet/shared-base' +import { DashboardRoutes } from '@masknet/shared-base' +import { ErrorBoundary } from '@masknet/shared-base-ui' import { NavigationVersionFooter } from '../NavigationVersionFooter' const featurePromotionsEnabled = [ diff --git a/packages/dashboard/src/initialization/Dashboard.tsx b/packages/dashboard/src/initialization/Dashboard.tsx index 44152b1919ca..b8d4d7932ac1 100644 --- a/packages/dashboard/src/initialization/Dashboard.tsx +++ b/packages/dashboard/src/initialization/Dashboard.tsx @@ -8,7 +8,7 @@ import { useSystemPreferencePalette, } from '@masknet/theme' import { I18NextProviderHMR } from '@masknet/shared' -import { ErrorBoundary } from '@masknet/shared-base' +import { ErrorBoundary } from '@masknet/shared-base-ui' import { createInjectHooksRenderer, NetworkPluginID, diff --git a/packages/dashboard/src/pages/Labs/index.tsx b/packages/dashboard/src/pages/Labs/index.tsx index 730f7df0d109..082e0ce68b52 100644 --- a/packages/dashboard/src/pages/Labs/index.tsx +++ b/packages/dashboard/src/pages/Labs/index.tsx @@ -23,7 +23,7 @@ import { useDashboardI18N } from '../../locales' import MarketTrendSettingDialog from './components/MarketTrendSettingDialog' import { useAccount } from '@masknet/web3-shared-evm' import { Messages, Services, PluginMessages } from '../../API' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { TUTORIAL_URLS_EN } from './constants' import { ContentContainer } from '../../components/ContentContainer' import { WalletStateBar } from '../Wallets/components/WalletStateBar' diff --git a/packages/dashboard/src/pages/Personas/api.ts b/packages/dashboard/src/pages/Personas/api.ts index 1462e8247e11..20adb144a113 100644 --- a/packages/dashboard/src/pages/Personas/api.ts +++ b/packages/dashboard/src/pages/Personas/api.ts @@ -1,4 +1,4 @@ -import { createGlobalState } from '@masknet/shared-base' +import { createGlobalState } from '@masknet/shared-base-ui' import { Services, Messages } from '../../API' export type SocialNetwork = { diff --git a/packages/dashboard/src/pages/Settings/api.ts b/packages/dashboard/src/pages/Settings/api.ts index c6d5570a86fe..eb5ec7c28d8b 100644 --- a/packages/dashboard/src/pages/Settings/api.ts +++ b/packages/dashboard/src/pages/Settings/api.ts @@ -1,4 +1,4 @@ -import { createGlobalState } from '@masknet/shared-base' +import { createGlobalState } from '@masknet/shared-base-ui' import { Messages, Services } from '../../API' import type { DataProvider } from '@masknet/public-api' import type { AccountType, BackupFileInfo, Scenario, Locale } from './type' diff --git a/packages/dashboard/src/pages/Wallets/StartUp.tsx b/packages/dashboard/src/pages/Wallets/StartUp.tsx index 7213161a14d2..3cc1419bec0b 100644 --- a/packages/dashboard/src/pages/Wallets/StartUp.tsx +++ b/packages/dashboard/src/pages/Wallets/StartUp.tsx @@ -3,7 +3,7 @@ import { CloudLinkIcon } from '@masknet/icons' import { useDashboardI18N } from '../../locales' import { Paper, Stack, Box } from '@mui/material' import { ActionCard } from '../../components/ActionCard' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { PluginMessages } from '../../API' const Container = styled('div')` diff --git a/packages/dashboard/src/pages/Wallets/api.ts b/packages/dashboard/src/pages/Wallets/api.ts index 4463eb5957ea..d16731b30b45 100644 --- a/packages/dashboard/src/pages/Wallets/api.ts +++ b/packages/dashboard/src/pages/Wallets/api.ts @@ -1,4 +1,4 @@ -import { createGlobalState } from '@masknet/shared-base' +import { createGlobalState } from '@masknet/shared-base-ui' import { Messages, Services } from '../../API' export const [useCurrentCollectibleDataProvider] = createGlobalState( diff --git a/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx b/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx index 67be6505d17d..b454b3a81fa2 100644 --- a/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Assets/index.tsx @@ -7,7 +7,7 @@ import { FungibleTokenTable } from '../FungibleTokenTable' import { useDashboardI18N } from '../../../../locales' import { CollectibleList } from '../CollectibleList' import { AddCollectibleDialog } from '../AddCollectibleDialog' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { PluginMessages } from '../../../../API' import type { Web3Plugin } from '@masknet/plugin-infra' import { NetworkPluginID, usePluginIDContext } from '@masknet/plugin-infra' diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx index e3b5da94e41e..eab1e788ea4b 100644 --- a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTable/index.tsx @@ -7,7 +7,7 @@ import { LoadingPlaceholder } from '../../../../components/LoadingPlaceholder' import { FungibleTokenTableRow } from '../FungibleTokenTableRow' import { useWeb3State } from '@masknet/web3-shared-evm' import BigNumber from 'bignumber.js' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { PluginMessages } from '../../../../API' import { DashboardRoutes } from '@masknet/shared-base' import { useNavigate } from 'react-router-dom' diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx index d43eb17da35b..ce5f9e651744 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx @@ -17,7 +17,7 @@ import { useTokenConstants, useTokenTransferCallback, } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { isGreaterThan, isZero, multipliedBy, rightShift } from '@masknet/web3-shared-base' import BigNumber from 'bignumber.js' import { diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx index 09370bcf1cc0..ce5c581dcfa3 100644 --- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx +++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx @@ -31,7 +31,8 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' import TuneIcon from '@mui/icons-material/Tune' import { useNativeTokenPrice } from './useNativeTokenPrice' import { useNavigate, useLocation } from 'react-router-dom' -import { DashboardRoutes, useRemoteControlledDialog } from '@masknet/shared-base' +import { DashboardRoutes } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useGasConfig } from '../../hooks/useGasConfig' import { unionBy } from 'lodash-unified' import { TransferTab } from './types' diff --git a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx index 62e17c489626..6b93fbc3013a 100644 --- a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx @@ -3,7 +3,7 @@ import { Box, Button, Stack, Typography } from '@mui/material' import { EMPTY_LIST, ProviderType, TransactionStatusType } from '@masknet/web3-shared-evm' import { makeStyles, MaskColorVar } from '@masknet/theme' import { FormattedAddress, LoadingAnimation, WalletIcon } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useNetworkDescriptor, useProviderDescriptor, diff --git a/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts b/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts index d7e0aa3dea26..51b62436afaf 100644 --- a/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts +++ b/packages/dashboard/src/pages/Wallets/hooks/useGasConfig.ts @@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react' import { toHex } from 'web3-utils' import BigNumber from 'bignumber.js' import { formatGweiToWei, GasOption, isEIP1559Supported, useChainId, useGasPrice } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '@masknet/plugin-wallet' import { useGasOptions } from '../../../hooks/useGasOptions' diff --git a/packages/dashboard/src/pages/Wallets/index.tsx b/packages/dashboard/src/pages/Wallets/index.tsx index cd77aafa01a2..51f53c52697a 100644 --- a/packages/dashboard/src/pages/Wallets/index.tsx +++ b/packages/dashboard/src/pages/Wallets/index.tsx @@ -10,7 +10,7 @@ import { useWeb3State as useWeb3PluginState, Web3Plugin, } from '@masknet/plugin-infra' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { DashboardRoutes, relativeRouteOf } from '@masknet/shared-base' import { useWeb3State } from '@masknet/web3-shared-evm' import BigNumber from 'bignumber.js' diff --git a/packages/dashboard/stories/components/Shared/CrashUI.tsx b/packages/dashboard/stories/components/Shared/CrashUI.tsx index 635823ad81e3..008b0648e462 100644 --- a/packages/dashboard/stories/components/Shared/CrashUI.tsx +++ b/packages/dashboard/stories/components/Shared/CrashUI.tsx @@ -1,4 +1,4 @@ -import { CrashUI as C } from '@masknet/shared-base' +import { CrashUI as C } from '@masknet/shared-base-ui' import { story } from '@masknet/storybook-shared' const { meta, of } = story(C) diff --git a/packages/dashboard/tsconfig.json b/packages/dashboard/tsconfig.json index 274b659bbd59..6b383b331235 100644 --- a/packages/dashboard/tsconfig.json +++ b/packages/dashboard/tsconfig.json @@ -20,6 +20,7 @@ { "path": "../plugins/Flow/" }, { "path": "../plugins/Wallet/" }, { "path": "../backup-format/" }, - { "path": "../shared-base" } + { "path": "../shared-base" }, + { "path": "../shared-base-ui" } ] } diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 868ca06bf859..dbdda6560e48 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -7,6 +7,7 @@ "dependencies": { "@dimensiondev/stego-js": "0.11.1-20201027083223-8ab41be", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/typed-message": "workspace:*", "@msgpack/msgpack": "^2.7.2" } diff --git a/packages/encryption/tsconfig.json b/packages/encryption/tsconfig.json index bd9d91161be8..f09f53214a44 100644 --- a/packages/encryption/tsconfig.json +++ b/packages/encryption/tsconfig.json @@ -6,5 +6,5 @@ "tsBuildInfoFile": "./dist/.tsbuildinfo" }, "include": ["./src/**/*"], - "references": [{ "path": "../shared-base" }, { "path": "../typed-message/base" }] + "references": [{ "path": "../shared-base" }, { "path": "../shared-base-ui" }, { "path": "../typed-message/base" }] } diff --git a/packages/mask/package.json b/packages/mask/package.json index 4d787ab18bf1..31ea8ea9929e 100644 --- a/packages/mask/package.json +++ b/packages/mask/package.json @@ -33,6 +33,7 @@ "@masknet/sdk": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/typed-message": "workspace:*", "@masknet/web3-contracts": "workspace:*", diff --git a/packages/mask/shared-ui/tsconfig.json b/packages/mask/shared-ui/tsconfig.json index 286bed574598..38ddc1e87c34 100644 --- a/packages/mask/shared-ui/tsconfig.json +++ b/packages/mask/shared-ui/tsconfig.json @@ -10,8 +10,9 @@ "include": ["./", "./**/*.json"], "references": [ { "path": "../utils-pure" }, - { "path": "../../shared-base" }, { "path": "../../shared/" }, + { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../typed-message/base" }, { "path": "../../typed-message/dom" }, { "path": "../../theme" }, diff --git a/packages/mask/src/UIRoot.tsx b/packages/mask/src/UIRoot.tsx index 4609e9b0efe0..31d738d9740c 100644 --- a/packages/mask/src/UIRoot.tsx +++ b/packages/mask/src/UIRoot.tsx @@ -4,7 +4,7 @@ import { Web3Provider } from '@masknet/web3-shared-evm' import { CssBaseline, StyledEngineProvider, Theme, ThemeProvider } from '@mui/material' import { NetworkPluginID, PluginsWeb3ContextProvider, useAllPluginsWeb3State } from '@masknet/plugin-infra' import { I18NextProviderHMR } from '@masknet/shared' -import { ErrorBoundary, ErrorBoundaryBuildInfoContext, useValueRef } from '@masknet/shared-base' +import { ErrorBoundary, ErrorBoundaryBuildInfoContext, useValueRef } from '@masknet/shared-base-ui' import i18nNextInstance from '../shared-ui/locales_legacy' import { Web3Context } from './web3/context' import { buildInfoMarkdown } from './utils/BuildInfoMarkdown' diff --git a/packages/mask/src/components/CompositionDialog/CompositionUI.tsx b/packages/mask/src/components/CompositionDialog/CompositionUI.tsx index 05f5ea261ee5..ef6a52dc00b5 100644 --- a/packages/mask/src/components/CompositionDialog/CompositionUI.tsx +++ b/packages/mask/src/components/CompositionDialog/CompositionUI.tsx @@ -2,7 +2,7 @@ import { forwardRef, useImperativeHandle, useMemo, useRef, useState, startTransi import { Typography, Chip, Button } from '@mui/material' import { LoadingButton } from '@mui/lab' import type { TypedMessage } from '@masknet/typed-message' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { makeStyles } from '@masknet/theme' import { ImagePayloadIcon } from '@masknet/icons' import { Send } from '@mui/icons-material' diff --git a/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx b/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx index ee3643b5245e..5d9e55775a7a 100644 --- a/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx +++ b/packages/mask/src/components/CompositionDialog/PluginEntryRender.tsx @@ -6,7 +6,7 @@ import { PluginI18NFieldRender, usePluginI18NField, } from '@masknet/plugin-infra' -import { ErrorBoundary } from '@masknet/shared-base' +import { ErrorBoundary } from '@masknet/shared-base-ui' import { Result } from 'ts-results' import { RedPacketPluginID } from '../../plugins/RedPacket/constants' import { ITO_PluginID } from '../../plugins/ITO/constants' diff --git a/packages/mask/src/components/DataSource/useActivatedUI.ts b/packages/mask/src/components/DataSource/useActivatedUI.ts index 67975dc3accb..a829094b54ff 100644 --- a/packages/mask/src/components/DataSource/useActivatedUI.ts +++ b/packages/mask/src/components/DataSource/useActivatedUI.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' import { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { ProfileIdentifier } from '@masknet/shared-base' import type { Profile } from '../../database' import type { SocialNetworkUI } from '../../social-network' diff --git a/packages/mask/src/components/DataSource/useMyPersonas.ts b/packages/mask/src/components/DataSource/useMyPersonas.ts index 0dadbff6b1c9..8692a6eaecb3 100644 --- a/packages/mask/src/components/DataSource/useMyPersonas.ts +++ b/packages/mask/src/components/DataSource/useMyPersonas.ts @@ -1,5 +1,5 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import Services from '../../extension/service' import { PersonaArrayComparer } from '../../utils/comparer' import { MaskMessages } from '../../utils/messages' diff --git a/packages/mask/src/components/DataSource/useNextID.ts b/packages/mask/src/components/DataSource/useNextID.ts index 7533e8ae5ac7..d7d11a89a8d5 100644 --- a/packages/mask/src/components/DataSource/useNextID.ts +++ b/packages/mask/src/components/DataSource/useNextID.ts @@ -9,7 +9,7 @@ import stringify from 'json-stable-stringify' import { SetupGuideStep } from '../InjectedComponents/SetupGuide/types' import type { SetupGuideCrossContextStatus } from '../../settings/types' import { useLastRecognizedIdentity } from './useActivatedUI' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { queryExistedBindingByPersona, queryExistedBindingByPlatform, queryIsBound } from '@masknet/web3-providers' export const usePersonaBoundPlatform = (personaPublicKey: string) => { diff --git a/packages/mask/src/components/GuideStep/index.tsx b/packages/mask/src/components/GuideStep/index.tsx index 76239bc24cb3..e28f0b2c4004 100644 --- a/packages/mask/src/components/GuideStep/index.tsx +++ b/packages/mask/src/components/GuideStep/index.tsx @@ -1,4 +1,4 @@ -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { makeStyles, usePortalShadowRoot } from '@masknet/theme' import { Box, Typography, styled, Portal } from '@mui/material' import classNames from 'classnames' diff --git a/packages/mask/src/components/InjectedComponents/PostComments.tsx b/packages/mask/src/components/InjectedComponents/PostComments.tsx index 5c9b677dcfc0..6f858f1f1c14 100644 --- a/packages/mask/src/components/InjectedComponents/PostComments.tsx +++ b/packages/mask/src/components/InjectedComponents/PostComments.tsx @@ -1,5 +1,5 @@ import type { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { Chip } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import type { ChipProps } from '@mui/material/Chip' diff --git a/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx b/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx index ed5608c77207..ed403063b9a3 100644 --- a/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx +++ b/packages/mask/src/components/InjectedComponents/PostDialogHint.tsx @@ -3,7 +3,7 @@ import { IconButton, Tooltip } from '@mui/material' import { useStylesExtends, makeStyles } from '@masknet/theme' import { useI18N } from '../../utils' import type { BannerProps } from '../Welcomes/Banner' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { isMobileFacebook } from '../../social-network-adaptor/facebook.com/utils/isMobile' import { MaskSharpIcon } from '../../resources/MaskIcon' import { useMyIdentities } from '../DataSource/useActivatedUI' diff --git a/packages/mask/src/components/InjectedComponents/PostInspector.tsx b/packages/mask/src/components/InjectedComponents/PostInspector.tsx index a79cfd2efebb..faeb5a714672 100644 --- a/packages/mask/src/components/InjectedComponents/PostInspector.tsx +++ b/packages/mask/src/components/InjectedComponents/PostInspector.tsx @@ -6,7 +6,7 @@ import { ProfileIdentifier, type PayloadAlpha40_Or_Alpha39, type PayloadAlpha38 import type { TypedMessageTuple } from '@masknet/typed-message' import type { Profile } from '../../database' import { useCurrentIdentity, useFriendsList } from '../DataSource/useActivatedUI' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { debugModeSetting } from '../../settings/settings' import { usePostInfoDetails } from '../DataSource/usePostInfo' import { createInjectHooksRenderer, useActivatedPluginsSNSAdaptor } from '@masknet/plugin-infra' diff --git a/packages/mask/src/components/InjectedComponents/SetupGuide.tsx b/packages/mask/src/components/InjectedComponents/SetupGuide.tsx index 99b3dd7a8c06..95d4b64fe8fe 100644 --- a/packages/mask/src/components/InjectedComponents/SetupGuide.tsx +++ b/packages/mask/src/components/InjectedComponents/SetupGuide.tsx @@ -1,6 +1,6 @@ import { useMemo, useState, useEffect, useRef } from 'react' import { makeStyles } from '@masknet/theme' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { useI18N, MaskMessages } from '../../utils' import { activatedSocialNetworkUI, SocialNetworkUI } from '../../social-network' import { currentSetupGuideStatus, dismissPinExtensionTip, userGuideStatus } from '../../settings/settings' diff --git a/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx b/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx index 39ea01b47133..62e03d1e1721 100644 --- a/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx +++ b/packages/mask/src/components/InjectedComponents/ToolboxUnstyled.tsx @@ -24,7 +24,7 @@ import { } from '@masknet/plugin-infra' import { useCallback, useMemo } from 'react' import { WalletIcon } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' import { hasNativeAPI, nativeAPI } from '../../../shared/native-rpc' diff --git a/packages/mask/src/components/shared/ApplicationBoard.tsx b/packages/mask/src/components/shared/ApplicationBoard.tsx index d0cfe5abf403..bbb9c04f84f2 100644 --- a/packages/mask/src/components/shared/ApplicationBoard.tsx +++ b/packages/mask/src/components/shared/ApplicationBoard.tsx @@ -3,7 +3,7 @@ import classNames from 'classnames' import { Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import { ChainId, useChainId, useAccount, useWallet } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { MaskMessages } from '../../utils/messages' import { useControlledDialog } from '../../utils/hooks/useControlledDialog' import { RedPacketPluginID } from '../../plugins/RedPacket/constants' diff --git a/packages/mask/src/components/shared/ErrorBoundary.tsx b/packages/mask/src/components/shared/ErrorBoundary.tsx deleted file mode 100644 index a33350327777..000000000000 --- a/packages/mask/src/components/shared/ErrorBoundary.tsx +++ /dev/null @@ -1 +0,0 @@ -export { ErrorBoundary, withErrorBoundary } from '@masknet/shared-base' diff --git a/packages/mask/src/components/shared/InjectedDialog.tsx b/packages/mask/src/components/shared/InjectedDialog.tsx index f38d05777d1f..ebedfbf3d394 100644 --- a/packages/mask/src/components/shared/InjectedDialog.tsx +++ b/packages/mask/src/components/shared/InjectedDialog.tsx @@ -13,7 +13,8 @@ import { useMediaQuery, } from '@mui/material' import { makeStyles, useDialogStackActor, useStylesExtends, mergeClasses } from '@masknet/theme' -import { isDashboardPage, ErrorBoundary } from '@masknet/shared-base' +import { isDashboardPage } from '@masknet/shared-base' +import { ErrorBoundary } from '@masknet/shared-base-ui' import { useI18N, usePortalShadowRoot } from '../../utils' import { DialogDismissIconUI } from '../InjectedComponents/DialogDismissIcon' import { activatedSocialNetworkUI } from '../../social-network' diff --git a/packages/mask/src/components/shared/WalletStatusBox.tsx b/packages/mask/src/components/shared/WalletStatusBox.tsx index 2845f37d753a..ebda5fe0b4e0 100644 --- a/packages/mask/src/components/shared/WalletStatusBox.tsx +++ b/packages/mask/src/components/shared/WalletStatusBox.tsx @@ -5,7 +5,8 @@ import classNames from 'classnames' import { ProviderType } from '@masknet/web3-shared-evm' import { Button, Link, Typography } from '@mui/material' import { getMaskColor, makeStyles } from '@masknet/theme' -import { isDashboardPage, useRemoteControlledDialog } from '@masknet/shared-base' +import { isDashboardPage } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useAccount, useWeb3State, diff --git a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx index a86b03a490ea..9e994e5222e2 100644 --- a/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx +++ b/packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx @@ -1,5 +1,5 @@ import { createContext, useEffect, useMemo, useState } from 'react' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { AddressName, ChainId, diff --git a/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx b/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx index 2e498c96a891..4169affe160c 100644 --- a/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx +++ b/packages/mask/src/extension/options-page/DashboardDialogs/Wallet/TransferNFT.tsx @@ -9,7 +9,7 @@ import { useTokenTransferCallback, } from '@masknet/web3-shared-evm' import { useI18N } from '../../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { Image } from '../../../../components/shared/Image' import { WalletMessages } from '../../../../plugins/Wallet/messages' import { MaskIconOutlined } from '../../../../resources/MaskIcon' diff --git a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx index 911da9cb9c38..d246ba6ff24d 100644 --- a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx +++ b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx @@ -6,7 +6,7 @@ import { ChainId, ProviderType, useAccount, useChainId } from '@masknet/web3-sha import { getRegisteredWeb3Networks, NetworkPluginID, Web3Plugin } from '@masknet/plugin-infra' import { currentMaskWalletAccountSettings, currentProviderSettings } from '../../../../plugins/Wallet/settings' import { ChainIcon, useMenuConfig, WalletIcon } from '@masknet/shared' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { ArrowDownRound } from '@masknet/icons' import { WalletRPC } from '../../../../plugins/Wallet/messages' diff --git a/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts b/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts index 0d03bbefa912..bb3ffe6c81f5 100644 --- a/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts +++ b/packages/mask/src/extension/popups/pages/Personas/hooks/usePersonaContext.ts @@ -1,5 +1,5 @@ import { createContainer } from 'unstated-next' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { ECKeyIdentifier, Identifier, PersonaInformation } from '@masknet/shared-base' import { currentPersonaIdentifier } from '../../../../../settings/settings' import { useAsyncRetry } from 'react-use' diff --git a/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx index 381f70195bcc..0c02a4cf8b33 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx @@ -9,7 +9,7 @@ import Services from '../../../../service' import { LoadingPlaceholder } from '../../../components/LoadingPlaceholder' import { Typography } from '@mui/material' import { FormattedAddress } from '@masknet/shared' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { useHasPassword } from '../../../hook/useHasPassword' import type { z as zod } from 'zod' import { Controller } from 'react-hook-form' diff --git a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx index 49490eee7809..7b75dddbcfc4 100644 --- a/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx +++ b/packages/mask/src/plugins/ArtBlocks/SNSAdaptor/PurchaseDialog.tsx @@ -27,7 +27,7 @@ import { usePurchaseCallback } from '../hooks/usePurchaseCallback' import { TokenAmountPanel } from '@masknet/shared' import { EthereumERC20TokenApprovedBoundary } from '../../../web3/UI/EthereumERC20TokenApprovedBoundary' import { leftShift } from '@masknet/web3-shared-base' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '../../Wallet/messages' import type { Project } from '../types' diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx index 1d387e22b933..b0082df47dfd 100644 --- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx +++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx @@ -1,7 +1,7 @@ import { useCallback, useState } from 'react' import { uniqBy } from 'lodash-unified' import { WalletMessages } from '@masknet/plugin-wallet' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { makeStyles, useStylesExtends } from '@masknet/theme' import { ChainId, diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx index 8ecaf50edbcf..13fc32d6776e 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/CheckoutDialog.tsx @@ -16,7 +16,7 @@ import { EthereumTokenType, useAccount, useFungibleTokenWatched } from '@masknet import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { UnreviewedWarning } from './UnreviewedWarning' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import ActionButton, { ActionButtonPromise } from '../../../extension/options-page/DashboardComponents/ActionButton' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' import { PluginCollectibleRPC } from '../messages' diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx index 44863372fc53..fd1fef98b836 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx @@ -16,7 +16,7 @@ import BigNumber from 'bignumber.js' import { FungibleTokenDetailed, EthereumTokenType, useAccount, useFungibleTokenWatched } from '@masknet/web3-shared-evm' import formatDateTime from 'date-fns/format' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { UnreviewedWarning } from './UnreviewedWarning' import ActionButton, { ActionButtonPromise } from '../../../extension/options-page/DashboardComponents/ActionButton' diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx index 76b47c20f2a3..65b43c08f6cd 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/CheckoutDialog.tsx @@ -8,7 +8,7 @@ import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { useI18N } from '../../../utils' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '../../Wallet/messages' import type { useAsset } from '../hooks/useAsset' import { resolvePaymentTokensOnCryptoartAI, resolveAssetLinkOnCryptoartAI } from '../pipes' diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx index 736dd46077f2..858d11125bce 100644 --- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx +++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx @@ -16,7 +16,7 @@ import { InjectedDialog } from '../../../components/shared/InjectedDialog' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { SelectTokenAmountPanel } from '../../ITO/SNSAdaptor/SelectTokenAmountPanel' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '../../Wallet/messages' import type { useAsset } from '../hooks/useAsset' import { resolvePaymentTokensOnCryptoartAI, resolveAssetLinkOnCryptoartAI } from '../pipes' diff --git a/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx b/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx index 55cf6a9e91f2..7b0bb4c8d22d 100644 --- a/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/NetworkIconClickBait.tsx @@ -1,7 +1,7 @@ import { useCallback, cloneElement, isValidElement } from 'react' import { unreachable } from '@dimensiondev/kit' import type { Web3Plugin } from '@masknet/plugin-infra' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { getChainIdFromNetworkType, isFortmaticSupported, NetworkType, ProviderType } from '@masknet/web3-shared-evm' import { WalletMessages } from '../../../Wallet/messages' diff --git a/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx b/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx index 7836b0095539..6c9618e7c638 100644 --- a/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx +++ b/packages/mask/src/plugins/EVM/UI/components/ProviderIconClickBait.tsx @@ -1,7 +1,7 @@ import { useCallback, cloneElement, isValidElement } from 'react' import { unreachable } from '@dimensiondev/kit' import type { Web3Plugin } from '@masknet/plugin-infra' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { isDashboardPage } from '@masknet/shared-base' import { getChainIdFromNetworkType, diff --git a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx index 1f0811c7d034..c72a5604c348 100644 --- a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx +++ b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/DonateDialog.tsx @@ -20,7 +20,7 @@ import { activatedSocialNetworkUI } from '../../../social-network' import { isTwitter } from '../../../social-network-adaptor/twitter.com/base' import { isFacebook } from '../../../social-network-adaptor/facebook.com/base' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { EthereumERC20TokenApprovedBoundary } from '../../../web3/UI/EthereumERC20TokenApprovedBoundary' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' import { TokenAmountPanel } from '../../../web3/UI/TokenAmountPanel' diff --git a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx index dec606c896f9..4fccc31502fa 100644 --- a/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx +++ b/packages/mask/src/plugins/Gitcoin/SNSAdaptor/PreviewCard.tsx @@ -4,7 +4,7 @@ import { makeStyles } from '@masknet/theme' import QueryBuilderIcon from '@mui/icons-material/QueryBuilder' import VerifiedUserIcon from '@mui/icons-material/VerifiedUser' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useGrant } from '../hooks/useGrant' import { PluginGitcoinMessages } from '../messages' import urlcat from 'urlcat' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx index 48c5b7b333d7..1b786419ad6c 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ClaimAllDialog.tsx @@ -4,7 +4,7 @@ import { flatten, uniq } from 'lodash-unified' import formatDateTime from 'date-fns/format' import { SnackbarProvider, makeStyles } from '@masknet/theme' import { FormattedBalance } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { DialogContent, CircularProgress, Typography, List, ListItem, useTheme } from '@mui/material' import { formatBalance, diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx index d1a783451a28..3e5bf0590453 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx @@ -3,7 +3,7 @@ import Web3Utils from 'web3-utils' import { DialogContent } from '@mui/material' import { makeStyles } from '@masknet/theme' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { InjectedDialog, InjectedDialogProps } from '../../../components/shared/InjectedDialog' import { ITO_MetaKey_2, MSG_DELIMITER } from '../constants' import { DialogTabs, JSON_PayloadInMask } from '../types' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx index 9080417859ed..096a903f9ff5 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ExchangeTokenPanel.tsx @@ -6,7 +6,7 @@ import RemoveIcon from '@mui/icons-material/RemoveOutlined' import { useCallback, useEffect, useState } from 'react' import { v4 as uuid } from 'uuid' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import type { TokenAmountPanelProps } from '../../../web3/UI/TokenAmountPanel' import { TokenAmountPanel } from '../../../web3/UI/TokenAmountPanel' import { SelectTokenDialogEvent, WalletMessages } from '../../Wallet/messages' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx index f2a35914a8b8..8b1e29854cd2 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO.tsx @@ -14,7 +14,7 @@ import { isNativeTokenAddress, } from '@masknet/web3-shared-evm' import { isZero, ZERO, isGreaterThan } from '@masknet/web3-shared-base' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { Box, Card, Grid, Link, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import OpenInNewIcon from '@mui/icons-material/OpenInNew' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx index 7f374fa920b4..9ae52c8bb1a7 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/ITO_Card.tsx @@ -7,7 +7,7 @@ import ActionButton from '../../../extension/options-page/DashboardComponents/Ac import { activatedSocialNetworkUI } from '../../../social-network' import { isTwitter } from '../../../social-network-adaptor/twitter.com/base' import { isFacebook } from '../../../social-network-adaptor/facebook.com/base' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '../../Wallet/messages' import { useMaskClaimCallback } from './hooks/useMaskClaimCallback' import { useMaskITO_Packet } from './hooks/useMaskITO_Packet' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx index 1fc96bc2e6dd..966b6db5d6b9 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/SelectTokenAmountPanel.tsx @@ -2,7 +2,7 @@ import { useState, useCallback } from 'react' import { v4 as uuid } from 'uuid' import type { FungibleTokenDetailed } from '@masknet/web3-shared-evm' import type { ERC20TokenListProps } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { SelectTokenDialogEvent, WalletMessages } from '../../Wallet/messages' import { TokenAmountPanel, TokenAmountPanelProps } from '../../../web3/UI/TokenAmountPanel' diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx index 75b70c13da97..0863d75fc0b1 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/SwapDialog.tsx @@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid' import { CircularProgress, Slider, Typography } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { ChainId, diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx index e4a2948dc0a2..c2ba6a47acf5 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/UnlockDialog.tsx @@ -2,7 +2,7 @@ import { Link, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' import { useCallback, useState } from 'react' import { v4 as uuid } from 'uuid' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../utils' import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton' import { diff --git a/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx b/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx index a8cf148a0b66..94a9a1fbd89c 100644 --- a/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx +++ b/packages/mask/src/plugins/MaskBox/SNSAdaptor/components/PreviewCard.tsx @@ -12,7 +12,7 @@ import { BoxState, CardTab } from '../../type' import { ArticlesTab } from './ArticlesTab' import { DetailsTab } from './DetailsTab' import { DrawResultDialog } from './DrawResultDialog' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '../../../Wallet/messages' const useTabsStyles = makeStyles()((theme) => ({ diff --git a/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx b/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx index 6d11cddd67ee..08b070937d65 100644 --- a/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx +++ b/packages/mask/src/plugins/NextID/components/tip/TipForm.tsx @@ -1,6 +1,6 @@ import { useWeb3State } from '@masknet/plugin-infra' import { SelectTokenDialogEvent, WalletMessages } from '@masknet/plugin-wallet' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { makeStyles } from '@masknet/theme' import { EthereumTokenType, useFungibleTokenBalance } from '@masknet/web3-shared-evm' import { Box, FormControl, FormControlLabel, MenuItem, Radio, RadioGroup, Select, Typography } from '@mui/material' diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx index 3d6626858bcd..e5e33dd9d802 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/Animate.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import { makeStyles, useStylesExtends } from '@masknet/theme' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { useEssay, useDefaultEssay, useCurrentVisitingUser } from '../hooks' import { ModelNFT } from './ModelNFT' import { NormalNFT } from './NormalNFT' diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx index c04aac922a23..b9efb0a31221 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/PetDialog.tsx @@ -1,7 +1,7 @@ import { useState } from 'react' import { useAsync, useTimeout } from 'react-use' import type { Constant } from '@masknet/web3-shared-evm/constants/utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { DialogContent } from '@mui/material' import { PluginPetMessages, PluginPetRPC } from '../messages' import { InjectedDialog } from '../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx index d9a9403a8839..8941cc14f6b7 100644 --- a/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx +++ b/packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx @@ -2,7 +2,7 @@ import { useState, useMemo, ReactNode } from 'react' import { useTimeout } from 'react-use' import { isSameAddress } from '@masknet/web3-shared-evm' import { makeStyles, useStylesExtends, useCustomSnackbar, ShadowRootPopper } from '@masknet/theme' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { TextField, Typography, diff --git a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx index 9cf803fe2c43..d30fb9b5a2f1 100644 --- a/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx +++ b/packages/mask/src/plugins/PoolTogether/UI/DepositDialog.tsx @@ -1,4 +1,4 @@ -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { EthereumTokenType, formatBalance, diff --git a/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx b/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx index b45408fba360..8c622fbb8a6d 100644 --- a/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx +++ b/packages/mask/src/plugins/PoolTogether/UI/PoolView.tsx @@ -12,7 +12,7 @@ import { calculateNextPrize, calculateSecondsRemaining, getPrizePeriod } from '. import { NetworkView } from './NetworkView' import { useI18N } from '../../../utils' import { TokenIcon } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' const useStyles = makeStyles()((theme) => ({ root: { diff --git a/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx b/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx index d1a0635be61e..75595ece1c67 100644 --- a/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx +++ b/packages/mask/src/plugins/Profile/SNSAdaptor/WalletsPage.tsx @@ -7,7 +7,7 @@ import { makeStyles } from '@masknet/theme' import { WalletMessages } from '@masknet/plugin-wallet' import { NetworkPluginID, useNetworkDescriptor } from '@masknet/plugin-infra' import { ImageIcon, useSnackbarCallback } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { formatEthereumAddress, resolveAddressLinkOnExplorer, useChainId, useWallets } from '@masknet/web3-shared-evm' import { Button, Link, List, ListItem, ListItemIcon, ListItemText, Typography } from '@mui/material' import { useI18N } from '../../../utils' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx index 8e69aef4bc90..601a68d5dcf4 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryItem.tsx @@ -3,7 +3,7 @@ import { Trans } from 'react-i18next' import classNames from 'classnames' import { fill } from 'lodash-unified' import { TokenIcon } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { makeStyles } from '@masknet/theme' import { WalletMessages } from '@masknet/plugin-wallet' import { ERC721ContractDetailed, useAccount, useERC721ContractDetailed } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx index 9173b9d6a0ab..16affe48056f 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/NftRedPacketHistoryList.tsx @@ -1,4 +1,4 @@ -import { useScrollBottomEvent } from '@masknet/shared-base' +import { useScrollBottomEvent } from '@masknet/shared-base-ui' import { makeStyles } from '@masknet/theme' import classNames from 'classnames' import { ERC721ContractDetailed, useAccount, useChainId, ChainId } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx index 5d21fbe909e1..42c1191e8f6c 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/OperationFooter.tsx @@ -1,5 +1,5 @@ import { WalletMessages } from '@masknet/plugin-wallet' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { TransactionState, TransactionStateType, useAccount, useChainIdValid } from '@masknet/web3-shared-evm' import { Box } from '@mui/material' import { useCallback } from 'react' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx index 3ee42abd18ee..8a5b11f35cea 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacket/index.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames' import { useCallback, useEffect, useMemo } from 'react' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { Card, Typography } from '@mui/material' import { ChainId, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index 5057658122d2..ede8483d9f27 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -1,7 +1,7 @@ import { useState, useCallback, useRef, useMemo, useEffect } from 'react' import { DialogContent } from '@mui/material' import { usePortalShadowRoot, makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../utils' import AbstractTab, { AbstractTabProps } from '../../../components/shared/AbstractTab' import { RedPacketJSONPayload, DialogTabs, RedPacketRecord, RpTypeTabs } from '../types' diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx index 55af96c842ce..2bf6f54f6503 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketERC20Form.tsx @@ -1,4 +1,4 @@ -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { EthereumTokenType, formatBalance, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx index 233833e971e0..2b82372e2bb5 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx @@ -6,7 +6,7 @@ import { makeStyles } from '@masknet/theme' import { Trans } from 'react-i18next' import { RedPacketJSONPayload, RedPacketStatus, RedPacketJSONPayloadFromChain } from '../types' import { TokenIcon } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../utils' import { formatBalance, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx index 7365c6a0bb44..0c7b53582212 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedpacketNftConfirmDialog.tsx @@ -14,7 +14,7 @@ import { formatNFT_TokenId, } from '@masknet/web3-shared-evm' import { NFTCardStyledAssetPlayer } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import classNames from 'classnames' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { Button, Grid, Link, Typography, DialogContent, List, ListItem } from '@mui/material' diff --git a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx index d1f0e530c47d..4027030abe94 100644 --- a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx +++ b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsForm.tsx @@ -13,7 +13,7 @@ import { formatBalance, } from '@masknet/web3-shared-evm' import { TokenAmountPanel, FormattedCurrency, LoadingAnimation } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useTokenPrice } from '../../Wallet/hooks/useTokenPrice' import { useI18N } from '../../../utils' import { useStyles } from './SavingsFormStyles' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx index 506d6baafe29..d96df5edf97c 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/ConfirmDialog.tsx @@ -18,7 +18,8 @@ import { import { useI18N } from '../../../../utils' import { InfoIcon, RetweetIcon, CramIcon } from '@masknet/icons' import { isZero, multipliedBy } from '@masknet/web3-shared-base' -import { isDashboardPage, useValueRef } from '@masknet/shared-base' +import { isDashboardPage } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { TargetChainIdContext } from '../../trader/useTargetChainIdContext' import { currentSlippageSettings } from '../../settings' import { useNativeTokenPrice } from '../../../Wallet/hooks/useTokenPrice' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx index 150b100054d6..ddabbb2f0488 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx @@ -1,8 +1,8 @@ import { useState, useCallback, useEffect } from 'react' import { Accordion, AccordionDetails, AccordionSummary, Alert, DialogContent, Typography } from '@mui/material' import { makeStyles, MaskColorVar, useStylesExtends } from '@masknet/theme' -import { useValueRef } from '@masknet/shared-base' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../../utils' import { SlippageSlider } from './SlippageSlider' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx index eece9e87f0f5..e40fef2df70f 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TradeForm.tsx @@ -3,7 +3,7 @@ import { useI18N } from '../../../../utils' import { makeStyles, MaskColorVar } from '@masknet/theme' import { InputTokenPanel } from './InputTokenPanel' import { Box, chipClasses, Collapse, IconButton, Tooltip, Typography } from '@mui/material' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import type { FungibleTokenDetailed, Wallet } from '@masknet/web3-shared-evm' import { EthereumTokenType, formatBalance, formatPercentage } from '@masknet/web3-shared-evm' import { isLessThan, rightShift } from '@masknet/web3-shared-base' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx index 80737910a3d7..d7f4277ddb2b 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx @@ -16,7 +16,7 @@ import { useWallet, UST, } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { delay } from '@dimensiondev/kit' import { useGasConfig } from './hooks/useGasConfig' import type { Coin } from '../../types' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx index 7da012e282d9..9abcfc2213ae 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/TraderDialog.tsx @@ -3,7 +3,7 @@ import { usePluginIDContext, useActivatedPlugin, PluginId } from '@masknet/plugi import { ChainId, useChainId, useChainIdValid } from '@masknet/web3-shared-evm' import { DialogContent } from '@mui/material' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { AllProviderTradeContext } from '../../trader/useAllProviderTradeContext' import { TargetChainIdContext } from '../../trader/useTargetChainIdContext' import { PluginTraderMessages } from '../../messages' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts index 70d9c8dd6fde..5fb0c9b1a4ee 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGreatThanSlippageSetting.ts @@ -1,5 +1,5 @@ import type BigNumber from 'bignumber.js' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { currentSlippageSettings } from '../../../settings' import { useMemo } from 'react' import { multipliedBy, isGreaterThan } from '@masknet/web3-shared-base' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx index f090a304fae8..3e525596bedc 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingPopper.tsx @@ -5,7 +5,7 @@ import { PluginTraderMessages } from '../../messages' import { WalletMessages } from '../../../Wallet/messages' import type { TagType } from '../../types' import type { DataProvider } from '@masknet/public-api' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { PluginTransakMessages } from '../../../Transak/messages' export interface TrendingPopperProps { diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx index ee58f518dfe2..e510b7861cbc 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx @@ -6,7 +6,7 @@ import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown' import stringify from 'json-stable-stringify' import { first, last } from 'lodash-unified' import { FormattedCurrency, TokenIcon } from '@masknet/shared' -import { useValueRef, useRemoteControlledDialog } from '@masknet/shared-base' +import { useValueRef, useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../../utils' import type { Coin, Currency, Stat, Trending } from '../../types' import { DataProvider } from '@masknet/public-api' diff --git a/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts index 7decd9f27180..2a6f0dd0f4c5 100644 --- a/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/0x/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts index 7decd9f27180..2a6f0dd0f4c5 100644 --- a/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/bancor/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts index 7decd9f27180..2a6f0dd0f4c5 100644 --- a/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/dodo/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts index 7decd9f27180..2a6f0dd0f4c5 100644 --- a/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/openocean/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts b/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts index 4a045d16926f..15cd446c35d4 100644 --- a/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts +++ b/packages/mask/src/plugins/Trader/trader/uniswap/useSingleHopOnly.ts @@ -1,4 +1,4 @@ -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { currentSingleHopOnlySettings } from '../../settings' export function useSingleHopOnly() { diff --git a/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts b/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts index 5c3cb07691dc..235a7ed540fc 100644 --- a/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts +++ b/packages/mask/src/plugins/Trader/trader/uniswap/useSlippageTolerance.ts @@ -1,5 +1,5 @@ import { clamp } from 'lodash-unified' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SLIPPAGE_MAX, SLIPPAGE_MIN } from '../../constants' import { toUniswapPercent } from '../../helpers' import { currentSlippageSettings } from '../../settings' diff --git a/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts b/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts index 1788b3c20d06..1c1cc5a67b9b 100644 --- a/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts +++ b/packages/mask/src/plugins/Trader/trending/useApprovedTokens.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect, useState } from 'react' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import stringify from 'json-stable-stringify' import { approvedTokensFromUniswap } from '../settings' import { APPROVED_TOKENS_MAX } from '../constants' diff --git a/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts b/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts index ce37e7f27f75..0ca548aa8b2b 100644 --- a/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts +++ b/packages/mask/src/plugins/Trader/trending/useCurrentCoinId.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { getCurrentPreferredCoinIdSettings } from '../settings' import type { DataProvider } from '@masknet/public-api' diff --git a/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts b/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts index 93b5d5adc177..e97dd79948db 100644 --- a/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts +++ b/packages/mask/src/plugins/Trader/trending/useCurrentDataProvider.ts @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react' import type { DataProvider } from '@masknet/public-api' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { currentDataProviderSettings } from '../settings' export function useCurrentDataProvider(availableDataProviders: DataProvider[]) { diff --git a/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx b/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx index b7908f00b171..7fb2ad26a422 100644 --- a/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx +++ b/packages/mask/src/plugins/Transak/SNSAdaptor/BuyTokenDialog.tsx @@ -1,4 +1,4 @@ -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { DialogContent, IconButton } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import CloseIcon from '@mui/icons-material/Close' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx index fd56115c1935..becd7b16a80d 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/ConnectWalletDialog/index.tsx @@ -12,7 +12,7 @@ import { resolveNetworkName, resolveProviderName, } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' import { WalletMessages, WalletRPC } from '../../messages' import { ConnectionProgress } from './ConnectionProgress' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx index 81c8588ae47c..a713935827df 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/GasSettingBar.tsx @@ -9,7 +9,7 @@ import { useNativeTokenDetailed, } from '@masknet/web3-shared-evm' import { Tune } from '@mui/icons-material' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import type { NonPayableTx } from '@masknet/web3-contracts/types/types' import { Box, IconButton, Typography } from '@mui/material' import { WalletMessages } from '../../messages' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx index e58fabcb5384..783e51eba5c8 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/index.tsx @@ -2,7 +2,7 @@ import { FC, useState } from 'react' import { DialogContent } from '@mui/material' import { WalletMessages } from '@masknet/plugin-wallet' import { makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { GasOption } from '@masknet/web3-shared-evm' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' import { useI18N } from '../../../../utils' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx index 6994ed759420..05e5c2826060 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RenameWalletDialog.tsx @@ -6,7 +6,7 @@ import { WalletMessages, WalletRPC } from '../messages' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { useI18N } from '../../../utils/i18n-next-ui' import { useSnackbarCallback } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' const useStyles = makeStyles()((theme) => ({ content: { diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx index 249dbfb94e50..5c3ef92a33fc 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RestoreLegacyWalletDialog/index.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect } from 'react' import { useAsyncRetry } from 'react-use' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { Box } from '@mui/system' import { makeStyles } from '@masknet/theme' import { ProviderType } from '@masknet/web3-shared-evm' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx index 5bd1cfb9dd52..28ff99b7d217 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/RiskWarningDialog/index.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' import classnames from 'classnames' import { Trans } from 'react-i18next' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { formatEthereumAddress, useAccount } from '@masknet/web3-shared-evm' import PriorityHighIcon from '@mui/icons-material/PriorityHigh' import { Avatar, Button, DialogActions, DialogContent, Paper, Typography } from '@mui/material' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx index ee0feb193d35..6401c6efd608 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx @@ -17,7 +17,7 @@ import { import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { WalletMessages } from '../messages' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { EthereumAddress } from 'wallet.ts' import { SearchInput } from '../../../extension/options-page/DashboardComponents/SearchInput' import OpenInNewIcon from '@mui/icons-material/OpenInNew' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx index 24fa8d184bd8..a76885ba440c 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectProviderDialog/index.tsx @@ -9,7 +9,8 @@ import { useNetworkType, useWeb3UI, } from '@masknet/plugin-infra' -import { isDashboardPage, useRemoteControlledDialog, useValueRef } from '@masknet/shared-base' +import { isDashboardPage } from '@masknet/shared-base' +import { useRemoteControlledDialog, useValueRef } from '@masknet/shared-base-ui' import { useI18N } from '../../../../utils/i18n-next-ui' import { WalletMessages } from '../../messages' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx index ecb721229697..f7867b6be574 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectTokenDialog.tsx @@ -6,7 +6,7 @@ import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { WalletMessages } from '../../Wallet/messages' import { useI18N } from '../../../utils' import { ERC20TokenList, ERC20TokenListProps } from '@masknet/shared' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { delay } from '@dimensiondev/kit' import { MINDS_ID } from '../../../social-network-adaptor/minds.com/base' import { activatedSocialNetworkUI } from '../../../social-network' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx index f8cac519b7a9..c661e2bc02d9 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectWalletDialog.tsx @@ -2,7 +2,7 @@ import { useState, useCallback } from 'react' import { Button, DialogActions, DialogContent } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import { ProviderType, useWallets, useWallet, NetworkType } from '@masknet/web3-shared-evm' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { DashboardRoutes } from '@masknet/shared-base' import { useI18N } from '../../../utils' import { WalletMessages, WalletRPC } from '../messages' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx index 9cf66a8e2e1c..684036b4a0aa 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionDialog.tsx @@ -10,7 +10,7 @@ import { resolveTransactionLinkOnExplorer, } from '@masknet/web3-shared-evm' import { useI18N } from '../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { WalletMessages } from '../messages' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx index 1ca110ddcf8c..f84c6c711972 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletConnectQRCodeDialog/index.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { Button, DialogActions, DialogContent } from '@mui/material' import { makeStyles } from '@masknet/theme' import { useI18N } from '../../../../utils' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { WalletMessages } from '../../messages' import Services from '../../../../extension/service' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx index 4535a95b64b3..90227a1f8b07 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/WalletStatusDialog/index.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react' import { DialogActions, DialogContent, Typography } from '@mui/material' import ErrorIcon from '@mui/icons-material/Error' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useChainIdValid } from '@masknet/web3-shared-evm' import { makeStyles } from '@masknet/theme' import { InjectedDialog } from '../../../../components/shared/InjectedDialog' diff --git a/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts b/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts index afc2859b6c64..b59f2f08fef9 100644 --- a/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts +++ b/packages/mask/src/plugins/Wallet/hooks/useWalletRiskWarningDialog.ts @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useAccount } from '@masknet/web3-shared-evm' import { WalletMessages, WalletRPC } from '../messages' diff --git a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx index d8304290d439..339d35ee64bf 100644 --- a/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx +++ b/packages/mask/src/plugins/dHEDGE/UI/InvestDialog.tsx @@ -16,7 +16,7 @@ import ActionButton from '../../../extension/options-page/DashboardComponents/Ac import { activatedSocialNetworkUI } from '../../../social-network' import { isTwitter } from '../../../social-network-adaptor/twitter.com/base' import { isFacebook } from '../../../social-network-adaptor/facebook.com/base' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../utils/i18n-next-ui' import { EthereumERC20TokenApprovedBoundary } from '../../../web3/UI/EthereumERC20TokenApprovedBoundary' import { EthereumWalletConnectedBoundary } from '../../../web3/UI/EthereumWalletConnectedBoundary' diff --git a/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx b/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx index 64ea76575c1c..94b2d5ffad3e 100644 --- a/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx +++ b/packages/mask/src/plugins/dHEDGE/UI/PoolViewDeck.tsx @@ -4,7 +4,7 @@ import { makeStyles } from '@masknet/theme' import BigNumber from 'bignumber.js' import { useCallback } from 'react' import { Trans } from 'react-i18next' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../utils/i18n-next-ui' import { useAvatar } from '../hooks/useManager' import { PluginDHedgeMessages } from '../messages' diff --git a/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts b/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts index 256962ff9166..2d163de13460 100644 --- a/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts +++ b/packages/mask/src/social-network-adaptor/facebook.com/customization/custom.ts @@ -2,7 +2,7 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' import { PaletteMode, Theme, unstable_createMuiStrictModeTheme } from '@mui/material' import produce, { setAutoFreeze } from 'immer' import { useMemo } from 'react' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SubscriptionFromValueRef } from '@masknet/shared-base' import type { SocialNetworkUI } from '../../../social-network' import { fromRGB, isDark, shade, toRGB } from '../../../utils/theme-tools' diff --git a/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts b/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts index 0d87363ebf9c..71f388a0f0d7 100644 --- a/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts +++ b/packages/mask/src/social-network-adaptor/minds.com/customization/custom.ts @@ -2,7 +2,7 @@ import { MutationObserverWatcher, ValueRef } from '@dimensiondev/holoflows-kit' import { PaletteMode, Theme, unstable_createMuiStrictModeTheme } from '@mui/material' import produce, { setAutoFreeze } from 'immer' import { useMemo } from 'react' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SubscriptionFromValueRef } from '@masknet/shared-base' import type { SocialNetworkUI } from '../../../social-network' import { fromRGB, getBackgroundColor, getForegroundColor, shade, toRGB } from '../../../utils/theme-tools' diff --git a/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts b/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts index a6af92c2d0ad..080f2a10f1e7 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts +++ b/packages/mask/src/social-network-adaptor/twitter.com/customization/custom.ts @@ -1,6 +1,6 @@ import { MutationObserverWatcher, ValueRef } from '@dimensiondev/holoflows-kit' import { SubscriptionFromValueRef } from '@masknet/shared-base' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { PaletteMode, Theme, unstable_createMuiStrictModeTheme } from '@mui/material' import produce, { setAutoFreeze } from 'immer' import { useMemo } from 'react' diff --git a/packages/mask/src/tsconfig.json b/packages/mask/src/tsconfig.json index 861dca90a047..40b24ac85751 100644 --- a/packages/mask/src/tsconfig.json +++ b/packages/mask/src/tsconfig.json @@ -17,6 +17,7 @@ { "path": "../../public-api" }, { "path": "../../shared" }, { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../typed-message/base" }, { "path": "../../typed-message/dom" }, { "path": "../../web3-shared/base" }, diff --git a/packages/mask/src/utils/createNormalReactRoot.tsx b/packages/mask/src/utils/createNormalReactRoot.tsx index 94c8a29f474f..da1deea5d468 100644 --- a/packages/mask/src/utils/createNormalReactRoot.tsx +++ b/packages/mask/src/utils/createNormalReactRoot.tsx @@ -1,6 +1,6 @@ import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' -import { ErrorBoundary } from '../components/shared/ErrorBoundary' +import { ErrorBoundary } from '@masknet/shared-base-ui' import { DisableShadowRootContext } from '@masknet/theme' export function createNormalReactRoot(jsx: JSX.Element, container?: HTMLElement) { diff --git a/packages/mask/src/utils/hooks/useSettingSwitcher.tsx b/packages/mask/src/utils/hooks/useSettingSwitcher.tsx index 2389c695ce6d..d804a8105252 100644 --- a/packages/mask/src/utils/hooks/useSettingSwitcher.tsx +++ b/packages/mask/src/utils/hooks/useSettingSwitcher.tsx @@ -1,5 +1,5 @@ import { useMemo, useCallback } from 'react' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import ActionButton from '../../extension/options-page/DashboardComponents/ActionButton' import type { InternalSettings } from '../../settings/createSettings' diff --git a/packages/mask/src/utils/theme.ts b/packages/mask/src/utils/theme.ts index b0a79275441a..3baa14bdc2ab 100644 --- a/packages/mask/src/utils/theme.ts +++ b/packages/mask/src/utils/theme.ts @@ -1,5 +1,5 @@ import { ValueRef } from '@dimensiondev/holoflows-kit' -import { useValueRef } from '@masknet/shared-base' +import { useValueRef } from '@masknet/shared-base-ui' import { SubscriptionFromValueRef } from '@masknet/shared-base' import { Appearance, or, makeStyles, parseColor } from '@masknet/theme' import { LanguageOptions, SupportedLanguages } from '@masknet/public-api' diff --git a/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx b/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx index f9f58cc6657a..b0f96a714d8f 100644 --- a/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx +++ b/packages/mask/src/web3/UI/ERC721ContractSelectPanel.tsx @@ -14,7 +14,7 @@ import classNames from 'classnames' import { EthereumAddress } from 'wallet.ts' import { Box, CircularProgress, Typography } from '@mui/material' import { makeStyles } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import ExpandMoreIcon from '@mui/icons-material/ExpandMore' import { SelectNftContractDialogEvent, WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' diff --git a/packages/mask/src/web3/UI/EthereumChainBoundary.tsx b/packages/mask/src/web3/UI/EthereumChainBoundary.tsx index ebbeb66a2980..a51196dca2ce 100644 --- a/packages/mask/src/web3/UI/EthereumChainBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumChainBoundary.tsx @@ -16,7 +16,7 @@ import { useAllowTestnet, useChainId, } from '@masknet/web3-shared-evm' -import { useValueRef, useRemoteControlledDialog } from '@masknet/shared-base' +import { useValueRef, useRemoteControlledDialog } from '@masknet/shared-base-ui' import { delay } from '@dimensiondev/kit' import ActionButton, { ActionButtonPromise, diff --git a/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx b/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx index 4256aff4e5a4..2eb116847743 100644 --- a/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx +++ b/packages/mask/src/web3/UI/EthereumWalletConnectedBoundary.tsx @@ -1,7 +1,7 @@ import { Grid } from '@mui/material' import { makeStyles, useStylesExtends } from '@masknet/theme' import classNames from 'classnames' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import ActionButton, { ActionButtonProps } from '../../extension/options-page/DashboardComponents/ActionButton' import { WalletMessages } from '../../plugins/Wallet/messages' import { useI18N } from '../../utils' diff --git a/packages/mask/src/web3/hooks/useTransactionDialog.ts b/packages/mask/src/web3/hooks/useTransactionDialog.ts index 7906a865bc1a..e7c1df87320b 100644 --- a/packages/mask/src/web3/hooks/useTransactionDialog.ts +++ b/packages/mask/src/web3/hooks/useTransactionDialog.ts @@ -1,5 +1,5 @@ import { useEffect } from 'react' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { TransactionState, TransactionStateType } from '@masknet/web3-shared-evm' import { WalletMessages } from '../../plugins/Wallet/messages' diff --git a/packages/plugin-infra/package.json b/packages/plugin-infra/package.json index 7af1b1c3edd4..3c9d1d5f0c3c 100644 --- a/packages/plugin-infra/package.json +++ b/packages/plugin-infra/package.json @@ -8,6 +8,7 @@ "dependencies": { "@dimensiondev/holoflows-kit": "^0.9.0-20210902104757-7c3d0d0", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/typed-message": "workspace:*", "@masknet/web3-shared-base": "workspace:*", diff --git a/packages/plugin-infra/src/PostContext.ts b/packages/plugin-infra/src/PostContext.ts index 9daa93e75e89..12ed72a3e7de 100644 --- a/packages/plugin-infra/src/PostContext.ts +++ b/packages/plugin-infra/src/PostContext.ts @@ -1,12 +1,11 @@ import { - useObservableValues, - useValueRef, ObservableMap, ObservableSet, type Payload, type PostIdentifier, type ProfileIdentifier, } from '@masknet/shared-base' +import { useObservableValues, useValueRef } from '@masknet/shared-base-ui' import type { TypedMessageTuple } from '@masknet/typed-message' import { ValueRef, LiveSelector, DOMProxy } from '@dimensiondev/holoflows-kit' import type { Result } from 'ts-results' diff --git a/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx b/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx index 45ff800533f6..2da5547361b3 100644 --- a/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx +++ b/packages/plugin-infra/src/utils/createInjectHooksRenderer.tsx @@ -1,5 +1,5 @@ import { useEffect, useState, useRef, memo, createContext, useContext } from 'react' -import { ErrorBoundary } from '@masknet/shared-base' +import { ErrorBoundary } from '@masknet/shared-base-ui' import { ShadowRootIsolation } from '@masknet/theme' import type { Plugin } from '../types' import { usePluginI18NField, PluginWrapperComponent, PluginWrapperMethods } from '../hooks' diff --git a/packages/plugin-infra/tsconfig.json b/packages/plugin-infra/tsconfig.json index b986cab80191..8148d2746a40 100644 --- a/packages/plugin-infra/tsconfig.json +++ b/packages/plugin-infra/tsconfig.json @@ -8,6 +8,7 @@ "include": ["./src"], "references": [ { "path": "../shared-base" }, + { "path": "../shared-base-ui" }, { "path": "../theme" }, { "path": "../web3-shared/base" }, { "path": "../typed-message/base" } diff --git a/packages/plugins/CyberConnect/package.json b/packages/plugins/CyberConnect/package.json index 89ba5b2257cf..018e20480edb 100644 --- a/packages/plugins/CyberConnect/package.json +++ b/packages/plugins/CyberConnect/package.json @@ -8,6 +8,7 @@ "@masknet/theme": "workspace:*", "@masknet/web3-shared-evm": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@cyberlab/cyberconnect": "^4.2.2", "boring-avatars": "^1.5.8", "react-use": "^17.3.2" diff --git a/packages/plugins/CyberConnect/tsconfig.json b/packages/plugins/CyberConnect/tsconfig.json index 4d052cd2e340..44d275dfd8d0 100644 --- a/packages/plugins/CyberConnect/tsconfig.json +++ b/packages/plugins/CyberConnect/tsconfig.json @@ -10,6 +10,7 @@ { "path": "../../plugin-infra" }, { "path": "../../theme" }, { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../web3-shared/evm" }, { "path": "../../typed-message/base" } ] diff --git a/packages/plugins/DAO/package.json b/packages/plugins/DAO/package.json index df9ab11a71ec..bd7153af92da 100644 --- a/packages/plugins/DAO/package.json +++ b/packages/plugins/DAO/package.json @@ -8,6 +8,7 @@ "@masknet/plugin-infra": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/configuration": "workspace:*", "bignumber.js": "^9.0.2", "date-fns": "^2.28.0", diff --git a/packages/plugins/DAO/tsconfig.json b/packages/plugins/DAO/tsconfig.json index 23321b41249e..077447670ebc 100644 --- a/packages/plugins/DAO/tsconfig.json +++ b/packages/plugins/DAO/tsconfig.json @@ -11,6 +11,7 @@ { "path": "../../plugin-infra" }, { "path": "../../shared" }, { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../theme" }, { "path": "../../web3-providers" }, { "path": "../../configuration" } diff --git a/packages/plugins/Debugger/package.json b/packages/plugins/Debugger/package.json index 1ba7d62f96c2..893b2f840b58 100644 --- a/packages/plugins/Debugger/package.json +++ b/packages/plugins/Debugger/package.json @@ -8,6 +8,7 @@ "@masknet/plugin-infra": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/web3-providers": "workspace:*", "@masknet/web3-shared-base": "workspace:*", diff --git a/packages/plugins/FileService/package.json b/packages/plugins/FileService/package.json index f12f9c29fd77..ed731f53bc04 100644 --- a/packages/plugins/FileService/package.json +++ b/packages/plugins/FileService/package.json @@ -11,6 +11,7 @@ "@masknet/plugin-wallet": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/typed-message": "workspace:*", "@msgpack/msgpack": "^2.7.2", diff --git a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx index 57c0cf329d36..b7bd512fbb7a 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx @@ -1,6 +1,6 @@ import { Button, DialogActions, DialogContent } from '@mui/material' import { makeStyles, MaskDialog, useCustomSnackbar } from '@masknet/theme' -import { useRemoteControlledDialog } from '@masknet/shared-base' +import { useRemoteControlledDialog } from '@masknet/shared-base-ui' import { isNil } from 'lodash-unified' import { useState } from 'react' import { useI18N } from '../locales/i18n_generated' diff --git a/packages/plugins/FileService/tsconfig.json b/packages/plugins/FileService/tsconfig.json index 3b57a27d76c7..b693f1bc4f12 100644 --- a/packages/plugins/FileService/tsconfig.json +++ b/packages/plugins/FileService/tsconfig.json @@ -10,6 +10,7 @@ { "path": "../../theme" }, { "path": "../../plugin-infra" }, { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../typed-message/base" }, { "path": "../../shared" }, { "path": "../../icons" }, diff --git a/packages/plugins/Flow/package.json b/packages/plugins/Flow/package.json index 4c7b36275947..67d9ded9456f 100644 --- a/packages/plugins/Flow/package.json +++ b/packages/plugins/Flow/package.json @@ -9,6 +9,7 @@ "@masknet/plugin-infra": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/web3-providers": "workspace:*", "@masknet/web3-shared-base": "workspace:*", diff --git a/packages/plugins/Flow/tsconfig.json b/packages/plugins/Flow/tsconfig.json index 631a5ee1ebfb..e338284f6219 100644 --- a/packages/plugins/Flow/tsconfig.json +++ b/packages/plugins/Flow/tsconfig.json @@ -11,6 +11,7 @@ { "path": "../../plugin-infra" }, { "path": "../../shared" }, { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../theme" }, { "path": "../../web3-shared/base" }, { "path": "../../web3-shared/flow" }, diff --git a/packages/plugins/RSS3/package.json b/packages/plugins/RSS3/package.json index 147188bb2cb2..b2ae7c06eb9e 100644 --- a/packages/plugins/RSS3/package.json +++ b/packages/plugins/RSS3/package.json @@ -8,6 +8,7 @@ "@masknet/plugin-infra": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/web3-providers": "workspace:*", "@masknet/web3-shared-base": "workspace:*", diff --git a/packages/plugins/RSS3/tsconfig.json b/packages/plugins/RSS3/tsconfig.json index 5ba330df8487..7d321d90c30b 100644 --- a/packages/plugins/RSS3/tsconfig.json +++ b/packages/plugins/RSS3/tsconfig.json @@ -11,6 +11,7 @@ { "path": "../../plugin-infra" }, { "path": "../../shared" }, { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../theme" }, { "path": "../../web3-providers" } ] diff --git a/packages/plugins/Solana/package.json b/packages/plugins/Solana/package.json index 3699cbac479b..0bed92237746 100644 --- a/packages/plugins/Solana/package.json +++ b/packages/plugins/Solana/package.json @@ -9,6 +9,7 @@ "@masknet/plugin-infra": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/web3-providers": "workspace:*", "@masknet/web3-shared-base": "workspace:*", diff --git a/packages/plugins/Solana/tsconfig.json b/packages/plugins/Solana/tsconfig.json index 783a13091a62..974debf831e3 100644 --- a/packages/plugins/Solana/tsconfig.json +++ b/packages/plugins/Solana/tsconfig.json @@ -12,6 +12,7 @@ { "path": "../../plugin-infra" }, { "path": "../../shared" }, { "path": "../../shared-base" }, + { "path": "../../shared-base-ui" }, { "path": "../../theme" }, { "path": "../../web3-providers" }, { "path": "../../web3-shared/base" }, diff --git a/packages/plugins/template/package.json b/packages/plugins/template/package.json index 7539398a33db..04ec2a9cea64 100644 --- a/packages/plugins/template/package.json +++ b/packages/plugins/template/package.json @@ -7,6 +7,7 @@ "@masknet/plugin-infra": "workspace:*", "@masknet/shared": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "react-use": "^17.3.2" } } diff --git a/packages/shared-base-ui/package.json b/packages/shared-base-ui/package.json new file mode 100644 index 000000000000..ebb6a6817fa0 --- /dev/null +++ b/packages/shared-base-ui/package.json @@ -0,0 +1,14 @@ +{ + "name": "@masknet/shared-base-ui", + "description": "This package MUST be pure.", + "main": "./dist/index.js", + "types": "./dist/index.d.ts", + "sideEffect": false, + "dependencies": { + "@dimensiondev/holoflows-kit": "^0.9.0-20210902104757-7c3d0d0", + "@masknet/shared-base": "workspace:*", + "react-use": "^17.3.2", + "use-subscription": "^1.5.1", + "uuid": "^8.3.2" + } +} diff --git a/packages/shared-base/src/UI/components/ErrorBoundary/CrashUI.tsx b/packages/shared-base-ui/src/components/ErrorBoundary/CrashUI.tsx similarity index 100% rename from packages/shared-base/src/UI/components/ErrorBoundary/CrashUI.tsx rename to packages/shared-base-ui/src/components/ErrorBoundary/CrashUI.tsx diff --git a/packages/shared-base/src/UI/components/ErrorBoundary/ErrorBoundary.tsx b/packages/shared-base-ui/src/components/ErrorBoundary/ErrorBoundary.tsx similarity index 100% rename from packages/shared-base/src/UI/components/ErrorBoundary/ErrorBoundary.tsx rename to packages/shared-base-ui/src/components/ErrorBoundary/ErrorBoundary.tsx diff --git a/packages/shared-base/src/UI/components/ErrorBoundary/context.ts b/packages/shared-base-ui/src/components/ErrorBoundary/context.ts similarity index 100% rename from packages/shared-base/src/UI/components/ErrorBoundary/context.ts rename to packages/shared-base-ui/src/components/ErrorBoundary/context.ts diff --git a/packages/shared-base/src/UI/components/ErrorBoundary/index.ts b/packages/shared-base-ui/src/components/ErrorBoundary/index.ts similarity index 100% rename from packages/shared-base/src/UI/components/ErrorBoundary/index.ts rename to packages/shared-base-ui/src/components/ErrorBoundary/index.ts diff --git a/packages/shared-base/src/UI/components/index.ts b/packages/shared-base-ui/src/components/index.ts similarity index 100% rename from packages/shared-base/src/UI/components/index.ts rename to packages/shared-base-ui/src/components/index.ts diff --git a/packages/shared-base/src/UI/hooks/createGlobalState.ts b/packages/shared-base-ui/src/hooks/createGlobalState.ts similarity index 100% rename from packages/shared-base/src/UI/hooks/createGlobalState.ts rename to packages/shared-base-ui/src/hooks/createGlobalState.ts diff --git a/packages/shared-base/src/UI/hooks/index.ts b/packages/shared-base-ui/src/hooks/index.ts similarity index 100% rename from packages/shared-base/src/UI/hooks/index.ts rename to packages/shared-base-ui/src/hooks/index.ts diff --git a/packages/shared-base/src/UI/hooks/useObservableMapSet.ts b/packages/shared-base-ui/src/hooks/useObservableMapSet.ts similarity index 86% rename from packages/shared-base/src/UI/hooks/useObservableMapSet.ts rename to packages/shared-base-ui/src/hooks/useObservableMapSet.ts index 2f46b2698b28..84b7f88441cb 100644 --- a/packages/shared-base/src/UI/hooks/useObservableMapSet.ts +++ b/packages/shared-base-ui/src/hooks/useObservableMapSet.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' import { useSubscription, Subscription } from 'use-subscription' -import { ALL_EVENTS, ObservableMap, ObservableSet } from '../../collections' +import { ALL_EVENTS, ObservableMap, ObservableSet } from '@masknet/shared-base' export function useObservableValues(map: ObservableMap | ObservableSet) { const subscription = useMemo>( diff --git a/packages/shared-base/src/UI/hooks/useRemoteControlledDialog.ts b/packages/shared-base-ui/src/hooks/useRemoteControlledDialog.ts similarity index 100% rename from packages/shared-base/src/UI/hooks/useRemoteControlledDialog.ts rename to packages/shared-base-ui/src/hooks/useRemoteControlledDialog.ts diff --git a/packages/shared-base/src/UI/hooks/useScrollBottomEvent.ts b/packages/shared-base-ui/src/hooks/useScrollBottomEvent.ts similarity index 100% rename from packages/shared-base/src/UI/hooks/useScrollBottomEvent.ts rename to packages/shared-base-ui/src/hooks/useScrollBottomEvent.ts diff --git a/packages/shared-base/src/UI/hooks/useValueRef.ts b/packages/shared-base-ui/src/hooks/useValueRef.ts similarity index 100% rename from packages/shared-base/src/UI/hooks/useValueRef.ts rename to packages/shared-base-ui/src/hooks/useValueRef.ts diff --git a/packages/shared-base-ui/src/index.ts b/packages/shared-base-ui/src/index.ts new file mode 100644 index 000000000000..7aea380be8cc --- /dev/null +++ b/packages/shared-base-ui/src/index.ts @@ -0,0 +1,2 @@ +export * from './components' +export * from './hooks' diff --git a/packages/shared-base/src/UI/locales/en-US.json b/packages/shared-base-ui/src/locales/en-US.json similarity index 100% rename from packages/shared-base/src/UI/locales/en-US.json rename to packages/shared-base-ui/src/locales/en-US.json diff --git a/packages/shared-base/src/UI/locales/index.ts b/packages/shared-base-ui/src/locales/index.ts similarity index 100% rename from packages/shared-base/src/UI/locales/index.ts rename to packages/shared-base-ui/src/locales/index.ts diff --git a/packages/shared-base/src/UI/locales/ja-JP.json b/packages/shared-base-ui/src/locales/ja-JP.json similarity index 100% rename from packages/shared-base/src/UI/locales/ja-JP.json rename to packages/shared-base-ui/src/locales/ja-JP.json diff --git a/packages/shared-base/src/UI/locales/ko-KR.json b/packages/shared-base-ui/src/locales/ko-KR.json similarity index 100% rename from packages/shared-base/src/UI/locales/ko-KR.json rename to packages/shared-base-ui/src/locales/ko-KR.json diff --git a/packages/shared-base/src/UI/locales/languages.ts b/packages/shared-base-ui/src/locales/languages.ts similarity index 100% rename from packages/shared-base/src/UI/locales/languages.ts rename to packages/shared-base-ui/src/locales/languages.ts diff --git a/packages/shared-base/src/UI/locales/qya-AA.json b/packages/shared-base-ui/src/locales/qya-AA.json similarity index 100% rename from packages/shared-base/src/UI/locales/qya-AA.json rename to packages/shared-base-ui/src/locales/qya-AA.json diff --git a/packages/shared-base/src/UI/locales/zh-CN.json b/packages/shared-base-ui/src/locales/zh-CN.json similarity index 100% rename from packages/shared-base/src/UI/locales/zh-CN.json rename to packages/shared-base-ui/src/locales/zh-CN.json diff --git a/packages/shared-base/src/UI/locales/zh-TW.json b/packages/shared-base-ui/src/locales/zh-TW.json similarity index 100% rename from packages/shared-base/src/UI/locales/zh-TW.json rename to packages/shared-base-ui/src/locales/zh-TW.json diff --git a/packages/shared-base-ui/tsconfig.json b/packages/shared-base-ui/tsconfig.json new file mode 100644 index 000000000000..4543006077d2 --- /dev/null +++ b/packages/shared-base-ui/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "rootDir": "./src/", + "outDir": "./dist/", + "tsBuildInfoFile": "./dist/.tsbuildinfo" + }, + "include": ["./src", "./src/**/*.json"], + // Only type-level dependency. + "references": [{ "path": "../public-api" }, { "path": "../shared-base" }] +} diff --git a/packages/shared-base/package.json b/packages/shared-base/package.json index f4af7f655c51..d4058ae2ba3c 100644 --- a/packages/shared-base/package.json +++ b/packages/shared-base/package.json @@ -21,12 +21,10 @@ "immer": "^9.0.12", "pvtsutils": "^1.2.2", "react": "../empty", - "react-use": "^17.3.2", "tiny-secp256k1": "^2.2.1", "typeson": "^7.0.1", "typeson-registry": "^2.0.0", "use-subscription": "^1.5.1", - "uuid": "^8.3.2", "z-schema": "^5.0.2" } } diff --git a/packages/shared-base/src/index.ts b/packages/shared-base/src/index.ts index fd9d20630a8c..bf8b3701eae3 100644 --- a/packages/shared-base/src/index.ts +++ b/packages/shared-base/src/index.ts @@ -15,5 +15,3 @@ export * from './Messages/Mask' export * from './Results' export * from './convert' export * from './NextID/type' -export * from './UI/components' -export * from './UI/hooks' diff --git a/packages/shared/package.json b/packages/shared/package.json index 97434bd7a67c..4837b3181823 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -6,6 +6,7 @@ "@dimensiondev/holoflows-kit": "^0.9.0-20210902104757-7c3d0d0", "@masknet/icons": "workspace:*", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/theme": "workspace:*", "@masknet/web3-shared-base": "workspace:*", "@masknet/web3-shared-evm": "workspace:*", diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json index 9c37d1905d8c..269b4a4f9998 100644 --- a/packages/shared/tsconfig.json +++ b/packages/shared/tsconfig.json @@ -10,6 +10,7 @@ { "path": "../web3-shared/evm" }, { "path": "../theme" }, { "path": "../shared-base" }, + { "path": "../shared-base-ui" }, { "path": "../icons" } ] } diff --git a/packages/web3-shared/evm/package.json b/packages/web3-shared/evm/package.json index 48dfd1d9dedc..ad4a504b9b82 100644 --- a/packages/web3-shared/evm/package.json +++ b/packages/web3-shared/evm/package.json @@ -7,6 +7,7 @@ "dependencies": { "@ensdomains/address-encoder": "^0.2.6", "@masknet/shared-base": "workspace:*", + "@masknet/shared-base-ui": "workspace:*", "@masknet/web3-constants": "workspace:*", "@masknet/web3-contracts": "workspace:*", "@masknet/web3-shared-base": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ed3067dc12a..e768b5ce4048 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -140,6 +140,7 @@ importers: '@masknet/public-api': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/storybook-shared': workspace:* '@masknet/theme': workspace:* '@masknet/web3-providers': workspace:* @@ -193,6 +194,7 @@ importers: '@masknet/public-api': link:../public-api '@masknet/shared': link:../shared '@masknet/shared-base': link:../shared-base + '@masknet/shared-base-ui': link:../shared-base-ui '@masknet/storybook-shared': link:../storybook-shared '@masknet/theme': link:../theme '@masknet/web3-providers': link:../web3-providers @@ -244,11 +246,13 @@ importers: specifiers: '@dimensiondev/stego-js': 0.11.1-20201027083223-8ab41be '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/typed-message': workspace:* '@msgpack/msgpack': ^2.7.2 dependencies: '@dimensiondev/stego-js': 0.11.1-20201027083223-8ab41be '@masknet/shared-base': link:../shared-base + '@masknet/shared-base-ui': link:../shared-base-ui '@masknet/typed-message': link:../typed-message '@msgpack/msgpack': 2.7.2 @@ -319,6 +323,7 @@ importers: '@masknet/sdk': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/typed-message': workspace:* '@masknet/web3-contracts': workspace:* @@ -455,6 +460,7 @@ importers: '@masknet/sdk': link:../mask-sdk '@masknet/shared': link:../shared '@masknet/shared-base': link:../shared-base + '@masknet/shared-base-ui': link:../shared-base-ui '@masknet/theme': link:../theme '@masknet/typed-message': link:../typed-message '@masknet/web3-contracts': link:../web3-contracts @@ -583,6 +589,7 @@ importers: specifiers: '@dimensiondev/holoflows-kit': ^0.9.0-20210902104757-7c3d0d0 '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/typed-message': workspace:* '@masknet/web3-shared-base': workspace:* @@ -597,6 +604,7 @@ importers: dependencies: '@dimensiondev/holoflows-kit': 0.9.0-20210902104757-7c3d0d0 '@masknet/shared-base': link:../shared-base + '@masknet/shared-base-ui': link:../shared-base-ui '@masknet/theme': link:../theme '@masknet/typed-message': link:../typed-message '@masknet/web3-shared-base': link:../web3-shared/base @@ -615,6 +623,7 @@ importers: '@cyberlab/cyberconnect': ^4.2.2 '@masknet/plugin-infra': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/web3-shared-evm': workspace:* boring-avatars: ^1.5.8 @@ -623,6 +632,7 @@ importers: '@cyberlab/cyberconnect': 4.2.2 '@masknet/plugin-infra': link:../../plugin-infra '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui '@masknet/theme': link:../../theme '@masknet/web3-shared-evm': link:../../web3-shared/evm boring-avatars: 1.6.1 @@ -635,6 +645,7 @@ importers: '@masknet/plugin-infra': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* bignumber.js: ^9.0.2 date-fns: ^2.28.0 iframe-resizer-react: ^1.1.0 @@ -646,6 +657,7 @@ importers: '@masknet/plugin-infra': link:../../plugin-infra '@masknet/shared': link:../../shared '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui bignumber.js: 9.0.2 date-fns: 2.28.0 iframe-resizer-react: 1.1.0_bc22c48adf1a4e34a005159413cd72b5 @@ -658,6 +670,7 @@ importers: '@masknet/plugin-infra': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/web3-providers': workspace:* '@masknet/web3-shared-base': workspace:* @@ -671,6 +684,7 @@ importers: '@masknet/plugin-infra': link:../../plugin-infra '@masknet/shared': link:../../shared '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui '@masknet/theme': link:../../theme '@masknet/web3-providers': link:../../web3-providers '@masknet/web3-shared-base': link:../../web3-shared/base @@ -689,6 +703,7 @@ importers: '@masknet/plugin-wallet': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/typed-message': workspace:* '@msgpack/msgpack': ^2.7.2 @@ -707,6 +722,7 @@ importers: '@masknet/plugin-wallet': link:../Wallet '@masknet/shared': link:../../shared '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui '@masknet/theme': link:../../theme '@masknet/typed-message': link:../../typed-message '@msgpack/msgpack': 2.7.2 @@ -725,6 +741,7 @@ importers: '@masknet/plugin-infra': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/web3-providers': workspace:* '@masknet/web3-shared-base': workspace:* @@ -737,6 +754,7 @@ importers: '@masknet/plugin-infra': link:../../plugin-infra '@masknet/shared': link:../../shared '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui '@masknet/theme': link:../../theme '@masknet/web3-providers': link:../../web3-providers '@masknet/web3-shared-base': link:../../web3-shared/base @@ -750,6 +768,7 @@ importers: '@masknet/plugin-infra': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/web3-providers': workspace:* '@masknet/web3-shared-base': workspace:* @@ -764,6 +783,7 @@ importers: '@masknet/plugin-infra': link:../../plugin-infra '@masknet/shared': link:../../shared '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui '@masknet/theme': link:../../theme '@masknet/web3-providers': link:../../web3-providers '@masknet/web3-shared-base': link:../../web3-shared/base @@ -781,6 +801,7 @@ importers: '@masknet/plugin-infra': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/web3-providers': workspace:* '@masknet/web3-shared-base': workspace:* @@ -801,6 +822,7 @@ importers: '@masknet/plugin-infra': link:../../plugin-infra '@masknet/shared': link:../../shared '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui '@masknet/theme': link:../../theme '@masknet/web3-providers': link:../../web3-providers '@masknet/web3-shared-base': link:../../web3-shared/base @@ -847,11 +869,13 @@ importers: '@masknet/plugin-infra': workspace:* '@masknet/shared': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* react-use: ^17.3.2 dependencies: '@masknet/plugin-infra': link:../../plugin-infra '@masknet/shared': link:../../shared '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5 packages/polyfills: @@ -960,6 +984,7 @@ importers: '@dimensiondev/holoflows-kit': ^0.9.0-20210902104757-7c3d0d0 '@masknet/icons': workspace:* '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/theme': workspace:* '@masknet/web3-shared-base': workspace:* '@masknet/web3-shared-evm': workspace:* @@ -978,6 +1003,7 @@ importers: '@dimensiondev/holoflows-kit': 0.9.0-20210902104757-7c3d0d0 '@masknet/icons': link:../icons '@masknet/shared-base': link:../shared-base + '@masknet/shared-base-ui': link:../shared-base-ui '@masknet/theme': link:../theme '@masknet/web3-shared-base': link:../web3-shared/base '@masknet/web3-shared-evm': link:../web3-shared/evm @@ -1011,12 +1037,10 @@ importers: immer: ^9.0.12 pvtsutils: ^1.2.2 react: ../empty - react-use: ^17.3.2 tiny-secp256k1: ^2.2.1 typeson: ^7.0.1 typeson-registry: ^2.0.0 use-subscription: ^1.5.1 - uuid: ^8.3.2 z-schema: ^5.0.2 dependencies: '@dimensiondev/holoflows-kit': 0.9.0-20210902104757-7c3d0d0 @@ -1035,14 +1059,26 @@ importers: immer: 9.0.12 pvtsutils: 1.2.2 react: link:../empty - react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5 tiny-secp256k1: 2.2.1 typeson: 7.0.1 typeson-registry: 2.0.0 use-subscription: 1.5.1_react@18.0.0-rc.2 - uuid: 8.3.2 z-schema: 5.0.2 + packages/shared-base-ui: + specifiers: + '@dimensiondev/holoflows-kit': ^0.9.0-20210902104757-7c3d0d0 + '@masknet/shared-base': workspace:* + react-use: ^17.3.2 + use-subscription: ^1.5.1 + uuid: ^8.3.2 + dependencies: + '@dimensiondev/holoflows-kit': 0.9.0-20210902104757-7c3d0d0 + '@masknet/shared-base': link:../shared-base + react-use: 17.3.2_bc22c48adf1a4e34a005159413cd72b5 + use-subscription: 1.5.1_react@18.0.0-rc.2 + uuid: 8.3.2 + packages/storybook-shared: specifiers: '@storybook/addons': ^6.4.19 @@ -1186,6 +1222,7 @@ importers: specifiers: '@ensdomains/address-encoder': ^0.2.6 '@masknet/shared-base': workspace:* + '@masknet/shared-base-ui': workspace:* '@masknet/web3-constants': workspace:* '@masknet/web3-contracts': workspace:* '@masknet/web3-shared-base': workspace:* @@ -1209,6 +1246,7 @@ importers: dependencies: '@ensdomains/address-encoder': 0.2.6 '@masknet/shared-base': link:../../shared-base + '@masknet/shared-base-ui': link:../../shared-base-ui '@masknet/web3-constants': link:../../web3-constants '@masknet/web3-contracts': link:../../web3-contracts '@masknet/web3-shared-base': link:../base diff --git a/tsconfig.json b/tsconfig.json index 8d940fd96612..9d256fb75970 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -75,6 +75,7 @@ // @masknet/scripts is not listed. It does not mean to be installed as a dependency and not join the type check. "@masknet/shared": ["./packages/shared/src"], "@masknet/shared-base": ["./packages/shared-base/src"], + "@masknet/shared-base-ui": ["./packages/shared-base-ui/src"], "@masknet/storybook-shared": ["./packages/storybook-shared/src"], "@masknet/theme": ["./packages/theme/src"], // @masknet/web3-constants is not listed. It is not a TS project (only contains JSON files). From 8a9a295bf158a5fdb64720d048998127d20c8511 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Thu, 17 Mar 2022 21:29:12 +0800 Subject: [PATCH 5/5] fix: ts error --- packages/mask/src/components/shared/InjectedDialog.tsx | 1 + .../src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/components/shared/InjectedDialog.tsx b/packages/mask/src/components/shared/InjectedDialog.tsx index 715bddc6b934..c8275949d509 100644 --- a/packages/mask/src/components/shared/InjectedDialog.tsx +++ b/packages/mask/src/components/shared/InjectedDialog.tsx @@ -13,6 +13,7 @@ import { useMediaQuery, } from '@mui/material' import { makeStyles, useDialogStackActor, useStylesExtends, mergeClasses } from '@masknet/theme' +import { EnhanceableSite, isDashboardPage } from '@masknet/shared-base' import { ErrorBoundary } from '@masknet/shared-base-ui' import { useI18N, usePortalShadowRoot } from '../../utils' import { DialogDismissIconUI } from '../InjectedComponents/DialogDismissIcon' diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx index ddabbb2f0488..919cd78c7776 100644 --- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx +++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/SettingsDialog.tsx @@ -1,8 +1,7 @@ import { useState, useCallback, useEffect } from 'react' import { Accordion, AccordionDetails, AccordionSummary, Alert, DialogContent, Typography } from '@mui/material' import { makeStyles, MaskColorVar, useStylesExtends } from '@masknet/theme' -import { useValueRef } from '@masknet/shared-base-ui' -import { useRemoteControlledDialog } from '@masknet/shared-base-ui' +import { useValueRef, useRemoteControlledDialog } from '@masknet/shared-base-ui' import { useI18N } from '../../../../utils' import { SlippageSlider } from './SlippageSlider' import { currentSlippageSettings } from '../../settings'