From 68197caebd9489d52a84b0e9334b4ced0e79ec30 Mon Sep 17 00:00:00 2001 From: Alka Date: Fri, 1 Dec 2023 13:43:12 +0530 Subject: [PATCH 1/2] feat(INJI-388): update error message of qr login to specific message Signed-off-by: Alka --- locales/en.json | 5 ++++- machines/QrLoginMachine.ts | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/locales/en.json b/locales/en.json index 2706e79965..1538d656b4 100644 --- a/locales/en.json +++ b/locales/en.json @@ -394,7 +394,10 @@ "cancel": "Cancel", "essentialClaims": "Important Claims", "voluntaryClaims": "Voluntary Claims", - "required": "It is necessary" + "required": "It is necessary", + "errors":{ + "invalidQR": "QR code is invalid. Please try again!" + } }, "ReceiveVcScreen": { "header": "Card details", diff --git a/machines/QrLoginMachine.ts b/machines/QrLoginMachine.ts index 7d4b84897f..70894a32a8 100644 --- a/machines/QrLoginMachine.ts +++ b/machines/QrLoginMachine.ts @@ -24,7 +24,7 @@ import i18n from '../i18n'; import {parseMetadatas, VCMetadata} from '../shared/VCMetadata'; import { getEndEventData, - sendEndEvent + sendEndEvent, } from '../shared/telemetry/TelemetryUtils'; import {TelemetryConstants} from '../shared/telemetry/TelemetryConstants'; import {API_URLS} from '../shared/api'; @@ -340,10 +340,21 @@ export const qrLoginMachine = }, SetErrorMessage: assign({ - errorMessage: (context, event) => - i18n.t(`errors.genericError`, { - ns: 'common', - }), + errorMessage: (context, event) => { + const message = event.data.name; + const ID_ERRORS_MAP = { + invalid_link_code: 'invalidQR', + }; + const errorMessage = ID_ERRORS_MAP[message] + ? i18n.t(`errors.${ID_ERRORS_MAP[message]}`, { + ns: 'QrLogin', + }) + : i18n.t(`errors.genericError`, { + ns: 'common', + }); + + return errorMessage; + }, }), setConsentClaims: assign({ From f3dbc43fe7e58531a29eac8636de36b65a4cf3eb Mon Sep 17 00:00:00 2001 From: Alka Date: Fri, 1 Dec 2023 13:44:03 +0530 Subject: [PATCH 2/2] fix(INJI-388): add missing error id constants in telemetry Signed-off-by: Alka --- shared/telemetry/TelemetryConstants.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shared/telemetry/TelemetryConstants.js b/shared/telemetry/TelemetryConstants.js index 59b52e481c..fe2997351a 100644 --- a/shared/telemetry/TelemetryConstants.js +++ b/shared/telemetry/TelemetryConstants.js @@ -30,6 +30,8 @@ export const TelemetryConstants = { hardwareKeyStore: 'Some security features will be unavailable as hardware key store is not available', activationCancelled: 'Activation Cancelled', + vcsAreTampered: + 'Tampered cards detected and removed for security reasons. Please download again', }), ErrorId: Object.freeze({ @@ -40,6 +42,7 @@ export const TelemetryConstants = { activationFailed: 'ACTIVATION_FAILED', tampered: 'TAMPERED', dataRetrieval: 'DATA_RETRIEVAL', + vcsAreTampered: 'VC_TAMPERED', }), Screens: Object.freeze({