From 8995c8cbedce87c81f9aaaa1c53d344c7ecf605b Mon Sep 17 00:00:00 2001 From: abhip2565 <74866247+abhip2565@users.noreply.github.com> Date: Thu, 17 Oct 2024 18:26:51 +0530 Subject: [PATCH] rebase changes and merge release 0.14.x to injimob-2005-new-theme-change (#1644) [INJIMOB-2051] fix Vc background not getting rendered (#1626) [INJIMOB-2073] change wellknown api from /.well-known to /well-known-proxy (#1630) Signed-off-by: Abhishek Paul Co-authored-by: anup-nehe <117707464+anup-nehe@users.noreply.github.com> --- components/VC/common/VCUtils.tsx | 5 ++++- shared/api.ts | 2 +- shared/openId4VCI/Utils.ts | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/components/VC/common/VCUtils.tsx b/components/VC/common/VCUtils.tsx index b7485e8d..d25dd19d 100644 --- a/components/VC/common/VCUtils.tsx +++ b/components/VC/common/VCUtils.tsx @@ -99,7 +99,10 @@ export const getFieldName = (field: string, wellknown: any) => { }; export const getBackgroundColour = (wellknown: any) => { - return wellknown?.display[0]?.background_color ?? Theme.Colors.textValue; + return { + backgroundColor: + wellknown?.display[0]?.background_color ?? Theme.Colors.textValue, + }; }; export const getBackgroundImage = (wellknown: any, defaultBackground: any) => { diff --git a/shared/api.ts b/shared/api.ts index 41584a53..c0fabb4e 100644 --- a/shared/api.ts +++ b/shared/api.ts @@ -30,7 +30,7 @@ export const API_URLS: ApiUrls = { issuerWellknownConfig: { method: 'GET', buildURL: (issuerId: string): `/${string}` => - `/v1/mimoto/issuers/${issuerId}/.well-known`, + `/v1/mimoto/issuers/${issuerId}/well-known-proxy`, }, allProperties: { method: 'GET', diff --git a/shared/openId4VCI/Utils.ts b/shared/openId4VCI/Utils.ts index 31cd13b6..82db8c4d 100644 --- a/shared/openId4VCI/Utils.ts +++ b/shared/openId4VCI/Utils.ts @@ -96,7 +96,7 @@ export const updateCredentialInformation = ( return { verifiableCredential: { ...credential, - wellKnown: context.selectedIssuer['.well-known'], + wellKnown: context.selectedIssuer['wellknown_endpoint'], credentialTypes: credential.credential.type ?? ['VerifiableCredential'], issuerLogo: getDisplayObjectForCurrentLanguage( context.selectedIssuer.display,