chore: turn on eslint rule and fix up some core internal imports (#630)

* chore: turn on eslint rule and fix up some core internal imports but not all, as some are not exported yet * chore: escape . in eslint rule * chore: use a different eslint rule for this
secretkeylabs · Oct 27, 2023 · 02725b4 · 02725b4
1 parent eb380ac
commit 02725b4
Show file tree

Hide file tree

Showing 22 changed files with 63 additions and 50 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -24,6 +24,12 @@
   "rules": {
     "consistent-return": "off",
     "import/prefer-default-export": 1,
+    "no-restricted-imports": [
+      "warn",
+      {
+        "patterns": ["@secretkeylabs/xverse-core/**/*"]
+      }
+    ],
     "no-promise-executor-return": "warn",
     "max-len": "off",
     "no-inline-styles/no-inline-styles": 2,

diff --git a/src/app/components/transactionsRequests/ContractCallRequest.tsx b/src/app/components/transactionsRequests/ContractCallRequest.tsx
@@ -9,11 +9,12 @@ import useNetworkSelector from '@hooks/useNetwork';
 import useOnOriginTabClose from '@hooks/useOnTabClosed';
 import {
   addressToString,
+  Args,
   broadcastSignedTransaction,
   Coin,
+  ContractFunction,
   extractFromPayload,
 } from '@secretkeylabs/xverse-core';
-import { Args, ContractFunction } from '@secretkeylabs/xverse-core/types/api/stacks/transaction';
 import { ContractCallPayload } from '@stacks/connect';
 import {
   ClarityType,

diff --git a/src/app/hooks/queries/useBtcWalletData.ts b/src/app/hooks/queries/useBtcWalletData.ts
@@ -1,5 +1,5 @@
 import useBtcClient from '@hooks/useBtcClient';
-import { BtcAddressData } from '@secretkeylabs/xverse-core/types';
+import type { BtcAddressData } from '@secretkeylabs/xverse-core';
 import { SetBtcWalletDataAction } from '@stores/wallet/actions/actionCreators';
 import { useQuery } from '@tanstack/react-query';
 import BigNumber from 'bignumber.js';

diff --git a/src/app/hooks/queries/usePendingOrdinalTx.ts b/src/app/hooks/queries/usePendingOrdinalTx.ts
@@ -1,6 +1,6 @@
-import { BtcAddressMempool } from '@secretkeylabs/xverse-core/types/api/esplora';
-import { useQuery } from '@tanstack/react-query';
 import useBtcClient from '@hooks/useBtcClient';
+import type { BtcAddressMempool } from '@secretkeylabs/xverse-core';
+import { useQuery } from '@tanstack/react-query';
 import useWalletSelector from '../useWalletSelector';
 
 const usePendingOrdinalTxs = (ordinalUtxoHash: string | undefined) => {

diff --git a/src/app/hooks/queries/useStacksCollectibles.ts b/src/app/hooks/queries/useStacksCollectibles.ts
@@ -1,9 +1,8 @@
-import { NftsListData } from '@secretkeylabs/xverse-core/types';
-import { getNfts } from '@secretkeylabs/xverse-core/api/stacks';
-import { useInfiniteQuery } from '@tanstack/react-query';
-import useWalletSelector from '@hooks/useWalletSelector';
 import useNetworkSelector from '@hooks/useNetwork';
-import { InvalidParamsError, handleRetries } from '@utils/query';
+import useWalletSelector from '@hooks/useWalletSelector';
+import { getNfts, NftsListData } from '@secretkeylabs/xverse-core';
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { handleRetries, InvalidParamsError } from '@utils/query';
 
 const useStacksCollectibles = () => {
   const { stxAddress } = useWalletSelector();

diff --git a/src/app/screens/home/coinSelectModal/index.tsx b/src/app/screens/home/coinSelectModal/index.tsx
@@ -3,7 +3,7 @@ import IconStacks from '@assets/img/dashboard/stack_icon.svg';
 import BottomModal from '@components/bottomModal';
 import TokenTile from '@components/tokenTile';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { FungibleToken } from '@secretkeylabs/xverse-core/types';
+import type { FungibleToken } from '@secretkeylabs/xverse-core';
 import { useTranslation } from 'react-i18next';
 import styled, { useTheme } from 'styled-components';
 

diff --git a/src/app/screens/home/index.tsx b/src/app/screens/home/index.tsx
@@ -12,6 +12,7 @@ import ActionButton from '@components/button';
 import ReceiveCardComponent from '@components/receiveCardComponent';
 import ShowBtcReceiveAlert from '@components/showBtcReceiveAlert';
 import ShowOrdinalReceiveAlert from '@components/showOrdinalReceiveAlert';
+import SquareButton from '@components/squareButton';
 import BottomBar from '@components/tabBar';
 import TokenTile from '@components/tokenTile';
 import UpdatedBottomModal from '@components/updatedBottomModal';
@@ -25,7 +26,7 @@ import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowDown, ArrowUp, Plus } from '@phosphor-icons/react';
 import CoinSelectModal from '@screens/home/coinSelectModal';
-import { FungibleToken } from '@secretkeylabs/xverse-core/types';
+import type { FungibleToken } from '@secretkeylabs/xverse-core';
 import { changeShowDataCollectionAlertAction } from '@stores/wallet/actions/actionCreators';
 import { CurrencyTypes } from '@utils/constants';
 import { isLedgerAccount } from '@utils/helper';
@@ -36,7 +37,6 @@ import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import styled, { useTheme } from 'styled-components';
 import Theme from 'theme';
-import SquareButton from '../../components/squareButton';
 import BalanceCard from './balanceCard';
 
 export const Container = styled.div((props) => ({

diff --git a/src/app/screens/nftDashboard/collectiblesTabs.tsx b/src/app/screens/nftDashboard/collectiblesTabs.tsx
@@ -1,4 +1,5 @@
 import ActionButton from '@components/button';
+import { StyledBarLoader, TilesSkeletonLoader } from '@components/tilesSkeletonLoader';
 import WrenchErrorMessage from '@components/wrenchErrorMessage';
 import { StyledP, StyledTab, StyledTabList } from '@ui-library/common.styled';
 import { ApiBundle, Bundle, mapRareSatsAPIResponseToRareSats } from '@utils/rareSats';
@@ -8,7 +9,6 @@ import { useNavigate, useSearchParams } from 'react-router-dom';
 import { TabPanel, Tabs } from 'react-tabs';
 import styled from 'styled-components';
 import type { NftDashboardState } from '.';
-import { StyledBarLoader, TilesSkeletonLoader } from '../../components/tilesSkeletonLoader';
 import Notice from './notice';
 import RareSatsTabGridItem from './rareSatsTabGridItem';
 

diff --git a/src/app/screens/nftDashboard/index.tsx b/src/app/screens/nftDashboard/index.tsx
@@ -9,7 +9,7 @@ import { useAddressRareSats } from '@hooks/queries/ordinals/useAddressRareSats';
 import useStacksCollectibles from '@hooks/queries/useStacksCollectibles';
 import useWalletSelector from '@hooks/useWalletSelector';
 import { ArrowDown, Wrench } from '@phosphor-icons/react';
-import type { InscriptionCollectionsData } from '@secretkeylabs/xverse-core/types';
+import type { InscriptionCollectionsData } from '@secretkeylabs/xverse-core';
 import {
   ChangeActivateOrdinalsAction,
   ChangeActivateRareSatsAction,

diff --git a/src/app/screens/ordinals/index.tsx b/src/app/screens/ordinals/index.tsx
@@ -1,5 +1,5 @@
 import useOrdinalDataReducer from '@hooks/stores/useOrdinalReducer';
-import { Inscription } from '@secretkeylabs/xverse-core/types/index';
+import type { Inscription } from '@secretkeylabs/xverse-core';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import styled from 'styled-components';

diff --git a/src/app/screens/restoreFunds/restoreOrdinals/ordinalRow.tsx b/src/app/screens/restoreFunds/restoreOrdinals/ordinalRow.tsx
@@ -1,6 +1,6 @@
 import useInscriptionDetails from '@hooks/queries/ordinals/useInscriptionDetails';
 import OrdinalImage from '@screens/ordinals/ordinalImage';
-import { BtcOrdinal, Inscription } from '@secretkeylabs/xverse-core/types';
+import type { BtcOrdinal, Inscription } from '@secretkeylabs/xverse-core';
 import { useTranslation } from 'react-i18next';
 import { MoonLoader } from 'react-spinners';
 import styled from 'styled-components';

diff --git a/src/app/screens/sendStx/index.tsx b/src/app/screens/sendStx/index.tsx
@@ -1,19 +1,22 @@
+import SendForm from '@components/sendForm';
+import BottomBar from '@components/tabBar';
+import useStxPendingTxData from '@hooks/queries/useStxPendingTxData';
+import useNetworkSelector from '@hooks/useNetwork';
+import useWalletSelector from '@hooks/useWalletSelector';
+import {
+  generateUnsignedStxTokenTransferTransaction,
+  microstacksToStx,
+  StacksTransaction,
+  stxToMicrostacks,
+  validateStxAddress,
+} from '@secretkeylabs/xverse-core';
 import { useMutation } from '@tanstack/react-query';
+import { replaceCommaByDot } from '@utils/helper';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { generateUnsignedStxTokenTransferTransaction } from '@secretkeylabs/xverse-core/transactions';
-import { microstacksToStx, stxToMicrostacks } from '@secretkeylabs/xverse-core/currency';
-import { StacksTransaction } from '@secretkeylabs/xverse-core/types';
-import { validateStxAddress } from '@secretkeylabs/xverse-core/wallet';
-import SendForm from '@components/sendForm';
-import TopRow from '@components/topRow';
-import useStxPendingTxData from '@hooks/queries/useStxPendingTxData';
-import { replaceCommaByDot } from '@utils/helper';
-import BottomBar from '@components/tabBar';
-import useNetworkSelector from '@hooks/useNetwork';
-import useWalletSelector from '@hooks/useWalletSelector';
+import TopRow from '../../components/topRow';
 
 function SendStxScreen() {
   const { t } = useTranslation('translation', { keyPrefix: 'SEND' });

diff --git a/src/app/screens/settings/changeNetwork/index.tsx b/src/app/screens/settings/changeNetwork/index.tsx
@@ -4,7 +4,7 @@ import BottomBar from '@components/tabBar';
 import TopRow from '@components/topRow';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { SettingsNetwork, StacksMainnet, StacksTestnet } from '@secretkeylabs/xverse-core/types';
+import type { SettingsNetwork, StacksMainnet, StacksTestnet } from '@secretkeylabs/xverse-core';
 import { initialNetworksList } from '@utils/constants';
 import { isValidBtcApi, isValidStacksApi } from '@utils/helper';
 import { useState } from 'react';

diff --git a/src/app/screens/settings/changeNetwork/networkRow.tsx b/src/app/screens/settings/changeNetwork/networkRow.tsx
@@ -1,5 +1,5 @@
 import TickIcon from '@assets/img/settings/tick.svg';
-import { SettingsNetwork } from '@secretkeylabs/xverse-core/types';
+import type { SettingsNetwork } from '@secretkeylabs/xverse-core';
 import styled, { useTheme } from 'styled-components';
 
 interface TitleProps {

diff --git a/src/app/screens/settings/fiatCurrency/currencyRow.tsx b/src/app/screens/settings/fiatCurrency/currencyRow.tsx
@@ -1,7 +1,7 @@
 import TickIcon from '@assets/img/settings/tick.svg';
-import { SupportedCurrency } from '@secretkeylabs/xverse-core/types';
+import type { SupportedCurrency } from '@secretkeylabs/xverse-core';
+import { Currency } from '@utils/currency';
 import styled, { useTheme } from 'styled-components';
-import { Currency } from '../../../utils/currency';
 
 interface TitleProps {
   color: string;

diff --git a/src/app/screens/stacking/startStacking/index.tsx b/src/app/screens/stacking/startStacking/index.tsx
@@ -1,8 +1,8 @@
 import ArrowSquareOut from '@assets/img/arrow_square_out.svg';
 import ActionButton from '@components/button';
 import useStackingData from '@hooks/queries/useStackingData';
+import type { Pool } from '@secretkeylabs/xverse-core';
 import { microstacksToStx } from '@secretkeylabs/xverse-core';
-import { Pool } from '@secretkeylabs/xverse-core/types';
 import { XVERSE_WEB_POOL_URL } from '@utils/constants';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';

diff --git a/src/app/screens/transactionRequest/index.tsx b/src/app/screens/transactionRequest/index.tsx
@@ -5,8 +5,12 @@ import useNetworkSelector from '@hooks/useNetwork';
 import useDappRequest from '@hooks/useTransationRequest';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';
-import { Coin, createDeployContractRequest, extractFromPayload } from '@secretkeylabs/xverse-core';
-import { ContractFunction } from '@secretkeylabs/xverse-core/types/api/stacks/transaction';
+import {
+  Coin,
+  ContractFunction,
+  createDeployContractRequest,
+  extractFromPayload,
+} from '@secretkeylabs/xverse-core';
 import { StacksTransaction } from '@stacks/transactions';
 import { getNetworkType, isHardwareAccount } from '@utils/helper';
 import { useEffect, useState } from 'react';

diff --git a/src/app/stores/wallet/actions/actionCreators.ts b/src/app/stores/wallet/actions/actionCreators.ts
@@ -1,15 +1,15 @@
 import { PostGuardPing } from '@components/guards/singleTab';
-import {
-  AccountType,
+import type {
   Account,
+  AccountType,
   BaseWallet,
   Coin,
   FeesMultipliers,
   FungibleToken,
   SettingsNetwork,
   SupportedCurrency,
   TransactionData,
-} from '@secretkeylabs/xverse-core/types';
+} from '@secretkeylabs/xverse-core';
 import BigNumber from 'bignumber.js';
 import * as actions from './types';
 

diff --git a/src/app/stores/wallet/actions/types.ts b/src/app/stores/wallet/actions/types.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   Account,
   AccountType,
   AppInfo,
@@ -9,7 +9,7 @@ import {
   SettingsNetwork,
   SupportedCurrency,
   TransactionData,
-} from '@secretkeylabs/xverse-core/types';
+} from '@secretkeylabs/xverse-core';
 import BigNumber from 'bignumber.js';
 
 export const SetWalletKey = 'SetWallet';

diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
@@ -1,11 +1,11 @@
 /* eslint-disable prefer-destructuring */
+import type { SettingsNetwork } from '@secretkeylabs/xverse-core';
 import {
   BTC_BASE_URI_MAINNET,
   BTC_BASE_URI_TESTNET,
   HIRO_MAINNET_DEFAULT,
   HIRO_TESTNET_DEFAULT,
 } from '@secretkeylabs/xverse-core/constant';
-import { SettingsNetwork } from '@secretkeylabs/xverse-core/types';
 
 export const BNS_CONTRACT = 'SP000000000000000000002Q6VF78.bns::names';
 export const GAMMA_URL = 'https://gamma.io/';

diff --git a/src/app/utils/currency.ts b/src/app/utils/currency.ts
@@ -1,16 +1,16 @@
-import UsFlag from '@assets/img/settings/ic_usa.svg';
+import ARG from '@assets/img/settings/ars.svg';
+import BRL from '@assets/img/settings/brl.svg';
+import CNY from '@assets/img/settings/cny.svg';
+import GBP from '@assets/img/settings/gbp.svg';
+import HKD from '@assets/img/settings/hkd.svg';
 import CanFlag from '@assets/img/settings/ic_can.svg';
 import EurFlag from '@assets/img/settings/ic_eu.svg';
 import JapanFlag from '@assets/img/settings/ic_jp.svg';
-import CNY from '@assets/img/settings/cny.svg';
-import ARG from '@assets/img/settings/ars.svg';
-import HKD from '@assets/img/settings/hkd.svg';
+import UsFlag from '@assets/img/settings/ic_usa.svg';
 import KRW from '@assets/img/settings/krw.svg';
-import SGD from '@assets/img/settings/sgd.svg';
-import GBP from '@assets/img/settings/gbp.svg';
-import BRL from '@assets/img/settings/brl.svg';
 import RUB from '@assets/img/settings/rub.svg';
-import { SupportedCurrency } from '@secretkeylabs/xverse-core/types';
+import SGD from '@assets/img/settings/sgd.svg';
+import type { SupportedCurrency } from '@secretkeylabs/xverse-core';
 
 export interface Currency {
   name: SupportedCurrency;

diff --git a/src/app/utils/mixpanel.ts b/src/app/utils/mixpanel.ts
@@ -1,6 +1,6 @@
-import mixpanel from 'mixpanel-browser';
+import { AnalyticsEvents } from '@secretkeylabs/xverse-core';
 import { sha256 } from 'js-sha256';
-import { AnalyticsEvents } from '@secretkeylabs/xverse-core/types';
+import mixpanel from 'mixpanel-browser';
 import { MIX_PANEL_TOKEN } from './constants';
 
 export const isMixPanelInited = () => !!MIX_PANEL_TOKEN && !!mixpanel.config;