Feat: Routing refactoring

src/renderer/app/App.tsx

@@ -6,22 +6,22 @@ import { useUnit } from 'effector-react';
 import { FallbackScreen } from '@renderer/components/common';
 import { CreateWalletProvider } from '@renderer/widgets/CreateWallet';
 import { walletModel } from '@renderer/entities/wallet';
+import { ROUTES_CONFIG } from '@renderer/pages';
+import { Paths } from '@renderer/shared/routes';
 import {
   ConfirmDialogProvider,
   I18Provider,
   MatrixProvider,
   NetworkProvider,
   GraphqlProvider,
   MultisigChainProvider,
-  Paths,
-  routesConfig,
 } from './providers';
 
 const SPLASH_SCREEN_DELAY = 450;
 
 export const App = () => {
   const navigate = useNavigate();
-  const appRoutes = useRoutes(routesConfig);
+  const appRoutes = useRoutes(ROUTES_CONFIG);
 
   const wallets = useUnit(walletModel.$wallets);
   const isLoadingWallets = useUnit(walletModel.$isLoadingWallets);

src/renderer/app/providers/index.ts

@@ -1,2 +1 @@
 export * from './context';
-export * from './routes';

src/renderer/entities/asset/ui/AssetCard/AssetCard.tsx

@@ -7,8 +7,7 @@ import { AssetBalance, AssetDetails, AssetIcon } from '@renderer/entities/asset'
 import { useToggle } from '@renderer/shared/lib/hooks';
 import { cnTw, KeyboardKey, totalAmount, transferableAmount } from '@renderer/shared/lib/utils';
 import { useI18n } from '@renderer/app/providers';
-import { Paths } from '../../../../app/providers/routes/paths';
-import { createLink } from '../../../../app/providers/routes/utils';
+import { Paths, createLink } from '@renderer/shared/routes';
 import { ChainId, Asset, Balance } from '@renderer/shared/core';
 // TODO: Move it to another layer https://app.clickup.com/t/8692tr8x0
 import { TokenPrice } from '@renderer/entities/price/ui/TokenPrice';

src/renderer/entities/contact/ui/EmptyContactList.tsx

@@ -1,7 +1,8 @@
 import { useNavigate } from 'react-router-dom';
 
 import { BodyText, Button, Icon } from '@renderer/shared/ui';
-import { Paths, useI18n } from '@renderer/app/providers';
+import { useI18n } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 
 type Props = {
   description?: string;

src/renderer/features/contacts/CreateContactForm/ui/CreateContactNavigation.tsx

@@ -1,6 +1,7 @@
 import { useNavigate } from 'react-router-dom';
 
-import { Paths, useI18n } from '@renderer/app/providers';
+import { useI18n } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { Button } from '@renderer/shared/ui';
 
 export const CreateContactNavigation = () => {

src/renderer/features/contacts/EditContactForm/ui/EditContactNavigation.tsx

@@ -1,6 +1,6 @@
 import { useNavigate } from 'react-router-dom';
 
-import { createLink, Paths } from '@renderer/app/providers';
+import { Paths, createLink } from '@renderer/shared/routes';
 import { IconButton } from '@renderer/shared/ui';
 import { Contact } from '@renderer/shared/core';
 

src/renderer/components/layout/PrimaryLayout/Wallets/WalletCard.tsx → src/renderer/features/wallets/WalletSelect/WalletCard.tsx

@@ -2,7 +2,7 @@ import { useUnit } from 'effector-react';
 
 import { BodyText, CaptionText, FootnoteText, Icon, Identicon } from '@renderer/shared/ui';
 import { WalletFiatBalance } from './WalletFiatBalance';
-import { GroupIcons, GroupLabels } from '@renderer/components/layout/PrimaryLayout/Wallets/common/constants';
+import { GroupIcons, GroupLabels } from '@renderer/features/wallets/WalletSelect/common/constants';
 import { toAddress, SS58_DEFAULT_PREFIX } from '@renderer/shared/lib/utils';
 import { useI18n } from '@renderer/app/providers';
 import { ChainsRecord } from './common/types';

src/renderer/components/layout/PrimaryLayout/Wallets/WalletGroup.tsx → src/renderer/features/wallets/WalletSelect/WalletGroup.tsx

@@ -2,7 +2,7 @@ import { Disclosure } from '@headlessui/react';
 import cn from 'classnames';
 
 import { Icon, BodyText, CaptionText } from '@renderer/shared/ui';
-import { GroupIcons, GroupLabels } from '@renderer/components/layout/PrimaryLayout/Wallets/common/constants';
+import { GroupIcons, GroupLabels } from '@renderer/features/wallets/WalletSelect/common/constants';
 import { useI18n } from '@renderer/app/providers';
 import { cnTw } from '@renderer/shared/lib/utils';
 import { WalletType, Wallet } from '@renderer/shared/core';

src/renderer/features/wallets/index.ts

@@ -0,0 +1,2 @@
+export { WalletMenu } from './WalletSelect/WalletMenu';
+export { WalletCard } from './WalletSelect/WalletCard';

src/renderer/pages/AddressBook/CreateContact/CreateContact.tsx

@@ -1,6 +1,6 @@
 import { useNavigate } from 'react-router-dom';
 
-import { Paths } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { CreateContactModal } from '@renderer/widgets';
 
 export const CreateContact = () => {

src/renderer/pages/AddressBook/EditContact/EditContact.tsx

@@ -1,6 +1,6 @@
 import { useNavigate } from 'react-router-dom';
 
-import { Paths } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { EditContactModal } from '@renderer/widgets';
 import { EditRouteGuard } from '@renderer/features/contacts';
 

src/renderer/pages/Assets/AssetsList/components/SelectShardModal/SelectShardModal.tsx

@@ -9,12 +9,12 @@ import {
   getMultishardStructure,
   getSelectableShards,
   searchShards,
-} from '@renderer/components/layout/PrimaryLayout/Wallets/common/utils';
+} from '@renderer/features/wallets/WalletSelect/common/utils';
 import {
   ChainsRecord,
   SelectableAccount,
   SelectableShards,
-} from '@renderer/components/layout/PrimaryLayout/Wallets/common/types';
+} from '@renderer/features/wallets/WalletSelect/common/types';
 import { AddressWithExplorers } from '@renderer/entities/wallet';
 import { ChainTitle } from '@renderer/entities/chain';
 

src/renderer/pages/Assets/ReceiveAsset/ReceiveAsset.tsx

@@ -1,7 +1,7 @@
 import { useNavigate } from 'react-router-dom';
 
 import { AssetRouteGuard } from '@renderer/features/assets';
-import { Paths } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { ReceiveAssetModal } from '@renderer/widgets';
 
 export const ReceiveAsset = () => {

src/renderer/pages/Assets/SendAsset/SendAsset.tsx

@@ -1,5 +1,5 @@
 import { AssetRouteGuard } from '@renderer/features/assets';
-import { Paths } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { SendAssetModal } from '@renderer/widgets';
 
 export const SendAsset = () => {

src/renderer/pages/Settings/Currency/Currency.tsx

@@ -1,7 +1,7 @@
 import { useNavigate } from 'react-router-dom';
 
 import { CurrencyModal } from '@renderer/widgets';
-import { Paths } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 
 export const Currency = () => {
   const navigate = useNavigate();

src/renderer/pages/Settings/Matrix/Matrix.tsx

@@ -1,7 +1,8 @@
 import { useNavigate } from 'react-router-dom';
 
 import { MatrixLoginModal, MatrixInfoModal } from '@renderer/widgets/MatrixModal';
-import { Paths, useMatrix } from '@renderer/app/providers';
+import { useMatrix } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 
 export const Matrix = () => {
   const navigate = useNavigate();

src/renderer/pages/Settings/Networks/Networks.tsx

@@ -4,7 +4,8 @@ import { Trans } from 'react-i18next';
 import uniqBy from 'lodash/uniqBy';
 import { useUnit } from 'effector-react';
 
-import { useI18n, useNetworkContext, useConfirmContext, Paths } from '@renderer/app/providers';
+import { useI18n, useNetworkContext, useConfirmContext } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { BaseModal, SearchInput, BodyText, InfoLink, Icon } from '@renderer/shared/ui';
 import { useToggle } from '@renderer/shared/lib/hooks';
 import { ExtendedChain, chainsService } from '@renderer/entities/network';

src/renderer/pages/Settings/Overview/components/GeneralActions/GeneralActions.tsx

@@ -2,7 +2,8 @@ import { Link } from 'react-router-dom';
 import { useUnit } from 'effector-react/effector-react.umd';
 
 import { Icon, BodyText, Plate, FootnoteText, HelpText } from '@renderer/shared/ui';
-import { useI18n, Paths } from '@renderer/app/providers';
+import { useI18n } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { cnTw } from '@renderer/shared/lib/utils';
 import { currencyModel, priceProviderModel } from '@renderer/entities/price';
 

src/renderer/pages/Settings/Overview/components/MatrixAction/MatrixAction.test.tsx

@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 
 import { MatrixAction } from './MatrixAction';
-import { Paths } from '../../../../../app/providers/routes/paths';
+import { Paths } from '@renderer/shared/routes';
 
 jest.mock('@renderer/app/providers', () => ({
   useI18n: jest.fn().mockReturnValue({

src/renderer/pages/Settings/Overview/components/MatrixAction/MatrixAction.tsx

@@ -2,7 +2,7 @@ import { Link } from 'react-router-dom';
 
 import { Icon, FootnoteText, Plate, BodyText, StatusLabel, HelpText } from '@renderer/shared/ui';
 import { useI18n, useMatrix } from '@renderer/app/providers';
-import { Paths } from '../../../../../app/providers/routes/paths';
+import { Paths } from '@renderer/shared/routes';
 import { cnTw } from '@renderer/shared/lib/utils';
 
 export const MatrixAction = () => {

src/renderer/pages/Staking/Operations/Bond/Bond.tsx

@@ -5,7 +5,8 @@ import { useUnit } from 'effector-react';
 
 import { DEFAULT_TRANSITION, getRelaychainAsset, toAddress } from '@renderer/shared/lib/utils';
 import { ValidatorMap } from '@renderer/entities/staking';
-import { Paths, useI18n, useNetworkContext } from '@renderer/app/providers';
+import { useI18n, useNetworkContext } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { Transaction, TransactionType, useTransaction } from '@renderer/entities/transaction';
 import { Confirmation, NoAsset, Submit, Validators } from '../components';
 import { useToggle } from '@renderer/shared/lib/hooks';

src/renderer/pages/Staking/Operations/ChangeValidators/ChangeValidators.tsx

@@ -3,7 +3,8 @@ import { useState, useEffect } from 'react';
 import { Navigate, useNavigate, useParams, useSearchParams } from 'react-router-dom';
 import { useUnit } from 'effector-react';
 
-import { useI18n, useNetworkContext, Paths } from '@renderer/app/providers';
+import { useI18n, useNetworkContext } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { Transaction, TransactionType, useTransaction } from '@renderer/entities/transaction';
 import { ValidatorMap } from '@renderer/entities/staking';
 import { toAddress, getRelaychainAsset, DEFAULT_TRANSITION } from '@renderer/shared/lib/utils';

src/renderer/pages/Staking/Operations/Destination/Destination.tsx

@@ -4,7 +4,8 @@ import { Navigate, useNavigate, useParams, useSearchParams } from 'react-router-
 import { useUnit } from 'effector-react';
 
 import { toAddress, getRelaychainAsset, DEFAULT_TRANSITION } from '@renderer/shared/lib/utils';
-import { useI18n, useNetworkContext, Paths } from '@renderer/app/providers';
+import { useI18n, useNetworkContext } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { Transaction, TransactionType, useTransaction } from '@renderer/entities/transaction';
 import { Confirmation, Submit, NoAsset } from '../components';
 import InitOperation, { DestinationResult } from './InitOperation/InitOperation';

src/renderer/pages/Staking/Operations/Redeem/Redeem.tsx

@@ -3,7 +3,8 @@ import { useEffect, useState } from 'react';
 import { Navigate, useNavigate, useParams, useSearchParams } from 'react-router-dom';
 import { useUnit } from 'effector-react';
 
-import { Paths, useI18n, useNetworkContext } from '@renderer/app/providers';
+import { useI18n, useNetworkContext } from '@renderer/app/providers';
+import { Paths } from '@renderer/shared/routes';
 import { ChainId, HexString } from '@renderer/shared/core';
 import { Transaction, TransactionType, useTransaction } from '@renderer/entities/transaction';
 import type { Account } from '@renderer/shared/core';