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

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

@@ -1,5 +1,7 @@
-import Avatar, { AvatarProps } from './avatar';
-import EntityCluster, { EntityClusterProps } from './entity-cluster';
+import type { AvatarProps } from './avatar';
+import Avatar from './avatar';
+import type { EntityClusterProps } from './entity-cluster';
+import EntityCluster from './entity-cluster';
 
 export { Avatar, AvatarProps };
 export { EntityCluster, EntityClusterProps };

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

@@ -37,7 +37,10 @@ type CredentialDetails = Omit<
 type CredentialCard = Omit<
   CredentialDetailsCardListItemProps,
   'expanded' | 'labels' | 'lastItem' | 'onHeaderPress' | 'onImagePreview'
->;
+> & {
+  /** default: true */
+  headerPressable?: boolean;
+};
 
 export type HistoryDetailsViewProps = {
   assets?: {
@@ -195,7 +198,7 @@ export const HistoryDetailsView: FC<HistoryDetailsViewProps> = ({
             ...props.credentialCard,
             card: {
               ...props.credentialCard.card,
-              onHeaderPress,
+              onHeaderPress: props.credentialCard.headerPressable === false ? undefined : onHeaderPress,
             },
           };
           return (

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

@@ -1,7 +1,10 @@
-import DataItem, { DataItemProps } from './data-item';
-import HistoryItemView, { HistoryItemViewProps } from './history-item';
+import type { DataItemProps } from './data-item';
+import DataItem from './data-item';
+import type { HistoryItemViewProps } from './history-item';
+import HistoryItemView from './history-item';
 import HistorySectionHeaderView from './history-section-header';
-import HistorySectionListItem, { HistorySectionListItemProps } from './history-section-list-item';
+import type { HistorySectionListItemProps } from './history-section-list-item';
+import HistorySectionListItem from './history-section-list-item';
 
 export * from './history-details';
 export { DataItem, DataItemProps };

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

@@ -30,28 +30,24 @@ export const EntityTrustedIcon: FC<SvgProps> = ({ ...props }) => {
   );
 };
 
-// https://www.figma.com/design/52qDYWUMjXAGre1dcnz5bz/Procivis-One-Wallet?node-id=415-5402&t=prmu1s6PuABrPg0l-0
+// https://www.figma.com/design/52qDYWUMjXAGre1dcnz5bz/Procivis-One-Wallet?node-id=415-5402&t=8jP7yF4eYj70Gm9A-0
 export const EntityNotTrustedIcon: FC<SvgProps> = ({ ...props }) => {
   const colorScheme = useAppColorScheme();
   return (
-    <Svg width={22} height={20} viewBox="0 0 22 20" fill="none" {...props}>
+    <Svg width={22} height={22} viewBox="0 0 22 22" fill="none" {...props}>
       <Path
-        d="M4.35742 17.9673C3.87598 17.9673 3.45817 17.8621 3.104 17.6519C2.74984 17.4416 2.47591 17.1593 2.28223 16.8052C2.09408 16.451 2 16.0581 2 15.6265C2 15.2059 2.11068 14.8047 2.33203 14.4229L8.75684 3.2251C8.97266 2.83219 9.26318 2.53613 9.62842 2.33691C9.99365 2.1377 10.3755 2.03809 10.7739 2.03809C11.1724 2.03809 11.5514 2.1377 11.9111 2.33691C12.2708 2.5306 12.5641 2.82666 12.791 3.2251L19.2158 14.4229C19.3265 14.611 19.4095 14.8075 19.4648 15.0122C19.5202 15.217 19.5479 15.4217 19.5479 15.6265C19.5479 16.0581 19.451 16.451 19.2573 16.8052C19.0636 17.1593 18.7897 17.4416 18.4355 17.6519C18.0869 17.8621 17.6719 17.9673 17.1904 17.9673H4.35742Z"
-        fill={colorScheme.warning}
+        d="M10.575 20a8.241 8.241 0 01-3.312-.672 8.649 8.649 0 01-2.74-1.851 8.837 8.837 0 01-1.85-2.74A8.242 8.242 0 012 11.425c0-1.173.224-2.277.672-3.312a8.793 8.793 0 014.582-4.59 8.243 8.243 0 013.312-.672c1.18 0 2.286.224 3.32.672a8.766 8.766 0 012.74 1.86 8.667 8.667 0 011.86 2.73 8.243 8.243 0 01.672 3.312 8.243 8.243 0 01-.673 3.312 8.768 8.768 0 01-4.598 4.59 8.241 8.241 0 01-3.312.673z"
+        fill={colorScheme.error}
       />
       <Path
-        d="M10.7744 1.03809C11.3435 1.03817 11.884 1.18254 12.3838 1.45703L12.3848 1.45605C12.386 1.45672 12.3874 1.45831 12.3887 1.45898C12.3908 1.46017 12.3933 1.46072 12.3955 1.46191L12.3945 1.46289C12.9333 1.75557 13.3522 2.19115 13.6582 2.72754L20.0781 13.916L20.1865 14.1162C20.2888 14.3193 20.3712 14.5309 20.4307 14.751C20.5082 15.0377 20.5479 15.331 20.5479 15.627C20.5478 16.2141 20.4144 16.7738 20.1348 17.2852C19.8533 17.7998 19.4512 18.2119 18.9463 18.5117L18.9453 18.5107C18.4159 18.8284 17.818 18.9678 17.1904 18.9678H4.35742C3.72707 18.9678 3.12678 18.8281 2.59375 18.5117C2.08885 18.2119 1.68678 17.7998 1.40527 17.2852L1.39941 17.2744C1.1288 16.765 1.00007 16.2092 1 15.627C1 15.0214 1.16165 14.4473 1.4668 13.9209L7.88965 2.72754C8.1894 2.18833 8.60891 1.75383 9.14941 1.45898C9.65481 1.18331 10.2012 1.03809 10.7744 1.03809Z"
+        d="M10.566 1.85c1.31 0 2.552.25 3.718.755a9.765 9.765 0 013.047 2.068l.321.335a9.671 9.671 0 011.751 2.708 9.244 9.244 0 01.755 3.71c0 1.304-.25 2.544-.755 3.709a9.766 9.766 0 01-5.123 5.112h0a9.242 9.242 0 01-3.705.753 9.244 9.244 0 01-3.706-.754 9.648 9.648 0 01-3.053-2.062l-.003-.002a9.836 9.836 0 01-2.058-3.047A9.242 9.242 0 011 11.425c0-1.304.25-2.544.755-3.71a9.793 9.793 0 015.1-5.11h.001a9.244 9.244 0 013.71-.754z"
         stroke={colorScheme.white}
-        strokeWidth={2}
         strokeOpacity={0.2}
+        strokeWidth={2}
       />
       <Path
-        d="M11.5376 11.5093C11.5265 12.0239 11.2747 12.2812 10.7822 12.2812C10.2786 12.2812 10.0186 12.0267 10.002 11.5176L9.88574 7.33398C9.87467 7.08496 9.95215 6.88021 10.1182 6.71973C10.2842 6.55371 10.5028 6.4707 10.7739 6.4707C11.0396 6.4707 11.2581 6.55371 11.4297 6.71973C11.6012 6.88021 11.6815 7.08773 11.6704 7.34229L11.5376 11.5093Z"
-        fill={colorScheme.black}
-      />
-      <Path
-        d="M11.4961 14.8711C11.2969 15.0482 11.0589 15.1367 10.7822 15.1367C10.5055 15.1367 10.2648 15.0482 10.0601 14.8711C9.86084 14.694 9.76123 14.4671 9.76123 14.1904C9.76123 13.9193 9.86084 13.6924 10.0601 13.5098C10.2593 13.3271 10.5 13.2358 10.7822 13.2358C11.0589 13.2358 11.2969 13.3271 11.4961 13.5098C11.6953 13.6924 11.7949 13.9193 11.7949 14.1904C11.7949 14.4671 11.6953 14.694 11.4961 14.8711Z"
-        fill={colorScheme.black}
+        d="M8.433 14.712a.822.822 0 01-.58.225.773.773 0 01-.557-.225.773.773 0 01-.224-.556c0-.216.077-.398.232-.548l2.167-2.174-2.167-2.159a.768.768 0 01-.232-.547c0-.227.074-.413.224-.557a.773.773 0 01.556-.224c.216 0 .401.072.556.216l2.175 2.167 2.183-2.167a.759.759 0 01.556-.232c.216 0 .399.077.548.232.155.15.232.332.232.548 0 .21-.077.396-.232.556l-2.175 2.167 2.167 2.166c.155.144.232.33.232.556a.759.759 0 01-.232.556.755.755 0 01-.556.225.765.765 0 01-.565-.225l-2.158-2.166-2.15 2.166z"
+        fill={colorScheme.white}
       />
     </Svg>
   )

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

@@ -1,6 +1,9 @@
-import RadioGroup, { RadioGroupItem, RadioGroupProps } from './radio-group';
-import SelectionInput, { SelectionInputChoice, SelectionInputProps } from './selection-input';
-import TextInput, { TextInputAccessory, TextInputProps } from './text-input';
+import type { RadioGroupItem, RadioGroupProps } from './radio-group';
+import RadioGroup from './radio-group';
+import type { SelectionInputChoice, SelectionInputProps } from './selection-input';
+import SelectionInput from './selection-input';
+import type { TextInputProps } from './text-input';
+import TextInput, { TextInputAccessory } from './text-input';
 
 export { RadioGroup, RadioGroupItem, RadioGroupProps };
 export { SelectionInput, SelectionInputChoice, SelectionInputProps };

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

@@ -1,5 +1,7 @@
-import ListSectionHeader, { ListSectionHeaderProps } from './list-section-header';
-import ListTitleHeader, { ListTitleHeaderProps } from './list-title-header';
+import type { ListSectionHeaderProps } from './list-section-header';
+import ListSectionHeader from './list-section-header';
+import type { ListTitleHeaderProps } from './list-title-header';
+import ListTitleHeader from './list-title-header';
 
 export { ListSectionHeader, ListSectionHeaderProps };
 export { ListTitleHeader, ListTitleHeaderProps };

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

@@ -1,5 +1,7 @@
-import LoaderView, { LoaderViewProps, LoaderViewState } from './loader';
-import LoadingResultScreen, { LoadingResultScreenProps } from './loading-result';
+import type { LoaderViewProps } from './loader';
+import LoaderView, { LoaderViewState } from './loader';
+import type { LoadingResultScreenProps } from './loading-result';
+import LoadingResultScreen from './loading-result';
 
 export { LoaderView, LoaderViewProps, LoaderViewState };
 export { LoadingResultScreen, LoadingResultScreenProps };

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]);