@procivis/one-react-native-components 0.3.22 → 0.3.27

package/src/components/entity/entity-details.tsx

@@ -1,10 +1,11 @@
-import { DidListItem, TrustEntity, TrustEntityRoleEnum, TrustEntityStateEnum } from '@procivis/react-native-one-core';
+import { TrustEntity, TrustEntityRoleEnum, TrustEntityStateEnum } from '@procivis/react-native-one-core';
+import { IdentifierListItem } from '@procivis/react-native-one-core/dist/src/identifier';
 import React, { FC, ReactNode, useMemo } from 'react';
 import { StyleProp, ViewStyle } from 'react-native';
 
 import EntityCluster from '../../ui-components/entity/entity-cluster';
-import { EntityTrustedIcon } from '../../ui-components/icons';
-import { concatTestID, replaceBreakingHyphens } from '../../utils';
+import { EntityNotTrustedIcon, EntityTrustedIcon } from '../../ui-components/icons';
+import { concatTestID, replaceBreakingHyphens, useIdentifierDetails } from '../../utils';
 import { useTrustEntity } from '../../utils/hooks/core/trust-entity';
 
 export type EntityDetailsLabels = {
@@ -18,17 +19,18 @@ export type EntityDetailsProps = {
   style?: StyleProp<ViewStyle>;
   testID?: string;
 } & (
-  | {
-      did?: DidListItem;
+    | {
+      identifier?: IdentifierListItem;
     }
-  | {
+    | {
       entity: TrustEntity;
     }
-);
+  );
 
 const EntityDetails: FC<EntityDetailsProps> = ({ labels, renderMore, role, style, testID, ...props }) => {
-  const { data } = useTrustEntity('did' in props ? props.did?.id : undefined);
+  const { data } = useTrustEntity('identifier' in props ? props.identifier?.id : undefined);
   const trustEntity: TrustEntity | undefined = 'entity' in props ? props.entity : data ?? undefined;
+  const { data: identifierDetail } = useIdentifierDetails('identifier' in props ? props.identifier?.id : undefined);
 
   const trusted =
     trustEntity &&
@@ -37,24 +39,17 @@ const EntityDetails: FC<EntityDetailsProps> = ({ labels, renderMore, role, style
 
   const trustEntityName = useMemo(() => {
     if (!trusted) {
+      if (identifierDetail?.did?.did) {
+        return replaceBreakingHyphens(identifierDetail.did.did);
+      }
       return labels.unknown;
     }
     return trustEntity.name;
-  }, [labels.unknown, trustEntity, trusted]);
-
-  const trustEntitySubline = useMemo(() => {
-    if (!trustEntity) {
-      return 'did' in props ? (props.did?.did ? replaceBreakingHyphens(props.did.did) : undefined) : undefined;
-    }
-    if (!trusted) {
-      return replaceBreakingHyphens(trustEntity.did.did);
-    }
-    return undefined;
-  }, [props, trustEntity, trusted]);
+  }, [labels.unknown, trustEntity, trusted, identifierDetail]);
 
   const trustEntityStatusIcon = useMemo(() => {
     if (!trusted) {
-      return undefined;
+      return <EntityNotTrustedIcon testID={concatTestID(testID, 'statusIcon', 'notTrusted')} />;
     }
     return <EntityTrustedIcon testID={concatTestID(testID, 'statusIcon', 'trusted')} />;
   }, [testID, trusted]);
@@ -65,16 +60,18 @@ const EntityDetails: FC<EntityDetailsProps> = ({ labels, renderMore, role, style
         avatar={
           trustEntity
             ? {
-                avatar: trusted && trustEntity.logo ? { imageSource: { uri: trustEntity.logo } } : undefined,
-                placeholderText: trustEntity.name.substring(0, 1),
-                statusIcon: trustEntityStatusIcon,
-                testID: concatTestID(testID, 'avatar'),
-              }
-            : undefined
+              avatar: trusted && trustEntity.logo ? { imageSource: { uri: trustEntity.logo } } : undefined,
+              placeholderText: trusted ? trustEntity.name.substring(0, 1) : "U",
+              statusIcon: trustEntityStatusIcon,
+              testID: concatTestID(testID, 'avatar'),
+            }
+            : {
+              statusIcon: trustEntityStatusIcon,
+              placeholderText: "U",
+            }
         }
         entityName={trustEntityName}
         style={style}
-        subline={trustEntitySubline}
         testID={testID}
       />
       {trustEntity && renderMore && renderMore(trustEntity)}

package/src/components/history/history-list-item-icon.tsx

@@ -5,8 +5,10 @@ import { SvgProps } from 'react-native-svg';
 import {
   HistoryBackupCreatedIcon,
   HistoryBackupRestoredIcon,
+  HistoryCertificateIcon,
   HistoryCredentialIcon,
   HistoryDidIcon,
+  HistoryIdentifierIcon,
   HistoryIssueIcon,
   HistoryItemIcon,
   HistoryKeyIcon,
@@ -51,12 +53,15 @@ const defaultIcons: {
     WITHDRAWN: HistoryStatusErrorIcon,
     REACTIVATED: HistoryStatusAcceptedIcon,
     CSR_GENERATED: HistoryStatusAcceptedIcon,
+    EXPIRED: HistoryStatusErrorIcon,
   },
   entityTypes: {
     BACKUP: HistoryRevokeIcon,
+    CERTIFICATE: HistoryCertificateIcon,
     CREDENTIAL: HistoryCredentialIcon,
     CREDENTIAL_SCHEMA: HistorySchemaIcon,
     DID: HistoryDidIcon,
+    IDENTIFIER: HistoryIdentifierIcon,
     KEY: HistoryKeyIcon,
     ORGANISATION: HistoryOrganisationIcon,
     PROOF: HistoryProofRequestIcon,

package/src/components/history/history-list-item.tsx

@@ -13,6 +13,7 @@ export type HistoryListItemLabels = {
 export interface HistoryListItemViewProps {
   dateFormatter?: (date: Date) => string;
   first?: boolean;
+  infoLabelMode?: 'entity' | 'associatedLabel' | 'none';
   item: HistoryListItem;
   labels: HistoryListItemLabels;
   last?: boolean;
@@ -23,15 +24,25 @@ export interface HistoryListItemViewProps {
 export const HistoryListItemView: FC<HistoryListItemViewProps> = ({
   dateFormatter = formatTime,
   first,
+  infoLabelMode = 'entity',
   item,
   labels,
   last,
   onPress,
   testID
 }) => {
-  const { data: entity } = useTrustEntity(item.target);
+  const { data: entity } = useTrustEntity(infoLabelMode === 'entity' ? item.target : undefined);
 
   const label = `${labels.entityTypes[item.entityType]} ${labels.actions[item.action]}`;
+  let infoLabel;
+  switch (infoLabelMode) {
+    case 'entity':
+      infoLabel = entity?.name;
+      break;
+    case 'associatedLabel':
+      infoLabel = item.name;
+      break;
+  }
   const icon = <HistoryListItemIcon item={item} />;
 
   const pressHandler = useCallback(() => {
@@ -42,7 +53,7 @@ export const HistoryListItemView: FC<HistoryListItemViewProps> = ({
     <HistoryItemView
       first={first}
       icon={icon}
-      info={entity?.name}
+      info={infoLabel}
       label={label}
       last={last}
       onPress={pressHandler}

package/src/components/history/history-list-screen.tsx

@@ -13,6 +13,7 @@ import {
 } from '../../ui-components';
 import { concatTestID, groupEntriesByDay, HistoryGroupByDaySection, useListContentInset } from '../../utils';
 import { HistoryListLabels, HistoryListView } from './history-list';
+import { HistoryListItemViewProps } from './history-list-item';
 
 export type HistoryListScreenLabels = {
   emptyTitle: string;
@@ -24,6 +25,7 @@ export type HistoryListScreenLabels = {
 
 export type HistoryListScreenProps = {
   groupItems?: (entries: HistoryListItem[]) => HistoryGroupByDaySection[];
+  itemInfoLabelMode?: HistoryListItemViewProps['infoLabelMode'];
   labels: HistoryListScreenLabels;
   onBackPressed: () => void;
   onHistoryItemPressed: (historyItem: HistoryListItem) => void;
@@ -36,6 +38,7 @@ export type HistoryListScreenProps = {
 export const HistoryListScreen: FC<PropsWithChildren<HistoryListScreenProps>> = ({
   children,
   groupItems = groupEntriesByDay,
+  itemInfoLabelMode = 'entity',
   labels,
   onBackPressed,
   onHistoryItemPressed,
@@ -92,7 +95,7 @@ export const HistoryListScreen: FC<PropsWithChildren<HistoryListScreenProps>> =
       <HistoryListView
         contentContainerStyle={insets}
         groupItems={groupItems}
-        itemProps={{ onPress: onHistoryItemPressed }}
+        itemProps={{ infoLabelMode: itemInfoLabelMode, onPress: onHistoryItemPressed }}
         onEmpty={setEmpty}
         onScroll={Animated.event([{ nativeEvent: { contentOffset: { y: scrollOffset } } }], {
           useNativeDriver: true,

package/src/components/proof-request/share-credential.tsx

@@ -70,7 +70,8 @@ export const ShareCredential: FunctionComponent<{
     credential
       ? {
           ...credential,
-          issuerDid: credential?.issuerDid?.did,
+          issuerDid: credential?.issuerDid?.id,
+          issuer: credential?.issuer?.id,
         }
       : undefined,
   );

package/src/ui-components/entity/entity-cluster.tsx

@@ -44,7 +44,7 @@ const EntityCluster: FunctionComponent<EntityClusterProps> = ({
         <Typography
           testID={concatTestID(testID, 'entityName')}
           color={textColor ?? colorScheme.text}
-          numberOfLines={2}
+          numberOfLines={1}
           preset="m"
           style={styles.entityName}>
           {entityName}

package/src/ui-components/icons/entity.tsx

@@ -29,3 +29,30 @@ export const EntityTrustedIcon: FC<SvgProps> = ({ ...props }) => {
     </Svg>
   );
 };
+
+// https://www.figma.com/design/52qDYWUMjXAGre1dcnz5bz/Procivis-One-Wallet?node-id=415-5402&t=prmu1s6PuABrPg0l-0
+export const EntityNotTrustedIcon: FC<SvgProps> = ({ ...props }) => {
+  const colorScheme = useAppColorScheme();
+  return (
+    <Svg width={22} height={20} viewBox="0 0 22 20" fill="none" {...props}>
+      <Path
+        d="M4.35742 17.9673C3.87598 17.9673 3.45817 17.8621 3.104 17.6519C2.74984 17.4416 2.47591 17.1593 2.28223 16.8052C2.09408 16.451 2 16.0581 2 15.6265C2 15.2059 2.11068 14.8047 2.33203 14.4229L8.75684 3.2251C8.97266 2.83219 9.26318 2.53613 9.62842 2.33691C9.99365 2.1377 10.3755 2.03809 10.7739 2.03809C11.1724 2.03809 11.5514 2.1377 11.9111 2.33691C12.2708 2.5306 12.5641 2.82666 12.791 3.2251L19.2158 14.4229C19.3265 14.611 19.4095 14.8075 19.4648 15.0122C19.5202 15.217 19.5479 15.4217 19.5479 15.6265C19.5479 16.0581 19.451 16.451 19.2573 16.8052C19.0636 17.1593 18.7897 17.4416 18.4355 17.6519C18.0869 17.8621 17.6719 17.9673 17.1904 17.9673H4.35742Z"
+        fill={colorScheme.warning}
+      />
+      <Path
+        d="M10.7744 1.03809C11.3435 1.03817 11.884 1.18254 12.3838 1.45703L12.3848 1.45605C12.386 1.45672 12.3874 1.45831 12.3887 1.45898C12.3908 1.46017 12.3933 1.46072 12.3955 1.46191L12.3945 1.46289C12.9333 1.75557 13.3522 2.19115 13.6582 2.72754L20.0781 13.916L20.1865 14.1162C20.2888 14.3193 20.3712 14.5309 20.4307 14.751C20.5082 15.0377 20.5479 15.331 20.5479 15.627C20.5478 16.2141 20.4144 16.7738 20.1348 17.2852C19.8533 17.7998 19.4512 18.2119 18.9463 18.5117L18.9453 18.5107C18.4159 18.8284 17.818 18.9678 17.1904 18.9678H4.35742C3.72707 18.9678 3.12678 18.8281 2.59375 18.5117C2.08885 18.2119 1.68678 17.7998 1.40527 17.2852L1.39941 17.2744C1.1288 16.765 1.00007 16.2092 1 15.627C1 15.0214 1.16165 14.4473 1.4668 13.9209L7.88965 2.72754C8.1894 2.18833 8.60891 1.75383 9.14941 1.45898C9.65481 1.18331 10.2012 1.03809 10.7744 1.03809Z"
+        stroke={colorScheme.white}
+        strokeWidth={2}
+        strokeOpacity={0.2}
+      />
+      <Path
+        d="M11.5376 11.5093C11.5265 12.0239 11.2747 12.2812 10.7822 12.2812C10.2786 12.2812 10.0186 12.0267 10.002 11.5176L9.88574 7.33398C9.87467 7.08496 9.95215 6.88021 10.1182 6.71973C10.2842 6.55371 10.5028 6.4707 10.7739 6.4707C11.0396 6.4707 11.2581 6.55371 11.4297 6.71973C11.6012 6.88021 11.6815 7.08773 11.6704 7.34229L11.5376 11.5093Z"
+        fill={colorScheme.black}
+      />
+      <Path
+        d="M11.4961 14.8711C11.2969 15.0482 11.0589 15.1367 10.7822 15.1367C10.5055 15.1367 10.2648 15.0482 10.0601 14.8711C9.86084 14.694 9.76123 14.4671 9.76123 14.1904C9.76123 13.9193 9.86084 13.6924 10.0601 13.5098C10.2593 13.3271 10.5 13.2358 10.7822 13.2358C11.0589 13.2358 11.2969 13.3271 11.4961 13.5098C11.6953 13.6924 11.7949 13.9193 11.7949 14.1904C11.7949 14.4671 11.6953 14.694 11.4961 14.8711Z"
+        fill={colorScheme.black}
+      />
+    </Svg>
+  )
+}

package/src/ui-components/icons/history.tsx

@@ -114,6 +114,8 @@ export const HistorySuspendIcon: FC<SvgProps> = (props) => {
 
 // TODO: replace HistoryDidIcon with icon of schema
 export const HistoryDidIcon = HistoryIssueIcon;
+export const HistoryIdentifierIcon = HistoryIssueIcon;
+export const HistoryCertificateIcon = HistoryIssueIcon;
 
 // TODO: replace HistoryKeyIcon with icon of schema
 export const HistoryKeyIcon = HistoryIssueIcon;

package/src/ui-components/screens/nerd-mode-screen.tsx

@@ -1,4 +1,4 @@
-import { DidListItem } from '@procivis/react-native-one-core';
+import { IdentifierListItem } from '@procivis/react-native-one-core/dist/src/identifier';
 import React, { FunctionComponent, useState } from 'react';
 import { SectionList, StyleSheet, View } from 'react-native';
 import Animated, { useAnimatedScrollHandler, useSharedValue } from 'react-native-reanimated';
@@ -26,15 +26,15 @@ export interface EntityLabels {
 
 export interface AttributesLabels {
   trustRegistry: string;
-  issuerDid: string;
-  entityDid: string;
+  issuerIdentifier: string;
+  entityIdentifier: string;
   role: string;
   expand: string;
   collapse: string;
 }
 
 interface SectionEntityCluster {
-  did?: DidListItem;
+  identifier?: IdentifierListItem;
   subline?: string;
   entityLabels: EntityLabels;
   role: ContextRole;
@@ -66,7 +66,7 @@ export enum EntityType {
 }
 
 function isSectionEntityCluster(item: NerdModeSectionItem): item is SectionEntityCluster {
-  return (item as SectionEntityCluster).did !== undefined;
+  return (item as SectionEntityCluster).identifier !== undefined;
 }
 
 const AnimatedSectionList = Animated.createAnimatedComponent(SectionList<NerdModeSectionItem>);

package/src/utils/hooks/core/core-init.ts

@@ -8,7 +8,7 @@ import { OneErrorCode } from './error-code';
 export const SW_DID_NAME_PREFIX = 'holder-did-sw-key';
 export const HW_DID_NAME_PREFIX = 'holder-did-hw-key';
 
-const generateHwDid = async (core: ONECore, organisationId: string) => {
+const generateHwIdentifier = async (core: ONECore, organisationId: string) => {
   const hwKeyId = await core
     .generateKey({
       keyParams: {},
@@ -27,25 +27,27 @@ const generateHwDid = async (core: ONECore, organisationId: string) => {
     });
 
   if (hwKeyId) {
-    return core.createDid({
-      didMethod: 'KEY',
-      keys: {
-        assertionMethod: [hwKeyId],
-        authentication: [hwKeyId],
-        capabilityDelegation: [hwKeyId],
-        capabilityInvocation: [hwKeyId],
-        keyAgreement: [hwKeyId],
+    return core.createIdentifier({
+      did: {
+        method: 'KEY',
+        keys: {
+          assertionMethod: [hwKeyId],
+          authentication: [hwKeyId],
+          capabilityDelegation: [hwKeyId],
+          capabilityInvocation: [hwKeyId],
+          keyAgreement: [hwKeyId],
+        },
+        params: {},
       },
       name: HW_DID_NAME_PREFIX,
       organisationId,
-      params: {},
     });
   }
 
   return null;
 };
 
-const generateSwDid = async (core: ONECore, organisationId: string) => {
+const generateSwIdentifier = async (core: ONECore, organisationId: string) => {
   const swKeyId = await core.generateKey({
     keyParams: {},
     keyType: 'ECDSA',
@@ -55,18 +57,20 @@ const generateSwDid = async (core: ONECore, organisationId: string) => {
     storageType: 'INTERNAL',
   });
 
-  return core.createDid({
-    didMethod: 'KEY',
-    keys: {
-      assertionMethod: [swKeyId],
-      authentication: [swKeyId],
-      capabilityDelegation: [swKeyId],
-      capabilityInvocation: [swKeyId],
-      keyAgreement: [swKeyId],
+  return core.createIdentifier({
+    did: {
+      method: 'KEY',
+      keys: {
+        assertionMethod: [swKeyId],
+        authentication: [swKeyId],
+        capabilityDelegation: [swKeyId],
+        capabilityInvocation: [swKeyId],
+        keyAgreement: [swKeyId],
+      },
+      params: {},
     },
     name: SW_DID_NAME_PREFIX,
     organisationId,
-    params: {},
   });
 };
 
@@ -94,8 +98,8 @@ export const useInitializeONECoreIdentifiers = ({ generateHwKey, generateSwKey }
       })
       .then(() =>
         Promise.all([
-          generateHwKey ? generateHwDid(core, organisationId) : null,
-          generateSwKey ? generateSwDid(core, organisationId) : null,
+          generateHwKey ? generateHwIdentifier(core, organisationId) : null,
+          generateSwKey ? generateSwIdentifier(core, organisationId) : null,
         ]),
       )
       .catch((err) => {

package/src/utils/hooks/core/credentials.ts

@@ -95,11 +95,17 @@ export const useCredentialAccept = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  type CredentialAcceptHookParams = { didId: string; interactionId: string; keyId?: string; txCode?: string };
+  type CredentialAcceptHookParams = {
+    didId?: string;
+    identifierId?: string;
+    interactionId: string;
+    keyId?: string;
+    txCode?: string;
+  };
 
   return useMutation(
-    async ({ interactionId, didId, keyId, txCode }: CredentialAcceptHookParams) =>
-      core.holderAcceptCredential(interactionId, didId, keyId, txCode),
+    async ({ interactionId, didId, identifierId, keyId, txCode }: CredentialAcceptHookParams) =>
+      core.holderAcceptCredential(interactionId, didId, identifierId, keyId, txCode),
     {
       onSuccess: async () => {
         await queryClient.invalidateQueries(CREDENTIAL_LIST_QUERY_KEY);

package/src/utils/hooks/core/identifiers.ts

@@ -0,0 +1,18 @@
+import { useQuery } from "react-query";
+
+import { useONECore } from "./core-context";
+
+export const IDENTIFIER_DETAIL_QUERY_KEY = 'identifier-detail';
+
+export const useIdentifierDetails = (identifierId: string | undefined) => {
+  const { core } = useONECore();
+
+  return useQuery(
+    [IDENTIFIER_DETAIL_QUERY_KEY, identifierId],
+    () => (identifierId ? core.getIdentifier(identifierId) : undefined),
+    {
+      enabled: Boolean(identifierId),
+      keepPreviousData: true,
+    },
+  );
+}

package/src/utils/hooks/core/index.ts

@@ -7,7 +7,8 @@ export * from './credential-schemas';
 export * from './credentials';
 export * from './dids';
 export * from './history';
+export * from './identifiers';
 export * from './proof-schemas';
 export * from './proofs';
 export * from './query';
-export * from './trust-entity';
+export * from './trust-entity';

package/src/utils/hooks/core/proofs.ts

@@ -75,13 +75,15 @@ export const useProofAccept = () => {
       interactionId,
       credentials,
       didId,
+      identifierId,
       keyId,
     }: {
       credentials: Record<string, PresentationSubmitCredentialRequest>;
-      didId: string;
+      didId?: string;
+      identifierId?: string;
       interactionId: string;
       keyId?: string;
-    }) => core.holderSubmitProof(interactionId, credentials, didId, keyId),
+    }) => core.holderSubmitProof(interactionId, credentials, didId, identifierId, keyId),
     {
       onError: async () => {
         await queryClient.invalidateQueries(PROOF_DETAIL_QUERY_KEY);

package/src/utils/hooks/core/trust-entity.ts

@@ -13,6 +13,7 @@ import { useHTTPClient } from '../http/client';
 import { useONECore } from './core-context';
 import { OneErrorCode } from './error-code';
 import { HISTORY_LIST_QUERY_KEY } from './history';
+import { useIdentifierDetails } from './identifiers';
 
 export const TRUST_ENTITY_DETAIL_QUERY_KEY = 'trust-entity-detail';
 export const REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY = 'remote-trust-entity-detail';
@@ -50,22 +51,25 @@ export const useCreateTrustAnchor = (publisherReference: string) => {
   );
 };
 
-export const useTrustEntity = (didId: string | undefined) => {
+// NOTE: As per ONE-5672, only handles DID Identifier details
+export const useTrustEntity = (identifierId: string | undefined) => {
   const { core } = useONECore();
 
+  const { data: identifierDetail } = useIdentifierDetails(identifierId);
+
   return useQuery(
-    [TRUST_ENTITY_DETAIL_QUERY_KEY, didId],
+    [TRUST_ENTITY_DETAIL_QUERY_KEY, identifierId],
     () =>
-      didId
-        ? core.getTrustEntityByDid(didId).catch((e) => {
-            if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
-              return null;
-            }
-            throw e;
-          })
+      identifierDetail?.did
+        ? core.getTrustEntityByDid(identifierDetail.did.id).catch((e) => {
+          if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
+            return null;
+          }
+          throw e;
+        })
         : undefined,
     {
-      enabled: Boolean(didId),
+      enabled: Boolean(identifierDetail?.did),
       keepPreviousData: true,
     },
   );

package/src/utils/parsers/credential-sharing.tsx

@@ -40,13 +40,13 @@ export const validityCheckedCardFromCredential = (
 ): Omit<CredentialCardProps, 'onHeaderPress' | 'style' | 'testID'> => {
   let credentialHeaderDetail:
     | Pick<
-        CredentialHeaderProps,
-        | 'credentialDetailPrimary'
-        | 'credentialDetailSecondary'
-        | 'credentialDetailErrorColor'
-        | 'credentialDetailTestID'
-        | 'statusIcon'
-      >
+      CredentialHeaderProps,
+      | 'credentialDetailPrimary'
+      | 'credentialDetailSecondary'
+      | 'credentialDetailErrorColor'
+      | 'credentialDetailTestID'
+      | 'statusIcon'
+    >
     | undefined;
   if (invalidLVVC) {
     credentialHeaderDetail = {
@@ -236,31 +236,31 @@ export const shareCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
     config,
   );
   const notice: CredentialCardNotice | undefined =
     selectiveDisclosureSupported === false
       ? {
-          text: labels.selectiveDisclosureNotice,
-          noticeIcon: CredentialNoticeWarningIcon,
-        }
+        text: labels.selectiveDisclosureNotice,
+        noticeIcon: CredentialNoticeWarningIcon,
+      }
       : undefined;
   const cardTestId = concatTestID(testID, 'card');
   const card = credential
     ? validityCheckedCardFromCredential(
-        credential,
-        invalidLVVC,
-        expanded,
-        multipleCredentialsAvailable,
-        config,
-        notice,
-        cardTestId,
-        labels,
-      )
+      credential,
+      invalidLVVC,
+      expanded,
+      multipleCredentialsAvailable,
+      config,
+      notice,
+      cardTestId,
+      labels,
+    )
     : missingCredentialCardFromRequest(request, notice, cardTestId, labels);
   const validityState = getValidityState(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
   );
   const displayedAttributes = getDisplayedAttributes(
     request,
@@ -320,16 +320,16 @@ export const selectCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
     config,
   );
   const rightAccessory = <Selector status={selected ? SelectorStatus.SelectedRadio : SelectorStatus.Empty} />;
   const notice: CredentialCardNotice | undefined =
     selectiveDisclosureSupported === false
       ? {
-          text: labels.selectiveDisclosureNotice,
-          noticeIcon: CredentialNoticeWarningIcon,
-        }
+        text: labels.selectiveDisclosureNotice,
+        noticeIcon: CredentialNoticeWarningIcon,
+      }
       : undefined;
   const { header, ...cardProps } = getCredentialCardPropsFromCredential(
     credential,

package/src/utils/parsers/credential.ts

@@ -231,6 +231,10 @@ const detailsCardAttributeValueFromClaim = (claim: Claim, config: Config, testID
         };
       }
       case DataTypeEnum.Date: {
+        if (!claim.value) {
+          // Don't try to parse empty values (which will return "Invalid Date")
+          return { testID: testID, value: String(claim.value) };
+        }
         const date = claim.value as string;
         return {
           testID: testID,

package/src/utils/parsers/query.tsx

@@ -26,7 +26,7 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
     entityTypes,
     createdDateFrom,
     createdDateTo,
-    didId,
+    identifierId,
     credentialId,
     credentialSchemaId,
     searchText,
@@ -39,7 +39,7 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
     entityTypes,
     createdDateFrom,
     createdDateTo,
-    didId,
+    identifierId,
     credentialId,
     credentialSchemaId,
     searchText,