Merge pull request #643 from credebl/develop

Merge Develop to QA
credebl · Mar 28, 2024 · dfb5d06 · dfb5d06
2 parents e3fa443 + 3e5e510
commit dfb5d06
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
 		"astro": "^2.9.0",
 		"axios": "^1.4.0",
 		"cookie": "^0.5.0",
-		"crypto-js": "^4.1.1",
+		"crypto-js": "^4.2.0",
 		"dom-to-image": "^2.6.0",
 		"downloadjs": "^1.4.7",
 		"flowbite": "^1.8.1",

diff --git a/src/components/Authentication/SignInUserPasskey.tsx b/src/components/Authentication/SignInUserPasskey.tsx
@@ -70,8 +70,12 @@ const SignInUserPasskey = (signInUserProps: signInUserProps) => {
 				(element: { orgRole: { name: string } }) =>
 					permissionArray.push(element?.orgRole?.name),
 			);
+			const { id, profileImg, firstName, email, enableEcosystem, multiEcosystemSupport } = data?.data || {}
+			const userProfile = {
+				id, profileImg, firstName, email, enableEcosystem, multiEcosystemSupport
+			}
 			await setToLocalStorage(storageKeys.PERMISSIONS, permissionArray);
-			await setToLocalStorage(storageKeys.USER_PROFILE, data?.data);
+			await setToLocalStorage(storageKeys.USER_PROFILE, userProfile);
 			await setToLocalStorage(storageKeys.USER_EMAIL, data?.data?.email);
 			return {
 				role: role?.orgRole || ""

diff --git a/src/components/Authentication/SignInUserPassword.tsx b/src/components/Authentication/SignInUserPassword.tsx
@@ -56,7 +56,11 @@ const SignInUserPassword = (signInUserProps: SignInUser3Props) => {
 				(element: { orgRole: { name: string } }) =>
 					permissionArray.push(element?.orgRole?.name),
 			);
-			await setToLocalStorage(storageKeys.USER_PROFILE, data?.data);
+			const { id, profileImg, firstName, email, enableEcosystem, multiEcosystemSupport } = data?.data || {}
+			const userProfile = {
+				id, profileImg, firstName, email, enableEcosystem, multiEcosystemSupport
+			}
+			await setToLocalStorage(storageKeys.USER_PROFILE, userProfile);
 			await setToLocalStorage(storageKeys.USER_EMAIL, data?.data?.email);
 			return {
 				role: role?.orgRole ?? '',

diff --git a/src/components/Profile/UserProfile.tsx b/src/components/Profile/UserProfile.tsx
@@ -28,7 +28,11 @@ const UserProfile = ({ noBreadcrumb }: { noBreadcrumb?: boolean }) => {
 
       if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
         setPrePopulatedUserProfile(data?.data);
-        await setToLocalStorage(storageKeys.USER_PROFILE, data?.data)
+        const { id, profileImg, firstName, email, enableEcosystem, multiEcosystemSupport } = data?.data || {}
+        const userProfile = {
+          id, profileImg, firstName, email, enableEcosystem, multiEcosystemSupport
+        }
+        await setToLocalStorage(storageKeys.USER_PROFILE, userProfile)
         await setToLocalStorage(storageKeys.USER_EMAIL, data?.data?.email)
       }
     } catch (error) {

diff --git a/src/config/ecosystem.ts b/src/config/ecosystem.ts
@@ -64,7 +64,7 @@ const checkEcosystem = async (): Promise<ICheckEcosystem> => {
 	return {
 		isEnabledEcosystem,
 		isMultiEcosystem,
-		isEcosystemMember: !isLead,
+		isEcosystemMember: !isLead && isEnabledEcosystem,
 		isEcosystemLead: isLead,
 	};
 };