From 01fb4765a5dce6256b28d48f61eabcb5536ab94c Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Tue, 14 Apr 2026 10:55:03 -0400 Subject: [PATCH] client: Don't override organization plans with personal plan (#53842) This PR makes it so we don't override organization plans with the user's personal plan. If an organization is selected and does not have a plan, we want to return `None` for the plan. Closes CLO-655. Release Notes: - N/A --- crates/client/src/user.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs index 270180cefd74b92075c1237a0f8320454a500b04..f7b7efb49cf82b347007738e664f0489f3ec8e9d 100644 --- a/crates/client/src/user.rs +++ b/crates/client/src/user.rs @@ -755,10 +755,8 @@ impl UserStore { }; } - if let Some(organization) = &self.current_organization - && let Some(plan) = self.plan_for_organization(&organization.id) - { - return Some(plan); + if let Some(organization) = &self.current_organization { + return self.plan_for_organization(&organization.id); } self.plan_info.as_ref().map(|info| info.plan())