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

package/src/ui-components/pin/index.ts

@@ -1,5 +1,7 @@
 import { Biometry } from './keypad';
-import { PinCodeScreen, PinCodeScreenActions, PinCodeScreenProps } from './pin-code-screen';
-import PinLockModal, { PinLockModalLabels } from './pin-lock';
+import type { PinCodeScreenActions, PinCodeScreenProps } from './pin-code-screen';
+import { PinCodeScreen } from './pin-code-screen';
+import type { PinLockModalLabels } from './pin-lock';
+import PinLockModal from './pin-lock';
 
 export { Biometry, PinCodeScreen, PinCodeScreenActions, PinCodeScreenProps, PinLockModal, PinLockModalLabels };

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

@@ -1,4 +1,4 @@
-import { IdentifierListItem } from '@procivis/react-native-one-core/dist/src/identifier';
+import { IdentifierListItem } from '@procivis/react-native-one-core';
 import React, { FunctionComponent, useState } from 'react';
 import { SectionList, StyleSheet, View } from 'react-native';
 import Animated, { useAnimatedScrollHandler, useSharedValue } from 'react-native-reanimated';

package/src/ui-components/searchbar/index.ts

@@ -1,5 +1,7 @@
-import AnimatedSearchBar, { AnimatedSearchBarProps } from './animated-search-bar';
-import SearchBar, { SearchBarProps } from './search-bar';
+import type { AnimatedSearchBarProps } from './animated-search-bar';
+import AnimatedSearchBar from './animated-search-bar';
+import type { SearchBarProps } from './search-bar';
+import SearchBar from './search-bar';
 
 export { AnimatedSearchBar, AnimatedSearchBarProps };
 export { SearchBar, SearchBarProps };

package/src/ui-components/settings/index.ts

@@ -1,8 +1,13 @@
-import ButtonSetting, { ButtonSettingProps } from './button-setting';
-import SettingItem, { SettingItemProps } from './setting-item';
-import SettingItemSeparator, { SettingItemSeparatorProps } from './setting-item-separator';
-import SettingsButton, { SettingsButtonProps } from './settings-button';
-import SwitchSetting, { SwitchSettingProps } from './switch-setting';
+import type { ButtonSettingProps } from './button-setting';
+import ButtonSetting from './button-setting';
+import type { SettingItemProps } from './setting-item';
+import SettingItem from './setting-item';
+import type { SettingItemSeparatorProps } from './setting-item-separator';
+import SettingItemSeparator from './setting-item-separator';
+import type { SettingsButtonProps } from './settings-button';
+import SettingsButton from './settings-button';
+import type { SwitchSettingProps } from './switch-setting';
+import SwitchSetting from './switch-setting';
 
 export { ButtonSetting, ButtonSettingProps };
 export { SettingItem, SettingItemProps };

package/src/ui-components/state/index.ts

@@ -1,3 +1,4 @@
-import ErrorScreen, { ErrorScreenButton, ErrorScreenProps } from './error-screen';
+import type { ErrorScreenButton, ErrorScreenProps } from './error-screen';
+import ErrorScreen from './error-screen';
 
 export { ErrorScreen, ErrorScreenButton, ErrorScreenProps };

package/src/utils/date.ts

@@ -9,7 +9,7 @@ const DAY = 24 * 60 * MINUTE;
 // OS locale
 const systemLocale: string | undefined = I18nManager.getConstants().localeIdentifier
   ?.replace(/_/g, '-')
-  .split('#')[0]
+  .split(/[#@]/)[0]
   .replace(/-$/, '');
 
 /**

package/src/utils/hooks/connectivity/connectivity.test.ts

@@ -8,12 +8,17 @@ jest.mock('@sentry/react-native', () => ({
   captureException: () => {},
 }));
 
+jest.mock('../core/core-config', () => ({
+  getEnabledTransports: () => [],
+  useCoreConfig: () => ({}),
+}));
+
 jest.mock('@react-native-community/netinfo', () => ({
-  addEventListener: () => {},
+  addEventListener: () => { },
 }));
 
 jest.mock('react-native-bluetooth-state-manager', () => ({
-  onStateChange: () => {},
+  onStateChange: () => { },
 }));
 
 describe('getInvitationUrlTransports', () => {

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

@@ -1,11 +1,15 @@
-import { DidTypeEnum, OneError } from '@procivis/react-native-one-core';
+import { IdentifierStateEnum, IdentifierTypeEnum } from '@procivis/react-native-one-core';
 import { useCallback } from 'react';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
-import { generateUUID } from '../../uuid';
+import { reportException } from '../../reporting';
 import { useONECore } from './core-context';
-import { HW_DID_NAME_PREFIX, IdentifiersInitializationConfig, SW_DID_NAME_PREFIX } from './core-init';
-import { OneErrorCode } from './error-code';
+import {
+  generateHwIdentifier,
+  generateSwIdentifier,
+  IdentifiersInitializationConfig,
+  SW_DID_NAME_PREFIX,
+} from './core-init';
 import { HISTORY_LIST_QUERY_KEY } from './history';
 
 const BACKUP_INFO_QUERY_KEY = 'backup-info';
@@ -61,6 +65,11 @@ export const useRollbackImport = () => {
   });
 };
 
+/**
+ * Finalize backup import and extract/prepare identifiers
+ * @param {IdentifiersInitializationConfig} config Select desired keys/dids to be restored/created
+ * @returns [hwIdentifierId, swIdentifierId]
+ */
 export const useBackupFinalizeImportProcedure = ({ generateHwKey, generateSwKey }: IdentifiersInitializationConfig) => {
   const { mutateAsync: finalizeImport } = useFinalizeImport();
   const { core, organisationId } = useONECore();
@@ -68,77 +77,26 @@ export const useBackupFinalizeImportProcedure = ({ generateHwKey, generateSwKey
   return useCallback(async () => {
     await finalizeImport();
 
-    // update wallet did references
-    const dids = await core.getDids({
-      deactivated: false,
-      organisationId,
-      page: 0,
-      pageSize: 1,
-      type: DidTypeEnum.LOCAL,
-    });
-    let swDidId = dids.values.find((did) => did.name.startsWith(SW_DID_NAME_PREFIX))?.id;
-
-    if (!swDidId && generateSwKey) {
-      const swKeyId = await core.generateKey({
-        keyParams: {},
-        keyType: 'EDDSA',
-        name: `holder-key-sw-${generateUUID()}`,
-        organisationId,
-        storageParams: {},
-        storageType: 'INTERNAL',
-      });
-      swDidId = await core.createDid({
-        didMethod: 'KEY',
-        keys: {
-          assertionMethod: [swKeyId],
-          authentication: [swKeyId],
-          capabilityDelegation: [swKeyId],
-          capabilityInvocation: [swKeyId],
-          keyAgreement: [swKeyId],
-        },
-        name: `${SW_DID_NAME_PREFIX}-${generateUUID()}`,
+    // update wallet identifier references
+    let swIdentifierId: string | undefined;
+    if (generateSwKey) {
+      const identifiers = await core.getIdentifiers({
+        state: IdentifierStateEnum.ACTIVE,
         organisationId,
-        params: {},
+        page: 0,
+        pageSize: 1,
+        types: [IdentifierTypeEnum.DID],
+        isRemote: false,
       });
+      swIdentifierId = identifiers.values.find((identifier) => identifier.name.startsWith(SW_DID_NAME_PREFIX))?.id;
     }
 
-    let hwKeyId: string | null = null;
-    if (generateHwKey) {
-      hwKeyId = await core
-        .generateKey({
-          keyParams: {},
-          keyType: 'ECDSA',
-          name: `holder-key-hw-${generateUUID()}`,
-          organisationId,
-          storageParams: {},
-          storageType: 'SECURE_ELEMENT',
-        })
-        .catch((e) => {
-          // ignore if HW keys not supported by device
-          if (e instanceof OneError && e.code === OneErrorCode.KeyStorageNotSupported) {
-            return null;
-          }
-          throw e;
-        });
-    }
-
-    let hwDidId: string | null = null;
-    if (hwKeyId) {
-      hwDidId = await core.createDid({
-        didMethod: 'KEY',
-        keys: {
-          assertionMethod: [hwKeyId],
-          authentication: [hwKeyId],
-          capabilityDelegation: [hwKeyId],
-          capabilityInvocation: [hwKeyId],
-          keyAgreement: [hwKeyId],
-        },
-        name: `${HW_DID_NAME_PREFIX}-${generateUUID()}`,
-        organisationId,
-        params: {},
-      });
-    }
-
-    return [hwDidId, swDidId] as [string | null, string | undefined];
+    return Promise.all([
+      generateHwKey ? generateHwIdentifier(core, organisationId) : null,
+      !swIdentifierId && generateSwKey ? generateSwIdentifier(core, organisationId) : swIdentifierId,
+    ]).catch((err) => {
+      reportException(err, 'Failed to create base identifiers');
+      throw err;
+    });
   }, [core, organisationId, finalizeImport, generateHwKey, generateSwKey]);
 };

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 generateHwIdentifier = async (core: ONECore, organisationId: string) => {
+export const generateHwIdentifier = async (core: ONECore, organisationId: string) => {
   const hwKeyId = await core
     .generateKey({
       keyParams: {},
@@ -30,6 +30,7 @@ const generateHwIdentifier = async (core: ONECore, organisationId: string) => {
     return core.createIdentifier({
       did: {
         method: 'KEY',
+        name: HW_DID_NAME_PREFIX,
         keys: {
           assertionMethod: [hwKeyId],
           authentication: [hwKeyId],
@@ -47,7 +48,7 @@ const generateHwIdentifier = async (core: ONECore, organisationId: string) => {
   return null;
 };
 
-const generateSwIdentifier = async (core: ONECore, organisationId: string) => {
+export const generateSwIdentifier = async (core: ONECore, organisationId: string) => {
   const swKeyId = await core.generateKey({
     keyParams: {},
     keyType: 'ECDSA',
@@ -60,6 +61,7 @@ const generateSwIdentifier = async (core: ONECore, organisationId: string) => {
   return core.createIdentifier({
     did: {
       method: 'KEY',
+      name: SW_DID_NAME_PREFIX,
       keys: {
         assertionMethod: [swKeyId],
         authentication: [swKeyId],
@@ -82,7 +84,7 @@ export interface IdentifiersInitializationConfig {
 /**
  * Create base local identifiers
  * @param {IdentifiersInitializationConfig} config Select desired keys/dids to be created
- * @returns [hwDidId, swDidId]
+ * @returns [hwIdentifierId, swIdentifierId]
  */
 export const useInitializeONECoreIdentifiers = ({ generateHwKey, generateSwKey }: IdentifiersInitializationConfig) => {
   const { core, organisationId } = useONECore();

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

@@ -1,8 +1,12 @@
+import { IdentifierListQuery, IdentifierStateEnum, IdentifierTypeEnum } from "@procivis/react-native-one-core";
 import { useQuery } from "react-query";
 
+import { getQueryKeyFromIdentifierListQueryParams } from "../../parsers";
 import { useONECore } from "./core-context";
 
 export const IDENTIFIER_DETAIL_QUERY_KEY = 'identifier-detail';
+export const IDENTIFIER_LIST_QUERY_KEY = 'identifier-list';
+const PAGE_SIZE = 20;
 
 export const useIdentifierDetails = (identifierId: string | undefined) => {
   const { core } = useONECore();
@@ -15,4 +19,21 @@ export const useIdentifierDetails = (identifierId: string | undefined) => {
       keepPreviousData: true,
     },
   );
-}
+}
+
+export const useIdentifiers = (identifierFilter?: Partial<IdentifierListQuery>) => {
+  const { core, organisationId } = useONECore();
+
+  return useQuery(
+    [IDENTIFIER_LIST_QUERY_KEY, ...getQueryKeyFromIdentifierListQueryParams(identifierFilter)],
+    ({ pageParam = 0 }) => (core.getIdentifiers({
+      types: [IdentifierTypeEnum.DID],
+      isRemote: false,
+      page: pageParam,
+      state: IdentifierStateEnum.ACTIVE,
+      organisationId: organisationId,
+      pageSize: PAGE_SIZE,
+      ...identifierFilter,
+    })),
+  );
+};

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

@@ -1,7 +1,7 @@
 import {
   Config,
   CreateProofRequest,
-  DidListQuery,
+  IdentifierListQuery,
   OneError,
   PresentationSubmitCredentialRequest,
   ProofListQuery,
@@ -16,9 +16,9 @@ import { getQueryKeyFromProofListQueryParams } from '../../parsers/query';
 import { Transport } from '../connectivity/connectivity';
 import { useCoreConfig } from './core-config';
 import { useONECore } from './core-context';
-import { useDids } from './dids';
 import { OneErrorCode } from './error-code';
 import { HISTORY_LIST_QUERY_KEY } from './history';
+import { useIdentifiers } from './identifiers';
 import { useProofSchemaDetail } from './proof-schemas';
 
 const PAGE_SIZE = 10;
@@ -198,7 +198,7 @@ export const useProofCreate = () => {
   });
 };
 
-const getDidFilterForProofSchema = (proofSchema: ProofSchema, config: Config): Partial<DidListQuery> => {
+const getIdentifierFilterForProofSchema = (proofSchema: ProofSchema, config: Config): Partial<IdentifierListQuery> => {
   const requestedFormats = proofSchema.proofInputSchemas.map((schema) => schema.credentialSchema.format);
   const requestedFormatsCapabilities = requestedFormats
     .map((format) => config.format[format]?.capabilities)
@@ -227,12 +227,12 @@ export const useProofForSchemaIdWithTransport = (
   const { data: proofSchema } = useProofSchemaDetail(proofSchemaId, enabled);
   const { data: config } = useCoreConfig();
 
-  const didFilter = useMemo(
-    () => (proofSchema && config ? getDidFilterForProofSchema(proofSchema, config) : undefined),
+  const identifierFilter = useMemo(
+    () => (proofSchema && config ? getIdentifierFilterForProofSchema(proofSchema, config) : undefined),
     [config, proofSchema],
   );
 
-  const { data: dids } = useDids(didFilter);
+  const { data: identifiers } = useIdentifiers(identifierFilter);
   const { mutateAsync: createProof } = useProofCreate();
   const { mutateAsync: deleteProof } = useProofDelete();
 
@@ -264,19 +264,28 @@ export const useProofForSchemaIdWithTransport = (
     if (enabled) {
       return;
     }
+
     if (proofState !== ProofStateEnum.CREATED && proofState !== ProofStateEnum.PENDING) {
       setProofId(undefined);
+    } else {
+      setDeleting(true);
+      deleteProof(proofIdRef.current || '')
+        .then(() => {
+          setProofId(undefined);
+          setDeleting(false);
+        })
+        .catch(() => {});
     }
-  }, [enabled, proofState, setProofId]);
+  }, [deleteProof, enabled, proofId, proofState, setProofId]);
 
   useEffect(() => {
     if (
       deleting ||
       !enabled ||
       proofId ||
-      !dids ||
-      !didFilter ||
-      !dids.values.length ||
+      !identifiers ||
+      !identifierFilter ||
+      !identifiers.values.length ||
       !transport ||
       transport.length === 0
     ) {
@@ -284,16 +293,16 @@ export const useProofForSchemaIdWithTransport = (
     }
 
     createProof({
-      exchange: VerificationProtocol.OPENID4VP_PROXIMITY_DRAFT00,
+      protocol: VerificationProtocol.OPENID4VP_PROXIMITY_DRAFT00,
       proofSchemaId,
       transport,
-      verifierDidId: dids.values[0].id,
+      verifierIdentifierId: identifiers.values[0].id,
     })
       .then((id) => {
         setProofId(id);
       })
       .catch(() => {});
-  }, [proofSchemaId, dids, didFilter, createProof, enabled, transport, proofId, setProofId, deleting]);
+  }, [proofSchemaId, identifiers, identifierFilter, createProof, enabled, transport, proofId, setProofId, deleting]);
 
   return deleting ? undefined : proofId;
 };
@@ -323,6 +332,7 @@ export const useShareProof = (proofUrlProps: ProofUrlHookParams | undefined, ena
   const [sharedProof, setSharedProof] = useState<{
     bleAdapterDisabled: boolean;
     url?: string;
+    error?: unknown;
   }>();
 
   // reset when proofId changes or the proof was retracted
@@ -344,12 +354,13 @@ export const useShareProof = (proofUrlProps: ProofUrlHookParams | undefined, ena
           url,
         });
       })
-      .catch((err: unknown) => {
-        // TODO emit error with specific error code from core.
-        if (err instanceof OneError && err.cause?.includes('BLE adapter not enabled')) {
+      .catch((error: unknown) => {
+        if (error instanceof OneError && error.cause?.includes('BLE adapter not enabled')) {
           setSharedProof({
             bleAdapterDisabled: true,
           });
+        } else {
+          setSharedProof({ error, bleAdapterDisabled: false });
         }
       });
   }, [enabled, proofUrlProps, shareProof, sharedProof]);

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

@@ -51,7 +51,6 @@ export const useCreateTrustAnchor = (publisherReference: string) => {
   );
 };
 
-// NOTE: As per ONE-5672, only handles DID Identifier details
 export const useTrustEntity = (identifierId: string | undefined) => {
   const { core } = useONECore();
 
@@ -59,9 +58,15 @@ export const useTrustEntity = (identifierId: string | undefined) => {
 
   return useQuery(
     [TRUST_ENTITY_DETAIL_QUERY_KEY, identifierId],
-    () =>
-      identifierDetail?.did
-        ? core.getTrustEntityByDid(identifierDetail.did.id).catch((e) => {
+    () => identifierId && identifierDetail
+        ? core.resolveTrustEntityByIdentifier({
+          identifiers: [{
+            certificateId: identifierDetail.type === 'CERTIFICATE' ? identifierDetail.certificates?.[0]?.id : undefined,
+            id: identifierId,
+          }],
+        }).then((result) => {
+          return result[identifierId];
+        }).catch((e) => {
           if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
             return null;
           }
@@ -69,20 +74,22 @@ export const useTrustEntity = (identifierId: string | undefined) => {
         })
         : undefined,
     {
-      enabled: Boolean(identifierDetail?.did),
+      enabled: Boolean(identifierDetail),
       keepPreviousData: true,
     },
   );
 };
 
-export const useRemoteTrustEntity = (did: string | undefined) => {
+export const useRemoteTrustEntity = (identifierId: string | undefined) => {
   const { core } = useONECore();
 
+  const { data: identifierDetail } = useIdentifierDetails(identifierId);
+
   return useQuery(
-    [REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY, did],
-    () => (did ? core.getRemoteTrustEntity(did) : undefined),
+    [REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY, identifierId],
+    () => (identifierDetail?.did ? core.getRemoteTrustEntity(identifierDetail.did.id) : undefined),
     {
-      enabled: Boolean(did),
+      enabled: Boolean(identifierDetail?.did),
       keepPreviousData: true,
     },
   );
@@ -92,7 +99,21 @@ export const useCreateRemoteTrustEntity = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (request: CreateRemoteTrustEntityRequest) => core.createRemoteTrustEntity(request), {
+  return useMutation(async (request: Omit<CreateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string, didId?: string }) => {
+    const { identifierId, didId } = request
+
+    let entityDidId = didId;
+
+    if (identifierId) {
+      const identifierDetail = await core.getIdentifier(identifierId);
+      entityDidId = identifierDetail?.did?.id;
+    }
+
+    return core.createRemoteTrustEntity({
+      ...request,
+      didId: entityDidId!,
+    })
+  }, {
     onSuccess: async () => {
       await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
@@ -104,7 +125,20 @@ export const useUpdateRemoteTrustEntity = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (request: UpdateRemoteTrustEntityRequest) => core.updateRemoteTrustEntity(request), {
+  return useMutation(async (request: Omit<UpdateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string, didId?: string }) => {
+    const { identifierId, didId } = request
+
+    let entityDidId = didId;
+    if (identifierId) {
+      const identifierDetail = await core.getIdentifier(identifierId);
+      entityDidId = identifierDetail?.did?.id;
+    }
+
+    return core.updateRemoteTrustEntity({
+      ...request,
+      didId: entityDidId!,
+    })
+  }, {
     onSuccess: async () => {
       await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);

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

@@ -143,22 +143,16 @@ const getDisplayedAttributes = (
   selectiveDisclosureSupported?: boolean,
   selectedFields?: string[],
 ): DisplayedAttribute[] => {
-  if (credential && selectiveDisclosureSupported === false) {
-    return credential.claims.map((claim) => ({
-      claim,
-      id: claim.id,
-      status: SelectorStatus.Required,
-    }));
-  }
+  const claims = credential ? spreadClaims(credential.claims) : undefined;
 
   return request.fields.map((field) => {
     const selected = !field.required && selectedFields?.includes(field.id);
     const claim =
-      credential &&
-      spreadClaims(credential.claims).find(({ key }) => {
+      credential ?
+      claims?.find(({ key }) => {
         return key === field.keyMap[credential.id];
-      });
-    const status = getAttributeSelectorStatus(field, validityState, credential, claim, selected);
+      }) : undefined;
+    const status = selectiveDisclosureSupported === false ? SelectorStatus.Required : getAttributeSelectorStatus(field, validityState, credential, claim, selected);
     return { claim, field, id: field.id, selected, status };
   });
 };
@@ -236,7 +230,7 @@ export const shareCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
+    credential ? { ...credential, issuer: credential.issuer?.id } : undefined,
     config,
   );
   const notice: CredentialCardNotice | undefined =
@@ -260,7 +254,7 @@ export const shareCredentialCardFromCredential = (
     )
     : missingCredentialCardFromRequest(request, notice, cardTestId, labels);
   const validityState = getValidityState(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
+    credential ? { ...credential, issuer: credential.issuer?.id } : undefined,
   );
   const displayedAttributes = getDisplayedAttributes(
     request,
@@ -320,7 +314,7 @@ export const selectCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
+    credential ? { ...credential, issuer: credential.issuer?.id } : undefined,
     config,
   );
   const rightAccessory = <Selector status={selected ? SelectorStatus.SelectedRadio : SelectorStatus.Empty} />;

package/src/utils/parsers/query.tsx

@@ -3,6 +3,7 @@ import {
   CredentialSchemaListQuery,
   DidListQuery,
   HistoryListQuery,
+  IdentifierListQuery,
   ProofListQuery,
   ProofSchemaListQuery,
 } from '@procivis/react-native-one-core';
@@ -22,7 +23,7 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
 
   const {
     entityId,
-    action,
+    actions,
     entityTypes,
     createdDateFrom,
     createdDateTo,
@@ -35,7 +36,7 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
   } = queryParams;
   return [
     entityId,
-    action,
+    actions,
     entityTypes,
     createdDateFrom,
     createdDateTo,
@@ -80,3 +81,12 @@ export const getQueryKeyFromDidListQueryParams = (queryParams?: Partial<DidListQ
   const { name, did, type, deactivated, keyAlgorithms, keyRoles } = queryParams;
   return [name, did, type, deactivated, keyAlgorithms, keyRoles];
 };
+
+export const getQueryKeyFromIdentifierListQueryParams = (queryParams?: Partial<IdentifierListQuery>) => {
+  if (!queryParams) {
+    return [];
+  }
+
+  const { isRemote, didMethods, state, keyStorages, keyAlgorithms, exact, keyRoles, types, name } = queryParams;
+  return [name, types, state, isRemote, didMethods, keyStorages, keyAlgorithms, exact, keyRoles];
+};