@procivis/one-react-native-components 0.3.115 → 0.3.130

package/src/utils/date.ts

@@ -7,10 +7,11 @@ const MINUTE = 60 * 1000;
 const DAY = 24 * 60 * MINUTE;
 
 // OS locale
-const systemLocale: string | undefined = I18nManager.getConstants()
-  .localeIdentifier?.replace(/_/g, '-')
-  .split(/[#@]/)[0]
-  .replace(/-$/, '');
+const systemLocale: string | undefined = (
+  Platform.OS === 'ios' ? Settings.get('AppleLocale') : I18nManager.getConstants().localeIdentifier
+)
+  ?.match(/[a-zA-Z]+_[a-zA-Z]+/)[0]
+  ?.replaceAll('_', '-');
 
 /**
  * Date only format
@@ -136,18 +137,10 @@ export const formatDateOnlyFromUTCTimestamp = (utcTimestamp: number): string =>
   );
 };
 
-const locale = (
-  Platform.OS === 'ios'
-    ? Settings.get('AppleLocale')
-    : I18nManager.getConstants().localeIdentifier
-)
-  ?.split('@')[0]
-  .replace('_', '-');
-
 export const formatDateTimeLocalized = (date: Date) => {
-  return formatDateTime(date, locale);
+  return formatDateTime(date, systemLocale);
 };
 
 export const formatDateLocalized = (date: Date) => {
-  return formatDate(date, locale);
+  return formatDate(date, systemLocale);
 };

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

@@ -3,10 +3,15 @@ import { useMutation, useQueryClient } from 'react-query';
 
 import { useONECore } from './core-context';
 import { CREDENTIAL_DETAIL_QUERY_KEY, CREDENTIAL_LIST_PAGED_QUERY_KEY, CREDENTIAL_LIST_QUERY_KEY } from './credentials';
-import { REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY, TRUST_ENTITY_DETAIL_QUERY_KEY } from './trust-entity';
+import { VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY } from './verifier-instance';
+import { WALLET_UNIT_QUERY_KEY, WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY } from './wallet-unit';
 
 const CREDENTIAL_QUERY_KEYS = [CREDENTIAL_LIST_QUERY_KEY, CREDENTIAL_LIST_PAGED_QUERY_KEY, CREDENTIAL_DETAIL_QUERY_KEY];
-const TRUST_ENTITY_QUERY_KEYS = [TRUST_ENTITY_DETAIL_QUERY_KEY, REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY];
+const WALLET_VERIFIER_INSTANCE_QUERY_KEYS = [
+  WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY,
+  WALLET_UNIT_QUERY_KEY,
+  VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY,
+];
 
 // Map each CacheType to the query keys that should be invalidated when that cache is cleared.
 const cacheTypeToQueryKeys: Record<CacheType, string[]> = {
@@ -15,10 +20,13 @@ const cacheTypeToQueryKeys: Record<CacheType, string[]> = {
   [CacheType.STATUS_LIST_CREDENTIAL]: CREDENTIAL_QUERY_KEYS,
   [CacheType.VCT_METADATA]: CREDENTIAL_QUERY_KEYS,
   [CacheType.JSON_SCHEMA]: CREDENTIAL_QUERY_KEYS,
-  [CacheType.TRUST_LIST]: [...TRUST_ENTITY_QUERY_KEYS, ...CREDENTIAL_QUERY_KEYS],
+  [CacheType.TRUST_LIST]: CREDENTIAL_QUERY_KEYS,
   [CacheType.X509_CRL]: CREDENTIAL_QUERY_KEYS,
   [CacheType.ANDROID_ATTESTATION_CRL]: CREDENTIAL_QUERY_KEYS,
-  [CacheType.OPEN_ID_METADATA]: CREDENTIAL_QUERY_KEYS,
+  [CacheType.OPEN_ID_METADATA_HOLDER]: CREDENTIAL_QUERY_KEYS,
+  [CacheType.OPEN_ID_METADATA_ISSUER]: CREDENTIAL_QUERY_KEYS,
+  [CacheType.WALLET_PROVIDER_METADATA]: WALLET_VERIFIER_INSTANCE_QUERY_KEYS,
+  [CacheType.REMOTE_TRUST_COLLECTION]: WALLET_VERIFIER_INSTANCE_QUERY_KEYS,
 };
 
 export const useCacheClear = () => {

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

@@ -1,4 +1,4 @@
-import { ConfigEntities,CoreConfig } from '@procivis/react-native-one-core';
+import { ConfigEntities, CoreConfig } from '@procivis/react-native-one-core';
 import { useQuery } from 'react-query';
 
 import { useONECore } from './core-context';
@@ -25,8 +25,3 @@ export const getEnabledExchangeProtocols = (exchangeProtocol: ConfigEntities<any
     .map((exchange) => exchange.type);
 };
 
-export const getEnabledTrustManagement = (config: CoreConfig): string[] => {
-  return Object.values(config?.trustManagement ?? {})
-    .filter((t) => t.enabled !== false)
-    .map((trustManagement) => trustManagement.type);
-};

package/src/utils/hooks/core/core-context.tsx

@@ -11,8 +11,6 @@ import React, {
 } from 'react';
 
 import { reportException } from '../../reporting';
-import { getEnabledTrustManagement } from './core-config';
-import { TrustManagementEnum, useCreateTrustAnchor } from './trust-entity';
 
 interface ContextValue {
   core: ONECore;
@@ -29,7 +27,6 @@ const defaultContextValue: ContextValue = {
 export type ONECoreContextProviderProps = {
   config?: Record<string, unknown>;
   organisationId?: string;
-  publisherReference?: string;
 };
 
 const ONECoreContext = createContext<ContextValue>(defaultContextValue);
@@ -37,11 +34,9 @@ const ONECoreContext = createContext<ContextValue>(defaultContextValue);
 export const ONECoreContextProvider: FC<PropsWithChildren<ONECoreContextProviderProps>> = ({
   children,
   organisationId = defaultContextValue.organisationId,
-  publisherReference,
   config,
 }) => {
   const [core, setCore] = useState<ONECore>();
-  const createTrustAnchor = useCreateTrustAnchor();
 
   const initialize = useCallback(
     async (force?: boolean) => {
@@ -76,25 +71,6 @@ export const ONECoreContextProvider: FC<PropsWithChildren<ONECoreContextProvider
     [],
   );
 
-  useEffect(() => {
-    if (!core || !publisherReference) {
-      return;
-    }
-
-    core
-      .getConfig()
-      .then((coreConfig) => {
-        const trustManagementEnabled = getEnabledTrustManagement(coreConfig).includes(
-          TrustManagementEnum.SimpleTrustList,
-        );
-
-        if (trustManagementEnabled) {
-          createTrustAnchor(core, publisherReference).catch(() => {});
-        }
-      })
-      .catch(() => {});
-  }, [core, createTrustAnchor, publisherReference]);
-
   const contextValue = useMemo(
     () => ({
       core: core ?? defaultContextValue.core,

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

@@ -7,7 +7,7 @@ import {
   InitiateIssuanceRequest,
   OneError,
 } from '@procivis/react-native-one-core';
-import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from 'react-query';
+import { useInfiniteQuery, useMutation, useQueries, useQuery, useQueryClient } from 'react-query';
 
 import { getQueryKeyFromCredentialListQueryParams } from '../../parsers/query';
 import { useONECore } from './core-context';
@@ -20,6 +20,7 @@ const PAGE_SIZE = 20;
 export const CREDENTIAL_LIST_QUERY_KEY = 'credential-list';
 export const CREDENTIAL_LIST_PAGED_QUERY_KEY = 'credential-list-paged';
 export const CREDENTIAL_DETAIL_QUERY_KEY = 'credential-detail';
+export const CREDENTIAL_TRUST_INFORMATION_QUERY_KEY = 'credential-trust-information';
 
 export const useCredentials = (queryParams?: Partial<CredentialListQuery>) => {
   const { core, organisationId } = useONECore();
@@ -169,6 +170,19 @@ export const useCredentialDelete = () => {
   });
 };
 
+export const useCredentialRefresh = () => {
+  const queryClient = useQueryClient();
+  const { core } = useONECore();
+
+  return useMutation(async (interactionId: string) => core.holderRefreshCredential(interactionId), {
+    onSuccess: async () => {
+      await queryClient.invalidateQueries(CREDENTIAL_LIST_QUERY_KEY);
+      await queryClient.invalidateQueries(CREDENTIAL_DETAIL_QUERY_KEY);
+      await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
+    },
+  });
+};
+
 export const useInvalidateCredentialDetails = () => {
   const queryClient = useQueryClient();
 
@@ -204,3 +218,31 @@ export const useContinueIssuance = () => {
     },
   });
 };
+
+export const useCredentialTrustInformation = (credentialId: string | undefined) => {
+  const { core } = useONECore();
+
+  return useQuery(
+    [CREDENTIAL_TRUST_INFORMATION_QUERY_KEY, credentialId],
+    () => (credentialId ? core.getCredentialTrustInformation(credentialId) : undefined),
+    {
+      enabled: Boolean(credentialId),
+      keepPreviousData: true,
+    },
+  );
+};
+
+export const useCredentialsTrustInformation = (credentialIds: string[]) => {
+  const { core } = useONECore();
+
+  return useQueries(
+    credentialIds.map((id) => ({
+      keepPreviousData: true,
+      meta: {
+        id,
+      },
+      queryFn: () => core.getCredentialTrustInformation(id),
+      queryKey: [CREDENTIAL_TRUST_INFORMATION_QUERY_KEY, id],
+    })),
+  );
+};

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

@@ -11,7 +11,6 @@ export * from './identifiers';
 export * from './proof-schemas';
 export * from './proofs';
 export * from './query';
-export * from './trust-entity';
 export * from './trust-list';
 export * from './verifier-instance';
 export * from './wallet-unit';

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

@@ -30,6 +30,7 @@ const PAGE_SIZE = 10;
 export const PROOF_DETAIL_QUERY_KEY = 'proof-detail';
 export const PROOF_STATE_QUERY_KEY = 'proof-state';
 export const PROOF_LIST_QUERY_KEY = 'proof-list';
+export const PROOF_REQUEST_TRUST_INFORMATION_QUERY_KEY = 'proof-request-trust-information';
 
 export const useProofDetail = (proofId: string | undefined) => {
   const { core } = useONECore();
@@ -464,3 +465,16 @@ export const useDeleteAllProofsData = (schemaId: string) => {
     },
   );
 };
+
+export const useProofRequestTrustInformation = (credentialId: string | undefined) => {
+  const { core } = useONECore();
+
+  return useQuery(
+    [PROOF_REQUEST_TRUST_INFORMATION_QUERY_KEY, credentialId],
+    () => (credentialId ? core.getProofTrustInformation(credentialId) : undefined),
+    {
+      enabled: Boolean(credentialId),
+      keepPreviousData: true,
+    },
+  );
+};

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

@@ -1,29 +1,40 @@
-import { HolderWalletUnit } from '@procivis/react-native-one-core';
-import { useMutation } from 'react-query';
+import { useMutation, useQueryClient } from 'react-query';
 
 import { reportException } from '../../reporting';
 import { useONECore } from './core-context';
+import { VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY } from './verifier-instance';
+import { WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY } from './wallet-unit';
 
 export const useTrustCollectionSync = () => {
+  const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(
-    async (params: { holderWalletUnitId?: HolderWalletUnit['id']; verifierInstanceId?: string }) =>
-      core.runTask('TRUST_COLLECTION_SYNC', JSON.stringify(params)),
-    {
-      onError: (err) => {
-        reportException(err, 'TRUST_COLLECTION_SYNC error');
-      },
+  return useMutation(async () => core.runTask('TRUST_COLLECTION_SYNC', undefined), {
+    onError: async (err) => {
+      reportException(err, 'TRUST_COLLECTION_SYNC error');
+      await queryClient.invalidateQueries(WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY);
+      await queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY);
     },
-  );
+    onSuccess: async () => {
+      await queryClient.invalidateQueries(WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY);
+      await queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY);
+    },
+  });
 };
 
 export const useTrustListSubscriptionUpdate = () => {
+  const queryClient = useQueryClient();
   const { core } = useONECore();
 
   return useMutation(async () => core.runTask('TRUST_LIST_SUBSCRIPTION_UPDATE', undefined), {
-    onError: (err) => {
+    onError: async (err) => {
       reportException(err, 'TRUST_LIST_SUBSCRIPTION_UPDATE error');
+      await queryClient.invalidateQueries(WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY);
+      await queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY);
+    },
+    onSuccess: async () => {
+      await queryClient.invalidateQueries(WALLET_UNIT_TRUST_COLLECTIONS_QUERY_KEY);
+      await queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY);
     },
   });
 };

package/src/utils/hooks/core/verifier-instance.ts

@@ -4,8 +4,22 @@ import { useMutation, useQuery, useQueryClient } from 'react-query';
 import { reportException } from '../../reporting';
 import { useONECore } from './core-context';
 
+export const VERIFIER_INSTANCE_QUERY_KEY = 'verifier-instance';
 export const VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY = 'verifier-instance-trust-collections';
 
+export const useVerifierInstance = (active = true) => {
+  const { core, organisationId } = useONECore();
+
+  return useQuery(
+    [VERIFIER_INSTANCE_QUERY_KEY],
+    () => core.getOrganisation(organisationId).then((org) => org.verifierInstance),
+    {
+      enabled: active,
+      keepPreviousData: true,
+    },
+  );
+};
+
 export const useVerifierInstanceTrustCollections = (verifierInstanceId: string | undefined, active = true) => {
   const { core } = useONECore();
 
@@ -31,7 +45,10 @@ export const useRegisterVerifierInstance = () => {
       }),
 
     {
-      onSuccess: () => queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY),
+      onSuccess: async () => {
+        await queryClient.invalidateQueries(VERIFIER_INSTANCE_QUERY_KEY);
+        await queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY);
+      },
     },
   );
 };
@@ -46,9 +63,13 @@ export const useVerifierInstanceUpdate = () => {
     {
       onError: async (err) => {
         reportException(err, 'Update verifier instance failure');
+        await queryClient.invalidateQueries(VERIFIER_INSTANCE_QUERY_KEY);
+        await queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY);
+      },
+      onSuccess: async () => {
+        await queryClient.invalidateQueries(VERIFIER_INSTANCE_QUERY_KEY);
         await queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY);
       },
-      onSuccess: () => queryClient.invalidateQueries(VERIFIER_INSTANCE_TRUST_COLLECTIONS_QUERY_KEY),
     },
   );
 };

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

@@ -1,7 +1,7 @@
 import {
+  HolderRegisterWalletUnitRequest,
   HolderWalletUnit,
   HolderWalletUnitUpdateRequest,
-  WalletProvider,
   WalletUnitStatus,
 } from '@procivis/react-native-one-core';
 import { useEffect } from 'react';
@@ -44,11 +44,11 @@ export const useRegisterWalletUnit = () => {
   const { core, organisationId } = useONECore();
 
   return useMutation(
-    async (walletProvider: WalletProvider) =>
+    async (request: Omit<HolderRegisterWalletUnitRequest, 'organisationId' | 'keyType'>) =>
       core.holderRegisterWalletUnit({
         keyType: 'ECDSA',
         organisationId,
-        walletProvider,
+        ...request,
       }),
 
     {

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

@@ -15,6 +15,7 @@ import {
   CredentialCardProps,
   CredentialNoticeWarningIcon,
   CredentialWarningIcon,
+  PurposeInfoIcon,
   Selector,
   SelectorStatus,
 } from '../../ui-components';
@@ -72,6 +73,7 @@ export const shareCredentialCardAttributeFromV2Claim = (
   parentUserSelected: boolean,
   config: CoreConfig,
   testID: string,
+  language: string | undefined,
   nested?: boolean,
   listValue?: boolean,
 ): CredentialAttribute => {
@@ -82,7 +84,7 @@ export const shareCredentialCardAttributeFromV2Claim = (
   const status = selection
     ? getAttributeSelectorStatus(claim, attributeShared, parentUserSelected || (attributeShared && !userSelected))
     : undefined;
-  const attribute = detailsCardAttributeFromClaim(v2PresentationClaimToClaim(claim), config, testID);
+  const attribute = detailsCardAttributeFromClaim(v2PresentationClaimToClaim(claim), config, testID, language);
   const disabledStatus = [SelectorStatus.Disabled, SelectorStatus.Rejected, SelectorStatus.Required];
   const disabled = attribute.disabled || !status || disabledStatus.includes(status);
   const credentialAttribute: CredentialAttribute = {
@@ -111,6 +113,7 @@ export const shareCredentialCardAttributeFromV2Claim = (
             userSelected,
             config,
             testID,
+            language,
             true,
             false,
           ),
@@ -120,7 +123,16 @@ export const shareCredentialCardAttributeFromV2Claim = (
       return {
         ...credentialAttribute,
         attributes: claim.value.value.map((v) =>
-          shareCredentialCardAttributeFromV2Claim(v, selection, attributeShared, userSelected, config, testID, true),
+          shareCredentialCardAttributeFromV2Claim(
+            v,
+            selection,
+            attributeShared,
+            userSelected,
+            config,
+            testID,
+            language,
+            true,
+          ),
         ),
         image: undefined,
         value: undefined,
@@ -158,22 +170,23 @@ export const shareCredentialCardFromV2PresentationCredential = (
   failureHint: CredentialQueryFailureHint | undefined,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
+  purpose: string | undefined,
   selectedFields: string[] | undefined,
   config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
+  language: string | undefined,
 ): CredentialDetailsCardPropsWithoutWidth => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
     credential ? { ...credential, issuer: credential.issuer?.id } : undefined,
     config,
   );
-  const notice: CredentialCardNotice | undefined =
-    selectiveDisclosureSupported === false
-      ? {
-          noticeIcon: CredentialNoticeWarningIcon,
-          text: labels.selectiveDisclosureNotice,
-        }
-      : undefined;
+  const notice: CredentialCardNotice | undefined = purpose
+    ? {
+        noticeIcon: PurposeInfoIcon,
+        text: purpose,
+      }
+    : undefined;
   const cardTestId = concatTestID(testID, 'card');
   const card = credential
     ? validityCheckedCardFromCredential(
@@ -182,18 +195,20 @@ export const shareCredentialCardFromV2PresentationCredential = (
           claims: [],
         },
         expanded,
+        selectiveDisclosureSupported,
         multipleCredentialsAvailable,
         config,
         notice,
         cardTestId,
         labels,
+        language,
       )
     : missingCredentialCardFromFailureHint(failureHint, notice, cardTestId, labels);
 
   return {
     attributes:
       credential?.claims.map((v) =>
-        shareCredentialCardAttributeFromV2Claim(v, selectedFields ?? [], true, false, config, testID),
+        shareCredentialCardAttributeFromV2Claim(v, selectedFields ?? [], true, false, config, testID, language),
       ) ?? [],
     card,
   };
@@ -206,6 +221,7 @@ export const selectCredentialCardFromV2Credential = (
   config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
+  language: string | undefined,
 ): CredentialDetailsCardPropsWithoutWidth => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
     credential ? { ...credential, issuer: credential.issuer?.id } : undefined,
@@ -217,7 +233,7 @@ export const selectCredentialCardFromV2Credential = (
     selectiveDisclosureSupported === false
       ? {
           noticeIcon: CredentialNoticeWarningIcon,
-          text: labels.selectiveDisclosureNotice,
+          text: labels.selectiveDisclosure,
         }
       : undefined;
   const { header, ...cardProps } = getCredentialCardPropsFromCredential(
@@ -230,6 +246,7 @@ export const selectCredentialCardFromV2Credential = (
     notice,
     testID,
     labels,
+    language,
   );
   const card = {
     header: {
@@ -241,7 +258,7 @@ export const selectCredentialCardFromV2Credential = (
   return {
     attributes:
       credential?.claims.map((v) =>
-        shareCredentialCardAttributeFromV2Claim(v, undefined, false, false, config, testID),
+        shareCredentialCardAttributeFromV2Claim(v, undefined, false, false, config, testID, language),
       ) ?? [],
     card,
   };

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

@@ -31,11 +31,13 @@ import {
 export const validityCheckedCardFromCredential = (
   credential: CredentialDetail,
   expanded: boolean,
+  selectiveDisclosureSupported: boolean | undefined,
   multipleCredentialsAvailable: boolean,
   config: CoreConfig,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
+  language: string | undefined,
 ): Omit<CredentialCardProps, 'onHeaderPress' | 'style' | 'testID' | 'width'> => {
   let credentialHeaderDetail:
     | Pick<
@@ -47,7 +49,13 @@ export const validityCheckedCardFromCredential = (
         | 'statusIcon'
       >
     | undefined;
-  if (!expanded && multipleCredentialsAvailable) {
+  if (selectiveDisclosureSupported === false) {
+    credentialHeaderDetail = {
+      credentialDetailPrimary: labels.selectiveDisclosure,
+      credentialDetailTestID: concatTestID(testID, 'header.nonSelectiveDisclosure'),
+      statusIcon: CredentialWarningIcon,
+    };
+  } else if (!expanded && multipleCredentialsAvailable) {
     credentialHeaderDetail = {
       credentialDetailPrimary: labels.multipleCredentials,
       credentialDetailTestID: concatTestID(testID, 'header.multiple'),
@@ -55,7 +63,15 @@ export const validityCheckedCardFromCredential = (
     };
   }
 
-  const card = getCredentialCardPropsFromCredential(credential, credential.claims, config, notice, testID, labels);
+  const card = getCredentialCardPropsFromCredential(
+    credential,
+    credential.claims,
+    config,
+    notice,
+    testID,
+    labels,
+    language,
+  );
   return {
     ...card,
     header: {
@@ -188,12 +204,13 @@ export const shareCredentialCardAttributeFromClaim = (
   config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
+  language: string | undefined,
   claim?: FlatClaim,
   field?: PresentationDefinitionField,
 ): CredentialAttribute => {
   if (claim) {
     return {
-      ...detailsCardAttributeFromClaim(claim, config, testID),
+      ...detailsCardAttributeFromClaim(claim, config, testID, language),
       id,
       path: claim.path,
       listValue: claim.isArrayElement,
@@ -243,7 +260,7 @@ const setStatusForNestedObjectOrArrayFields = (
 };
 
 export type ShareCredentialCardLabels = CardLabels & {
-  selectiveDisclosureNotice: string;
+  selectiveDisclosure: string;
   missingAttribute: string;
   missingCredential: string;
   multipleCredentials: string;
@@ -258,30 +275,26 @@ export const shareCredentialCardFromCredential = (
   config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
+  language: string | undefined,
 ): CredentialDetailsCardPropsWithoutWidth => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
     credential ? { ...credential, issuer: credential.issuer?.id } : undefined,
     config,
   );
-  const notice: CredentialCardNotice | undefined =
-    selectiveDisclosureSupported === false
-      ? {
-          text: labels.selectiveDisclosureNotice,
-          noticeIcon: CredentialNoticeWarningIcon,
-        }
-      : undefined;
   const cardTestId = concatTestID(testID, 'card');
   const card = credential
     ? validityCheckedCardFromCredential(
         credential,
         expanded,
+        selectiveDisclosureSupported,
         multipleCredentialsAvailable,
         config,
-        notice,
+        undefined,
         cardTestId,
         labels,
+        language,
       )
-    : missingCredentialCardFromRequest(request, notice, cardTestId, labels);
+    : missingCredentialCardFromRequest(request, undefined, cardTestId, labels);
   const validityState = getValidityState(credential ? { ...credential, issuer: credential.issuer?.id } : undefined);
   const displayedAttributes = getDisplayedAttributes(
     request,
@@ -299,6 +312,7 @@ export const shareCredentialCardFromCredential = (
         config,
         concatTestID(testID, 'attribute', `${index}`),
         labels,
+        language,
         claim,
         field,
       ),
@@ -319,10 +333,11 @@ export const selectCredentialCardAttributeFromClaim = (
   config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
+  language: string | undefined,
   claim?: FlatClaim,
   field?: PresentationDefinitionField,
 ): CredentialAttribute => {
-  const attribute = shareCredentialCardAttributeFromClaim(id, config, testID, labels, claim, field);
+  const attribute = shareCredentialCardAttributeFromClaim(id, config, testID, labels, language, claim, field);
   if (!claim) {
     return attribute;
   }
@@ -339,6 +354,7 @@ export const selectCredentialCardFromCredential = (
   config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
+  language: string | undefined,
 ): CredentialDetailsCardPropsWithoutWidth => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
     credential ? { ...credential, issuer: credential.issuer?.id } : undefined,
@@ -348,7 +364,7 @@ export const selectCredentialCardFromCredential = (
   const notice: CredentialCardNotice | undefined =
     selectiveDisclosureSupported === false
       ? {
-          text: labels.selectiveDisclosureNotice,
+          text: labels.selectiveDisclosure,
           noticeIcon: CredentialNoticeWarningIcon,
         }
       : undefined;
@@ -359,6 +375,7 @@ export const selectCredentialCardFromCredential = (
     notice,
     testID,
     labels,
+    language,
   );
   const card = {
     header: {
@@ -372,7 +389,7 @@ export const selectCredentialCardFromCredential = (
       return path === field.keyMap[credential.id];
     });
 
-    const attribute = selectCredentialCardAttributeFromClaim(field.id, config, testID, labels, claim, field);
+    const attribute = selectCredentialCardAttributeFromClaim(field.id, config, testID, labels, language, claim, field);
     return {
       ...attribute,
       rightAccessory: (