From 5e6e0c69ef32470548a492af44f7544ba8aec243 Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Tue, 9 Jul 2024 12:44:45 +0530
Subject: [PATCH 1/2] fix: default redirect on settings route

---
 frontend/src/routes.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/routes.tsx b/frontend/src/routes.tsx
index 3f7d62ee..340932a0 100644
--- a/frontend/src/routes.tsx
+++ b/frontend/src/routes.tsx
@@ -1,6 +1,5 @@
 import { Navigate } from "react-router-dom";
 import AppLayout from "src/components/layouts/AppLayout";
-import SettingsLayout from "src/components/layouts/SettingsLayout";
 import TwoColumnFullScreenLayout from "src/components/layouts/TwoColumnFullScreenLayout";
 import { DefaultRedirect } from "src/components/redirects/DefaultRedirect";
 import { HomeRedirect } from "src/components/redirects/HomeRedirect";
@@ -102,7 +101,7 @@ const routes = [
       },
       {
         path: "settings",
-        element: <SettingsLayout />,
+        element: <DefaultRedirect />,
         handle: { crumb: () => "Settings" },
         children: [
           {

From 71d3eafd736509ad6a2b03fd01e22187991e7c81 Mon Sep 17 00:00:00 2001
From: pavanjoshi914 <pavanj914@gmail.com>
Date: Tue, 9 Jul 2024 15:25:11 +0530
Subject: [PATCH 2/2] fix: add redirects properly

---
 frontend/src/routes.tsx | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/frontend/src/routes.tsx b/frontend/src/routes.tsx
index 340932a0..06cabff9 100644
--- a/frontend/src/routes.tsx
+++ b/frontend/src/routes.tsx
@@ -1,5 +1,6 @@
 import { Navigate } from "react-router-dom";
 import AppLayout from "src/components/layouts/AppLayout";
+import SettingsLayout from "src/components/layouts/SettingsLayout";
 import TwoColumnFullScreenLayout from "src/components/layouts/TwoColumnFullScreenLayout";
 import { DefaultRedirect } from "src/components/redirects/DefaultRedirect";
 import { HomeRedirect } from "src/components/redirects/HomeRedirect";
@@ -105,22 +106,28 @@ const routes = [
         handle: { crumb: () => "Settings" },
         children: [
           {
-            index: true,
-            element: <Settings />,
-          },
-          {
-            path: "change-unlock-password",
-            element: <ChangeUnlockPassword />,
-            handle: { crumb: () => "Unlock Password" },
-          },
-          {
-            path: "key-backup",
-            element: <BackupMnemonic />,
-            handle: { crumb: () => "Key Backup" },
-          },
-          {
-            path: "node-backup",
-            element: <BackupNode />,
+            path: "",
+            element: <SettingsLayout />,
+            children: [
+              {
+                index: true,
+                element: <Settings />,
+              },
+              {
+                path: "change-unlock-password",
+                element: <ChangeUnlockPassword />,
+                handle: { crumb: () => "Unlock Password" },
+              },
+              {
+                path: "key-backup",
+                element: <BackupMnemonic />,
+                handle: { crumb: () => "Key Backup" },
+              },
+              {
+                path: "node-backup",
+                element: <BackupNode />,
+              },
+            ],
           },
         ],
       },