From b8fc7fbe2c7b389a1315e099249db35de6e8ba7e Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Fri, 6 Sep 2024 16:30:46 +0200
Subject: [PATCH] fix(settings): closing modal could close app

---
 src/components/settings-modal/settings-modal.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/settings-modal/settings-modal.tsx b/src/components/settings-modal/settings-modal.tsx
index 00ef90b2..1334a908 100644
--- a/src/components/settings-modal/settings-modal.tsx
+++ b/src/components/settings-modal/settings-modal.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import styles from './settings-modal.module.css';
 import AccountSettings from './account-settings';
@@ -12,10 +12,12 @@ import PlebbitOptions from './plebbit-options';
 
 const SettingsModal = () => {
   const { t } = useTranslation();
+  const location = useLocation();
   const navigate = useNavigate();
 
   const closeModal = () => {
-    navigate(-1);
+    const newPath = location.pathname.replace(/\/settings$/, '');
+    navigate(newPath);
   };
 
   const [showInterfaceSettings, setShowInterfaceSettings] = useState(false);