chore: rename popup folder hook to hooks (#10609)

packages/mask/src/extension/popups/UI.tsx

@@ -1,13 +1,3 @@
-import { Suspense, lazy, memo, useEffect, useMemo, useState, type ReactNode } from 'react'
-import { useIdleTimer } from 'react-idle-timer'
-import {
-    unstable_HistoryRouter as HistoryRouter,
-    Navigate,
-    Route,
-    Routes,
-    useLocation,
-    type HistoryRouterProps,
-} from 'react-router-dom'
 import { createInjectHooksRenderer, useActivatedPluginsDashboard } from '@masknet/plugin-infra/dashboard'
 import { PageUIProvider, PersonaContext } from '@masknet/shared'
 import {
@@ -17,18 +7,27 @@ import {
     PopupsHistory,
 } from '@masknet/shared-base'
 import { PopupSnackbarProvider } from '@masknet/theme'
+import { DefaultWeb3ContextProvider, TelemetryProvider, useMountReport } from '@masknet/web3-hooks-base'
 import { ProviderType } from '@masknet/web3-shared-evm'
-import { TelemetryProvider, DefaultWeb3ContextProvider, useMountReport } from '@masknet/web3-hooks-base'
 import { EventID } from '@masknet/web3-telemetry/types'
 import { Box } from '@mui/material'
+import { Suspense, lazy, memo, useEffect, useMemo, useState, type ReactNode } from 'react'
+import { useIdleTimer } from 'react-idle-timer'
+import {
+    unstable_HistoryRouter as HistoryRouter,
+    Navigate,
+    Route,
+    Routes,
+    useLocation,
+    type HistoryRouterProps,
+} from 'react-router-dom'
 import { usePopupTheme } from '../../utils/theme/usePopupTheme.js'
 import Services from '../service.js'
 import { LoadingPlaceholder } from './components/LoadingPlaceholder/index.js'
 import { PopupLayout } from './components/PopupLayout/index.js'
 import { wrapModal } from './components/index.js'
 import { PageTitleContext } from './context.js'
-import { PopupContext } from './hook/usePopupContext.js'
-import { UserContext } from './hook/useUserContext.js'
+import { PopupContext, UserContext } from './hooks/index.js'
 import { ConnectProviderModal } from './modals/ConnectProvider/index.js'
 import { SelectProviderModal } from './modals/SelectProviderModal/index.js'
 import {

packages/mask/src/extension/popups/components/AddContactInputPanel/index.tsx

@@ -8,7 +8,7 @@ import { isSameAddress } from '@masknet/web3-shared-base'
 import { Box, Typography, useTheme, type BoxProps } from '@mui/material'
 import { memo, useCallback, useMemo } from 'react'
 import { useI18N } from '../../../../utils/index.js'
-import { ContactsContext } from '../../hook/useContactsContext.js'
+import { ContactsContext } from '../../hooks/index.js'
 import { AddContactModal } from '../../modals/modals.js'
 
 const useStyles = makeStyles()((theme) => ({

packages/mask/src/extension/popups/components/GasSettingMenu/index.tsx

@@ -26,8 +26,7 @@ import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { useAsync } from 'react-use'
 import { useContainer } from 'unstated-next'
 import { useI18N } from '../../../../utils/i18n-next-ui.js'
-import { useGasOptionsMenu } from '../../hook/useGasOptionsMenu.js'
-import { PopupContext } from '../../hook/usePopupContext.js'
+import { useGasOptionsMenu, PopupContext } from '../../hooks/index.js'
 
 interface GasSettingMenuProps {
     minimumGas: string

packages/mask/src/extension/popups/components/InitialPlaceholder/index.tsx

@@ -1,7 +1,7 @@
 import { memo } from 'react'
 import { Box, Button, Typography } from '@mui/material'
 import { makeStyles } from '@masknet/theme'
-import { useEnterDashboard } from '../../hook/useEnterDashboard.js'
+import { useEnterDashboard } from '../../hooks/index.js'
 import { Icons } from '@masknet/icons'
 import { useI18N } from '../../../../utils/index.js'
 

packages/mask/src/extension/popups/components/Navigator/index.tsx

@@ -8,7 +8,7 @@ import { Icons } from '@masknet/icons'
 import { makeStyles } from '@masknet/theme'
 import { DashboardRoutes, PopupRoutes } from '@masknet/shared-base'
 import { useMessages, useWallet } from '@masknet/web3-hooks-base'
-import { useHasPassword } from '../../hook/useHasPassword.js'
+import { useHasPassword } from '../../hooks/index.js'
 import { useWalletLockStatus } from '../../pages/Wallet/hooks/useWalletLockStatus.js'
 import { HydrateFinished } from '../../../../utils/createNormalReactRoot.js'
 import Services from '../../../service.js'

packages/mask/src/extension/popups/hooks/index.ts

@@ -0,0 +1,15 @@
+export * from './useContactsContext.js'
+export * from './useEnterDashboard.js'
+export * from './useFriendProfiles.js'
+export * from './useFriends.js'
+export * from './useFriendsFromSearch.js'
+export * from './useGasOptionsMenu.js'
+export * from './useHasPassword.js'
+export * from './useParamTab.js'
+export * from './usePopupContext.js'
+export * from './useSearchValue.js'
+export * from './useSupportSocialNetworks.js'
+export * from './useTitle.js'
+export * from './useTokenParams.js'
+export * from './useUserContext.js'
+export * from './useVerifiedWallets.js'

packages/mask/src/extension/popups/hook/useFriendProfiles.ts → packages/mask/src/extension/popups/hooks/useFriendProfiles.ts

@@ -1,20 +1,8 @@
-import {
-    type ECKeyIdentifier,
-    type BindingProof,
-    NextIDPlatform,
-    type ProfileIdentifier,
-    EMPTY_LIST,
-} from '@masknet/shared-base'
-import { useCurrentPersona } from '../../../components/DataSource/useCurrentPersona.js'
-import { useQuery } from '@tanstack/react-query'
+import { EMPTY_LIST, NextIDPlatform, type BindingProof } from '@masknet/shared-base'
 import { NextIDProof } from '@masknet/web3-providers'
-import { UnsupportedPlatforms, PlatformSort } from '../pages/Friends/common.js'
-
-export type Friend = {
-    persona: ECKeyIdentifier
-    profile?: ProfileIdentifier
-    avatar?: string
-}
+import { useQuery } from '@tanstack/react-query'
+import { useCurrentPersona } from '../../../components/DataSource/useCurrentPersona.js'
+import { PlatformSort, UnsupportedPlatforms } from '../pages/Friends/common.js'
 
 export const profilesFilter = (x: BindingProof) => {
     return (x.platform === NextIDPlatform.ENS && x.name.endsWith('.eth')) || !UnsupportedPlatforms.includes(x.platform)

packages/mask/src/extension/popups/hook/useFriends.ts → packages/mask/src/extension/popups/hooks/useFriends.ts

@@ -1,10 +1,10 @@
-import { type ECKeyIdentifier, EMPTY_LIST, type BindingProof, type ProfileIdentifier } from '@masknet/shared-base'
-import { useCurrentPersona } from '../../../components/DataSource/useCurrentPersona.js'
-import Services from '../../../extension/service.js'
-import { first } from 'lodash-es'
 import { isProfileIdentifier } from '@masknet/shared'
+import { EMPTY_LIST, type BindingProof, type ECKeyIdentifier, type ProfileIdentifier } from '@masknet/shared-base'
 import { useInfiniteQuery, useQuery } from '@tanstack/react-query'
+import { first } from 'lodash-es'
 import { useCallback } from 'react'
+import { useCurrentPersona } from '../../../components/DataSource/useCurrentPersona.js'
+import Services from '../../../extension/service.js'
 
 export type FriendsInformation = Friend & {
     profiles: BindingProof[]

packages/mask/src/extension/popups/modals/ConnectSocialAccountModal/index.tsx

@@ -4,7 +4,7 @@ import { EMPTY_LIST, type EnhanceableSite } from '@masknet/shared-base'
 import { useI18N } from '../../../../utils/i18n-next-ui.js'
 import { ActionModal, type ActionModalBaseProps } from '../../components/index.js'
 import { ConnectSocialAccounts } from '../../components/ConnectSocialAccounts/index.js'
-import { useSupportSocialNetworks } from '../../hook/useSupportSocialNetworks.js'
+import { useSupportSocialNetworks } from '../../hooks/index.js'
 import Services from '../../../service.js'
 import { PersonaContext } from '@masknet/shared'
 

packages/mask/src/extension/popups/modals/PersonaSettingModal/index.tsx

@@ -8,7 +8,7 @@ import { PersonaAvatar } from '../../components/PersonaAvatar/index.js'
 import { Icons } from '@masknet/icons'
 import { PersonaPublicKey } from '../../components/PersonaPublicKey/index.js'
 import { PopupModalRoutes, PopupRoutes } from '@masknet/shared-base'
-import { UserContext } from '../../hook/useUserContext.js'
+import { UserContext } from '../../hooks/index.js'
 import { useNavigate } from 'react-router-dom'
 
 const useStyles = makeStyles()((theme) => ({

packages/mask/src/extension/popups/modals/SetBackupPasswordModal/index.tsx

@@ -6,7 +6,7 @@ import { ActionButton, usePopupCustomSnackbar } from '@masknet/theme'
 import { ActionModal, type ActionModalBaseProps } from '../../components/index.js'
 import { useI18N } from '../../../../utils/i18n-next-ui.js'
 import { PasswordField } from '../../components/PasswordField/index.js'
-import { UserContext } from '../../hook/useUserContext.js'
+import { UserContext } from '../../hooks/index.js'
 import { MATCH_PASSWORD_RE } from '../../constants.js'
 
 export const SetBackupPasswordModal = memo<ActionModalBaseProps>(function SetBackupPasswordModal() {

packages/mask/src/extension/popups/modals/VerifyBackupPasswordModal/index.tsx

@@ -4,7 +4,7 @@ import { Box } from '@mui/material'
 import { ActionModal, type ActionModalBaseProps } from '../../components/index.js'
 import { useI18N } from '../../../../utils/i18n-next-ui.js'
 import { PasswordField } from '../../components/PasswordField/index.js'
-import { UserContext } from '../../hook/useUserContext.js'
+import { UserContext } from '../../hooks/index.js'
 import { useNavigate } from 'react-router-dom'
 import { PopupRoutes } from '@masknet/shared-base'
 import { MATCH_PASSWORD_RE } from '../../constants.js'

packages/mask/src/extension/popups/pages/Friends/ContactCard/index.tsx

@@ -17,10 +17,10 @@ import { ConnectedAccounts } from './ConnectedAccounts/index.js'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
 import Services from '../../../../service.js'
 import { useEverSeen } from '@masknet/shared-base-ui'
-import { useFriendProfiles } from '../../../hook/useFriendProfiles.js'
+import { useFriendProfiles } from '../../../hooks/index.js'
 import { useMutation, useQueryClient, type InfiniteData } from '@tanstack/react-query'
 import urlcat from 'urlcat'
-import { type Friend } from '../../../hook/useFriends.js'
+import { type Friend } from '../../../hooks/index.js'
 
 const useStyles = makeStyles()((theme) => ({
     card: {

packages/mask/src/extension/popups/pages/Friends/Contacts/index.tsx

@@ -5,7 +5,7 @@ import { makeStyles } from '@masknet/theme'
 import { ElementAnchor, EmptyStatus } from '@masknet/shared'
 import { ContactCard } from '../ContactCard/index.js'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
-import { type Friend } from '../../../hook/useFriends.js'
+import { type Friend } from '../../../hooks/index.js'
 
 const useStyles = makeStyles()((theme) => ({
     empty: {

packages/mask/src/extension/popups/pages/Friends/Detail/index.tsx

@@ -7,7 +7,7 @@ import Services from '../../../../service.js'
 import { FriendsDetailUI } from './UI.js'
 import { useQueryClient, useMutation, type InfiniteData } from '@tanstack/react-query'
 import { usePopupCustomSnackbar } from '@masknet/theme'
-import { type Friend } from '../../../hook/useFriends.js'
+import { type Friend } from '../../../hooks/index.js'
 
 export const FriendsDetail = memo(function FriendsDetail() {
     const location = useLocation()

packages/mask/src/extension/popups/pages/Friends/Home/UI.tsx

@@ -5,10 +5,9 @@ import { memo } from 'react'
 import { Box, Typography } from '@mui/material'
 import { Search } from '../Search/index.js'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
-import type { NextIDPersonaBindingsWithIdentifier } from '../../../hook/useFriendsFromSearch.js'
+import type { NextIDPersonaBindingsWithIdentifier, Friend } from '../../../hooks/index.js'
 import { Contacts } from '../Contacts/index.js'
 import { SearchList } from '../SearchList/index.js'
-import { type Friend } from '../../../hook/useFriends.js'
 
 const useStyles = makeStyles()((theme) => ({
     container: {

packages/mask/src/extension/popups/pages/Friends/Home/index.tsx

@@ -1,12 +1,9 @@
 import { memo, useState, useMemo } from 'react'
 import { FriendsHomeUI } from './UI.js'
-import { useFriendsPaged } from '../../../hook/useFriends.js'
+import { useFriendsPaged, useTitle, useSearchValue, useFriendsFromSearch } from '../../../hooks/index.js'
 import { EMPTY_LIST } from '@masknet/shared-base'
-import { useTitle } from '../../../hook/useTitle.js'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
 import { resolveNextIDPlatform } from '@masknet/shared'
-import { useSearchValue } from '../../../hook/useSearchValue.js'
-import { useFriendsFromSearch } from '../../../hook/useFriendsFromSearch.js'
 import { useInfiniteQuery } from '@tanstack/react-query'
 import { NextIDProof } from '@masknet/web3-providers'
 

packages/mask/src/extension/popups/pages/Friends/SearchList/index.tsx

@@ -4,7 +4,7 @@ import { ContactCard } from '../ContactCard/index.js'
 import { Box } from '@mui/material'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
 import { EmptyStatus, RestorableScroll, ElementAnchor } from '@masknet/shared'
-import type { NextIDPersonaBindingsWithIdentifier } from '../../../hook/useFriendsFromSearch.js'
+import type { NextIDPersonaBindingsWithIdentifier } from '../../../hooks/index.js'
 
 const useStyles = makeStyles()((theme) => ({
     empty: {

packages/mask/src/extension/popups/pages/Personas/AccountDetail/index.tsx

@@ -13,7 +13,7 @@ import {
 } from '@masknet/shared-base'
 import { PersonaContext } from '@masknet/shared'
 import { usePopupCustomSnackbar } from '@masknet/theme'
-import { useTitle } from '../../../hook/useTitle.js'
+import { useTitle } from '../../../hooks/index.js'
 import { useI18N } from '../../../../../utils/index.js'
 import { AccountDetailUI } from './UI.js'
 import Service from '../../../../service.js'

packages/mask/src/extension/popups/pages/Personas/ConnectWallet/index.tsx

@@ -27,7 +27,7 @@ import {
 import { isSameAddress } from '@masknet/web3-shared-base'
 import { Icons } from '@masknet/icons'
 
-import { useTitle } from '../../../hook/useTitle.js'
+import { useTitle } from '../../../hooks/index.js'
 import { useI18N } from '../../../../../utils/index.js'
 import { BottomController } from '../../../components/BottomController/index.js'
 import { LoadingMask } from '../../../components/LoadingMask/index.js'

packages/mask/src/extension/popups/pages/Personas/ExportPrivateKey/index.tsx

@@ -1,5 +1,5 @@
 import { memo, useCallback } from 'react'
-import { useTitle } from '../../../hook/useTitle.js'
+import { useTitle } from '../../../hooks/index.js'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
 import { Box, Button, Link, Typography, useTheme } from '@mui/material'
 

packages/mask/src/extension/popups/pages/Personas/Home/UI.tsx

@@ -21,7 +21,7 @@ import type { ConnectedWalletInfo } from '../type.js'
 import { useModalNavigate } from '../../../components/index.js'
 import { PersonaPublicKey } from '../../../components/PersonaPublicKey/index.js'
 import { PersonaAvatar } from '../../../components/PersonaAvatar/index.js'
-import { useParamTab } from '../../../hook/useParamTab.js'
+import { useParamTab } from '../../../hooks/index.js'
 import { useNavigate } from 'react-router-dom'
 import { PopupHomeTabType } from '@masknet/shared'
 

packages/mask/src/extension/popups/pages/Personas/Home/index.tsx

@@ -10,9 +10,7 @@ import {
 } from '@masknet/shared-base'
 import { PersonaHomeUI } from './UI.js'
 import Services from '../../../../service.js'
-import { useSupportSocialNetworks } from '../../../hook/useSupportSocialNetworks.js'
-import { useVerifiedWallets } from '../../../hook/useVerifiedWallets.js'
-import { useHasPassword } from '../../../hook/useHasPassword.js'
+import { useSupportSocialNetworks, useVerifiedWallets, useHasPassword } from '../../../hooks/index.js'
 
 const PersonaHome = memo(() => {
     const navigate = useNavigate()

packages/mask/src/extension/popups/pages/Personas/Logout/index.tsx

@@ -15,13 +15,10 @@ import { ExplorerResolver, Providers, Web3 } from '@masknet/web3-providers'
 import { type ChainId, ProviderType, formatEthereumAddress } from '@masknet/web3-shared-evm'
 import { useI18N } from '../../../../../utils/index.js'
 import Services from '../../../../service.js'
-import { useTitle } from '../../../hook/useTitle.js'
-import { PopupContext } from '../../../hook/usePopupContext.js'
+import { useTitle, PopupContext, useHasPassword, UserContext } from '../../../hooks/index.js'
 import { PersonaAvatar } from '../../../components/PersonaAvatar/index.js'
-import { useHasPassword } from '../../../hook/useHasPassword.js'
 import { PasswordField } from '../../../components/PasswordField/index.js'
 import { BottomController } from '../../../components/BottomController/index.js'
-import { UserContext } from '../../../hook/useUserContext.js'
 import { useModalNavigate } from '../../../components/index.js'
 
 const useStyles = makeStyles()((theme) => ({

packages/mask/src/extension/popups/pages/Personas/PersonaAvatarSetting/index.tsx

@@ -16,10 +16,9 @@ import { NormalHeader, useModalNavigate } from '../../../components/index.js'
 import { PopupModalRoutes, PopupRoutes, SignType } from '@masknet/shared-base'
 import { ProfilePhotoType } from '../../Wallet/type.js'
 import { NFTAvatarPicker } from '../../../components/NFTAvatarPicker/index.js'
-import { useVerifiedWallets } from '../../../hook/useVerifiedWallets.js'
+import { useVerifiedWallets, useTitle } from '../../../hooks/index.js'
 import Services from '../../../../service.js'
 import { MAX_FILE_SIZE } from '../../../constants.js'
-import { useTitle } from '../../../hook/useTitle.js'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
 
 const useStyles = makeStyles()((theme) => ({

packages/mask/src/extension/popups/pages/Swap/index.tsx

@@ -8,7 +8,7 @@ import { ThemeProvider, Typography } from '@mui/material'
 import { useI18N } from '../../../../utils/index.js'
 import { useSwapPageTheme } from '../../../../utils/theme/useSwapPageTheme.js'
 import { NetworkSelector } from '../../components/NetworkSelector/index.js'
-import { useTokenParams } from '../../hook/useTokenParams.js'
+import { useTokenParams } from '../../hooks/index.js'
 import { SwapBox } from './SwapBox/index.js'
 import { SiteAdaptorContextRef } from '@masknet/plugin-infra/dom'
 import { TwitterAdaptor } from '../../../../../shared/site-adaptors/implementations/twitter.com.js'

packages/mask/src/extension/popups/pages/Wallet/AddDeriveWallet/index.tsx

@@ -12,7 +12,7 @@ import { useNativeToken, useWallets } from '@masknet/web3-hooks-base'
 import { Web3 } from '@masknet/web3-providers'
 import { DeriveWalletTable } from '@masknet/shared'
 import { useI18N } from '../../../../../utils/index.js'
-import { useTitle } from '../../../hook/useTitle.js'
+import { useTitle } from '../../../hooks/index.js'
 import Services from '../../../../service.js'
 
 const useStyles = makeStyles()({

packages/mask/src/extension/popups/pages/Wallet/AddToken/index.tsx

@@ -13,7 +13,7 @@ import { TabContext, TabPanel } from '@mui/lab'
 import { Tab } from '@mui/material'
 import { useI18N } from '../../../../../utils/index.js'
 import { NormalHeader } from '../../../components/index.js'
-import { useTitle } from '../../../hook/useTitle.js'
+import { useTitle } from '../../../hooks/index.js'
 import { WalletAssetTabs } from '../type.js'
 
 const useStyles = makeStyles<{ currentTab: TabType; searchError: boolean }>()((theme, { currentTab, searchError }) => ({

packages/mask/src/extension/popups/pages/Wallet/BackupWallet/index.tsx

@@ -14,7 +14,7 @@ import { saveFileFromBuffer } from '../../../../../../shared/index.js'
 import { useI18N } from '../../../../../utils/index.js'
 import Services from '../../../../service.js'
 import { PasswordField } from '../../../components/PasswordField/index.js'
-import { useTitle } from '../../../hook/useTitle.js'
+import { useTitle } from '../../../hooks/index.js'
 
 const useStyles = makeStyles()({
     content: {

packages/mask/src/extension/popups/pages/Wallet/ChangeOwner/index.tsx

@@ -18,8 +18,7 @@ import { formatEthereumAddress, ProviderType, type GasConfig } from '@masknet/we
 import { useI18N } from '../../../../../utils/index.js'
 import { StyledInput } from '../../../components/StyledInput/index.js'
 import { StyledRadio } from '../../../components/StyledRadio/index.js'
-import { PopupContext } from '../../../hook/usePopupContext.js'
-import { useTitle } from '../../../hook/useTitle.js'
+import { PopupContext, useTitle } from '../../../hooks/index.js'
 import { PersonaAvatar } from '../../../components/PersonaAvatar/index.js'
 import { GasSettingMenu } from '../../../components/GasSettingMenu/index.js'
 import { useQuery } from '@tanstack/react-query'

packages/mask/src/extension/popups/pages/Wallet/CollectibleDetail/index.tsx

@@ -20,7 +20,7 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import urlcat from 'urlcat'
 import { useI18N } from '../../../../../utils/index.js'
 import { PageTitleContext } from '../../../context.js'
-import { useTitle, useTokenParams } from '../../../hook/index.js'
+import { useTitle, useTokenParams } from '../../../hooks/index.js'
 import { ConfirmModal } from '../../../modals/modals.js'
 import { TransferTabType } from '../type.js'
 

packages/mask/src/extension/popups/pages/Wallet/ConnectWallet/index.tsx

@@ -10,9 +10,8 @@ import { useWeb3UI, useWallets } from '@masknet/web3-hooks-base'
 import { getRegisteredWeb3Networks, getRegisteredWeb3Providers } from '@masknet/plugin-infra'
 import { Web3 } from '@masknet/web3-providers'
 import type { Web3Helper } from '@masknet/web3-helpers'
-import { useTitle } from '../../../hook/useTitle.js'
+import { useTitle, PopupContext } from '../../../hooks/index.js'
 import { useI18N } from '../../../../../utils/index.js'
-import { PopupContext } from '../../../hook/usePopupContext.js'
 import { useWalletLockStatus } from '../hooks/useWalletLockStatus.js'
 import Services from '../../../../service.js'