fix(data-warehouse): Fixed react hook ordering (#22907)

* Fixed react hook ordering * Moved the memo further up * Update UI snapshots for `chromium` (2) * Update UI snapshots for `chromium` (2) --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
PostHog · Jun 12, 2024 · 78ed4f2 · 78ed4f2
1 parent 23acd14
commit 78ed4f2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/frontend/__snapshots__/scenes-app-insights--trends-line-edit--light.png b/frontend/__snapshots__/scenes-app-insights--trends-line-edit--light.png
diff --git a/frontend/src/lib/components/DefinitionPopover/DefinitionPopoverContents.tsx b/frontend/src/lib/components/DefinitionPopover/DefinitionPopoverContents.tsx
@@ -93,6 +93,24 @@ function DefinitionView({ group }: { group: TaxonomicFilterGroup }): JSX.Element
         }
     }, [definition])
 
+    const hasSentAsLabel = useMemo(() => {
+        const _definition = definition as PropertyDefinition
+
+        if (!_definition) {
+            return null
+        }
+
+        if (isDataWarehousePersonProperty) {
+            return _definition.id
+        }
+
+        if (_definition.name !== '') {
+            return _definition.name
+        }
+
+        return <i>(empty string)</i>
+    }, [isDataWarehousePersonProperty, definition, isProperty])
+
     if (!definition) {
         return <></>
     }
@@ -174,19 +192,9 @@ function DefinitionView({ group }: { group: TaxonomicFilterGroup }): JSX.Element
             </>
         )
     }
+
     if (isProperty) {
         const _definition = definition as PropertyDefinition
-        const hasSentAsLabel = useMemo(() => {
-            if (isDataWarehousePersonProperty) {
-                return _definition.id
-            }
-
-            if (_definition.name !== '') {
-                return _definition.name
-            }
-
-            return <i>(empty string)</i>
-        }, [isDataWarehousePersonProperty, _definition])
 
         return (
             <>