Add null checks

wso2 · Sep 9, 2024 · edc0312 · edc0312
1 parent 03ce70a
commit edc0312
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/features/admin.users.v1/components/user-profile.tsx b/features/admin.users.v1/components/user-profile.tsx
@@ -369,11 +369,12 @@ export const UserProfile: FunctionComponent<UserProfilePropsInterface> = (
                                 if (schemaName.includes("addresses")) {
                                     // Ex: addresses#home.streetAddress
                                     const addressSubSchema: string = schema?.name?.split(".")[1];
+                                    const addressSchemaArray: string[] = schemaName?.split(".");
 
-                                    if (schemaName.split("#").length > 1) {
+                                    if (addressSchemaArray.length > 1) {
                                         // Ex: addresses#home
-                                        const addressSchema: string = schemaName.split("#")[0];
-                                        const addressType: string = schemaName.split("#")[1];
+                                        const addressSchema: string = addressSchemaArray[0];
+                                        const addressType: string = addressSchemaArray[1];
 
                                         const subValue: SubValueInterface = userInfo[addressSchema] &&
                                             Array.isArray(userInfo[addressSchema]) &&
@@ -383,7 +384,7 @@ export const UserProfile: FunctionComponent<UserProfilePropsInterface> = (
 
                                         tempProfileInfo.set(
                                             schema.name,
-                                            subValue[addressSubSchema] ? subValue[addressSubSchema] : ""
+                                            (subValue && subValue[addressSubSchema]) ? subValue[addressSubSchema] : ""
                                         );
                                     } else {
                                         tempProfileInfo.set(