From 9e4cd446e3b7c58049c0c2eeabcc227fd75418c8 Mon Sep 17 00:00:00 2001
From: gkatrakazas <grigoriskatrakazas@gmail.com>
Date: Fri, 29 Nov 2024 15:56:22 +0200
Subject: [PATCH] Fix Expiration ribbon display

---
 src/components/Credentials/CredentialImage.js  | 2 +-
 src/components/Credentials/CredentialLayout.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Credentials/CredentialImage.js b/src/components/Credentials/CredentialImage.js
index 3051fa10..401f37e2 100644
--- a/src/components/Credentials/CredentialImage.js
+++ b/src/components/Credentials/CredentialImage.js
@@ -25,7 +25,7 @@ const CredentialImage = ({ credential, className, onClick, showRibbon = true, vc
 				<img src={parsedCredential.credentialImage.credentialImageURL} alt={"Credential"} className={className} onClick={onClick} />
 			)}
 			{parsedCredential && showRibbon &&
-				<ExpiredRibbon parsedCredential={parsedCredential} />
+				<ExpiredRibbon parsedCredential={parsedCredential.beautifiedForm} />
 			}
 			{vcEntityInstances && showRibbon &&
 				<UsagesRibbon vcEntityInstances={vcEntityInstances} />
diff --git a/src/components/Credentials/CredentialLayout.js b/src/components/Credentials/CredentialLayout.js
index 98d8c881..284be119 100644
--- a/src/components/Credentials/CredentialLayout.js
+++ b/src/components/Credentials/CredentialLayout.js
@@ -61,7 +61,7 @@ const CredentialLayout = ({ children, title = null }) => {
 			if ('error' in c) {
 				return;
 			}
-			setIsExpired(CheckExpired(c.beautifiedForm.expiry_date ?? c.beautifiedForm.exp))
+			setIsExpired(CheckExpired(c.beautifiedForm.exp ?? c.beautifiedForm.expiry_date ))
 			setCredentialFriendlyName(c.credentialFriendlyName);
 		});
 	}, [vcEntity, container]);