handled condition for undefined values

Signed-off-by: bhavanakarwade <[email protected]>
credebl · Dec 4, 2024 · a64a6dc · a64a6dc
1 parent c00f22a
commit a64a6dc
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 15 deletions.
diff --git a/src/components/Profile/DisplayProfileImg.tsx b/src/components/Profile/DisplayProfileImg.tsx
@@ -7,16 +7,33 @@ import { storageKeys } from "../../config/CommonConstant.ts";
 
 const DisplayProfileImg = () => {
     const [userObj, setUserObj] = useState<IUserProfile | null>(null)
+    // const getUserDetails = async () => {
+    //     const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE)
+    //     const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
+    //     const parsedUser = userProfile ? JSON.parse(userProfile) : null;
+
+    //     if (parsedUser) {
+    //         parsedUser.roles = orgRoles;
+    //         setUserObj(parsedUser);
+    //     }
+    // }
+
     const getUserDetails = async () => {
-        const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE)
-        const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
-        const parsedUser = userProfile ? JSON.parse(userProfile) : null;
+        try {
+            const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE);
+            const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES);
+            const parsedUser = userProfile ? JSON.parse(userProfile) : null;
 
-        if (parsedUser) {
-            parsedUser.roles = orgRoles;
-            setUserObj(parsedUser);
+            if (parsedUser) {
+                parsedUser.roles = orgRoles || []; // Default to an empty array if orgRoles is null
+                setUserObj(parsedUser);
+            } else {
+                console.warn("User profile is not available in local storage.");
+            }
+        } catch (error) {
+            console.error("Error fetching user details:", error);
         }
-    }
+    };
 
     useEffect(() => {
         getUserDetails()

diff --git a/src/components/Profile/DisplayUser.tsx b/src/components/Profile/DisplayUser.tsx
@@ -9,16 +9,34 @@ const DisplayUser = () => {
     const [userObj, setUserObj] = useState(null)
 
     let timer:any= null
+    // const getUserDetails = async () => {
+    //     const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE)
+    //     const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
+    //     const parsedUser = userProfile ? JSON.parse(userProfile) : null
+
+    //      if (parsedUser) {
+    //         parsedUser.roles = orgRoles;
+    //         setUserObj(parsedUser);
+    //     }
+    // }
+
     const getUserDetails = async () => {
-        const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE)
-        const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES)
-        const parsedUser = userProfile ? JSON.parse(userProfile) : null
+        try {
+            const userProfile = await getFromLocalStorage(storageKeys.USER_PROFILE);
+            const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES);
+            const parsedUser = userProfile ? JSON.parse(userProfile) : null;
 
-         if (parsedUser) {
-            parsedUser.roles = orgRoles;
-            setUserObj(parsedUser);
+            if (parsedUser) {
+                parsedUser.roles = orgRoles || []; // Default to an empty array if orgRoles is null
+                setUserObj(parsedUser);
+            } else {
+                console.warn("User profile is not available in local storage.");
+            }
+        } catch (error) {
+            console.error("Error fetching user details:", error);
         }
-    }
+    };
+
     useEffect(() => {
 			const fetchData = async () => {
 					await getUserDetails();

diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
@@ -275,7 +275,7 @@ const UserDashBoard = () => {
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 			const orgAgentsList =  data?.data?.org_agents;
 			if (orgAgentsList && orgAgentsList.length > 0) {
-				const orgDid = orgAgentsList[0].orgDid;
+				const orgDid = orgAgentsList[0]?.orgDid;
 				setWalletData(data?.data?.org_agents);
 
 				if(orgDid?.includes(DidMethod.INDY)){