fix: organize files (#1483)

src/App.tsx

@@ -14,17 +14,15 @@ import { GOVERNANCE_TOKEN, RELAY_CHAIN_NATIVE_TOKEN, WRAPPED_TOKEN } from '@/con
 import ErrorFallback from '@/legacy-components/ErrorFallback';
 import FullLoadingSpinner from '@/legacy-components/FullLoadingSpinner';
 import { useSubstrate, useSubstrateSecureState } from '@/lib/substrate';
-import Layout from '@/parts/Layout';
-import Wrapper from '@/parts/Wrapper';
 import graphqlFetcher, { GRAPHQL_FETCHER, GraphqlReturn } from '@/services/fetchers/graphql-fetcher';
 import vaultsByAccountIdQuery from '@/services/queries/vaults-by-accountId-query';
 import { BitcoinNetwork } from '@/types/bitcoin';
 import { PAGES } from '@/utils/constants/links';
 
-import { TransactionModal } from './components/TransactionModal';
+import { Layout, TransactionModal, Wrapper } from './components';
 import * as constants from './constants';
+import { FeatureFlags, useFeatureFlag } from './hooks/use-feature-flag';
 import TestnetBanner from './legacy-components/TestnetBanner';
-import { FeatureFlags, useFeatureFlag } from './utils/hooks/use-feature-flag';
 
 const BTC = React.lazy(() => import(/* webpackChunkName: 'btc' */ '@/pages/BTC'));
 const Strategies = React.lazy(() => import(/* webpackChunkName: 'strategies' */ '@/pages/Strategies'));

src/common/reducers/general.reducer.ts

@@ -2,7 +2,7 @@ import { newMonetaryAmount } from '@interlay/interbtc-api';
 import { BitcoinAmount } from '@interlay/monetary-js';
 
 import { RELAY_CHAIN_NATIVE_TOKEN } from '@/config/relay-chains';
-import { TransactionStatus } from '@/utils/hooks/transaction/types';
+import { TransactionStatus } from '@/hooks/transaction/types';
 
 import {
   ADD_NOTIFICATION,

src/common/types/util.types.ts

@@ -3,7 +3,7 @@ import { BitcoinAmount, MonetaryAmount } from '@interlay/monetary-js';
 import { u256 } from '@polkadot/types/primitive';
 import { CombinedState, Store } from 'redux';
 
-import { TransactionStatus } from '@/utils/hooks/transaction/types';
+import { TransactionStatus } from '@/hooks/transaction/types';
 
 import { rootReducer } from '../reducers/index';
 import { GeneralActions, RedeemActions, VaultActions } from './actions.types';

src/common/utils/utils.ts

@@ -3,8 +3,8 @@ import { BitcoinAmount, MonetaryAmount } from '@interlay/monetary-js';
 import Big, { BigSource } from 'big.js';
 
 import { PARACHAIN_URL } from '@/constants';
+import { Prices } from '@/hooks/api/use-get-prices';
 import { getTokenPrice } from '@/utils/helpers/prices';
-import { Prices } from '@/utils/hooks/api/use-get-prices';
 
 function shortAddress(address: string): string {
   if (address.length < 12) return address;

src/components/AuthCTA/AuthCTA.tsx

@@ -5,8 +5,8 @@ import { useDispatch } from 'react-redux';
 import { showAccountModalAction } from '@/common/actions/general.actions';
 import { CTA, CTAProps } from '@/component-library';
 import { SIGNER_API_URL } from '@/constants';
+import { useSignMessage } from '@/hooks/use-sign-message';
 import { useSubstrateSecureState } from '@/lib/substrate';
-import { useSignMessage } from '@/utils/hooks/use-sign-message';
 
 enum AuthStatus {
   UNAUTH,

src/components/AuthModal/AccountStep.tsx

@@ -6,10 +6,10 @@ import { useCopyToClipboard } from 'react-use';
 import { DocumentDuplicate } from '@/assets/icons';
 import { shortAddress } from '@/common/utils/utils';
 import { CTA, Divider, Flex, P, Span, Tooltip, WalletIcon } from '@/component-library';
+import { useCopyTooltip } from '@/hooks/use-copy-tooltip';
 import { KeyringPair } from '@/lib/substrate';
 import { WalletData } from '@/utils/constants/wallets';
 import { StepComponentProps, withStep } from '@/utils/hocs/step';
-import { useCopyTooltip } from '@/utils/hooks/use-copy-tooltip';
 
 import { StyledAccountItem, StyledCopyItem, StyledP } from './AuthModal.style';
 import { AuthModalSteps } from './types';

src/components/AuthModal/SignTermsModal.tsx

@@ -1,5 +1,5 @@
 import { CTA, Modal, ModalBody, ModalFooter, ModalHeader, ModalProps } from '@/component-library';
-import { useSignMessage } from '@/utils/hooks/use-sign-message';
+import { useSignMessage } from '@/hooks/use-sign-message';
 
 import { Disclaimer } from './Disclaimer';
 

src/components/FundWallet/use-entities.tsx

@@ -10,9 +10,9 @@ import { ReactComponent as MexcLogoForKintsugiIcon } from '@/assets/img/exchange
 import { ReactComponent as StellaSwapLogoIcon } from '@/assets/img/exchanges/stellaswap-logo.svg';
 import { ReactComponent as ZenlinkLogoIcon } from '@/assets/img/exchanges/zenlink-logo.svg';
 import { GOVERNANCE_TOKEN } from '@/config/relay-chains';
+import { useWallet } from '@/hooks/use-wallet';
 import { EXTERNAL_PAGES, EXTERNAL_QUERY_PARAMETERS } from '@/utils/constants/links';
 import { KUSAMA, POLKADOT } from '@/utils/constants/relay-chain-names';
-import { useWallet } from '@/utils/hooks/use-wallet';
 
 const queryString = require('query-string');
 

src/components/Geoblock/Geoblock.tsx

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { useGeoblocking } from '@/utils/hooks/use-geoblocking';
+import { useGeoblocking } from '@/hooks/use-geoblocking';
 
 type Props = {
   children: ReactNode;

src/components/IsAuthenticated/IsAuthenticated.tsx

@@ -1,8 +1,8 @@
 import { ReactNode } from 'react';
 
 import { SIGNER_API_URL } from '@/constants';
+import { useSignMessage } from '@/hooks/use-sign-message';
 import { useSubstrateSecureState } from '@/lib/substrate';
-import { useSignMessage } from '@/utils/hooks/use-sign-message';
 
 type IsAuthenticatedProps = { children: ReactNode };
 

src/parts/Layout/index.tsx → src/components/Layout/index.tsx

@@ -1,8 +1,8 @@
 import clsx from 'clsx';
 
-import MaintenanceBanner from '@/parts/MaintenanceBanner';
-import Sidebar from '@/parts/Sidebar';
-import Topbar from '@/parts/Topbar';
+import Sidebar from '../../legacy-components/Sidebar';
+import Topbar from '../../legacy-components/Topbar';
+import { MaintenanceBanner } from '../MaintenanceBanner';
 
 interface Props {
   className?: string;
@@ -21,4 +21,4 @@ const Layout = ({ className, children }: Props): JSX.Element => {
   );
 };
 
-export default Layout;
+export { Layout };

src/components/LoanPositionsTable/LoanApyCell.tsx

@@ -6,9 +6,9 @@ import { useTranslation } from 'react-i18next';
 import { displayMonetaryAmountInUSDFormat } from '@/common/utils/utils';
 import { Flex } from '@/component-library';
 import { GOVERNANCE_TOKEN } from '@/config/relay-chains';
+import { Prices } from '@/hooks/api/use-get-prices';
 import { getApyLabel, getSubsidyRewardApy } from '@/utils/helpers/loans';
 import { getTokenPrice } from '@/utils/helpers/prices';
-import { Prices } from '@/utils/hooks/api/use-get-prices';
 
 import { ApyDetails, ApyDetailsGroup, ApyDetailsGroupItem } from '../ApyDetails';
 import { Cell } from '../DataGrid';

src/components/LoanPositionsTable/LoanPositionsTable.tsx

@@ -5,9 +5,9 @@ import { useTranslation } from 'react-i18next';
 
 import { convertMonetaryAmountToValueInUSD } from '@/common/utils/utils';
 import { Switch } from '@/component-library';
+import { useGetPrices } from '@/hooks/api/use-get-prices';
 import { LoanType } from '@/types/loans';
 import { getTokenPrice } from '@/utils/helpers/prices';
-import { useGetPrices } from '@/utils/hooks/api/use-get-prices';
 
 import { AssetCell, BalanceCell, Table, TableProps } from '../DataGrid';
 import { LoanApyCell } from './LoanApyCell';

src/parts/MainContainer/index.tsx → src/components/MainContainer/index.tsx

@@ -4,4 +4,4 @@ const MainContainer = ({ className, ...rest }: React.ComponentPropsWithRef<'div'
   <div className={clsx('p-4', 'lg:p-6', 'space-y-10', 'container', 'mx-auto', className)} {...rest} />
 );
 
-export default MainContainer;
+export { MainContainer };

src/parts/MaintenanceBanner/index.tsx → src/components/MaintenanceBanner/index.tsx

@@ -65,4 +65,4 @@ const MaintenanceBanner = (): JSX.Element | null => {
   );
 };
 
-export default MaintenanceBanner;
+export { MaintenanceBanner };

src/components/NotificationToast/NotificationToast.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 
 import { CheckCircle, XCircle } from '@/assets/icons';
 import { CTA, Divider, Flex, FlexProps, LoadingSpinner, P } from '@/component-library';
-import { useCountdown } from '@/utils/hooks/use-countdown';
+import { useCountdown } from '@/hooks/use-countdown';
 
 import { StyledProgressBar, StyledWrapper } from './NotificationToast.styles';
 

src/components/NotificationToast/TransactionToast.tsx

@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux';
 
 import { updateTransactionModal } from '@/common/actions/general.actions';
 import { CTA, CTALink } from '@/component-library';
-import { TransactionStatus } from '@/utils/hooks/transaction/types';
+import { TransactionStatus } from '@/hooks/transaction/types';
 
 import { NotificationToast, NotificationToastProps, NotificationToastVariant } from './NotificationToast';
 

src/components/NotificationsPopover/NotificationsListItem.tsx

@@ -5,7 +5,7 @@ import { useRef } from 'react';
 import { CheckCircle, XCircle } from '@/assets/icons';
 import { Notification } from '@/common/types/util.types';
 import { Flex, P } from '@/component-library';
-import { TransactionStatus } from '@/utils/hooks/transaction/types';
+import { TransactionStatus } from '@/hooks/transaction/types';
 
 import { StyledListItem } from './NotificationsPopover.styles';
 

src/components/PoolsTable/PoolApyCell.tsx

@@ -4,9 +4,9 @@ import { useTranslation } from 'react-i18next';
 import { formatPercentage } from '@/common/utils/utils';
 import { Flex } from '@/component-library';
 import { ApyDetails, ApyDetailsGroup, ApyDetailsGroupItem, Cell } from '@/components';
+import { useGetPoolsTradingApr } from '@/hooks/api/use-get-pools-trading-apr';
+import { Prices } from '@/hooks/api/use-get-prices';
 import { getFarmingApr } from '@/utils/helpers/pools';
-import { useGetPoolsTradingApr } from '@/utils/hooks/api/use-get-pools-trading-apr';
-import { Prices } from '@/utils/hooks/api/use-get-prices';
 
 import { StyledTooltip } from './PoolsTable.style';
 

src/components/PoolsTable/PoolsTable.tsx

@@ -5,10 +5,10 @@ import { Key, ReactNode, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { formatUSD } from '@/common/utils/utils';
+import { DateRangeVolume, useGetDexVolumes } from '@/hooks/api/use-get-dex-volume';
+import { useGetPrices } from '@/hooks/api/use-get-prices';
 import { getCoinIconProps } from '@/utils/helpers/coin-icon';
 import { calculateAccountLiquidityUSD, calculateTotalLiquidityUSD } from '@/utils/helpers/pool';
-import { DateRangeVolume, useGetDexVolumes } from '@/utils/hooks/api/use-get-dex-volume';
-import { useGetPrices } from '@/utils/hooks/api/use-get-prices';
 
 import { AssetCell, BalanceCell, Cell, Table, TableProps } from '../DataGrid';
 import { PoolApyCell } from './PoolApyCell';

src/components/ReceivableAssets/index.tsx

@@ -4,8 +4,8 @@ import { useTranslation } from 'react-i18next';
 
 import { convertMonetaryAmountToValueInUSD, formatNumber, formatUSD } from '@/common/utils/utils';
 import { CoinIcon, Dd, Dl, DlGroup, Dt, Flex, P } from '@/component-library';
+import { Prices } from '@/hooks/api/use-get-prices';
 import { getTokenPrice } from '@/utils/helpers/prices';
-import { Prices } from '@/utils/hooks/api/use-get-prices';
 
 type ReceivableAssetsProps = {
   assetAmounts: MonetaryAmount<CurrencyExt>[];

src/components/TransactionFeeDetails/TransactionFeeDetails.tsx

@@ -4,10 +4,10 @@ import { useTranslation } from 'react-i18next';
 
 import { displayMonetaryAmountInUSDFormat, formatUSD } from '@/common/utils/utils';
 import { Alert, Flex } from '@/component-library';
+import { useGetPrices } from '@/hooks/api/use-get-prices';
+import { UseFeeEstimateResult } from '@/hooks/transaction/types/hook';
+import { SelectCurrencyFilter, useSelectCurrency } from '@/hooks/use-select-currency';
 import { getTokenPrice } from '@/utils/helpers/prices';
-import { useGetPrices } from '@/utils/hooks/api/use-get-prices';
-import { UseFeeEstimateResult } from '@/utils/hooks/transaction/types/hook';
-import { SelectCurrencyFilter, useSelectCurrency } from '@/utils/hooks/use-select-currency';
 
 import {
   TransactionDetails,

src/components/TransactionModal/TransactionModal.tsx

@@ -17,8 +17,8 @@ import {
   P,
   TextLink
 } from '@/component-library';
+import { TransactionStatus } from '@/hooks/transaction/types';
 import { NotificationToastType, useNotifications } from '@/utils/context/Notifications';
-import { TransactionStatus } from '@/utils/hooks/transaction/types';
 
 import { StyledCard, StyledCheckCircle, StyledXCircle } from './TransactionModal.style';
 

src/parts/Wrapper/index.tsx → src/components/Wrapper/index.tsx

@@ -9,4 +9,4 @@ const Wrapper = ({ className, children }: Props): JSX.Element => {
   return <StyledWrapper className={className}>{children}</StyledWrapper>;
 };
 
-export default Wrapper;
+export { Wrapper };

src/components/index.tsx

@@ -12,10 +12,13 @@ export type { FundWalletProps } from './FundWallet';
 export { FundWallet } from './FundWallet';
 export type { IsAuthenticatedProps } from './IsAuthenticated';
 export { IsAuthenticated } from './IsAuthenticated';
+export { Layout } from './Layout';
 export type { LoanPositionsTableProps } from './LoanPositionsTable';
 export type { LoanApyCellProps } from './LoanPositionsTable';
 export { LoanPositionsTable } from './LoanPositionsTable';
 export { LoanApyCell } from './LoanPositionsTable';
+export { MainContainer } from './MainContainer';
+export { MaintenanceBanner } from './MaintenanceBanner';
 export type { NotificationsPopoverProps } from './NotificationsPopover';
 export { NotificationsPopover } from './NotificationsPopover';
 export type { NotificationToastProps, TransactionToastProps } from './NotificationToast';
@@ -32,3 +35,5 @@ export { ToastContainer } from './ToastContainer';
 export * from './TransactionDetails';
 export type { TransactionFeeDetailsProps } from './TransactionFeeDetails';
 export { TransactionFeeDetails } from './TransactionFeeDetails';
+export { TransactionModal } from './TransactionModal';
+export { Wrapper } from './Wrapper';

src/utils/hooks/api/amm/use-get-account-pools.tsx → src/hooks/api/amm/use-get-account-pools.tsx

@@ -5,9 +5,9 @@ import Big from 'big.js';
 import { useErrorHandler } from 'react-error-boundary';
 import { useQuery } from 'react-query';
 
+import { Prices, useGetPrices } from '@/hooks/api/use-get-prices';
 import { BLOCKTIME_REFETCH_INTERVAL } from '@/utils/constants/api';
 import { calculateAccountLiquidityUSD, calculateTotalLiquidityUSD } from '@/utils/helpers/pool';
-import { Prices, useGetPrices } from '@/utils/hooks/api/use-get-prices';
 
 import useAccountId from '../../use-account-id';
 import { useGetLiquidityPools } from './use-get-liquidity-pools';

src/utils/hooks/api/loans/use-get-account-lending-statistics.tsx → src/hooks/api/loans/use-get-account-lending-statistics.tsx

@@ -3,9 +3,9 @@ import Big from 'big.js';
 import { useMemo } from 'react';
 
 import { convertMonetaryAmountToValueInUSD, convertMonetaryBtcToUSD } from '@/common/utils/utils';
+import { useGetLoanAssets } from '@/hooks/api/loans/use-get-loan-assets';
 import { getSubsidyRewardApy } from '@/utils/helpers/loans';
 import { getTokenPrice } from '@/utils/helpers/prices';
-import { useGetLoanAssets } from '@/utils/hooks/api/loans/use-get-loan-assets';
 
 import { Prices, useGetPrices } from '../use-get-prices';
 import { useGetAccountPositions } from './use-get-account-positions';

src/utils/hooks/api/tokens/use-balances-subscription.tsx → src/hooks/api/tokens/use-balances-subscription.tsx

@@ -4,8 +4,8 @@ import { QueryClient, useQueryClient } from 'react-query';
 import { useSelector } from 'react-redux';
 
 import { StoreType } from '@/common/types/util.types';
+import { useGetCurrencies } from '@/hooks/api/use-get-currencies';
 import { useSubstrateSecureState } from '@/lib/substrate';
-import { useGetCurrencies } from '@/utils/hooks/api/use-get-currencies';
 
 import { BalanceData, getBalancesQueryKey } from './use-get-balances';
 

src/utils/hooks/api/tokens/use-get-balances.tsx → src/hooks/api/tokens/use-get-balances.tsx

@@ -6,10 +6,10 @@ import { useQuery, UseQueryResult } from 'react-query';
 import { useSelector } from 'react-redux';
 
 import { StoreType } from '@/common/types/util.types';
+import { useGetCurrencies } from '@/hooks/api/use-get-currencies';
+import useAccountId from '@/hooks/use-account-id';
 import { useSubstrateSecureState } from '@/lib/substrate';
 import { REFETCH_INTERVAL } from '@/utils/constants/api';
-import { useGetCurrencies } from '@/utils/hooks/api/use-get-currencies';
-import useAccountId from '@/utils/hooks/use-account-id';
 
 type BalanceData = {
   [ticker: string]: ChainBalance;

src/utils/hooks/api/vaults/use-get-vault-data.tsx → src/hooks/api/vaults/use-get-vault-data.tsx

@@ -3,8 +3,8 @@ import { useEffect, useState } from 'react';
 // import { useErrorHandler } from 'react-error-boundary';
 import { useQueries, UseQueryResult } from 'react-query';
 
-import { useGetPrices } from '@/utils/hooks/api/use-get-prices';
-import { useGetVaults } from '@/utils/hooks/api/vaults/use-get-vaults';
+import { useGetPrices } from '@/hooks/api/use-get-prices';
+import { useGetVaults } from '@/hooks/api/vaults/use-get-vaults';
 
 import { getVaultData, VaultData } from './get-vault-data';
 

src/utils/hooks/api/vaults/use-get-vault-transactions.tsx → src/hooks/api/vaults/use-get-vault-transactions.tsx

@@ -5,12 +5,12 @@ import { useQuery } from 'react-query';
 
 import { formatDateTimePrecise } from '@/common/utils/utils';
 import { ACCOUNT_ID_TYPE_NAME } from '@/config/general';
+import useCurrentActiveBlockNumber from '@/hooks/use-current-active-block-number';
+import useStableBitcoinConfirmations from '@/hooks/use-stable-bitcoin-confirmations';
+import useStableParachainConfirmations from '@/hooks/use-stable-parachain-confirmations';
 import genericFetcher, { GENERIC_FETCHER } from '@/services/fetchers/generic-fetcher';
 import issuesFetcher, { getIssueWithStatus, ISSUES_FETCHER } from '@/services/fetchers/issues-fetcher';
 import redeemsFetcher, { getRedeemWithStatus, REDEEMS_FETCHER } from '@/services/fetchers/redeems-fetcher';
-import useCurrentActiveBlockNumber from '@/services/hooks/use-current-active-block-number';
-import useStableBitcoinConfirmations from '@/services/hooks/use-stable-bitcoin-confirmations';
-import useStableParachainConfirmations from '@/services/hooks/use-stable-parachain-confirmations';
 import { getCurrencyEqualityCondition } from '@/utils/helpers/currencies';
 
 import { useGetCurrencies } from '../use-get-currencies';

src/utils/hooks/api/xcm/use-xcm-bridge.ts → src/hooks/api/xcm/use-xcm-bridge.ts

@@ -10,9 +10,9 @@ import { firstValueFrom } from 'rxjs';
 
 import { convertMonetaryAmountToValueInUSD, formatUSD } from '@/common/utils/utils';
 import { XCM_ADAPTERS } from '@/config/relay-chains';
+import { useGetPrices } from '@/hooks/api/use-get-prices';
 import { Chains } from '@/types/chains';
 import { getTokenPrice } from '@/utils/helpers/prices';
-import { useGetPrices } from '@/utils/hooks/api/use-get-prices';
 
 import { XCMEndpoints } from './xcm-endpoints';
 

src/services/hooks/issue-requests.ts → src/hooks/issue-requests.ts

@@ -3,11 +3,11 @@ import * as React from 'react';
 import { useQuery } from 'react-query';
 
 import { ISSUE_REDEEM_REQUEST_REFETCH_INTERVAL } from '@/config/parachain';
+import useCurrentActiveBlockNumber from '@/hooks/use-current-active-block-number';
+import useStableBitcoinConfirmations from '@/hooks/use-stable-bitcoin-confirmations';
+import useStableParachainConfirmations from '@/hooks/use-stable-parachain-confirmations';
 import { useSubstrateSecureState } from '@/lib/substrate';
 import issuesFetcher, { getIssueWithStatus, ISSUES_FETCHER } from '@/services/fetchers/issues-fetcher';
-import useCurrentActiveBlockNumber from '@/services/hooks/use-current-active-block-number';
-import useStableBitcoinConfirmations from '@/services/hooks/use-stable-bitcoin-confirmations';
-import useStableParachainConfirmations from '@/services/hooks/use-stable-parachain-confirmations';
 import { IssueRequest, IssueRequestWithStatusDecoded } from '@/types/issues.d';
 
 const getManualIssueRequests = (

src/utils/hooks/transaction/types/amm.ts → src/hooks/transaction/types/amm.ts

@@ -1,6 +1,6 @@
 import { InterBtcApi } from '@interlay/interbtc-api';
 
-import { Transaction } from '../types';
+import { Transaction } from '.';
 
 interface SwapAction {
   type: Transaction.AMM_SWAP;

src/utils/hooks/transaction/types/escrow.ts → src/hooks/transaction/types/escrow.ts

@@ -1,6 +1,6 @@
 import { InterBtcApi } from '@interlay/interbtc-api';
 
-import { Transaction } from '../types';
+import { Transaction } from '.';
 
 interface EscrowCreateLockAction {
   type: Transaction.ESCROW_CREATE_LOCK;

src/utils/hooks/transaction/types/issue.ts → src/hooks/transaction/types/issue.ts

@@ -1,6 +1,6 @@
 import { InterBtcApi } from '@interlay/interbtc-api';
 
-import { Transaction } from '../types';
+import { Transaction } from '.';
 
 interface IssueRequestAction {
   type: Transaction.ISSUE_REQUEST;