diff --git a/frontend/src/app/main/data/users.cljs b/frontend/src/app/main/data/users.cljs index 8a540317f..e82fee08f 100644 --- a/frontend/src/app/main/data/users.cljs +++ b/frontend/src/app/main/data/users.cljs @@ -537,10 +537,8 @@ on-success identity}} (meta params)] (->> (rp/cmd! :delete-profile {}) (rx/tap on-success) - (rx/delay-at-least 300) - (rx/catch (constantly (rx/of 1))) - (rx/map logged-out) - (rx/catch on-error)))))) + (rx/catch on-error) + (rx/delay-at-least 300)))))) ;; --- EVENT: request-profile-recovery diff --git a/frontend/src/app/main/ui/settings/delete_account.cljs b/frontend/src/app/main/ui/settings/delete_account.cljs index 384907dfe..3dd81a34b 100644 --- a/frontend/src/app/main/ui/settings/delete_account.cljs +++ b/frontend/src/app/main/ui/settings/delete_account.cljs @@ -18,11 +18,12 @@ [rumext.v2 :as mf])) (defn on-error - [{:keys [code] :as error}] - (if (= :owner-teams-with-people code) - (let [msg (tr "notifications.profile-deletion-not-allowed")] - (rx/of (msg/error msg))) - (rx/throw error))) + [cause] + (let [code (-> cause ex-data :code)] + (if (= :owner-teams-with-people code) + (let [msg (tr "notifications.profile-deletion-not-allowed")] + (rx/of (msg/error msg))) + (rx/throw cause)))) (mf/defc delete-account-modal {::mf/register modal/components