diff --git a/packages/hoppscotch-sh-admin/src/helpers/userManagement.ts b/packages/hoppscotch-sh-admin/src/helpers/userManagement.ts index 605602cb..f2865d45 100644 --- a/packages/hoppscotch-sh-admin/src/helpers/userManagement.ts +++ b/packages/hoppscotch-sh-admin/src/helpers/userManagement.ts @@ -40,17 +40,11 @@ export const handleUserDeletion = (deletedUsersList: UserDeletionResult[]) => { // Show the success toast based on the action type if there are no errors if (uniqueErrorMessages.size === 0) { - if (isBulkAction) { - toast.success( - isBulkAction - ? t('state.delete_user_success') - : t('state.delete_users_success') - ); - - return; - } - - toast.success(t('state.delete_user_success')); + toast.success( + isBulkAction + ? t('state.delete_users_success') + : t('state.delete_user_success') + ); return; } diff --git a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue index 05b22059..4bd9700d 100644 --- a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue +++ b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue @@ -207,7 +207,6 @@ const deleteUserMutation = async (id: string | null) => { if (result.error) { toast.error(t('state.delete_user_failure')); - router.push('/users'); } else { const deletedUsers = result.data?.removeUsersByAdmin || []; @@ -215,5 +214,7 @@ const deleteUserMutation = async (id: string | null) => { } confirmDeletion.value = false; deleteUserUID.value = null; + + !result.error && router.push('/users'); };