@procivis/one-react-native-components 0.3.94 → 0.3.99

package/src/utils/hooks/core/proof-schemas.ts

@@ -1,9 +1,8 @@
 import {
-  CreateProofSchemaRequest,
-  ImportProofSchema,
-  ProofSchema,
-  ProofSchemaListItem,
-  ProofSchemaListQuery,
+  CreateProofSchemaRequestDto,
+  GetProofSchemaListItemBindingDto,
+  ImportProofSchemaBindingDto,
+  ListProofSchemasFiltersBindingDto,
 } from '@procivis/react-native-one-core';
 import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from 'react-query';
 
@@ -19,7 +18,7 @@ export const PROOF_SCHEMA_IMPORT_DETAIL_QUERY_KEY = 'proof-schema-import';
 export const PROOF_SCHEMA_DETAIL_QUERY_KEY = 'proof-schema-detail';
 export const PROOF_SCHEMA_SHARE_QUERY_KEY = 'proof-schema-share';
 
-export const useProofSchemas = (queryParams?: Partial<ProofSchemaListQuery>, keepPreviousData = true) => {
+export const useProofSchemas = (queryParams?: Partial<ListProofSchemasFiltersBindingDto>, keepPreviousData = true) => {
   const { core, organisationId } = useONECore();
 
   return useInfiniteQuery(
@@ -40,7 +39,10 @@ export const useProofSchemas = (queryParams?: Partial<ProofSchemaListQuery>, kee
   );
 };
 
-export const useProofSchemaDetail = (proofSchemaId: ProofSchemaListItem['id'] | undefined, active = true) => {
+export const useProofSchemaDetail = (
+  proofSchemaId: GetProofSchemaListItemBindingDto['id'] | undefined,
+  active = true,
+) => {
   const { core } = useONECore();
 
   return useQuery(
@@ -63,7 +65,7 @@ export const useProofSchemaImportDetail = (url: string) => {
         if (!response.ok) {
           throw response.originalError;
         }
-        return response.data as ImportProofSchema;
+        return response.data as ImportProofSchemaBindingDto;
       }),
     {
       keepPreviousData: true,
@@ -76,7 +78,7 @@ export const useProofSchemaAccept = () => {
   const { core, organisationId } = useONECore();
 
   return useMutation(
-    async ({ schema }: { schema: ImportProofSchema }) =>
+    async ({ schema }: { schema: ImportProofSchemaBindingDto }) =>
       core.importProofSchema({
         organisationId,
         schema,
@@ -95,7 +97,7 @@ export const useProofSchemaCreate = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (proofSchema: CreateProofSchemaRequest) => core.createProofSchema(proofSchema), {
+  return useMutation(async (proofSchema: CreateProofSchemaRequestDto) => core.createProofSchema(proofSchema), {
     onSuccess: async () => {
       await queryClient.invalidateQueries(PROOF_SCHEMA_LIST_QUERY_KEY);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
@@ -107,13 +109,16 @@ export const useProofSchemaDelete = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (proofSchemaId: ProofSchema['id']) => core.deleteProofSchema(proofSchemaId), {
-    onSuccess: async (_, proofSchemaId) => {
-      await queryClient.invalidateQueries(PROOF_SCHEMA_LIST_QUERY_KEY);
-      await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
-      await queryClient.removeQueries([PROOF_SCHEMA_DETAIL_QUERY_KEY, proofSchemaId]);
+  return useMutation(
+    async (proofSchemaId: GetProofSchemaListItemBindingDto['id']) => core.deleteProofSchema(proofSchemaId),
+    {
+      onSuccess: async (_, proofSchemaId) => {
+        await queryClient.invalidateQueries(PROOF_SCHEMA_LIST_QUERY_KEY);
+        await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
+        await queryClient.removeQueries([PROOF_SCHEMA_DETAIL_QUERY_KEY, proofSchemaId]);
+      },
     },
-  });
+  );
 };
 
 export const useShareProofSchema = (schemaId?: string) => {

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

@@ -1,17 +1,17 @@
 import {
   Config,
-  CreateProofRequest,
-  HistoryActionEnum,
-  HistoryEntityTypeEnum,
-  HistoryErrorMetadata,
-  IdentifierListQuery,
+  CreateProofRequestBindingDto,
+  GetProofSchemaBindingDto,
+  HistoryActionBindingEnum,
+  HistoryEntityTypeBindingEnum,
+  HistoryErrorMetadataBindingDto,
+  IdentifierListQueryBindingDto,
   OneError,
-  PresentationSubmitCredentialRequest,
-  ProofListQuery,
-  ProofSchema,
-  ProofStateEnum,
-  ProposeProofRequest,
-  ShareProofRequest,
+  PresentationSubmitCredentialRequestBindingDto,
+  ProofListQueryBindingDto,
+  ProofStateBindingEnum,
+  ProposeProofRequestBindingDto,
+  ShareProofRequestBindingDto,
 } from '@procivis/react-native-one-core';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
@@ -51,18 +51,18 @@ export const useProofState = (proofId: string | undefined, isPolling: boolean) =
       }
 
       const state = await core.getProof(proofId).then((proof) => proof.state);
-      let metadata: HistoryErrorMetadata | undefined;
-      if (state === ProofStateEnum.ERROR) {
+      let metadata: HistoryErrorMetadataBindingDto | undefined;
+      if (state === ProofStateBindingEnum.ERROR) {
         metadata = await core
-          .getHistory({
+          .getHistoryList({
             organisationId,
             page: 0,
             pageSize: 1,
             entityIds: [proofId],
-            entityTypes: [HistoryEntityTypeEnum.PROOF],
-            actions: [HistoryActionEnum.ERRORED],
+            entityTypes: [HistoryEntityTypeBindingEnum.PROOF],
+            actions: [HistoryActionBindingEnum.ERRORED],
           })
-          .then((result) => result.values[0]?.metadata as HistoryErrorMetadata);
+          .then((result) => result.values[0]?.metadata?.value as HistoryErrorMetadataBindingDto);
       }
       return { state, metadata };
     },
@@ -73,7 +73,7 @@ export const useProofState = (proofId: string | undefined, isPolling: boolean) =
   );
 };
 
-type ProofUrlHookParams = { proofId: string; request?: ShareProofRequest };
+type ProofUrlHookParams = { proofId: string; request?: ShareProofRequestBindingDto };
 
 export const useProofUrl = () => {
   const queryClient = useQueryClient();
@@ -101,7 +101,7 @@ export const useProofAccept = () => {
       interactionId,
       credentials,
     }: {
-      credentials: Record<string, PresentationSubmitCredentialRequest>;
+      credentials: Record<string, PresentationSubmitCredentialRequestBindingDto[]>;
       interactionId: string;
     }) => core.holderSubmitProof(interactionId, credentials),
     {
@@ -164,7 +164,8 @@ export const useProposeProof = () => {
   const { core, organisationId } = useONECore();
 
   return useMutation(
-    async (request: Omit<ProposeProofRequest, 'organisationId'>) => core.proposeProof({ organisationId, ...request }),
+    async (request: Omit<ProposeProofRequestBindingDto, 'organisationId'>) =>
+      core.proposeProof({ organisationId, ...request }),
     {
       onSuccess: async () => {
         await queryClient.invalidateQueries(PROOF_LIST_QUERY_KEY);
@@ -198,7 +199,7 @@ export const useProofDelete = () => {
   );
 };
 
-export const useProofs = (queryParams?: Partial<ProofListQuery>) => {
+export const useProofs = (queryParams?: Partial<ProofListQueryBindingDto>) => {
   const { core, organisationId } = useONECore();
 
   const queryKey = [PROOF_LIST_QUERY_KEY, ...getQueryKeyFromProofListQueryParams(queryParams)];
@@ -223,7 +224,7 @@ export const useProofCreate = () => {
 
   const { core } = useONECore();
 
-  return useMutation(async (data: CreateProofRequest) => core.createProof(data), {
+  return useMutation(async (data: CreateProofRequestBindingDto) => core.createProof(data), {
     onSuccess: async () => {
       await queryClient.invalidateQueries(PROOF_LIST_QUERY_KEY);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
@@ -231,7 +232,10 @@ export const useProofCreate = () => {
   });
 };
 
-const getIdentifierFilterForProofSchema = (proofSchema: ProofSchema, config: Config): Partial<IdentifierListQuery> => {
+const getIdentifierFilterForProofSchema = (
+  proofSchema: GetProofSchemaBindingDto,
+  config: Config,
+): Partial<IdentifierListQueryBindingDto> => {
   const requestedFormats = proofSchema.proofInputSchemas.map((schema) => schema.credentialSchema.format);
   const requestedFormatsCapabilities = requestedFormats
     .map((format) => config.format[format]?.capabilities)
@@ -298,7 +302,7 @@ export const useProofForSchemaIdWithTransport = (
       return;
     }
 
-    if (proofState?.state !== ProofStateEnum.CREATED && proofState?.state !== ProofStateEnum.PENDING) {
+    if (proofState?.state !== ProofStateBindingEnum.CREATED && proofState?.state !== ProofStateBindingEnum.PENDING) {
       setProofId(undefined);
     } else {
       setDeleting(true);
@@ -345,7 +349,7 @@ export const useCleanupUnusedProofs = () => {
   const { data: proofs } = useProofs({
     page: 0,
     pageSize: 100,
-    proofStates: [ProofStateEnum.CREATED, ProofStateEnum.PENDING],
+    proofStates: [ProofStateBindingEnum.CREATED, ProofStateBindingEnum.PENDING],
   });
   const [cleaned, setCleaned] = useState(false);
 
@@ -370,7 +374,7 @@ export const useShareProof = (proofUrlProps: ProofUrlHookParams | undefined, ena
 
   // reset when proofId changes or the proof was retracted
   useEffect(() => {
-    if (!proofUrlProps?.proofId || proofState?.state === ProofStateEnum.CREATED) {
+    if (!proofUrlProps?.proofId || proofState?.state === ProofStateBindingEnum.CREATED) {
       setSharedProof(undefined);
     }
   }, [proofUrlProps?.proofId, proofState]);
@@ -442,7 +446,7 @@ export const useDeleteAllProofsData = (schemaId: string) => {
           page: 0,
           pageSize: 1000,
           proofSchemaIds: [schemaId],
-          proofStates: [ProofStateEnum.ACCEPTED],
+          proofStates: [ProofStateBindingEnum.ACCEPTED],
         })
         .then((result) => Promise.all(result.values.reverse().map((proof) => core.deleteProofClaims(proof.id)))),
     {

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

@@ -1,10 +1,10 @@
 import {
-  CreateRemoteTrustEntityRequest,
-  IdentifierTypeEnum,
+  CreateRemoteTrustEntityRequestBindingDto,
+  GetTrustAnchorResponseBindingDto,
+  IdentifierTypeBindingEnum,
   ONECore,
   OneError,
-  TrustAnchor,
-  UpdateRemoteTrustEntityRequest,
+  UpdateRemoteTrustEntityFromDidRequestBindingDto,
 } from '@procivis/react-native-one-core';
 import { useCallback } from 'react';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
@@ -19,19 +19,19 @@ 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';
 
-export const useCreateTrustAnchor = (publisherReference: string) => {
+export const useCreateTrustAnchor = () => {
   const httpClient = useHTTPClient();
 
   return useCallback(
-    async (core: ONECore) => {
-      const trustAnchors = await core.getTrustAnchors({
+    async (core: ONECore, publisherReference: string) => {
+      const trustAnchors = await core.listTrustAnchors({
         page: 0,
         pageSize: 1,
       });
       if (trustAnchors.values.length > 0) {
         return;
       }
-      const response = await httpClient.get<TrustAnchor>(publisherReference);
+      const response = await httpClient.get<GetTrustAnchorResponseBindingDto>(publisherReference);
       if (!response.ok || !response.data) {
         return;
       }
@@ -48,7 +48,7 @@ export const useCreateTrustAnchor = (publisherReference: string) => {
           throw err;
         });
     },
-    [publisherReference, httpClient],
+    [httpClient],
   );
 };
 
@@ -66,7 +66,7 @@ export const useTrustEntity = (identifierId: string | undefined) => {
               identifiers: [
                 {
                   certificateId:
-                    identifierDetail?.type === IdentifierTypeEnum.CERTIFICATE
+                    identifierDetail?.type === IdentifierTypeBindingEnum.CERTIFICATE
                       ? identifierDetail.certificates?.[0]?.id
                       : undefined,
                   id: identifierId,
@@ -110,7 +110,9 @@ export const useCreateRemoteTrustEntity = () => {
   const { core } = useONECore();
 
   return useMutation(
-    async (request: Omit<CreateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string; didId?: string }) => {
+    async (
+      request: Omit<CreateRemoteTrustEntityRequestBindingDto, 'didId'> & { identifierId?: string; didId?: string },
+    ) => {
       const { identifierId, didId } = request;
 
       let entityDidId = didId;
@@ -139,7 +141,12 @@ export const useUpdateRemoteTrustEntity = () => {
   const { core } = useONECore();
 
   return useMutation(
-    async (request: Omit<UpdateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string; didId?: string }) => {
+    async (
+      request: Omit<UpdateRemoteTrustEntityFromDidRequestBindingDto, 'didId'> & {
+        identifierId?: string;
+        didId?: string;
+      },
+    ) => {
       const { identifierId, didId } = request;
 
       let entityDidId = didId;

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

@@ -1,4 +1,8 @@
-import { HolderWalletUnitDetail, WalletProvider, WalletUnitStatus } from '@procivis/react-native-one-core';
+import {
+  HolderWalletUnitResponseBindingDto,
+  WalletProviderBindingDto,
+  WalletUnitStatusBindingEnum,
+} from '@procivis/react-native-one-core';
 import { useEffect } from 'react';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
@@ -7,7 +11,10 @@ import { useONECore } from './core-context';
 
 export const WALLET_UNIT_QUERY_KEY = 'wallet-unit';
 
-export const useWalletUnitDetail = (walletUnitId: HolderWalletUnitDetail['id'] | undefined, active = true) => {
+export const useWalletUnitDetail = (
+  walletUnitId: HolderWalletUnitResponseBindingDto['id'] | undefined,
+  active = true,
+) => {
   const { core } = useONECore();
 
   return useQuery(
@@ -25,7 +32,7 @@ export const useRegisterWalletUnit = () => {
   const { core, organisationId } = useONECore();
 
   return useMutation(
-    async (walletProvider: WalletProvider) =>
+    async (walletProvider: WalletProviderBindingDto) =>
       core.holderRegisterWalletUnit({
         keyType: 'ECDSA',
         organisationId,
@@ -42,16 +49,19 @@ export const useWalletUnitStatus = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (walletUnitId: HolderWalletUnitDetail['id']) => core.holderWalletUnitStatus(walletUnitId), {
-    onError: async (err) => {
-      reportException(err, 'Refresh wallet unit failure');
-      await queryClient.invalidateQueries(WALLET_UNIT_QUERY_KEY);
+  return useMutation(
+    async (walletUnitId: HolderWalletUnitResponseBindingDto['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),
     },
-    onSuccess: () => queryClient.invalidateQueries(WALLET_UNIT_QUERY_KEY),
-  });
+  );
 };
 
-export const useWalletUnitCheck = (walletUnitId: HolderWalletUnitDetail['id'] | undefined) => {
+export const useWalletUnitCheck = (walletUnitId: HolderWalletUnitResponseBindingDto['id'] | undefined) => {
   const { data: walletUnitDetail, isLoading } = useWalletUnitDetail(walletUnitId);
   const { mutateAsync: refreshWalletUnit, isLoading: isRefreshing, status: refreshStatus } = useWalletUnitStatus();
 
@@ -59,7 +69,7 @@ export const useWalletUnitCheck = (walletUnitId: HolderWalletUnitDetail['id'] |
     if (isLoading || refreshStatus !== 'idle') {
       return;
     }
-    if (walletUnitId && walletUnitDetail?.status === WalletUnitStatus.ACTIVE) {
+    if (walletUnitId && walletUnitDetail?.status === WalletUnitStatusBindingEnum.ACTIVE) {
       void refreshWalletUnit(walletUnitId);
     }
   }, [isLoading, refreshStatus, walletUnitDetail, refreshWalletUnit, walletUnitId]);

package/src/utils/hooks/navigation/open-settings.ts

@@ -25,7 +25,7 @@ export const useOpenSettings = () => {
       Linking.sendIntent('android.settings.WIFI_SETTINGS').catch(() => {});
     }
   }, []);
-  
+
   const openAppPermissionSettings = useCallback(() => {
     Linking.openSettings().catch(() => {});
   }, []);

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

@@ -1,4 +1,4 @@
-import { CredentialStateEnum } from '@procivis/react-native-one-core';
+import { CredentialStateBindingEnum } 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: [CredentialStateEnum.ACCEPTED, CredentialStateEnum.SUSPENDED],
+    states: [CredentialStateBindingEnum.ACCEPTED, CredentialStateBindingEnum.SUSPENDED],
   });
 
   const checkCredentialsStatus = useCallback(async () => {

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

@@ -1,4 +1,8 @@
-import { Claim, CredentialSchemaCodeType, CredentialSchemaLayoutProperties } from '@procivis/react-native-one-core';
+import {
+  ClaimBindingDto,
+  CredentialSchemaCodeTypeBindingDto,
+  CredentialSchemaLayoutPropertiesBindingDto,
+} from '@procivis/react-native-one-core';
 import React from 'react';
 import { StyleSheet } from 'react-native';
 
@@ -17,8 +21,8 @@ const styles = StyleSheet.create({
 });
 
 export const getCarouselImagesFromClaims = (
-  claims: Claim[],
-  layoutProperties?: CredentialSchemaLayoutProperties,
+  claims: ClaimBindingDto[],
+  layoutProperties?: CredentialSchemaLayoutPropertiesBindingDto,
   testID?: string,
 ): CarouselImage[] => {
   const result: CarouselImage[] = [];
@@ -35,7 +39,7 @@ export const getCarouselImagesFromClaims = (
       result.push({
         element: (
           <ImageOrComponent
-            source={{ imageSource: { uri: pictureClaim.value as string } }}
+            source={{ imageSource: { uri: pictureClaim.value.value as string } }}
             style={styles.container}
             testID={concatTestID(testID, CarouselImageType.Photo)}
           />
@@ -48,27 +52,29 @@ export const getCarouselImagesFromClaims = (
   if (code) {
     const claim = findClaimByPath(code.attribute, claims);
 
-    if (claim && typeof claim.value === 'number') {
-      claim.value = String(claim.value);
+    let claimValue = '';
+
+    if (claim && (claim.value.type_ === 'FLOAT' || claim.value.type_ === 'INTEGER')) {
+      claimValue = String(claim.value.value);
     }
 
-    if (!claim || typeof claim.value !== 'string') {
+    if (!claim || typeof claimValue !== 'string') {
       return result;
     }
 
-    if (code.type === CredentialSchemaCodeType.QR_CODE) {
+    if (code.type === CredentialSchemaCodeTypeBindingDto.QR_CODE) {
       result.push({
-        element: <QrCode content={claim.value} testID={concatTestID(testID, CarouselImageType.QrCode)} />,
+        element: <QrCode content={claimValue} testID={concatTestID(testID, CarouselImageType.QrCode)} />,
         type: CarouselImageType.QrCode,
       });
-    } else if (code.type === CredentialSchemaCodeType.BARCODE && isASCII(claim.value)) {
+    } else if (code.type === CredentialSchemaCodeTypeBindingDto.BARCODE && isASCII(claimValue)) {
       result.push({
-        element: <Barcode content={claim.value} testID={concatTestID(testID, CarouselImageType.Barcode)} />,
+        element: <Barcode content={claimValue} testID={concatTestID(testID, CarouselImageType.Barcode)} />,
         type: CarouselImageType.Barcode,
       });
-    } else if (code.type === CredentialSchemaCodeType.MRZ) {
+    } else if (code.type === CredentialSchemaCodeTypeBindingDto.MRZ) {
       result.push({
-        element: <Mrz content={claim.value} testID={concatTestID(testID, CarouselImageType.MRZ)} />,
+        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 {
-  Claim,
+  ClaimBindingDto,
+  ClaimValueBindingDto,
   Config,
-  DataTypeEnum,
-  FailureHint,
-  PresentationDefinitionV2ClaimValue,
-  PresentationDefinitionV2CredentialClaim,
-  PresentationDefinitionV2CredentialDetail,
+  CredentialQueryFailureHintResponseBindingDto,
+  PresentationDefinitionV2ClaimBindingDto,
+  PresentationDefinitionV2ClaimValueBindingDto,
+  PresentationDefinitionV2CredentialDetailBindingDto,
 } from '@procivis/react-native-one-core';
 import React from 'react';
 
@@ -27,51 +27,33 @@ import {
 } from '.';
 import { ShareCredentialCardLabels, validityCheckedCardFromCredential } from './credential-sharing';
 
-const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValue): string | number | boolean | Claim[] => {
-  if (!Array.isArray(value)) {
+const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValueBindingDto): ClaimValueBindingDto => {
+  if (value.type_ !== 'NESTED') {
     return value;
   }
-  return value.map((c) => v2PresentationClaimToClaim(c));
+  return {
+    type_: 'NESTED',
+    value: value.value.map((c) => v2PresentationClaimToClaim(c)),
+  };
 };
 
-const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2CredentialClaim): Claim => {
-  if (Array.isArray(claim.value)) {
-    if (claim.schema.array) {
-      return {
-        array: claim.schema.array,
-        dataType: claim.schema.datatype,
-        id: claim.path,
-        key: claim.path,
-        value: v2ClaimValueToClaimValue(claim.value) as Claim[],
-      };
-    } else {
-      return {
-        array: claim.schema.array,
-        dataType: DataTypeEnum.Object,
-        id: claim.path,
-        key: claim.path,
-        value: v2ClaimValueToClaimValue(claim.value) as Claim[],
-      };
-    }
-  }
+const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2ClaimBindingDto): ClaimBindingDto => {
   return {
-    array: false,
-    dataType: claim.schema.datatype,
-    id: claim.path,
-    key: claim.path,
-    value: claim.value,
+    schema: claim.schema,
+    path: claim.path,
+    value: v2ClaimValueToClaimValue(claim.value),
   };
 };
 
 const getAttributeSelectorStatus = (
-  claim: PresentationDefinitionV2CredentialClaim,
+  claim: PresentationDefinitionV2ClaimBindingDto,
   selected: boolean,
   force: boolean,
 ): SelectorStatus | undefined => {
   if (claim.required && selected) {
     return SelectorStatus.Required;
   }
-  if (force && claim.value) {
+  if (force) {
     return SelectorStatus.Required;
   }
   if (claim.userSelection) {
@@ -84,7 +66,7 @@ const getAttributeSelectorStatus = (
 };
 
 export const shareCredentialCardAttributeFromV2Claim = (
-  claim: PresentationDefinitionV2CredentialClaim,
+  claim: PresentationDefinitionV2ClaimBindingDto,
   selection: string[] | undefined,
   parentShared: boolean,
   parentUserSelected: boolean,
@@ -114,14 +96,14 @@ export const shareCredentialCardAttributeFromV2Claim = (
     selected,
     testID,
   };
-  if (Array.isArray(claim.value)) {
+  if (claim.value.type_ === 'NESTED') {
     if (claim.schema.array) {
       return {
         ...credentialAttribute,
         attributes: undefined,
         image: undefined,
         value: undefined,
-        values: claim.value.map((v) =>
+        values: claim.value.value.map((v) =>
           shareCredentialCardAttributeFromV2Claim(
             v,
             selection,
@@ -137,7 +119,7 @@ export const shareCredentialCardAttributeFromV2Claim = (
     } else if (claim.schema.datatype === 'OBJECT') {
       return {
         ...credentialAttribute,
-        attributes: claim.value.map((v) =>
+        attributes: claim.value.value.map((v) =>
           shareCredentialCardAttributeFromV2Claim(v, selection, attributeShared, userSelected, config, testID, true),
         ),
         image: undefined,
@@ -151,7 +133,7 @@ export const shareCredentialCardAttributeFromV2Claim = (
 };
 
 export const missingCredentialCardFromFailureHint = (
-  failureHint: FailureHint['failureHint'] | undefined,
+  failureHint: CredentialQueryFailureHintResponseBindingDto | undefined,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -172,8 +154,8 @@ export const missingCredentialCardFromFailureHint = (
 };
 
 export const shareCredentialCardFromV2PresentationCredential = (
-  credential: PresentationDefinitionV2CredentialDetail | undefined,
-  failureHint: FailureHint['failureHint'] | undefined,
+  credential: PresentationDefinitionV2CredentialDetailBindingDto | undefined,
+  failureHint: CredentialQueryFailureHintResponseBindingDto | undefined,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
   selectedFields: string[] | undefined,
@@ -219,7 +201,7 @@ export const shareCredentialCardFromV2PresentationCredential = (
 };
 
 export const selectCredentialCardFromV2Credential = (
-  credential: PresentationDefinitionV2CredentialDetail,
+  credential: PresentationDefinitionV2CredentialDetailBindingDto,
   selected: boolean,
   multiple: boolean,
   config: Config,
@@ -266,13 +248,15 @@ export const selectCredentialCardFromV2Credential = (
   };
 };
 
-export const getV2CredentialClaimAllSubpaths = (claim: PresentationDefinitionV2CredentialClaim): string[] => {
-  if (!Array.isArray(claim.value)) {
+export const getV2CredentialClaimAllSubpaths = (claim: PresentationDefinitionV2ClaimBindingDto): string[] => {
+  if (claim.value.type_ !== 'NESTED') {
     return [claim.path];
   }
-  return [claim.path, ...claim.value.flatMap(getV2CredentialClaimAllSubpaths)];
+  return [claim.path, ...claim.value.value.flatMap(getV2CredentialClaimAllSubpaths)];
 };
 
-export const getV2CredentialAvailablePaths = (credential: PresentationDefinitionV2CredentialDetail): string[] => {
+export const getV2CredentialAvailablePaths = (
+  credential: PresentationDefinitionV2CredentialDetailBindingDto,
+): string[] => {
   return credential.claims.flatMap(getV2CredentialClaimAllSubpaths);
 };