Fixed circular dependencies (#427)

razvantomegea · web-flow · commit 84b244ce820a · 2025-11-20T16:54:52.000+02:00
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/App.tsx b/src/App.tsx
@@ -2,7 +2,7 @@ import { Route, BrowserRouter as Router, Routes } from 'react-router-dom';
 import { PageNotFound } from 'pages/PageNotFound/PageNotFound';
 import { routes } from 'routes';
 import { AxiosInterceptors, BatchTransactionsContextProvider } from 'wrappers';
-import { Layout } from './components';
+import { Layout } from './components/Layout';
 
 export const App = () => {
   return (
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
@@ -9,7 +9,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import classNames from 'classnames';
 import { MouseEvent } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { Logo, Tooltip } from 'components';
 import { GITHUB_REPO_URL } from 'config';
 import {
   ACCOUNTS_ENDPOINT,
@@ -22,6 +21,8 @@ import {
   useGetNetworkConfig
 } from 'lib';
 import { RouteNamesEnum } from 'localConstants';
+import { Logo } from '../Logo';
+import { Tooltip } from '../Tooltip';
 import { ThemeTooltip } from './components';
 import styles from './header.styles';
 
diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
@@ -1,7 +1,7 @@
 import { PropsWithChildren } from 'react';
-
-import { Footer, Header } from 'components';
 import { AuthRedirectWrapper } from 'wrappers';
+import { Footer } from '../Footer';
+import { Header } from '../Header';
 
 // prettier-ignore
 const styles = {
diff --git a/src/components/OutputContainer/OutputContainer.tsx b/src/components/OutputContainer/OutputContainer.tsx
@@ -1,8 +1,7 @@
 import classNames from 'classnames';
 import { PropsWithChildren } from 'react';
-
-import { Loader } from 'components';
 import { WithClassnameType } from 'types';
+import { Loader } from '../Loader';
 
 // prettier-ignore
 const styles = {
diff --git a/src/components/OutputContainer/components/PingPongOutput.tsx b/src/components/OutputContainer/components/PingPongOutput.tsx
@@ -1,6 +1,5 @@
 import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Label } from 'components';
 import { contractAddress } from 'config';
 import {
   ACCOUNTS_ENDPOINT,
@@ -9,6 +8,7 @@ import {
   SignedTransactionType,
   useGetNetworkConfig
 } from 'lib';
+import { Label } from '../../Label';
 import { TransactionsOutput } from './TransactionsOutput';
 
 const styles = {
diff --git a/src/components/OutputContainer/components/TransactionOutput.tsx b/src/components/OutputContainer/components/TransactionOutput.tsx
@@ -1,6 +1,5 @@
 import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { Label } from 'components';
 import {
   ACCOUNTS_ENDPOINT,
   FormatAmount,
@@ -10,6 +9,7 @@ import {
   TRANSACTIONS_ENDPOINT,
   useGetNetworkConfig
 } from 'lib';
+import { Label } from '../../Label';
 
 const styles = {
   transactionContainer: 'transaction-container flex flex-col',
diff --git a/src/components/PingPongComponent/PingPongComponent.tsx b/src/components/PingPongComponent/PingPongComponent.tsx
@@ -3,12 +3,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { TokenLoginType } from '@multiversx/sdk-dapp/out/types/login.types';
 import { Duration } from 'luxon';
 import { useEffect, useState } from 'react';
-import {
-  Label,
-  MissingNativeAuthError,
-  OutputContainer,
-  PingPongOutput
-} from 'components';
 import { contractAddress } from 'config';
 import { getCountdownSeconds, setTimeRemaining } from 'helpers';
 import {
@@ -19,6 +13,10 @@ import {
 } from 'lib';
 import { ACCOUNTS_ENDPOINT, Transaction, useGetPendingTransactions } from 'lib';
 import { ItemsIdentifiersEnum } from 'pages/Dashboard/dashboard.types';
+import { Label } from '../Label';
+import { MissingNativeAuthError } from '../MissingNativeAuthError';
+import { OutputContainer } from '../OutputContainer';
+import { PingPongOutput } from '../OutputContainer/components';
 
 const styles = {
   pingPongContainer: 'ping-pong-container flex flex-col gap-6',
diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx
@@ -1,9 +1,7 @@
 import classNames from 'classnames';
 import { CSSProperties, MouseEvent, useState } from 'react';
 import { Tooltip as ReactTooltip } from 'react-tooltip';
-
-import { Drawer } from 'components';
-
+import { Drawer } from '../Drawer';
 import { TooltipPlaceEnum, TooltipPropsType } from './tooltip.types';
 
 // prettier-ignore
diff --git a/src/components/index.ts b/src/components/index.ts
diff --git a/src/initConfig.ts b/src/initConfig.ts
@@ -23,6 +23,9 @@ export const config: InitAppType = {
   dAppConfig: {
     nativeAuth: true,
     environment: EnvironmentsEnum.devnet,
+    network: {
+      walletAddress: 'https://localhost:3002'
+    },
     theme: 'mvx:dark-theme',
     providers: {
       walletConnect: {
diff --git a/src/pages/Dashboard/components/LeftPanel/LeftPanel.tsx b/src/pages/Dashboard/components/LeftPanel/LeftPanel.tsx
@@ -7,7 +7,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import classNames from 'classnames';
 import { useNavigate } from 'react-router-dom';
 import { ReactComponent as IconExpand } from 'assets/img/expand-up-down.svg';
-import { Logo } from 'components';
+import { Logo } from 'components/Logo';
 import {
   ACCOUNTS_ENDPOINT,
   getAccountProvider,
diff --git a/src/pages/Dashboard/components/LeftPanel/components/Account/Account.tsx b/src/pages/Dashboard/components/LeftPanel/components/Account/Account.tsx
@@ -7,7 +7,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import classNames from 'classnames';
 import { ReactNode, useState } from 'react';
 import { ReactComponent as XLogo } from 'assets/img/x-logo.svg';
-import { Label } from 'components';
+import { Label } from 'components/Label';
 import { FormatAmount, MvxTrim, useGetAccount } from 'lib';
 import { DataTestIdsEnum } from 'localConstants';
 import styles from './account.styles';
diff --git a/src/pages/Dashboard/components/Widget/Widget.tsx b/src/pages/Dashboard/components/Widget/Widget.tsx
@@ -1,4 +1,4 @@
-import { Card } from 'components';
+import { Card } from 'components/Card';
 import { WidgetType } from 'types/widget.types';
 
 export const Widget = ({
diff --git a/src/pages/Dashboard/widgets/BatchTransactions/BatchTransactions.tsx b/src/pages/Dashboard/widgets/BatchTransactions/BatchTransactions.tsx
@@ -5,7 +5,8 @@ import {
   IconDefinition
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { OutputContainer, TransactionsOutput } from 'components';
+import { OutputContainer } from 'components/OutputContainer';
+import { TransactionsOutput } from 'components/OutputContainer/components';
 import { MvxButton, useGetPendingTransactionsSessions } from 'lib';
 import {
   useGetAccount,
diff --git a/src/pages/Dashboard/widgets/NativeAuth/NativeAuth.tsx b/src/pages/Dashboard/widgets/NativeAuth/NativeAuth.tsx
@@ -1,5 +1,7 @@
 import { useEffect } from 'react';
-import { Label, MissingNativeAuthError, OutputContainer } from 'components';
+import { Label } from 'components/Label';
+import { MissingNativeAuthError } from 'components/MissingNativeAuthError';
+import { OutputContainer } from 'components/OutputContainer';
 import {
   ACCOUNTS_ENDPOINT,
   FormatAmount,
diff --git a/src/pages/Dashboard/widgets/PingPongAbi/PingPongAbi.tsx b/src/pages/Dashboard/widgets/PingPongAbi/PingPongAbi.tsx
@@ -1,4 +1,7 @@
-import { PingPongComponent, PingTransactionPayloadType } from 'components';
+import {
+  PingPongComponent,
+  PingTransactionPayloadType
+} from 'components/PingPongComponent';
 import { useSendPingPongTransaction } from 'hooks';
 import { useGetPingAmount, useGetTimeToPong } from './hooks';
 
diff --git a/src/pages/Dashboard/widgets/PingPongRaw/PingPongRaw.tsx b/src/pages/Dashboard/widgets/PingPongRaw/PingPongRaw.tsx
@@ -1,4 +1,7 @@
-import { PingPongComponent, PingTransactionPayloadType } from 'components';
+import {
+  PingPongComponent,
+  PingTransactionPayloadType
+} from 'components/PingPongComponent';
 import { useSendPingPongTransaction } from 'hooks';
 import { useGetPingAmount, useGetTimeToPong } from './hooks';
 
diff --git a/src/pages/Dashboard/widgets/PingPongService/PingPongService.tsx b/src/pages/Dashboard/widgets/PingPongService/PingPongService.tsx
@@ -1,4 +1,7 @@
-import { PingPongComponent, PingTransactionPayloadType } from 'components';
+import {
+  PingPongComponent,
+  PingTransactionPayloadType
+} from 'components/PingPongComponent';
 import { useSendPingPongTransaction } from 'hooks';
 import { useGetLoginInfo } from 'lib';
 import {
diff --git a/src/pages/Dashboard/widgets/SignMessage/SignMessage.tsx b/src/pages/Dashboard/widgets/SignMessage/SignMessage.tsx
@@ -7,7 +7,7 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { MvxButton } from '@multiversx/sdk-dapp-ui/react';
 import { MouseEvent, useState } from 'react';
-import { OutputContainer } from 'components';
+import { OutputContainer } from 'components/OutputContainer';
 import { Address, getAccountProvider, Message, useGetAccount } from 'lib';
 import { ItemsIdentifiersEnum } from 'pages/Dashboard/dashboard.types';
 import { SignFailure, SignSuccess } from './components';
diff --git a/src/pages/Dashboard/widgets/SignMessage/components/SignSuccess.tsx b/src/pages/Dashboard/widgets/SignMessage/components/SignSuccess.tsx
@@ -1,4 +1,4 @@
-import { Label } from 'components';
+import { Label } from 'components/Label';
 import { CopyButton, Message } from 'lib';
 import { DataTestIdsEnum } from 'localConstants';
 import { decodeMessage } from '../helpers';
diff --git a/src/pages/Dashboard/widgets/Transactions/Transactions.tsx b/src/pages/Dashboard/widgets/Transactions/Transactions.tsx
@@ -1,21 +1,16 @@
 import { useEffect } from 'react';
-
-import { OutputContainer, TransactionsTable } from 'components';
+import { OutputContainer } from 'components/OutputContainer';
+import { TransactionsTable } from 'components/TransactionsTable';
 import { getActiveTransactionsStatus } from 'lib';
-import { ItemsIdentifiersEnum } from 'pages/Dashboard/dashboard.types';
 import { useGetTransactions } from './hooks';
+import { TransactionsPropsType } from './transactions.types';
 
 // prettier-ignore
 const styles = {
   transactionsContainer: 'transactions-container flex flex-col border border-secondary rounded-xl transition-all duration-200 ease-out',
   transactionsTable: 'transactions-table w-full h-full overflow-x-auto shadow rounded-lg'
 } satisfies Record<string, string>;
 
-export interface TransactionsPropsType {
-  receiver?: string;
-  identifier?: `${ItemsIdentifiersEnum}`;
-}
-
 export const Transactions = (props: TransactionsPropsType) => {
   const { success } = getActiveTransactionsStatus();
   const { isLoading, getTransactions, transactions } =
diff --git a/src/pages/Dashboard/widgets/Transactions/hooks/useGetTransactions.ts b/src/pages/Dashboard/widgets/Transactions/hooks/useGetTransactions.ts
@@ -7,7 +7,7 @@ import {
   useGetAccount,
   useGetNetworkConfig
 } from 'lib';
-import { TransactionsPropsType } from '../Transactions';
+import { TransactionsPropsType } from '../transactions.types';
 
 export const useGetTransactions = (payload?: TransactionsPropsType) => {
   const { address } = useGetAccount();
diff --git a/src/pages/Dashboard/widgets/Transactions/transactions.types.ts b/src/pages/Dashboard/widgets/Transactions/transactions.types.ts
@@ -0,0 +1,6 @@
+import { ItemsIdentifiersEnum } from '../../dashboard.types';
+
+export interface TransactionsPropsType {
+  receiver?: string;
+  identifier?: `${ItemsIdentifiersEnum}`;
+}
diff --git a/src/pages/Home/components/HomeHero/HomeHero.tsx b/src/pages/Home/components/HomeHero/HomeHero.tsx
@@ -5,7 +5,7 @@ import { ReactComponent as ArrowUpRightIcon } from 'assets/icons/arrow-up-right-
 import { ReactComponent as HomeDarkThemeIcon } from 'assets/icons/home-dark-theme-icon.svg';
 import { ReactComponent as HomeLightThemeIcon } from 'assets/img/bright-light-icon.svg';
 import { ReactComponent as HomeVibeThemeIcon } from 'assets/img/vibe-mode-icon.svg';
-import { Button } from 'components';
+import { Button } from 'components/Button';
 import {
   ThemeOptionType,
   useHandleThemeManagement
diff --git a/src/pages/index.ts b/src/pages/index.ts
diff --git a/src/routes/routes.ts b/src/routes/routes.ts
@@ -1,5 +1,8 @@
 import { RouteNamesEnum } from 'localConstants';
-import { Dashboard, Disclaimer, Home, Unlock } from 'pages';
+import { Dashboard } from 'pages/Dashboard/Dashboard';
+import { Disclaimer } from 'pages/Disclaimer/Disclaimer';
+import { Home } from 'pages/Home/Home';
+import { Unlock } from 'pages/Unlock/Unlock';
 import { RouteType } from 'types';
 
 interface RouteWithTitleType extends RouteType {
diff --git a/src/types/pingPong.types.ts b/src/types/pingPong.types.ts
@@ -1,4 +1,4 @@
-import { Transaction } from 'lib';
+import { Transaction } from 'lib/sdkCore';
 
 export type PingPongServiceProps = PongRawProps & {
   transactions: Transaction[];
