diff --git a/packages/webapp/package.json b/packages/webapp/package.json index d06767340..574edc80c 100644 --- a/packages/webapp/package.json +++ b/packages/webapp/package.json @@ -106,6 +106,7 @@ "react-router": "5.3.4", "react-router-breadcrumbs-hoc": "^3.2.10", "react-router-dom": "^5.3.3", + "react-router-dom-v5-compat": "6", "react-scripts": "5.0.1", "react-scroll-sync": "^0.7.1", "react-scrollbars-custom": "^4.0.21", diff --git a/packages/webapp/src/components/Dashboard/BigcapitalLoading.tsx b/packages/webapp/src/components/Dashboard/BigcapitalLoading.tsx index 60acf4ead..36225efb0 100644 --- a/packages/webapp/src/components/Dashboard/BigcapitalLoading.tsx +++ b/packages/webapp/src/components/Dashboard/BigcapitalLoading.tsx @@ -1,17 +1,16 @@ -// @ts-nocheck -import React from 'react'; -import classNames from 'classnames'; import { Icon } from '@/components'; +import classNames from 'classnames'; +import React from 'react'; import '@/style/components/BigcapitalLoading.scss'; /** * Bigcapital logo loading. */ -export default function BigcapitalLoading({ className }) { +export default function BigcapitalLoading({ className }: { className: string }) { return (
-
+
diff --git a/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx b/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx index 2471a46e0..fe09a5943 100644 --- a/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx +++ b/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx @@ -13,17 +13,14 @@ function DashboardBackLink({ dashboardBackLink, breadcrumbs }) { const crumb = breadcrumbs[breadcrumbs.length - 2]; const handleClick = (event) => { - const url = - typeof dashboardBackLink === 'string' - ? dashboardBackLink - : crumb.match.url; + const url = typeof dashboardBackLink === 'string' ? dashboardBackLink : crumb.match.url; history.push(url); event.preventDefault(); }; return ( -