fix: 🐛 form editor page break sometime

growupanand · Feb 27, 2024 · bf718b7 · bf718b7
1 parent 37f4203
commit bf718b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apps/web/src/app/(protectedPage)/forms/[formId]/_components/formPageHeader.tsx b/apps/web/src/app/(protectedPage)/forms/[formId]/_components/formPageHeader.tsx
@@ -16,12 +16,12 @@ type Props = {
 };
 
 function FormPageHeader({ formId }: Readonly<Props>) {
-  const { organization } = useOrganization();
+  const { organization, isLoaded } = useOrganization();
   const { data, isLoading } = api.form.getOneWithWorkspace.useQuery({
     id: formId,
   });
 
-  if (isLoading) {
+  if (isLoading || !isLoaded) {
     return <FormEditorPageHeaderSkeleton />;
   }
 

diff --git a/apps/web/src/app/(protectedPage)/forms/[formId]/page.tsx b/apps/web/src/app/(protectedPage)/forms/[formId]/page.tsx
@@ -27,12 +27,12 @@ type Props = {
 };
 
 export default function FormPage({ params: { formId } }: Props) {
-  const { organization } = useOrganization();
+  const { organization, isLoaded } = useOrganization();
   const { isLoading, data } = api.form.getOneWithFields.useQuery({
     id: formId,
   });
 
-  if (isLoading) {
+  if (isLoading || !isLoaded) {
     return <FormPageLoading formId={formId} />;
   }