diff --git a/components/VC/common/VCUtils.tsx b/components/VC/common/VCUtils.tsx index 14750cb44f..3c54c37ccf 100644 --- a/components/VC/common/VCUtils.tsx +++ b/components/VC/common/VCUtils.tsx @@ -58,7 +58,12 @@ export const getFieldValue = ( } switch (field) { case 'status': - return ; + return ( + + ); case 'idType': return getIDType(verifiableCredential); case 'credentialRegistry': diff --git a/machines/VerifiableCredential/VCItemMachine/VCItemActions.ts b/machines/VerifiableCredential/VCItemMachine/VCItemActions.ts index 83fb6aa23a..6c283ab4fd 100644 --- a/machines/VerifiableCredential/VCItemMachine/VCItemActions.ts +++ b/machines/VerifiableCredential/VCItemMachine/VCItemActions.ts @@ -21,10 +21,11 @@ import { sendErrorEvent, getErrorEventData, } from '../../../shared/telemetry/TelemetryUtils'; -import {WalletBindingResponse} from '../VCMetaMachine/vc'; + import {ActivityLogEvents} from '../../activityLog'; import {BackupEvents} from '../../backupAndRestore/backup'; import {VcMetaEvents} from '../VCMetaMachine/VCMetaMachine'; +import {WalletBindingResponse} from '../VCMetaMachine/vc'; export const VCItemActions = model => { return { @@ -43,7 +44,7 @@ export const VCItemActions = model => { vcMetadata: context.vcMetadata, }), { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), requestStoredContext: send( @@ -94,7 +95,7 @@ export const VCItemActions = model => { }; }, { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), removeVcMetaDataFromStorage: send( @@ -116,7 +117,7 @@ export const VCItemActions = model => { }; }, { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), sendDownloadLimitExpire: send( @@ -127,7 +128,7 @@ export const VCItemActions = model => { }; }, { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), @@ -140,7 +141,7 @@ export const VCItemActions = model => { }; }, { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), refreshAllVcs: send( @@ -148,7 +149,7 @@ export const VCItemActions = model => { type: 'REFRESH_MY_VCS', }), { - to: (context: any) => context.serviceRefs.vc, + to: (context: any) => context.serviceRefs.vcMeta, }, ), @@ -166,13 +167,13 @@ export const VCItemActions = model => { sendVcUpdated: send( (context: any) => VcMetaEvents.VC_METADATA_UPDATED(context.vcMetadata), { - to: (context: any) => context.serviceRefs.vc, + to: (context: any) => context.serviceRefs.vcMeta, }, ), sendTamperedVc: send( (context: any) => VcMetaEvents.TAMPERED_VC(context.vcMetadata), { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), setErrorAsWalletBindingError: assign({ @@ -196,7 +197,7 @@ export const VCItemActions = model => { }; }, { - to: (context: any) => context.serviceRefs.vc, + to: (context: any) => context.serviceRefs.vcMeta, }, ), setWalletBindingResponse: assign({ @@ -340,7 +341,7 @@ export const VCItemActions = model => { }; }, { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), @@ -352,7 +353,7 @@ export const VCItemActions = model => { }; }, { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), sendTelemetryEvents: () => { diff --git a/machines/VerifiableCredential/VCMetaMachine/VCMetaMachine.ts b/machines/VerifiableCredential/VCMetaMachine/VCMetaMachine.ts index b30e83f295..7e4129820d 100644 --- a/machines/VerifiableCredential/VCMetaMachine/VCMetaMachine.ts +++ b/machines/VerifiableCredential/VCMetaMachine/VCMetaMachine.ts @@ -78,13 +78,13 @@ export const vcMetaMachine = context: model.initialContext, events: {} as EventFrom, }, - id: 'vc', + id: 'vcMeta', initial: 'init', states: { init: { on: { REFRESH_MY_VCS: { - target: '#vc.ready.myVcs.refreshing', + target: '#vcMeta.ready.myVcs.refreshing', }, }, initial: 'myVcs', @@ -103,7 +103,7 @@ export const vcMetaMachine = on: { STORE_RESPONSE: { actions: 'setReceivedVcs', - target: '#vc.ready', + target: '#vcMeta.ready', }, }, }, @@ -183,7 +183,7 @@ export const vcMetaMachine = actions: 'resetWalletBindingSuccess', }, REFRESH_RECEIVED_VCS: { - target: '#vc.ready.receivedVcs.refreshing', + target: '#vcMeta.ready.receivedVcs.refreshing', }, TAMPERED_VC: { actions: 'setTamperedVcs', @@ -194,7 +194,7 @@ export const vcMetaMachine = 'removeVcFromInProgressDownlods', 'setDownloadingFailedVcs', ], - target: '#vc.ready.myVcs.refreshing', + target: '#vcMeta.ready.myVcs.refreshing', }, DELETE_VC: { target: 'deletingFailedVcs', @@ -204,7 +204,7 @@ export const vcMetaMachine = 'removeVcFromInProgressDownlods', 'setVerificationErrorMessage', ], - target: '#vc.ready.myVcs.refreshing', + target: '#vcMeta.ready.myVcs.refreshing', }, RESET_VERIFY_ERROR: { actions: 'resetVerificationErrorMessage', @@ -239,7 +239,7 @@ export const vcMetaMachine = entry: ['logTamperedVCsremoved', send('REFRESH_VCS_METADATA')], on: { REFRESH_VCS_METADATA: { - target: '#vc.init', + target: '#vcMeta.init', }, }, }, @@ -253,7 +253,7 @@ export const vcMetaMachine = 'removeDownloadingFailedVcsFromMyVcs', 'resetDownloadFailedVcs', ], - target: '#vc.ready.myVcs.refreshing', + target: '#vcMeta.ready.myVcs.refreshing', }, }, }, diff --git a/screens/Home/MyVcsTabMachine.ts b/screens/Home/MyVcsTabMachine.ts index c8b97bbc5a..5fe54837d4 100644 --- a/screens/Home/MyVcsTabMachine.ts +++ b/screens/Home/MyVcsTabMachine.ts @@ -195,7 +195,7 @@ export const MyVcsTabMachine = model.createMachine( (_context, event) => VcMetaEvents.VC_ADDED(event.response as VCMetadata), { - to: context => context.serviceRefs.vc, + to: context => context.serviceRefs.vcMeta, }, ), }, diff --git a/shared/vcjs/verifyCredential.ts b/shared/vcjs/verifyCredential.ts index 8a04e3280c..101c6a3065 100644 --- a/shared/vcjs/verifyCredential.ts +++ b/shared/vcjs/verifyCredential.ts @@ -86,9 +86,6 @@ function handleResponse( errorMessage = VerificationErrorType.TECHNICAL_ERROR; isVerifiedFlag = false; - console.log('Verification: ', result['results'][0]); - console.log('Verifiable Credential: ', verifiableCredential); - if (errorCodeName == 'jsonld.InvalidUrl') { errorMessage = VerificationErrorType.NETWORK_ERROR; } else if (errorCodeName == VerificationErrorType.RANGE_ERROR) {