[INJIMOB-2405] remove displayid and refactor code (#1708)

Signed-off-by: Abhishek Paul <paul.apaul.abhishek.ap@gmail.com>

components/BannerNotificationContainer.tsx

@@ -138,7 +138,6 @@ export const BannerNotificationContainer: React.FC<
 export type vcVerificationBannerDetails = {
   statusType: BannerStatus;
   vcType: string;
-  vcNumber: string;
 };
 
 export interface BannerNotificationContainerProps {

locales/ara.json

@@ -1,20 +1,20 @@
 {
   "ActivityLogText": {
-    "VC_SHARED": "تم مشاركة {{idType}} {{id}} بنجاح.",
-    "VC_RECEIVED": "تم استلام {{idType}} {{id}}.",
-    "VC_RECEIVED_NOT_SAVED": "لم يتمكن من حفظ {{idType}} {{id}}.",
-    "VC_DELETED": "تم حذف {{idType}} {{id}} بنجاح.",
-    "VC_DOWNLOADED": "تم تنزيل {{idType}} {{id}}.",
-    "VC_SHARED_WITH_VERIFICATION_CONSENT": "تم مشاركة {{idType}} {{id}} بالموافقة للتحقق من الحضور.",
-    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "تم استلام {{idType}} {{id}} ونجح التحقق من الحضور.",
-    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "تم استلام {{idType}} {{id}} ولكن فشل التحقق من الحضور.",
-    "PRESENCE_VERIFIED_AND_VC_SHARED": "تم التحقق من الوجه بنجاح وتمت مشاركة {{idType}} {{id}}.",
-    "PRESENCE_VERIFICATION_FAILED": "فشل التحقق من الوجه أثناء محاولة مشاركة {{idType}} {{id}}.",
-    "QRLOGIN_SUCCESFULL": "نجح تسجيل الدخول باستخدام QR باستخدام {{idType}} {{id}}.",
-    "WALLET_BINDING_SUCCESSFULL": "تم تفعيل {{idType}} {{id}} بنجاح.",
-    "WALLET_BINDING_FAILURE": "فشل تفعيل {{idType}} {{id}}.",
-    "VC_REMOVED": "تم إزالة {{idType}} {{id}} من المحفظة.",
-    "TAMPERED_VC_REMOVED": "تم إزالة {{idType}} {{id}} من المحفظة بسبب العبث.",
+    "VC_SHARED": "تم مشاركة {{idType}} بنجاح.",
+    "VC_RECEIVED": "تم استلام {{idType}}.",
+    "VC_RECEIVED_NOT_SAVED": "لم يتمكن من حفظ {{idType}}.",
+    "VC_DELETED": "تم حذف {{idType}} بنجاح.",
+    "VC_DOWNLOADED": "تم تنزيل {{idType}}.",
+    "VC_SHARED_WITH_VERIFICATION_CONSENT": "تم مشاركة {{idType}} بالموافقة للتحقق من الحضور.",
+    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "تم استلام {{idType}} ونجح التحقق من الحضور.",
+    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "تم استلام {{idType}} ولكن فشل التحقق من الحضور.",
+    "PRESENCE_VERIFIED_AND_VC_SHARED": "تم التحقق من الوجه بنجاح وتمت مشاركة {{idType}}.",
+    "PRESENCE_VERIFICATION_FAILED": "فشل التحقق من الوجه أثناء محاولة مشاركة {{idType}}.",
+    "QRLOGIN_SUCCESFULL": "نجح تسجيل الدخول باستخدام QR باستخدام {{idType}}.",
+    "WALLET_BINDING_SUCCESSFULL": "تم تفعيل {{idType}} بنجاح.",
+    "WALLET_BINDING_FAILURE": "فشل تفعيل {{idType}}.",
+    "VC_REMOVED": "تم إزالة {{idType}} من المحفظة.",
+    "TAMPERED_VC_REMOVED": "تم إزالة {{idType}} من المحفظة بسبب العبث.",
     "vpSharing": {
       "SHARED_SUCCESSFULLY": "تمت مشاركة العرض التقديمي لبيانات الاعتماد بنجاح.",
       "SHARED_WITH_FACE_VERIFIACTION": "تم التحقق من الوجه بنجاح، وتمت مشاركة العرض التقديمي لبيانات الاعتماد بنجاح.",
@@ -157,7 +157,8 @@
     "downloaded": "يملك",
     "shared": "مشترك",
     "received": "تلقى",
-    "deleted": "إزالة"
+    "deleted": "إزالة",
+    "historyHeaderLabel": "تاريخ"
   },
   "SettingScreen": {
     "header": "إعدادات",

locales/en.json

@@ -1,20 +1,20 @@
 {
   "ActivityLogText": {
-    "VC_SHARED": "{{idType}} {{id}} is shared successfully.",
-    "VC_RECEIVED": "Received {{idType}} {{id}}.",
-    "VC_RECEIVED_NOT_SAVED": "Couldn't save {{idType}} {{id}}.",
-    "VC_DELETED": "{{idType}} {{id}} is deleted successfully.",
-    "VC_DOWNLOADED": "{{idType}} {{id}} is downloaded.",
-    "VC_SHARED_WITH_VERIFICATION_CONSENT": "Shared {{idType}} {{id}} with consent for presence verification.",
-    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "Received {{idType}} {{id}} and presence verification is successful.",
-    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "Received {{idType}} {{id}} and presence verification failed.",
-    "PRESENCE_VERIFIED_AND_VC_SHARED": "Face verification is successful and {{idType}} {{id}} is shared.",
-    "PRESENCE_VERIFICATION_FAILED": "Face verification has failed while trying to share {{idType}} {{id}}.",
-    "QRLOGIN_SUCCESFULL": "QRLogin using {{idType}} {{id}} is successful.",
-    "WALLET_BINDING_SUCCESSFULL": "Activation of {{idType}} {{id}} is successful.",
-    "WALLET_BINDING_FAILURE": "Activation of {{idType}} {{id}} has failed.",
-    "VC_REMOVED": "{{idType}} {{id}} is removed from wallet.",
-    "TAMPERED_VC_REMOVED": "{{idType}} {{id}} is removed from from wallet due to tampering.",
+    "VC_SHARED": "{{idType}} is shared successfully.",
+    "VC_RECEIVED": "Received {{idType}}.",
+    "VC_RECEIVED_NOT_SAVED": "Couldn't save {{idType}}.",
+    "VC_DELETED": "{{idType}} is deleted successfully.",
+    "VC_DOWNLOADED": "{{idType}} is downloaded.",
+    "VC_SHARED_WITH_VERIFICATION_CONSENT": "Shared {{idType}} with consent for presence verification.",
+    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "Received {{idType}} and presence verification is successful.",
+    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "Received {{idType}} and presence verification failed.",
+    "PRESENCE_VERIFIED_AND_VC_SHARED": "Face verification is successful and {{idType}} is shared.",
+    "PRESENCE_VERIFICATION_FAILED": "Face verification has failed while trying to share {{idType}}.",
+    "QRLOGIN_SUCCESFULL": "QRLogin using {{idType}} is successful.",
+    "WALLET_BINDING_SUCCESSFULL": "Activation of {{idType}} is successful.",
+    "WALLET_BINDING_FAILURE": "Activation of {{idType}} has failed.",
+    "VC_REMOVED": "{{idType}} is removed from wallet.",
+    "TAMPERED_VC_REMOVED": "{{idType}} is removed from from wallet due to tampering.",
     "vpSharing": {
       "SHARED_SUCCESSFULLY": "Credential Presentation is shared successfully.",
       "SHARED_WITH_FACE_VERIFIACTION": "Face verification is successful, and the Credential Presentation is shared successfully.",
@@ -157,7 +157,8 @@
     "downloaded": "downloaded",
     "shared": "shared",
     "received": "received",
-    "deleted": "deleted"
+    "deleted": "deleted",
+    "historyHeaderLabel": "History"
   },
   "SettingScreen": {
     "header": "Settings",

locales/fil.json

@@ -1,20 +1,20 @@
 {
   "ActivityLogText": {
-    "VC_SHARED": "Matagumpay na naibahagi ang {{idType}} {{id}}.",
-    "VC_RECEIVED": "Natanggap ang {{idType}} {{id}}.",
-    "VC_RECEIVED_NOT_SAVED": "Hindi ma-save ang {{idType}} {{id}}.",
-    "VC_DELETED": "Matagumpay na natanggal ang {{idType}} {{id}}.",
-    "VC_DOWNLOADED": "Na-download ang {{idType}} {{id}}.",
-    "VC_SHARED_WITH_VERIFICATION_CONSENT": "Ibinahagi ang {{idType}} {{id}} na may pahintulot para sa pag-verify ng presensya.",
-    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "Natanggap ang {{idType}} {{id}} at matagumpay ang pag-verify ng presensya.",
-    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "Natanggap ang {{idType}} {{id}} at nabigo ang pag-verify ng presensya.",
-    "PRESENCE_VERIFIED_AND_VC_SHARED": "Matagumpay ang pag-verify ng mukha at ibinahagi ang {{idType}} {{id}}.",
-    "PRESENCE_VERIFICATION_FAILED": "Nabigo ang pag-verify ng mukha habang sinusubukang ibahagi ang {{idType}} {{id}}.",
-    "QRLOGIN_SUCCESFULL": "Ang QRlogin gamit ang {{idType}} {{id}} ay matagumpay.",
-    "WALLET_BINDING_SUCCESSFULL": "Ang pag-activate ng {{idType}} {{id}} ay matagumpay.",
-    "WALLET_BINDING_FAILURE": "Nabigo ang pag-activate ng {{idType}} {{id}}.",
-    "VC_REMOVED": "Ang {{idType}} {{id}} ay inalis sa wallet.",
-    "TAMPERED_VC_REMOVED": "Ang {{idType}} {{id}} ay inalis mula sa wallet dahil sa pakikialam.",
+    "VC_SHARED": "Matagumpay na naibahagi ang {{idType}}.",
+    "VC_RECEIVED": "Natanggap ang {{idType}}.",
+    "VC_RECEIVED_NOT_SAVED": "Hindi ma-save ang {{idType}}.",
+    "VC_DELETED": "Matagumpay na natanggal ang {{idType}}.",
+    "VC_DOWNLOADED": "Na-download ang {{idType}}.",
+    "VC_SHARED_WITH_VERIFICATION_CONSENT": "Ibinahagi ang {{idType}} na may pahintulot para sa pag-verify ng presensya.",
+    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "Natanggap ang {{idType}} at matagumpay ang pag-verify ng presensya.",
+    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "Natanggap ang {{idType}} at nabigo ang pag-verify ng presensya.",
+    "PRESENCE_VERIFIED_AND_VC_SHARED": "Matagumpay ang pag-verify ng mukha at ibinahagi ang {{idType}}.",
+    "PRESENCE_VERIFICATION_FAILED": "Nabigo ang pag-verify ng mukha habang sinusubukang ibahagi ang {{idType}}.",
+    "QRLOGIN_SUCCESFULL": "Ang QRlogin gamit ang {{idType}} ay matagumpay.",
+    "WALLET_BINDING_SUCCESSFULL": "Ang pag-activate ng {{idType}} ay matagumpay.",
+    "WALLET_BINDING_FAILURE": "Nabigo ang pag-activate ng {{idType}}.",
+    "VC_REMOVED": "Ang {{idType}} ay inalis sa wallet.",
+    "TAMPERED_VC_REMOVED": "Ang {{idType}} ay inalis mula sa wallet dahil sa pakikialam.",
     "vpSharing": {
       "SHARED_SUCCESSFULLY": "Matagumpay na naibahagi ang Pagtatanghal ng Kredensyal.",
       "SHARED_WITH_FACE_VERIFIACTION": "Matagumpay ang pag-verify sa mukha, at matagumpay na naibahagi ang Credential Presentation.",
@@ -157,7 +157,8 @@
     "downloaded": "nakuha",
     "shared": "ibinahagi",
     "received": "natanggap",
-    "deleted": "tinanggal"
+    "deleted": "tinanggal",
+    "historyHeaderLabel": "Kasaysayan"
   },
   "SettingScreen": {
     "header": "Mga setting",

locales/hin.json

@@ -1,20 +1,20 @@
 {
   "ActivityLogText": {
-    "VC_SHARED": "{{idType}} {{id}} को सफलतापूर्वक साझा किया गया।",
-    "VC_RECEIVED": "{{idType}} {{id}} प्राप्त किया गया।",
-    "VC_RECEIVED_NOT_SAVED": "{{idType}} {{id}} को सहेजा नहीं जा सका।",
-    "VC_DELETED": "{{idType}} {{id}} को सफलतापूर्वक हटा दिया गया।",
-    "VC_DOWNLOADED": "{{idType}} {{id}} डाउनलोड हो गया है।",
-    "VC_SHARED_WITH_VERIFICATION_CONSENT": "उपस्थिति सत्यापन के लिए सहमति के साथ {{idType}} {{id}} साझा किया गया।",
-    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "{{idType}} {{id}} प्राप्त किया गया और उपस्थिति सत्यापन सफल रहा।",
-    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "{{idType}} {{id}} प्राप्त हुआ लेकिन उपस्थिति सत्यापन विफल रहा।",
-    "PRESENCE_VERIFIED_AND_VC_SHARED": "चेहरे का सत्यापन सफल है और {{idType}} {{id}} साझा किया गया है।",
-    "PRESENCE_VERIFICATION_FAILED": "{{idType}} {{id}} साझा करने का प्रयास करते समय चेहरे का सत्यापन विफल हो गया है।",
-    "QRLOGIN_SUCCESFULL": "{{idType}} {{id}} का उपयोग करके QRLogin सफल रहा।",
-    "WALLET_BINDING_SUCCESSFULL": "{{idType}} {{id}} का सक्रियण सफल रहा।",
-    "WALLET_BINDING_FAILURE": "{{idType}} {{id}} का सक्रियण विफल हो गया।",
-    "VC_REMOVED": "{{idType}} {{id}} को वॉलेट से हटा दिया गया।",
-    "TAMPERED_VC_REMOVED": "{{idType}} {{id}} को छेड़छाड़ के कारण वॉलेट से हटा दिया गया।",
+    "VC_SHARED": "{{idType}} को सफलतापूर्वक साझा किया गया।",
+    "VC_RECEIVED": "{{idType}} प्राप्त किया गया।",
+    "VC_RECEIVED_NOT_SAVED": "{{idType}} को सहेजा नहीं जा सका।",
+    "VC_DELETED": "{{idType}} को सफलतापूर्वक हटा दिया गया।",
+    "VC_DOWNLOADED": "{{idType}} डाउनलोड हो गया है।",
+    "VC_SHARED_WITH_VERIFICATION_CONSENT": "उपस्थिति सत्यापन के लिए सहमति के साथ {{idType}} साझा किया गया।",
+    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "{{idType}} प्राप्त किया गया और उपस्थिति सत्यापन सफल रहा।",
+    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "{{idType}} प्राप्त हुआ लेकिन उपस्थिति सत्यापन विफल रहा।",
+    "PRESENCE_VERIFIED_AND_VC_SHARED": "चेहरे का सत्यापन सफल है और {{idType}} साझा किया गया है।",
+    "PRESENCE_VERIFICATION_FAILED": "{{idType}} साझा करने का प्रयास करते समय चेहरे का सत्यापन विफल हो गया है।",
+    "QRLOGIN_SUCCESFULL": "{{idType}} का उपयोग करके QRLogin सफल रहा।",
+    "WALLET_BINDING_SUCCESSFULL": "{{idType}} का सक्रियण सफल रहा।",
+    "WALLET_BINDING_FAILURE": "{{idType}} का सक्रियण विफल हो गया।",
+    "VC_REMOVED": "{{idType}} को वॉलेट से हटा दिया गया।",
+    "TAMPERED_VC_REMOVED": "{{idType}} को छेड़छाड़ के कारण वॉलेट से हटा दिया गया।",
     "vpSharing": {
       "SHARED_SUCCESSFULLY": "क्रेडेंशियल प्रेजेंटेशन सफलतापूर्वक साझा किया गया है.",
       "SHARED_WITH_FACE_VERIFIACTION": "चेहरा सत्यापन सफल है, और क्रेडेंशियल प्रस्तुति सफलतापूर्वक साझा की गई है।",
@@ -158,7 +158,8 @@
     "downloaded": "डाउनलोड",
     "shared": "साझा",
     "received": "प्राप्त",
-    "deleted": "हटाए गए"
+    "deleted": "हटाए गए",
+    "historyHeaderLabel":"इतिहास"
   },
   "SettingScreen": {
     "header": "समायोजन",

locales/kan.json

@@ -1,20 +1,20 @@
 {
   "ActivityLogText": {
-    "VC_SHARED": "{{idType}} {{id}} ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ.",
-    "VC_RECEIVED": "{{idType}} {{id}} ಸ್ವೀಕರಿಸಲಾಗಿದೆ.",
-    "VC_RECEIVED_NOT_SAVED": "{{idType}} {{id}} ಉಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.",
-    "VC_DELETED": "{{idType}} {{id}} ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಗಿದೆ.",
-    "VC_DOWNLOADED": "{{idType}} {{id}} ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗಿದೆ.",
-    "VC_SHARED_WITH_VERIFICATION_CONSENT": "ಹಾಜರಿ ಪರಿಶೀಲನೆಗಾಗಿ {{idType}} {{id}} ಅನುಮತಿಯೊಂದಿಗೆ ಹಂಚಲಾಗಿದೆ.",
-    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "{{idType}} {{id}} ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಮತ್ತು ಹಾಜರಿ ಪರಿಶೀಲನೆ ಯಶಸ್ವಿಯಾಗಿದೆ.",
-    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "{{idType}} {{id}} ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಆದರೆ ಹಾಜರಿ ಪರಿಶೀಲನೆ ವಿಫಲವಾಗಿದೆ.",
-    "PRESENCE_VERIFIED_AND_VC_SHARED": "ಮುಖ ಪರಿಶೀಲನೆ ಯಶಸ್ವಿಯಾಗಿದೆ ಮತ್ತು {{idType}} {{id}} ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ.",
-    "PRESENCE_VERIFICATION_FAILED": "{{idType}} {{id}} ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಪ್ರಯತ್ನಿಸುವಾಗ ಮುಖ ಪರಿಶೀಲನೆ ವಿಫಲವಾಗಿದೆ.",
-    "QRLOGIN_SUCCESFULL": "{{idType}} {{id}} ಬಳಸಿ QRಲಾಗಿನ್ ಯಶಸ್ವಿಯಾಗಿದೆ.",
-    "WALLET_BINDING_SUCCESSFULL": "{{idType}} {{id}} ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ಯಶಸ್ವಿಯಾಗಿದೆ.",
-    "WALLET_BINDING_FAILURE": "{{idType}} {{id}} ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ವಿಫಲವಾಗಿದೆ.",
-    "VC_REMOVED": "{{idType}} {{id}} ವಾಲೆಟ್‌ನಿಂದ ತೆಗೆದುಹಾಕಲಾಗಿದೆ.",
-    "TAMPERED_VC_REMOVED": "ತಿದ್ದುವಿಕೆಯಿಂದಾಗಿ {{idType}} {{id}} ಅನ್ನು ವ್ಯಾಲೆಟ್‌ನಿಂದ ತೆಗೆದುಹಾಕಲಾಗಿದೆ.",
+    "VC_SHARED": "{{idType}} ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ.",
+    "VC_RECEIVED": "{{idType}} ಸ್ವೀಕರಿಸಲಾಗಿದೆ.",
+    "VC_RECEIVED_NOT_SAVED": "{{idType}} ಉಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.",
+    "VC_DELETED": "{{idType}} ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಗಿದೆ.",
+    "VC_DOWNLOADED": "{{idType}} ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗಿದೆ.",
+    "VC_SHARED_WITH_VERIFICATION_CONSENT": "ಹಾಜರಿ ಪರಿಶೀಲನೆಗಾಗಿ {{idType}} ಅನುಮತಿಯೊಂದಿಗೆ ಹಂಚಲಾಗಿದೆ.",
+    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "{{idType}} ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಮತ್ತು ಹಾಜರಿ ಪರಿಶೀಲನೆ ಯಶಸ್ವಿಯಾಗಿದೆ.",
+    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "{{idType}} ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಆದರೆ ಹಾಜರಿ ಪರಿಶೀಲನೆ ವಿಫಲವಾಗಿದೆ.",
+    "PRESENCE_VERIFIED_AND_VC_SHARED": "ಮುಖ ಪರಿಶೀಲನೆ ಯಶಸ್ವಿಯಾಗಿದೆ ಮತ್ತು {{idType}} ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ.",
+    "PRESENCE_VERIFICATION_FAILED": "{{idType}} ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಪ್ರಯತ್ನಿಸುವಾಗ ಮುಖ ಪರಿಶೀಲನೆ ವಿಫಲವಾಗಿದೆ.",
+    "QRLOGIN_SUCCESFULL": "{{idType}} ಬಳಸಿ QRಲಾಗಿನ್ ಯಶಸ್ವಿಯಾಗಿದೆ.",
+    "WALLET_BINDING_SUCCESSFULL": "{{idType}} ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ಯಶಸ್ವಿಯಾಗಿದೆ.",
+    "WALLET_BINDING_FAILURE": "{{idType}} ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ವಿಫಲವಾಗಿದೆ.",
+    "VC_REMOVED": "{{idType}} ವಾಲೆಟ್‌ನಿಂದ ತೆಗೆದುಹಾಕಲಾಗಿದೆ.",
+    "TAMPERED_VC_REMOVED": "ತಿದ್ದುವಿಕೆಯಿಂದಾಗಿ {{idType}} ಅನ್ನು ವ್ಯಾಲೆಟ್‌ನಿಂದ ತೆಗೆದುಹಾಕಲಾಗಿದೆ.",
     "vpSharing": {
       "SHARED_SUCCESSFULLY": "ರುಜುವಾತು ಪ್ರಸ್ತುತಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ.",
       "SHARED_WITH_FACE_VERIFIACTION": "ಮುಖ ಪರಿಶೀಲನೆ ಯಶಸ್ವಿಯಾಗಿದೆ ಮತ್ತು ರುಜುವಾತು ಪ್ರಸ್ತುತಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ.",
@@ -157,7 +157,8 @@
     "downloaded": "ಸಿಕ್ಕಿತು",
     "shared": "ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
     "received": "ಸ್ವೀಕರಿಸಿದರು",
-    "deleted": "ತೆಗೆದುಹಾಕಲಾಗಿದೆ"
+    "deleted": "ತೆಗೆದುಹಾಕಲಾಗಿದೆ",
+    "historyHeaderLabel": "ಇತಿಹಾಸ"
   },
   "SettingScreen": {
     "header": "ಸಂಯೋಜನೆಗಳು",

locales/tam.json

@@ -1,20 +1,20 @@
 {
   "ActivityLogText": {
-    "VC_SHARED": "{{idType}} {{id}} வெற்றிகரமாகப் பகிரப்பட்டது.",
-    "VC_RECEIVED": "{{idType}} {{id}} பெறப்பட்டது.",
-    "VC_RECEIVED_NOT_SAVED": "{{idType}} {{id}} ஐச் சேமிக்க முடியவில்லை.",
-    "VC_DELETED": "{{idType}} {{id}} வெற்றிகரமாக நீக்கப்பட்டது.",
-    "VC_DOWNLOADED": "{{idType}} {{id}} பதிவிறக்கம் செய்யப்பட்டது.",
-    "VC_SHARED_WITH_VERIFICATION_CONSENT": " {{idType}} {{id}} ஐ  சரிபார்ப்புக்காக  அனுமதியுடன்  பகிரப்பட்டது.",
-    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "{{idType}} {{id}} பெறப்பட்டது மற்றும் இருப்புச் சரிபார்ப்பு வெற்றிகரமானது.",
-    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "{{idType}} {{id}} பெறப்பட்டது, ஆனால் இருப்புச் சரிபார்ப்பு தோல்வியடைந்தது.",
-    "PRESENCE_VERIFIED_AND_VC_SHARED": "முகம் சரிபார்ப்பு வெற்றிகரமாக உள்ளது மற்றும் {{idType}} {{id}} பகிரப்பட்டது.",
-    "PRESENCE_VERIFICATION_FAILED": "{{idType}} {{id}}ஐப் பகிர முயற்சிக்கும் போது முகம் சரிபார்ப்பு தோல்வியடைந்தது.",
-    "QRLOGIN_SUCCESFULL": "{{idType}} {{id}} ஐப் பயன்படுத்தி QRLogin வெற்றிகரமானது.",
-    "WALLET_BINDING_SUCCESSFULL": "{{idType}} {{id}}  செயல்படுத்தல் வெற்றிகரமானது.",
-    "WALLET_BINDING_FAILURE": "{{idType}} {{id}} செயல்படுத்தல் தோல்வியடைந்தது.",
-    "VC_REMOVED": "{{idType}} {{id}} பணப்பையிலிருந்து நீக்கப்பட்டது.",
-    "TAMPERED_VC_REMOVED": "{{idType}} {{id}}  த篡றுத்தல் காரணமாக  பணப்பையிலிருந்து நீக்கப்பட்டது.",
+    "VC_SHARED": "{{idType}} வெற்றிகரமாகப் பகிரப்பட்டது.",
+    "VC_RECEIVED": "{{idType}} பெறப்பட்டது.",
+    "VC_RECEIVED_NOT_SAVED": "{{idType}} ஐச் சேமிக்க முடியவில்லை.",
+    "VC_DELETED": "{{idType}} வெற்றிகரமாக நீக்கப்பட்டது.",
+    "VC_DOWNLOADED": "{{idType}} பதிவிறக்கம் செய்யப்பட்டது.",
+    "VC_SHARED_WITH_VERIFICATION_CONSENT": " {{idType}} ஐ  சரிபார்ப்புக்காக  அனுமதியுடன்  பகிரப்பட்டது.",
+    "VC_RECEIVED_WITH_PRESENCE_VERIFIED": "{{idType}} பெறப்பட்டது மற்றும் இருப்புச் சரிபார்ப்பு வெற்றிகரமானது.",
+    "VC_RECEIVED_BUT_PRESENCE_VERIFICATION_FAILED": "{{idType}} பெறப்பட்டது, ஆனால் இருப்புச் சரிபார்ப்பு தோல்வியடைந்தது.",
+    "PRESENCE_VERIFIED_AND_VC_SHARED": "முகம் சரிபார்ப்பு வெற்றிகரமாக உள்ளது மற்றும் {{idType}} பகிரப்பட்டது.",
+    "PRESENCE_VERIFICATION_FAILED": "{{idType}}ஐப் பகிர முயற்சிக்கும் போது முகம் சரிபார்ப்பு தோல்வியடைந்தது.",
+    "QRLOGIN_SUCCESFULL": "{{idType}} ஐப் பயன்படுத்தி QRLogin வெற்றிகரமானது.",
+    "WALLET_BINDING_SUCCESSFULL": "{{idType}}  செயல்படுத்தல் வெற்றிகரமானது.",
+    "WALLET_BINDING_FAILURE": "{{idType}} செயல்படுத்தல் தோல்வியடைந்தது.",
+    "VC_REMOVED": "{{idType}} பணப்பையிலிருந்து நீக்கப்பட்டது.",
+    "TAMPERED_VC_REMOVED": "{{idType}}  த篡றுத்தல் காரணமாக  பணப்பையிலிருந்து நீக்கப்பட்டது.",
     "vpSharing": {
       "SHARED_SUCCESSFULLY": "நற்சான்றிதழ் வழங்கல் வெற்றிகரமாகப் பகிரப்பட்டது.",
       "SHARED_WITH_FACE_VERIFIACTION": "முக சரிபார்ப்பு வெற்றிகரமாக உள்ளது, மேலும் நற்சான்றிதழ் விளக்கக்காட்சி வெற்றிகரமாக பகிரப்பட்டது.",
@@ -157,7 +157,8 @@
     "downloaded": "கிடைத்தது",
     "shared": "பகிர்ந்து கொண்டார்",
     "received": "பெற்றது",
-    "deleted": "அகற்றப்பட்டது"
+    "deleted": "அகற்றப்பட்டது",
+    "historyHeaderLabel": "வரலாறு"
   },
   "SettingScreen": {
     "header": "அமைப்புகள்",

machines/Issuers/IssuersActions.ts

@@ -279,7 +279,6 @@ export const IssuersActions = (model: any) => {
           VCActivityLog.getLogFromObject({
             _vcKey: vcMetadata.getVcKey(),
             type: 'VC_DOWNLOADED',
-            id: vcMetadata.displayId,
             timestamp: Date.now(),
             deviceName: '',
             issuer: context.selectedIssuerId,

machines/QrLogin/QrLoginServices.ts

@@ -26,7 +26,7 @@ export const QrLoginServices = {
 
   sendAuthenticate: async context => {
     let privateKey;
-    const individualId = context.selectedVc.vcMetadata.displayId;
+    const individualId = context.selectedVc.vcMetadata.mosipIndividualId;
     const keyType = context.selectedVc.vcMetadata.downloadKeyType;
     if (!isHardwareKeystoreExists) {
       privateKey = await getPrivateKey(

machines/VerifiableCredential/VCItemMachine/VCItemActions.ts

@@ -457,7 +457,6 @@ export const VCItemActions = model => {
           VCActivityLog.getLogFromObject({
             _vcKey: context.vcMetadata.getVcKey(),
             type: 'VC_DOWNLOADED',
-            id: context.vcMetadata.displayId,
             issuer: context.vcMetadata.issuer!!,
             credentialConfigurationId:
               context.verifiableCredential.credentialConfigurationId,
@@ -478,7 +477,6 @@ export const VCItemActions = model => {
             credentialConfigurationId:
               context.verifiableCredential.credentialConfigurationId,
             issuer: vcMetadata.issuer!!,
-            id: vcMetadata.displayId,
             _vcKey: vcMetadata.getVcKey(),
             type: 'VC_REMOVED',
             timestamp: Date.now(),
@@ -500,7 +498,6 @@ export const VCItemActions = model => {
             credentialConfigurationId:
               context.verifiableCredential.credentialConfigurationId,
             issuer: vcMetadata.issuer!!,
-            id: vcMetadata.displayId,
             timestamp: Date.now(),
             deviceName: '',
           }),
@@ -518,7 +515,6 @@ export const VCItemActions = model => {
           VCActivityLog.getLogFromObject({
             _vcKey: vcMetadata.getVcKey(),
             type: 'WALLET_BINDING_FAILURE',
-            id: vcMetadata.displayId,
             credentialConfigurationId:
               context.verifiableCredential.credentialConfigurationId,
             issuer: vcMetadata.issuer!!,

machines/VerifiableCredential/VCItemMachine/VCItemServices.ts

@@ -59,7 +59,7 @@ export const VCItemServices = model => {
           request: {
             authFactorType: 'WLA',
             format: 'jwt',
-            individualId: context.vcMetadata.displayId,
+            individualId: context.vcMetadata.mosipIndividualId,
             transactionId: context.bindingTransactionId,
             publicKey: context.publicKey,
             challengeList: [
@@ -103,7 +103,7 @@ export const VCItemServices = model => {
         {
           requestTime: String(new Date().toISOString()),
           request: {
-            individualId: context.vcMetadata.displayId,
+            individualId: context.vcMetadata.mosipIndividualId,
             otpChannels: ['EMAIL', 'PHONE'],
           },
         },
@@ -175,7 +175,7 @@ export const VCItemServices = model => {
             API_URLS.credentialDownload.method,
             API_URLS.credentialDownload.buildURL(),
             {
-              individualId: context.vcMetadata.displayId,
+              individualId: context.vcMetadata.mosipIndividualId,
               requestId: context.vcMetadata.requestId,
             },
           );

machines/bleShare/request/requestMachine.ts

@@ -620,7 +620,6 @@ export const requestMachine =
               VCActivityLog.getLogFromObject({
                 _vcKey: vcMetadata.getVcKey(),
                 type: context.receiveLogType,
-                id: vcMetadata.displayId,
                 credentialConfigurationId:
                   context.incomingVc.verifiableCredential
                     .credentialConfigurationId,

machines/bleShare/scan/scanActions.ts

@@ -242,7 +242,6 @@ export const ScanActions = (model: any) => {
             type: context.shareLogType
               ? context.shareLogType
               : 'VC_SHARED_WITH_VERIFICATION_CONSENT',
-            id: vcMetadata.displayId,
             credentialConfigurationId:
               context.selectedVc.verifiableCredential.credentialConfigurationId,
             issuer: vcMetadata.issuer!!,
@@ -265,7 +264,6 @@ export const ScanActions = (model: any) => {
             timestamp: Date.now(),
             credentialConfigurationId:
               context.selectedVc.verifiableCredential.credentialConfigurationId,
-            id: vcMetadata.displayId,
             issuer: vcMetadata.issuer!!,
             deviceName:
               context.receiverInfo.name || context.receiverInfo.deviceName,
@@ -340,7 +338,6 @@ export const ScanActions = (model: any) => {
         return ActivityLogEvents.LOG_ACTIVITY(
           VCActivityLog.getLogFromObject({
             _vcKey: '',
-            id: vcMetadata.displayId,
             issuer: vcMetadata.issuer!!,
             credentialConfigurationId:
               selectedVc.verifiableCredential.credentialConfigurationId,

screens/Home/MyVcs/HistoryTab.tsx

@@ -10,13 +10,13 @@ import {ActorRefFrom} from 'xstate';
 import {VCItemMachine} from '../../../machines/VerifiableCredential/VCItemMachine/VCItemMachine';
 
 export const HistoryTab: React.FC<HistoryTabProps> = props => {
-  const {t} = useTranslation('HistoryTab');
+  const {t} = useTranslation('HistoryScreen');
   const controller = useKebabPopUp(props);
 
   return (
     <>
       <Modal
-        headerLabel={props.vcMetadata.displayId}
+        headerLabel={t('historyHeaderLabel')}
         isVisible={controller.isShowActivities}
         onDismiss={controller.DISMISS}>
         <Column fill>

shared/VCMetadata.ts

@@ -7,6 +7,7 @@ import {
 import {Protocols} from './openId4VCI/Utils';
 import {getMosipIdentifier} from './commonUtil';
 import {VCFormat} from './VCFormat';
+import {isMosipVC} from './Utils';
 
 const VC_KEY_PREFIX = 'VC';
 const VC_ITEM_STORE_KEY_REGEX = '^VC_[a-zA-Z0-9_-]+$';
@@ -21,7 +22,7 @@ export class VCMetadata {
   protocol?: string = '';
   timestamp?: string = '';
   isVerified: boolean = false;
-  displayId: string = '';
+  mosipIndividualId: string = '';
   format: string = '';
 
   downloadKeyType: string = '';
@@ -34,7 +35,7 @@ export class VCMetadata {
     protocol = '',
     timestamp = '',
     isVerified = false,
-    displayId = '',
+    mosipIndividualId = '',
     format = '',
     downloadKeyType = '',
   } = {}) {
@@ -46,7 +47,7 @@ export class VCMetadata {
     this.issuer = issuer;
     this.timestamp = timestamp;
     this.isVerified = isVerified;
-    this.displayId = displayId;
+    this.mosipIndividualId = mosipIndividualId;
     this.format = format;
     this.downloadKeyType = downloadKeyType;
   }
@@ -63,11 +64,12 @@ export class VCMetadata {
       issuer: vc.issuer,
       timestamp: vc.vcMetadata ? vc.vcMetadata.timestamp : vc.timestamp,
       isVerified: vc.isVerified,
-      displayId: vc.displayId
-        ? vc.displayId
+      isExpired: vc.isExpired,
+      mosipIndividualId: vc.mosipIndividualId
+        ? vc.mosipIndividualId
         : vc.vcMetadata
-        ? vc.vcMetadata.displayId
-        : getDisplayId(vc.verifiableCredential, vc.format),
+        ? vc.vcMetadata.mosipIndividualId
+        : getMosipIndividualId(vc.verifiableCredential, vc.issuer),
       downloadKeyType: vc.downloadKeyType,
     });
   }
@@ -119,53 +121,31 @@ export const getVCMetadata = (context: object, keyType: string) => {
     id: `${credentialId} + '_' + ${issuer}`,
     timestamp: context.timestamp ?? '',
     isVerified: context.vcMetadata.isVerified ?? false,
-    displayId: getDisplayId(
+    isExpired: context.vcMetadata.isExpired ?? false,
+    mosipIndividualId: getMosipIndividualId(
       context['verifiableCredential'] as VerifiableCredential,
-      context['credentialWrapper'].format,
+      issuer,
     ),
     format: context['credentialWrapper'].format,
     downloadKeyType: keyType,
   });
 };
 
-const getDisplayId = (
+const getMosipIndividualId = (
   verifiableCredential: VerifiableCredential | Credential,
-  format: string,
+  issuer: string,
 ) => {
   try {
-    if (format === VCFormat.mso_mdoc) {
-      const namespaces =
-        (verifiableCredential as VerifiableCredential)?.processedCredential?.[
-          'issuerSigned'
-        ]['nameSpaces'] ?? {};
-
-      let displayId: string | undefined;
-      for (const namespace in namespaces) {
-        displayId = namespaces[namespace].find(
-          (element: object) =>
-            element['elementIdentifier'] === 'document_number',
-        ).elementValue;
-        if (!!displayId) break;
-      }
-
-      if (!!displayId) return displayId;
-      console.error('error in id getting ', 'Id not found for the credential');
-      throw new Error('Id not found for the credential');
+    const credential = verifiableCredential?.credential
+      ? verifiableCredential.credential
+      : verifiableCredential;
+    const credentialSubject = credential?.credentialSubject;
+    if (isMosipVC(issuer)) {
+      return credentialSubject ? getMosipIdentifier(credentialSubject) : '';
     }
-    if (verifiableCredential?.credential) {
-      if (verifiableCredential.credential?.credentialSubject) {
-        return (
-          verifiableCredential.credential?.credentialSubject?.policyNumber ||
-          getMosipIdentifier(verifiableCredential.credential.credentialSubject)
-        );
-      }
-    }
-    return (
-      verifiableCredential?.credentialSubject?.policyNumber ||
-      getMosipIdentifier(verifiableCredential.credentialSubject)
-    );
+    return '';
   } catch (error) {
-    console.error('Error getting the display Id - ', error);
+    console.error('Error getting the display ID:', error);
     return null;
   }
 };

shared/constants.ts

@@ -159,5 +159,10 @@ export const copilotTestID = {
   '6': 'cardView',
 };
 
-export const FACE_SDK_MODEL_PATH = isAndroid() ? 'assets:faceModel.tflite' : 'bundle:/faceModel.tflite'
-export const FACE_SDK_MODEL_CHECKSUM = '797b4d99794965749635352d55da38d4748c28c659ee1502338badee4614ed06'
+export const FACE_SDK_MODEL_PATH = isAndroid()
+  ? 'assets:faceModel.tflite'
+  : 'bundle:/faceModel.tflite';
+export const FACE_SDK_MODEL_CHECKSUM =
+  '797b4d99794965749635352d55da38d4748c28c659ee1502338badee4614ed06';
+
+export const EXPIRED_VC_ERROR_CODE = 'ERR_VC_EXPIRED';

shared/openId4VCI/Utils.ts

@@ -51,7 +51,6 @@ export function getVcVerificationDetails(
   return {
     statusType: statusType,
     vcType: idType,
-    vcNumber: vcMetadata.displayId,
   };
 }