Merge branch 'Development' into issue-525/remove-dob-from-profile

codeforpdx · Nov 17, 2023 · 9596cae · 9596cae
2 parents 1fdb132 + 9b3bac8
commit 9596cae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/src/components/Modals/ConfirmationModal.jsx b/src/components/Modals/ConfirmationModal.jsx
@@ -47,7 +47,7 @@ const ConfirmationModal = ({
 
   const confirmButton = () =>
     isLogout ? (
-      <LogoutButton>
+      <LogoutButton onLogout={() => localStorage.clear()}>
         <ConfirmationButton
           title={title}
           confirmFunction={confirmFunction}

diff --git a/src/components/NavBar/NavBar.jsx b/src/components/NavBar/NavBar.jsx
@@ -33,7 +33,6 @@ const NavBar = () => {
   const handleLogout = async () => {
     setProcessing(true);
     try {
-      localStorage.clear();
       addNotification('success', 'You have been logged out');
     } catch (e) {
       addNotification('error', `Log out failed. Reason: ${e.message}`);

diff --git a/src/components/Notification/InactivityMessage.jsx b/src/components/Notification/InactivityMessage.jsx
@@ -102,16 +102,8 @@ const InactivityMessage = () => {
           </DialogContentText>
         </DialogContent>
         <DialogActions>
-          <LogoutButton>
-            <Button
-              variant="outlined"
-              color="error"
-              endIcon={<LogoutIcon />}
-              onClick={() => {
-                localStorage.clear();
-                logout();
-              }}
-            >
+          <LogoutButton onLogout={() => localStorage.clear()}>
+            <Button variant="outlined" color="error" endIcon={<LogoutIcon />}>
               Log Out
             </Button>
           </LogoutButton>