Merge pull request wso2#4611 from Achintha444/master

(fix) admin username not getting displaying properly in myaccount.
Achintha444 · Nov 15, 2023 · 33879d7 · 33879d7
2 parents 1489dd8 + ce60d2e
commit 33879d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.changeset/warm-dingos-battle.md b/.changeset/warm-dingos-battle.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/myaccount": patch
+---
+
+(fix) admin username not getting displaying properly in myaccount.
diff --git a/apps/myaccount/src/components/shared/header.tsx b/apps/myaccount/src/components/shared/header.tsx
@@ -267,7 +267,14 @@ export const Header: FunctionComponent<HeaderPropsInterface> = (
         }
 
         if (profileInfo?.userName) {
-            return profileInfo.userName.split("/")[ 1 ];
+            const userName: string = profileInfo.userName.split("/")[ 1 ];
+
+            // If the username is in TENANT/USERNAME format, return the USERNAME.
+            if (userName) {
+                return userName;
+            }
+
+            return profileInfo.userName;
         }
 
         return "";