From db03b826e83c231c523fe4ef5cc47f0bdcc47124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= <michal.szalowski@gmail.com>
Date: Fri, 1 Mar 2024 10:51:18 +0100
Subject: [PATCH] [#217] Resolve conflicts, code cleanup

---
 govtool/frontend/src/App.tsx         |  6 +++---
 govtool/frontend/src/consts/paths.ts | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/govtool/frontend/src/App.tsx b/govtool/frontend/src/App.tsx
index 842b3d6de..3da3e9a9b 100644
--- a/govtool/frontend/src/App.tsx
+++ b/govtool/frontend/src/App.tsx
@@ -93,7 +93,7 @@ export default function App() {
         <Route
           path={PATHS.governance_actions}
           element={<GovernanceActions />}
-        ></Route>
+        />
         <Route
           path={PATHS.governance_actions_category}
           element={<GovernanceActionsCategory />}
@@ -140,8 +140,8 @@ export default function App() {
           handleClose={
             !modals[modal.type].preventDismiss
               ? callAll(modals[modal.type]?.onClose, () =>
-                openModal({ type: "none", state: null })
-              )
+                  openModal({ type: "none", state: null })
+                )
               : undefined
           }
         >
diff --git a/govtool/frontend/src/consts/paths.ts b/govtool/frontend/src/consts/paths.ts
index dfff509bf..e7fc669d6 100644
--- a/govtool/frontend/src/consts/paths.ts
+++ b/govtool/frontend/src/consts/paths.ts
@@ -1,23 +1,24 @@
 export const PATHS = {
+  dashboard: "/dashboard",
+  dashboard_drep_directory: "/connected/drep_directory",
+  dashboard_governance_actions: "/connected/governance_actions",
   dashboard_governance_actions_action:
     "/connected/governance_actions/:proposalId",
   dashboard_governance_actions_category:
     "/connected/governance_actions/category/:category",
-  dashboard_governance_actions: "/connected/governance_actions",
-  dashboard: "/dashboard",
   delegateTodRep: "/delegate",
-  error: "/error",
   drep_directory: "/drep_directory",
+  error: "/error",
+  faqs: "/faqs",
   governance_actions: "/governance_actions",
   governance_actions_action: "/governance_actions/:proposalId",
+  governance_actions_category: "/governance_actions/category/:category",
   governance_actions_category_action:
     "/governance_actions/category/:category/:proposalId",
-  governance_actions: "/governance_actions",
-  dashboard_drep_directory: "/connected/drep_directory",
   guides: "/guides",
   home: "/",
-  registerAsdRep: "/register",
   registerAsSoleVoter: "/register_sole_voter",
+  registerAsdRep: "/register",
   retireAsSoleVoter: "/retire_sole_voter",
   stakeKeys: "/stake_keys",
   updateMetadata: "/update_metadata",