From d286b0f430a4cf11ae2cf3353b8374a842a23df3 Mon Sep 17 00:00:00 2001
From: Kamil Pyszkowski <kamil.pyszkowski@akena.co>
Date: Tue, 23 Apr 2024 15:31:55 +0200
Subject: [PATCH] Resolve merge errors

---
 dapp/src/DApp.tsx                     | 3 ---
 dapp/src/components/Header/index.tsx  | 2 +-
 dapp/src/components/shared/Layout.tsx | 1 -
 dapp/src/router/index.tsx             | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dapp/src/DApp.tsx b/dapp/src/DApp.tsx
index 714266352..5075b7d24 100644
--- a/dapp/src/DApp.tsx
+++ b/dapp/src/DApp.tsx
@@ -9,9 +9,6 @@ import {
   SidebarContextProvider,
   WalletContextProvider,
 } from "./contexts"
-import { AcreSdkProvider } from "./acre-react/contexts"
-import GlobalStyles from "./components/GlobalStyles"
-import { router } from "./router"
 import { useInitApp } from "./hooks"
 import { Router } from "./router"
 import { store } from "./store"
diff --git a/dapp/src/components/Header/index.tsx b/dapp/src/components/Header/index.tsx
index efcdde6ac..f633a9fdc 100644
--- a/dapp/src/components/Header/index.tsx
+++ b/dapp/src/components/Header/index.tsx
@@ -9,7 +9,7 @@ import { Navigation } from "./Navigation"
 // TODO: To be adjusted after project pivot/cleanup
 const NAVIGATION_ITEMS: NavigationItemType[] = [
   { label: "Season 1", href: routerPath.home },
-  { label: "Dashboard", href: routerPath.overview },
+  { label: "Dashboard", href: routerPath.dashboard },
 ]
 
 export default function Header() {
diff --git a/dapp/src/components/shared/Layout.tsx b/dapp/src/components/shared/Layout.tsx
index 6926a0a23..fd070bc36 100644
--- a/dapp/src/components/shared/Layout.tsx
+++ b/dapp/src/components/shared/Layout.tsx
@@ -1,5 +1,4 @@
 import React, { useState } from "react"
-import { Box, BoxProps } from "@chakra-ui/react"
 import { AnimatePresence, motion, Variants } from "framer-motion"
 import { useLocation, useOutlet } from "react-router-dom"
 import Header from "../Header"
diff --git a/dapp/src/router/index.tsx b/dapp/src/router/index.tsx
index bae60179d..7d72d8ee3 100644
--- a/dapp/src/router/index.tsx
+++ b/dapp/src/router/index.tsx
@@ -4,7 +4,6 @@ import LandingPage from "#/pages/LandingPage"
 import Layout from "#/components/shared/Layout"
 import ActivityPage from "#/pages/ActivityPage"
 import DashboardPage from "#/pages/DashboardPage"
-import Layout from "#/components/shared/Layout"
 import { routerPath } from "./path"
 
 export function Router() {