From c5d858591811f01e491a8986c9261276da4259c8 Mon Sep 17 00:00:00 2001
From: Arthur Belleville <arthur.belleville@datadoghq.com>
Date: Tue, 7 Apr 2026 21:15:42 +0200
Subject: [PATCH] fix: use useMaybeUser in UpgradeBlockProvider to avoid crash
 during loading

useUser() throws when the store is null (before user data is fetched).
Switch to useMaybeUser() which safely returns null.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 apps/main/src/contexts/UpgradeBlockContext.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/main/src/contexts/UpgradeBlockContext.tsx b/apps/main/src/contexts/UpgradeBlockContext.tsx
index 1f887f5..51dfbd9 100644
--- a/apps/main/src/contexts/UpgradeBlockContext.tsx
+++ b/apps/main/src/contexts/UpgradeBlockContext.tsx
@@ -1,7 +1,7 @@
 import React, { createContext, useContext } from "react";
 import { getOrganizationUpgradeBlockReason, type UpgradeBlockReason } from "../hooks/stripe";
 import { useOrganization } from "../hooks/organization";
-import { useUser } from "../providers/UserStoreProvider";
+import { useMaybeUser } from "../providers/UserStoreProvider";
 
 interface UpgradeBlockContextValue {
   isBlocked: boolean;
@@ -26,10 +26,10 @@ interface UpgradeBlockProviderProps {
 
 export const UpgradeBlockProvider: React.FC<UpgradeBlockProviderProps> = ({ children }) => {
   const { data: organizationData } = useOrganization();
-  const user = useUser();
+  const user = useMaybeUser();
 
   const reason =
-    user.is_temporary
+    user?.is_temporary
       ? null
       : organizationData
         ? getOrganizationUpgradeBlockReason({