@procivis/one-react-native-components 0.3.102 → 0.3.112

package/src/utils/hooks/core/wallet-unit.ts

@@ -1,7 +1,8 @@
 import {
-  HolderWalletUnitResponseBindingDto,
-  WalletProviderBindingDto,
-  WalletUnitStatusBindingEnum,
+  HolderWalletUnit,
+  HolderWalletUnitUpdateRequest,
+  WalletProvider,
+  WalletUnitStatus,
 } from '@procivis/react-native-one-core';
 import { useEffect } from 'react';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
@@ -10,11 +11,9 @@ import { reportException } from '../../reporting';
 import { useONECore } from './core-context';
 
 export const WALLET_UNIT_QUERY_KEY = 'wallet-unit';
+export const WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY = 'wallet-unit-trust-collections';
 
-export const useWalletUnitDetail = (
-  walletUnitId: HolderWalletUnitResponseBindingDto['id'] | undefined,
-  active = true,
-) => {
+export const useWalletUnitDetail = (walletUnitId: HolderWalletUnit['id'] | undefined, active = true) => {
   const { core } = useONECore();
 
   return useQuery(
@@ -27,12 +26,25 @@ export const useWalletUnitDetail = (
   );
 };
 
+export const useWalletUnitTrustCollections = (walletUnitId: HolderWalletUnit['id'] | undefined, active = true) => {
+  const { core } = useONECore();
+
+  return useQuery(
+    [WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY, walletUnitId],
+    () => (walletUnitId ? core.holderGetWalletUnitTrustCollections(walletUnitId) : undefined),
+    {
+      enabled: active && Boolean(walletUnitId),
+      keepPreviousData: true,
+    },
+  );
+};
+
 export const useRegisterWalletUnit = () => {
   const queryClient = useQueryClient();
   const { core, organisationId } = useONECore();
 
   return useMutation(
-    async (walletProvider: WalletProviderBindingDto) =>
+    async (walletProvider: WalletProvider) =>
       core.holderRegisterWalletUnit({
         keyType: 'ECDSA',
         organisationId,
@@ -49,11 +61,25 @@ export const useWalletUnitStatus = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
+  return useMutation(async (walletUnitId: HolderWalletUnit['id']) => core.holderWalletUnitStatus(walletUnitId), {
+    onError: async (err) => {
+      reportException(err, 'Refresh wallet unit failure');
+      await queryClient.invalidateQueries(WALLET_UNIT_QUERY_KEY);
+    },
+    onSuccess: () => queryClient.invalidateQueries(WALLET_UNIT_QUERY_KEY),
+  });
+};
+
+export const useWalletUnitUpdate = () => {
+  const queryClient = useQueryClient();
+  const { core } = useONECore();
+
   return useMutation(
-    async (walletUnitId: HolderWalletUnitResponseBindingDto['id']) => core.holderWalletUnitStatus(walletUnitId),
+    async ({ walletUnitId, update }: { walletUnitId: HolderWalletUnit['id']; update: HolderWalletUnitUpdateRequest }) =>
+      core.holderWalletUnitUpdate(walletUnitId, update),
     {
       onError: async (err) => {
-        reportException(err, 'Refresh wallet unit failure');
+        reportException(err, 'Update wallet unit failure');
         await queryClient.invalidateQueries(WALLET_UNIT_QUERY_KEY);
       },
       onSuccess: () => queryClient.invalidateQueries(WALLET_UNIT_QUERY_KEY),
@@ -61,7 +87,7 @@ export const useWalletUnitStatus = () => {
   );
 };
 
-export const useWalletUnitCheck = (walletUnitId: HolderWalletUnitResponseBindingDto['id'] | undefined) => {
+export const useWalletUnitCheck = (walletUnitId: HolderWalletUnit['id'] | undefined) => {
   const { data: walletUnitDetail, isLoading } = useWalletUnitDetail(walletUnitId);
   const { mutateAsync: refreshWalletUnit, isLoading: isRefreshing, status: refreshStatus } = useWalletUnitStatus();
 
@@ -69,7 +95,7 @@ export const useWalletUnitCheck = (walletUnitId: HolderWalletUnitResponseBinding
     if (isLoading || refreshStatus !== 'idle') {
       return;
     }
-    if (walletUnitId && walletUnitDetail?.status === WalletUnitStatusBindingEnum.ACTIVE) {
+    if (walletUnitId && walletUnitDetail?.status === WalletUnitStatus.ACTIVE) {
       void refreshWalletUnit(walletUnitId);
     }
   }, [isLoading, refreshStatus, walletUnitDetail, refreshWalletUnit, walletUnitId]);

package/src/utils/hooks/revocation/credential-status.ts

@@ -1,4 +1,4 @@
-import { CredentialStateBindingEnum } from '@procivis/react-native-one-core';
+import { CredentialState } from '@procivis/react-native-one-core';
 import { useIsFocused } from '@react-navigation/native';
 import { useCallback, useRef } from 'react';
 
@@ -18,7 +18,7 @@ export const useCredentialStatusCheck = (credentialIds?: string[], forceRefresh
   const { mutateAsync: check } = useCredentialRevocationCheck(forceRefresh);
   const { data: credentials } = useCredentials({
     ids: credentialIds,
-    states: [CredentialStateBindingEnum.ACCEPTED, CredentialStateBindingEnum.SUSPENDED],
+    states: [CredentialState.ACCEPTED, CredentialState.SUSPENDED],
   });
 
   const checkCredentialsStatus = useCallback(async () => {

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

@@ -1,8 +1,4 @@
-import {
-  ClaimBindingDto,
-  CredentialSchemaCodeTypeBindingDto,
-  CredentialSchemaLayoutPropertiesBindingDto,
-} from '@procivis/react-native-one-core';
+import { Claim, CredentialSchemaCodeType, CredentialSchemaLayoutProperties } from '@procivis/react-native-one-core';
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
@@ -21,8 +17,8 @@ const styles = StyleSheet.create({
 });
 
 export const getCarouselImagesFromClaims = (
-  claims: ClaimBindingDto[],
-  layoutProperties?: CredentialSchemaLayoutPropertiesBindingDto,
+  claims: Claim[],
+  layoutProperties?: CredentialSchemaLayoutProperties,
   testID?: string,
 ): CarouselImage[] => {
   const result: CarouselImage[] = [];
@@ -54,7 +50,7 @@ export const getCarouselImagesFromClaims = (
 
     let claimValue = '';
 
-    if (claim && (claim.value.type_ === 'FLOAT' || claim.value.type_ === 'INTEGER')) {
+    if (claim && (claim.value.type_ === 'FLOAT' || claim.value.type_ === 'INTEGER' || claim.value.type_ === 'STRING')) {
       claimValue = String(claim.value.value);
     }
 
@@ -62,17 +58,17 @@ export const getCarouselImagesFromClaims = (
       return result;
     }
 
-    if (code.type === CredentialSchemaCodeTypeBindingDto.QR_CODE) {
+    if (code.type === CredentialSchemaCodeType.QR_CODE) {
       result.push({
         element: <QrCode content={claimValue} testID={concatTestID(testID, CarouselImageType.QrCode)} />,
         type: CarouselImageType.QrCode,
       });
-    } else if (code.type === CredentialSchemaCodeTypeBindingDto.BARCODE && isASCII(claimValue)) {
+    } else if (code.type === CredentialSchemaCodeType.BARCODE && isASCII(claimValue)) {
       result.push({
         element: <Barcode content={claimValue} testID={concatTestID(testID, CarouselImageType.Barcode)} />,
         type: CarouselImageType.Barcode,
       });
-    } else if (code.type === CredentialSchemaCodeTypeBindingDto.MRZ) {
+    } else if (code.type === CredentialSchemaCodeType.MRZ) {
       result.push({
         element: <Mrz content={claimValue} testID={concatTestID(testID, CarouselImageType.MRZ)} />,
         type: CarouselImageType.MRZ,

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

@@ -1,11 +1,11 @@
 import {
-  ClaimBindingDto,
-  ClaimValueBindingDto,
-  Config,
-  CredentialQueryFailureHintResponseBindingDto,
-  PresentationDefinitionV2ClaimBindingDto,
-  PresentationDefinitionV2ClaimValueBindingDto,
-  PresentationDefinitionV2CredentialDetailBindingDto,
+  Claim,
+  ClaimValue,
+  CoreConfig,
+  CredentialQueryFailureHint,
+  PresentationDefinitionV2Claim,
+  PresentationDefinitionV2ClaimValue,
+  PresentationDefinitionV2Credential,
 } from '@procivis/react-native-one-core';
 import React from 'react';
 
@@ -27,7 +27,7 @@ import {
 } from '.';
 import { ShareCredentialCardLabels, validityCheckedCardFromCredential } from './credential-sharing';
 
-const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValueBindingDto): ClaimValueBindingDto => {
+const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValue): ClaimValue => {
   if (value.type_ !== 'NESTED') {
     return value;
   }
@@ -37,7 +37,7 @@ const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValueBindi
   };
 };
 
-const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2ClaimBindingDto): ClaimBindingDto => {
+const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2Claim): Claim => {
   return {
     schema: claim.schema,
     path: claim.path,
@@ -46,7 +46,7 @@ const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2ClaimBindingD
 };
 
 const getAttributeSelectorStatus = (
-  claim: PresentationDefinitionV2ClaimBindingDto,
+  claim: PresentationDefinitionV2Claim,
   selected: boolean,
   force: boolean,
 ): SelectorStatus | undefined => {
@@ -66,11 +66,11 @@ const getAttributeSelectorStatus = (
 };
 
 export const shareCredentialCardAttributeFromV2Claim = (
-  claim: PresentationDefinitionV2ClaimBindingDto,
+  claim: PresentationDefinitionV2Claim,
   selection: string[] | undefined,
   parentShared: boolean,
   parentUserSelected: boolean,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   nested?: boolean,
   listValue?: boolean,
@@ -133,7 +133,7 @@ export const shareCredentialCardAttributeFromV2Claim = (
 };
 
 export const missingCredentialCardFromFailureHint = (
-  failureHint: CredentialQueryFailureHintResponseBindingDto | undefined,
+  failureHint: CredentialQueryFailureHint | undefined,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -154,12 +154,12 @@ export const missingCredentialCardFromFailureHint = (
 };
 
 export const shareCredentialCardFromV2PresentationCredential = (
-  credential: PresentationDefinitionV2CredentialDetailBindingDto | undefined,
-  failureHint: CredentialQueryFailureHintResponseBindingDto | undefined,
+  credential: PresentationDefinitionV2Credential | undefined,
+  failureHint: CredentialQueryFailureHint | undefined,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
   selectedFields: string[] | undefined,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -181,7 +181,6 @@ export const shareCredentialCardFromV2PresentationCredential = (
           ...credential,
           claims: [],
         },
-        false,
         expanded,
         multipleCredentialsAvailable,
         config,
@@ -201,10 +200,10 @@ export const shareCredentialCardFromV2PresentationCredential = (
 };
 
 export const selectCredentialCardFromV2Credential = (
-  credential: PresentationDefinitionV2CredentialDetailBindingDto,
+  credential: PresentationDefinitionV2Credential,
   selected: boolean,
   multiple: boolean,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -248,15 +247,13 @@ export const selectCredentialCardFromV2Credential = (
   };
 };
 
-export const getV2CredentialClaimAllSubpaths = (claim: PresentationDefinitionV2ClaimBindingDto): string[] => {
+export const getV2CredentialClaimAllSubpaths = (claim: PresentationDefinitionV2Claim): string[] => {
   if (claim.value.type_ !== 'NESTED') {
     return [claim.path];
   }
   return [claim.path, ...claim.value.value.flatMap(getV2CredentialClaimAllSubpaths)];
 };
 
-export const getV2CredentialAvailablePaths = (
-  credential: PresentationDefinitionV2CredentialDetailBindingDto,
-): string[] => {
+export const getV2CredentialAvailablePaths = (credential: PresentationDefinitionV2Credential): string[] => {
   return credential.claims.flatMap(getV2CredentialClaimAllSubpaths);
 };

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

@@ -1,9 +1,9 @@
 import {
-  ClaimBindingDto,
-  Config,
-  CredentialDetailBindingDto,
-  PresentationDefinitionFieldBindingDto,
-  PresentationDefinitionRequestedCredentialBindingDto,
+  Claim,
+  CoreConfig,
+  CredentialDetail,
+  PresentationDefinitionField,
+  PresentationDefinitionRequestedCredential,
 } from '@procivis/react-native-one-core';
 import React from 'react';
 
@@ -29,11 +29,10 @@ import {
 } from './credential';
 
 export const validityCheckedCardFromCredential = (
-  credential: CredentialDetailBindingDto,
-  invalidLVVC: boolean,
+  credential: CredentialDetail,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
-  config: Config,
+  config: CoreConfig,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -48,13 +47,7 @@ export const validityCheckedCardFromCredential = (
         | 'statusIcon'
       >
     | undefined;
-  if (invalidLVVC) {
-    credentialHeaderDetail = {
-      credentialDetailErrorColor: true,
-      credentialDetailPrimary: labels.revoked,
-      credentialDetailTestID: concatTestID(testID, 'header.invalid'),
-    };
-  } else if (!expanded && multipleCredentialsAvailable) {
+  if (!expanded && multipleCredentialsAvailable) {
     credentialHeaderDetail = {
       credentialDetailPrimary: labels.multipleCredentials,
       credentialDetailTestID: concatTestID(testID, 'header.multiple'),
@@ -73,7 +66,7 @@ export const validityCheckedCardFromCredential = (
 };
 
 export const missingCredentialCardFromRequest = (
-  request: PresentationDefinitionRequestedCredentialBindingDto,
+  request: PresentationDefinitionRequestedCredential,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -95,17 +88,17 @@ export const missingCredentialCardFromRequest = (
 
 interface DisplayedAttribute {
   claim?: FlatClaim;
-  field?: PresentationDefinitionFieldBindingDto;
+  field?: PresentationDefinitionField;
   id: string;
   selected?: boolean;
   status: SelectorStatus;
 }
 
 const getAttributeSelectorStatus = (
-  field: PresentationDefinitionFieldBindingDto,
+  field: PresentationDefinitionField,
   validityState: ValidityState,
-  credential?: CredentialDetailBindingDto,
-  claim?: ClaimBindingDto,
+  credential?: CredentialDetail,
+  claim?: Claim,
   selected?: boolean,
 ): SelectorStatus => {
   if (!credential || validityState !== ValidityState.Valid) {
@@ -124,12 +117,12 @@ const getAttributeSelectorStatus = (
   return selected ? SelectorStatus.SelectedCheckmark : SelectorStatus.Empty;
 };
 
-type FlatClaim = ClaimBindingDto & {
+type FlatClaim = Claim & {
   isArrayElement?: boolean;
 };
 
 // Returns a spread list of all claims with their full JSON path as key, including all intermediate objects
-const spreadClaims = (claims: ClaimBindingDto[]): FlatClaim[] => {
+const spreadClaims = (claims: Claim[]): FlatClaim[] => {
   return claims.reduce((acc, claim) => {
     const result = [claim];
     if (claim.value.type_ === 'NESTED') {
@@ -144,9 +137,9 @@ const spreadClaims = (claims: ClaimBindingDto[]): FlatClaim[] => {
 };
 
 const getDisplayedAttributes = (
-  request: PresentationDefinitionRequestedCredentialBindingDto,
+  request: PresentationDefinitionRequestedCredential,
   validityState: ValidityState,
-  credential?: CredentialDetailBindingDto,
+  credential?: CredentialDetail,
   selectiveDisclosureSupported?: boolean,
   selectedFields?: string[],
 ): DisplayedAttribute[] => {
@@ -179,8 +172,8 @@ const getDisplayedAttributes = (
 };
 
 const getFullyNestedFields = (
-  fields: PresentationDefinitionRequestedCredentialBindingDto['fields'],
-  credentialId: CredentialDetailBindingDto['id'],
+  fields: PresentationDefinitionRequestedCredential['fields'],
+  credentialId: CredentialDetail['id'],
 ) => {
   const allKeys = fields.filter((field) => credentialId in field.keyMap).map((field) => field.keyMap[credentialId]);
 
@@ -192,11 +185,11 @@ const getFullyNestedFields = (
 
 export const shareCredentialCardAttributeFromClaim = (
   id: string,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
   claim?: FlatClaim,
-  field?: PresentationDefinitionFieldBindingDto,
+  field?: PresentationDefinitionField,
 ): CredentialAttribute => {
   if (claim) {
     return {
@@ -257,13 +250,12 @@ export type ShareCredentialCardLabels = CardLabels & {
 };
 
 export const shareCredentialCardFromCredential = (
-  credential: CredentialDetailBindingDto | undefined,
-  invalidLVVC: boolean,
+  credential: CredentialDetail | undefined,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
-  request: PresentationDefinitionRequestedCredentialBindingDto,
+  request: PresentationDefinitionRequestedCredential,
   selectedFields: string[] | undefined,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -282,7 +274,6 @@ export const shareCredentialCardFromCredential = (
   const card = credential
     ? validityCheckedCardFromCredential(
         credential,
-        invalidLVVC,
         expanded,
         multipleCredentialsAvailable,
         config,
@@ -325,11 +316,11 @@ export const shareCredentialCardFromCredential = (
 
 export const selectCredentialCardAttributeFromClaim = (
   id: string,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
   claim?: FlatClaim,
-  field?: PresentationDefinitionFieldBindingDto,
+  field?: PresentationDefinitionField,
 ): CredentialAttribute => {
   const attribute = shareCredentialCardAttributeFromClaim(id, config, testID, labels, claim, field);
   if (!claim) {
@@ -342,10 +333,10 @@ export const selectCredentialCardAttributeFromClaim = (
 };
 
 export const selectCredentialCardFromCredential = (
-  credential: CredentialDetailBindingDto,
+  credential: CredentialDetail,
   selected: boolean,
-  request: PresentationDefinitionRequestedCredentialBindingDto,
-  config: Config,
+  request: PresentationDefinitionRequestedCredential,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {

package/src/utils/parsers/credential.ts

@@ -1,12 +1,12 @@
 import {
-  ClaimBindingDto,
-  Config,
-  CredentialDetailBindingDto,
-  CredentialListItemBindingDto,
-  CredentialSchemaBindingDto,
-  CredentialStateBindingEnum,
-  DataTypeEnum,
-  FormatFeatureEnum,
+  Claim,
+  CoreConfig,
+  CredentialDetail,
+  CredentialListItem,
+  CredentialSchemaListItem,
+  CredentialState,
+  DataType,
+  FormatFeature,
 } from '@procivis/react-native-one-core';
 import { FC } from 'react';
 import { SvgProps } from 'react-native-svg';
@@ -30,27 +30,27 @@ export enum ValidityState {
   Valid = 'valid',
 }
 
-export const getValidityState = (credential: CredentialListItemBindingDto | undefined) => {
-  if (credential?.state === CredentialStateBindingEnum.REVOKED) {
+export const getValidityState = (credential: CredentialListItem | undefined) => {
+  if (credential?.state === CredentialState.REVOKED) {
     return ValidityState.Revoked;
   }
-  if (credential?.state === CredentialStateBindingEnum.SUSPENDED) {
+  if (credential?.state === CredentialState.SUSPENDED) {
     return ValidityState.Suspended;
   }
   return ValidityState.Valid;
 };
 
 export const supportsSelectiveDisclosure = (
-  credential: CredentialListItemBindingDto | undefined,
-  config: Config | undefined,
+  credential: CredentialListItem | undefined,
+  config: CoreConfig | undefined,
 ) => {
   const formatConfig = credential && config?.format[credential.schema.format];
   return formatConfig
-    ? Boolean(formatConfig.capabilities?.features?.includes(FormatFeatureEnum.SelectiveDisclosure))
+    ? Boolean(formatConfig.capabilities?.features?.includes(FormatFeature.SelectiveDisclosure))
     : undefined;
 };
 
-export const findClaimByPath = (path: string | undefined, claims: ClaimBindingDto[]): ClaimBindingDto | undefined => {
+export const findClaimByPath = (path: string | undefined, claims: Claim[]): Claim | undefined => {
   if (!path) {
     return undefined;
   }
@@ -68,12 +68,12 @@ export const findClaimByPath = (path: string | undefined, claims: ClaimBindingDt
   return undefined;
 };
 
-const formatCredentialDetail = (claim: ClaimBindingDto, config: Config, testID: string): string => {
+const formatCredentialDetail = (claim: Claim, config: CoreConfig, testID: string): string => {
   const attributeValue = detailsCardAttributeValueFromClaim(claim, config, testID);
   return attributeValue.value ?? '';
 };
 
-export const hasMsoValidityIssues = (credential: CredentialDetailBindingDto): boolean => {
+export const hasMsoValidityIssues = (credential: CredentialDetail): boolean => {
   const mdocMsoValidityIssue = Boolean(
     credential.mdocMsoValidity?.nextUpdate && new Date(credential.mdocMsoValidity.nextUpdate) < new Date(),
   );
@@ -89,9 +89,9 @@ export type CardHeaderLabels = {
 };
 
 const credentialDetailFromCredential = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[] = [],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[] = [],
+  config: CoreConfig,
   testID: string,
   labels: CardHeaderLabels,
 ): {
@@ -104,7 +104,7 @@ const credentialDetailFromCredential = (
   const { layoutProperties } = credential.schema;
 
   switch (credential.state) {
-    case CredentialStateBindingEnum.SUSPENDED:
+    case CredentialState.SUSPENDED:
       return {
         credentialDetailPrimary: credential.suspendEndDate
           ? labels.suspendedUntil(formatDateTimeLocalized(new Date(credential.suspendEndDate))!)
@@ -112,7 +112,7 @@ const credentialDetailFromCredential = (
         credentialDetailTestID: concatTestID(testID, 'suspended'),
         statusIcon: CredentialWarningIcon,
       };
-    case CredentialStateBindingEnum.REVOKED:
+    case CredentialState.REVOKED:
       return {
         credentialDetailPrimary: labels.revoked,
         credentialDetailErrorColor: true,
@@ -153,9 +153,9 @@ const credentialDetailFromCredential = (
 };
 
 export const cardHeaderFromCredential = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[] = [],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[] = [],
+  config: CoreConfig,
   testID: string,
   labels: CardHeaderLabels,
 ): Omit<CredentialHeaderProps, 'style'> => {
@@ -193,9 +193,9 @@ export type CardLabels = CardHeaderLabels & {
 };
 
 export const getCredentialCardPropsFromCredential = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[] = [],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[] = [],
+  config: CoreConfig,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: CardLabels,
@@ -224,8 +224,8 @@ export const getCredentialCardPropsFromCredential = (
 };
 
 export const detailsCardAttributeFromClaim = (
-  claim: ClaimBindingDto,
-  config: Config,
+  claim: Claim,
+  config: CoreConfig,
   testID: string,
 ): CredentialAttribute => {
   const value = detailsCardAttributeValueFromClaim(claim, config, testID);
@@ -238,21 +238,21 @@ export const detailsCardAttributeFromClaim = (
 };
 
 const detailsCardAttributeValueFromClaim = (
-  claim: ClaimBindingDto,
-  config: Config,
+  claim: Claim,
+  config: CoreConfig,
   testID: string,
 ): CredentialAttributeValue => {
   const typeConfig = config?.datatype[claim.schema.datatype];
 
   if (claim.schema.array) {
     return {
-      values: ((claim.value.value as ClaimBindingDto[]) || []).map((arrayValue, index) => {
+      values: ((claim.value.value as Claim[]) || []).map((arrayValue, index) => {
         return detailsCardAttributeFromClaim(arrayValue, config, concatTestID(testID, index.toString()));
       }),
     };
   } else {
     switch (typeConfig?.type) {
-      case DataTypeEnum.Object: {
+      case DataType.Object: {
         if (claim.value.type_ !== 'NESTED') {
           return { attributes: [] };
         }
@@ -262,7 +262,7 @@ const detailsCardAttributeValueFromClaim = (
           ),
         };
       }
-      case DataTypeEnum.Date: {
+      case DataType.Date: {
         if (!claim.value.value) {
           // Don't try to parse empty values (which will return "Invalid Date")
           return { testID: testID, value: String(claim.value.value) };
@@ -273,8 +273,8 @@ const detailsCardAttributeValueFromClaim = (
           value: formatDateLocalized(new Date(date)) ?? date,
         };
       }
-      case DataTypeEnum.Picture: // fallback
-      case DataTypeEnum.SwiyuPicture: {
+      case DataType.Picture: // fallback
+      case DataType.SwiyuPicture: {
         if (typeConfig.params?.showAs === 'IMAGE') {
           return { image: { uri: claim.value.value as string }, testID: testID };
         } else {
@@ -292,8 +292,8 @@ export type CredentialDetailsCardPropsWithoutWidth = Omit<CredentialDetailsCardP
 };
 
 export const detailsCardFromCredential = (
-  credential: CredentialDetailBindingDto,
-  config: Config,
+  credential: CredentialDetail,
+  config: CoreConfig,
   testID: string,
   labels: CardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -301,9 +301,9 @@ export const detailsCardFromCredential = (
 };
 
 export const detailsCardFromCredentialWithClaims = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[],
+  config: CoreConfig,
   testID: string,
   labels: CardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -402,7 +402,7 @@ function parseBase64Image(image: string | undefined) {
   return image ? '__BASE64IMAGE__' : '';
 }
 
-export function getCredentialSchemaWithoutImages<T extends CredentialSchemaBindingDto>(credentialSchema: T): T {
+export function getCredentialSchemaWithoutImages<T extends CredentialSchemaListItem>(credentialSchema: T): T {
   return {
     ...credentialSchema,
     layoutProperties: {