Merge branch 'main' into fix-email

AmbossTech · Aug 4, 2024 · 98ebb44 · 98ebb44
2 parents 2c79ca4 + 55a5b9e
commit 98ebb44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/components/button/LogoutButton.tsx b/src/components/button/LogoutButton.tsx
@@ -15,7 +15,8 @@ export const LogoutButtonWithTooltip = () => {
 
   const [logout] = useLogoutMutation({
     onCompleted: () => {
-      window.location.href = ROUTES.home;
+      localStorage.removeItem(LOCALSTORAGE_KEYS.currentWalletId);
+      window.location.assign(ROUTES.home);
     },
     onError: () =>
       toast({
@@ -50,7 +51,7 @@ export const LogoutButton = () => {
   const [logout] = useLogoutMutation({
     onCompleted: () => {
       localStorage.removeItem(LOCALSTORAGE_KEYS.currentWalletId);
-      window.location.href = ROUTES.home;
+      window.location.assign(ROUTES.home);
     },
     onError: () =>
       toast({

diff --git a/src/views/settings/ChangePassword.tsx b/src/views/settings/ChangePassword.tsx
@@ -38,6 +38,7 @@ import { useToast } from '@/components/ui/use-toast';
 import { useChangePasswordMutation } from '@/graphql/mutations/__generated__/changePassword.generated';
 import { useLogoutMutation } from '@/graphql/mutations/__generated__/logout.generated';
 import { useUserQuery } from '@/graphql/queries/__generated__/user.generated';
+import { LOCALSTORAGE_KEYS } from '@/utils/constants';
 import { handleApolloError } from '@/utils/error';
 import { ROUTES } from '@/utils/routes';
 import { WorkerMessage, WorkerResponse } from '@/workers/account/types';
@@ -128,7 +129,8 @@ export const ChangePassword = () => {
 
   const [logout] = useLogoutMutation({
     onCompleted: () => {
-      window.location.href = ROUTES.login;
+      localStorage.removeItem(LOCALSTORAGE_KEYS.currentWalletId);
+      window.location.assign(ROUTES.home);
     },
     onError: error => {
       const messages = handleApolloError(error);
@@ -138,8 +140,6 @@ export const ChangePassword = () => {
         title: 'Error logging out.',
         description: messages.join(', '),
       });
-
-      window.location.reload();
     },
   });