refactor(route types): refactor route types

deriv-com · Sep 5, 2022 · f41a350 · f41a350
1 parent ecad9b0
commit f41a350
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/packages/cashier/src/constants/routes-config.ts b/packages/cashier/src/constants/routes-config.ts
@@ -1,30 +1,13 @@
 import React from 'react';
 import { routes, moduleLoader } from '@deriv/shared';
-import { Redirect } from 'react-router-dom';
 import { localize } from '@deriv/translations';
 import { Cashier } from '../containers';
 import { AccountTransfer, Deposit, OnRamp, P2PCashier, PaymentAgent, PaymentAgentTransfer, Withdrawal } from '../pages';
-
-export type TRoute = {
-    default?: boolean;
-    exact?: boolean;
-    id?: string;
-    icon_component?: string;
-    is_invisible?: boolean;
-    path?: string;
-    to?: string;
-    component: ((cashier_routes?: TRoute[]) => JSX.Element) | typeof Page404 | typeof Redirect;
-    getTitle: () => string;
-};
-
-export type TRouteConfig = TRoute & {
-    is_modal?: boolean;
-    is_authenticated?: boolean;
-    routes?: TRoute[];
-};
+import { TRouteConfig, TRoute } from 'Types';
 
 // Error Routes
 const Page404 = React.lazy(() => moduleLoader(() => import(/* webpackChunkName: "404" */ 'Components/page-404')));
+export type TPage404 = typeof Page404;
 
 // Order matters
 const initRoutesConfig = (): TRouteConfig[] => [

diff --git a/packages/cashier/src/containers/cashier/cashier.tsx b/packages/cashier/src/containers/cashier/cashier.tsx
@@ -15,9 +15,8 @@ import { getSelectedRoute, getStaticUrl, isMobile, routes, WS } from '@deriv/sha
 import { localize } from '@deriv/translations';
 import AccountPromptDialog from 'Components/account-prompt-dialog';
 import ErrorDialog from 'Components/error-dialog';
-import { TRoute } from 'Constants/routes-config';
 import { connect } from 'Stores/connect';
-import { TClientStore, TCommonStore, TError, TRootStore, TUiStore } from 'Types';
+import { TClientStore, TCommonStore, TError, TRootStore, TRoute, TUiStore } from 'Types';
 import './cashier.scss';
 
 type TCashierProps = RouteComponentProps & {

diff --git a/packages/cashier/src/containers/routes/route-with-sub-routes.tsx b/packages/cashier/src/containers/routes/route-with-sub-routes.tsx
@@ -10,8 +10,7 @@ import {
     default_title,
 } from '@deriv/shared';
 import { getLanguage } from '@deriv/translations';
-import { TRouteConfig, TRoute } from 'Constants/routes-config';
-import { TClientStore } from 'Types';
+import { TClientStore, TRouteConfig, TRoute } from 'Types';
 
 type TRouteWithSubRoutesProps = TRouteConfig & {
     is_logged_in: TClientStore['is_logged_in'];

diff --git a/packages/cashier/src/types/shared/index.ts b/packages/cashier/src/types/shared/index.ts
@@ -1,4 +1,5 @@
 export * from './crypto-transaction-details.types';
 export * from './error.types';
 export * from './props.types';
+export * from './routes.types';
 export * from './websocket.types';
diff --git a/packages/cashier/src/types/shared/routes.types.ts b/packages/cashier/src/types/shared/routes.types.ts
@@ -0,0 +1,20 @@
+import { Redirect } from 'react-router-dom';
+import { TPage404 } from 'Constants/routes-config';
+
+export type TRoute = {
+    default?: boolean;
+    exact?: boolean;
+    id?: string;
+    icon_component?: string;
+    is_invisible?: boolean;
+    path?: string;
+    to?: string;
+    component: ((cashier_routes?: TRoute[]) => JSX.Element) | TPage404 | typeof Redirect;
+    getTitle: () => string;
+};
+
+export type TRouteConfig = TRoute & {
+    is_modal?: boolean;
+    is_authenticated?: boolean;
+    routes?: TRoute[];
+};