From fc50a9d4c68cbb22181ae13e7a5df73b82700c5b Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Fri, 6 Jun 2025 19:06:29 -0600
Subject: [PATCH] fix problem finding offer identifiers

---
 src/libs/endorserServer.ts |  2 +-
 src/libs/util.ts           | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts
index 41c2a6ac..6febf7e9 100644
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -136,7 +136,7 @@ export function isDid(did: string): boolean {
  * @param {string} did - The DID to check
  * @returns {boolean} True if DID is hidden
  */
-export function isHiddenDid(did: string): boolean {
+export function isHiddenDid(did: string | undefined): boolean {
   return did === HIDDEN_DID;
 }
 
diff --git a/src/libs/util.ts b/src/libs/util.ts
index 035bd164..7c2dc7a4 100644
--- a/src/libs/util.ts
+++ b/src/libs/util.ts
@@ -42,6 +42,7 @@ import { createPeerDid } from "../libs/crypto/vc/didPeer";
 import { registerCredential } from "../libs/crypto/vc/passkeyDidPeer";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+import OfferDetailsView from "@/views/OfferDetailsView.vue";
 
 export interface GiverReceiverInputInfo {
   did?: string;
@@ -382,11 +383,11 @@ export function offerGiverDid(
 ): string | undefined {
   let giver;
   const claim = veriClaim.claim as OfferVerifiableCredential;
-  if (
-    claim.credentialSubject.offeredBy?.identifier &&
-    !serverUtil.isHiddenDid(claim.credentialSubject.offeredBy.identifier)
-  ) {
-    giver = claim.credentialSubject.offeredBy.identifier;
+  const offeredBy: { identifier?: string } | undefined =
+    claim.offeredBy || claim.credentialSubject?.offeredBy;
+  const offeredById = offeredBy?.identifier;
+  if (offeredById && !serverUtil.isHiddenDid(offeredById)) {
+    giver = offeredById;
   } else if (veriClaim.issuer && !serverUtil.isHiddenDid(veriClaim.issuer)) {
     giver = veriClaim.issuer;
   }