From 577ddfa03e6aca52999c81a896608434d414e573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Valderrama?= Date: Wed, 10 Jun 2026 11:12:52 +0200 Subject: [PATCH] :bug: Fix number of days for deletion for nitrate --- frontend/src/app/main/ui/dashboard/deleted.cljs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/ui/dashboard/deleted.cljs b/frontend/src/app/main/ui/dashboard/deleted.cljs index 33c9ea5d74..e5be919ea3 100644 --- a/frontend/src/app/main/ui/dashboard/deleted.cljs +++ b/frontend/src/app/main/ui/dashboard/deleted.cljs @@ -12,10 +12,12 @@ [app.main.data.common :as dcm] [app.main.data.dashboard :as dd] [app.main.data.modal :as modal] + [app.main.data.nitrate :as dnt] [app.main.refs :as refs] [app.main.store :as st] [app.main.ui.components.context-menu-a11y :refer [context-menu*]] [app.main.ui.dashboard.grid :refer [grid*]] + [app.main.ui.dashboard.subscription :refer [get-subscription-type]] [app.main.ui.ds.buttons.button :refer [button*]] [app.main.ui.ds.product.empty-placeholder :refer [empty-placeholder*]] [app.main.ui.hooks :as hooks] @@ -239,13 +241,15 @@ ;; Calculate deletion days based on team subscription deletion-days - (let [subscription (get team :subscription) - sub-type (get subscription :type) - sub-status (get subscription :status) - canceled? (contains? #{"canceled" "unpaid"} sub-status)] + (let [profile (mf/deref refs/profile) + subscription-type (get-subscription-type (:subscription team)) + nitrate-type (get-in profile [:subscription :type]) + nitrate-active? (dnt/is-valid-license? profile)] (cond - (and (= "unlimited" sub-type) (not canceled?)) 30 - (and (= "enterprise" sub-type) (not canceled?)) 90 + (and nitrate-active? + (contains? #{"enterprise" "nitrate"} nitrate-type)) 90 + (= subscription-type "unlimited") 30 + (= subscription-type "enterprise") 90 :else 7)) on-delete-all