From 56521723473e127e8d1b6d7c04bf4189b4b4f956 Mon Sep 17 00:00:00 2001
From: eirikhaugstulen <eirik.haugstulen@gmail.com>
Date: Wed, 15 Jan 2025 01:38:42 +0100
Subject: [PATCH] fix: show 'Profile' instead of 'False' during loading

---
 .../WidgetProfile/WidgetProfile.component.js         | 12 ++++++++----
 .../WidgetProfile/hooks/useTrackedEntityInstances.js |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
index c94ed1cdb6..4379a7b768 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
+++ b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
@@ -148,10 +148,14 @@ const WidgetProfilePlain = ({
             <Widget
                 header={
                     <div className={classes.header}>
-                        <div>{i18n.t('{{trackedEntityTypeName}} profile', {
-                            trackedEntityTypeName,
-                            interpolation: { escapeValue: false },
-                        })}</div>
+                        <div>
+                            {trackedEntityTypeName
+                                ? i18n.t('{{trackedEntityTypeName}} profile', {
+                                    trackedEntityTypeName,
+                                    interpolation: { escapeValue: false },
+                                })
+                                : i18n.t('Profile')}
+                        </div>
                         <div className={classes.actions}>
                             {isEditable && (
                                 <Button onClick={() => setTeiModalState(TEI_MODAL_STATE.OPEN)} secondary small>
diff --git a/src/core_modules/capture-core/components/WidgetProfile/hooks/useTrackedEntityInstances.js b/src/core_modules/capture-core/components/WidgetProfile/hooks/useTrackedEntityInstances.js
index 7571ca33be..c5f318525e 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/hooks/useTrackedEntityInstances.js
+++ b/src/core_modules/capture-core/components/WidgetProfile/hooks/useTrackedEntityInstances.js
@@ -1,5 +1,5 @@
 // @flow
-import { useMemo, useState, useEffect } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useDataQuery } from '@dhis2/app-runtime';
 import type { Geometry } from '../DataEntry/helpers/types';
 
@@ -93,7 +93,7 @@ export const useTrackedEntityInstances = (
         loading,
         trackedEntity: !loading && data?.trackedEntityInstance,
         trackedEntityInstanceAttributes: !loading && trackedEntityInstanceAttributes,
-        trackedEntityTypeName: !tetLoading && tetData?.trackedEntityType?.displayName,
+        trackedEntityTypeName: tetLoading ? undefined : tetData?.trackedEntityType?.displayName,
         trackedEntityTypeAccess: !tetLoading && tetData?.trackedEntityType?.access,
         geometry,
     };