fix: merge conflict

dhis2 · Oct 14, 2024 · f3f987d · f3f987d
1 parent 7ef97c8
commit f3f987d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/core_modules/capture-core/converters/clientToList.js b/src/core_modules/capture-core/converters/clientToList.js
@@ -87,9 +87,10 @@ function convertStatusForDisplay(clientValue: Object) {
     );
 }
 
-function convertOrgUnitForDisplay(clientValue: { id: string }) {
+function convertOrgUnitForDisplay(clientValue: string | Object) {
+    const orgUnitId = typeof clientValue === 'string' ? clientValue : clientValue.id;
     return (
-        <TooltipOrgUnit orgUnitId={clientValue.id} />
+        <TooltipOrgUnit orgUnitId={orgUnitId} />
     );
 }