MOSIP-37719, MOSIP-37709, MOSIP-37699, MOSIP-37709 - story review cha…

…nges. (#1006) * MOSIP-37719, MOSIP-37709, MOSIP-37699, MOSIP-37709 - story review changes. Signed-off-by: sudeep <[email protected]> * MOSIP-37719, MOSIP-37709, MOSIP-37699, MOSIP-37709 - story review changes. Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]>
mosip · Dec 9, 2024 · 86dac65 · 86dac65
1 parent 480498e
commit 86dac65
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 36 deletions.
diff --git a/pmp-revamp-ui/public/i18n/ara.json b/pmp-revamp-ui/public/i18n/ara.json
@@ -857,19 +857,20 @@
         "errorWhileGettingFtmDetails": "أثناء جلب تفاصيل الشهادة، واجهنا خطأ"
     },
     "viewSbiDetails": {
-        "viewSbiDetails": "عرض تفاصيل الهيئة الفرعية للتنفيذ",
-        "listOfSbi": "قائمة الهيئة الفرعية للتنفيذ",
-        "sbiVersion":"نسخة الهيئة الفرعية للتنفيذ",
-        "sbiCreatedDateTime": "تاريخ ووقت إنشاء الهيئة الفرعية للتنفيذ",
-        "sbiExpiryDateTime": "تاريخ ووقت انتهاء صلاحية الهيئة الفرعية للتنفيذ"
+        "viewSbiDetails": "عرض تفاصيل SBI",
+        "listOfSbi": "قائمة SBIs",
+        "sbiVersion": "إصدار SBI",
+        "sbiCreatedDate": "تاريخ إنشاء SBI",
+        "sbiExpiryDate": "تاريخ انتهاء SBI",
+        "organisation": "المنظمة"
     },
     "sbiApproveRejectPopup": {
-        "header": "هل تريد الموافقة/رفض SBI للإصدار - {{sbiVersion}} ?",
-        "description": "يرجى مراجعة تفاصيل SBI والأجهزة المرتبطة بها بعناية قبل اتخاذ الإجراء المناسب"
+        "header": "هل تريد الموافقة أو رفض SBI؟",
+        "description": "يرجى مراجعة تفاصيل SBI والأجهزة المرتبطة بعناية قبل اتخاذ الإجراء المناسب."
     },
     "deviceApproveRejectPopup": {
-        "header": "هل تريد الموافقة/رفض الجهاز باستخدام {{make}} - {{model}}",
-        "description": "يرجى مراجعة تفاصيل الجهاز بعناية قبل اتخاذ الإجراء المناسب"
+        "header": "هل تريد الموافقة أو رفض الجهاز؟",
+        "description": "يرجى مراجعة تفاصيل الجهاز بعناية قبل اتخاذ الإجراء المناسب."
     },
     "consentPopup": {
         "title": "الأحكام والشروط",

diff --git a/pmp-revamp-ui/public/i18n/eng.json b/pmp-revamp-ui/public/i18n/eng.json
@@ -854,17 +854,18 @@
     },
     "viewSbiDetails": {
         "viewSbiDetails": "View SBI Details",
-        "listOfSbi": "List Of SBI",
+        "listOfSbi": "List Of SBIs",
         "sbiVersion": "SBI Version",
-        "sbiCreatedDateTime": "SBI Created Date & Time",
-        "sbiExpiryDateTime": "SBI Expiry Date & Time"
+        "sbiCreatedDate": "SBI Created Date",
+        "sbiExpiryDate": "SBI Expiry Date",
+        "organisation": "Organisation"
     },
     "sbiApproveRejectPopup": {
-        "header": "Do you want to Approve/Reject the SBI of version - '{{sbiVersion}}' ?",
+        "header": "Do you want to Approve or Reject the SBI?",
         "description": "Please review the SBI details and associated devices carefully before taking appropriate action."
     },
     "deviceApproveRejectPopup": {
-        "header": "Do you want to Approve/Reject the device with {{make}} - {{model}} ?",
+        "header": "Do you want to Approve or Reject the Device?",
         "description": "Please review the Device details carefully before taking appropriate action."
     },
     "consentPopup": {

diff --git a/pmp-revamp-ui/public/i18n/fra.json b/pmp-revamp-ui/public/i18n/fra.json
@@ -857,19 +857,20 @@
         "errorWhileGettingFtmDetails": "Lors de la récupération des détails du certificat, nous avons rencontré une erreur."
     },
     "viewSbiDetails": {
-        "viewSbiDetails": "Voir les détails du Sbi",
-        "listOfSbi": "Liste des SBI",
-        "sbiVersion":"Version SBI",
-        "sbiCreatedDateTime": "Date et heure de création du SBI",
-        "sbiExpiryDateTime": "Date et heure d’expiration du SBI"
-    },  
+        "viewSbiDetails": "Voir les détails du SBI",
+        "listOfSbi": "Liste des SBIs",
+        "sbiVersion": "Version du SBI",
+        "sbiCreatedDate": "Date de création du SBI",
+        "sbiExpiryDate": "Date d'expiration du SBI",
+        "organisation": "Organisation"
+    },
     "sbiApproveRejectPopup": {
-        "header": "Voulez-vous approuver/rejeter le SBI de la version - '{{sbiVersion}}' ?",
-        "description": "Veuillez examiner attentivement les détails du SBI et les appareils associés avant de prendre les mesures appropriées.."
+        "header": "Voulez-vous approuver ou rejeter le SBI ?",
+        "description": "Veuillez examiner attentivement les détails du SBI et les appareils associés avant de prendre une décision appropriée."
     },
     "deviceApproveRejectPopup": {
-        "header": "Voulez-vous approuver/rejeter l'appareil avec {{make}} - {{model}} ?",
-        "description": "Veuillez examiner attentivement les détails de l'appareil avant de prendre les mesures appropriées."
+        "header": "Voulez-vous approuver ou rejeter l'appareil ?",
+        "description": "Veuillez examiner attentivement les détails de l'appareil avant de prendre une décision appropriée."
     },
     "consentPopup": {
         "title": "Termes et conditions",

diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDevicesList.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminDevicesList.js
@@ -240,7 +240,7 @@ function AdminDevicesList() {
                     )}
                     <div className="flex-col mt-7">
                         <div className="flex justify-between mb-5 max-470:flex-col">
-                            <Title title='deviceProviderServices.sbiDeviceDetails' backLink='/partnermanagement' ></Title>
+                            <Title title='devicesList.listOfDevices' backLink='/partnermanagement' ></Title>
                         </div>
                         <DeviceProviderServicesTab
                             activeSbi={false}
@@ -333,7 +333,7 @@ function AdminDevicesList() {
                                                                                             closePopUp={closeApproveRejectPopup}
                                                                                             approveRejectResponse={(responseData, status) => onClickApproveReject(responseData, status, device)}
                                                                                             title={`${device.make} | ${device.model}`}
-                                                                                            header={t('deviceApproveRejectPopup.header', { make: device.make, model: device.model })}
+                                                                                            header={t('deviceApproveRejectPopup.header')}
                                                                                             description={t('deviceApproveRejectPopup.description')}
                                                                                         />
                                                                                     )}

diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminSbiList.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/AdminSbiList.js
@@ -325,9 +325,8 @@ function AdminSbiList() {
                                                                                             popupData={{ ...sbi, isSbiRequest: true }}
                                                                                             closePopUp={closeApproveRejectPopup}
                                                                                             approveRejectResponse={(responseData, status) => onClickApproveReject(responseData, status, sbi)}
-                                                                                            title={sbi.partnerId}
-                                                                                            subtitle={sbi.orgName}
-                                                                                            header={t('sbiApproveRejectPopup.header', { sbiVersion: sbi.version })}
+                                                                                            title={sbi.sbiVersion}
+                                                                                            header={t('sbiApproveRejectPopup.header')}
                                                                                             description={t('sbiApproveRejectPopup.description')}
                                                                                         />
                                                                                     )}

diff --git a/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminSbiDetails.js b/pmp-revamp-ui/src/pages/admin/deviceProviderServices/ViewAdminSbiDetails.js
@@ -53,7 +53,7 @@ function ViewAdminSbiDetails() {
                         <div className="flex justify-between px-7 pt-3 border-b max-[450px]:flex-col">
                             <div className="flex-col">
                                 <p className="font-semibold text-lg text-dark-blue mb-2">
-                                    {sbiDetails.sbiVersion}
+                                    {`${sbiDetails.sbiId} | ${sbiDetails.sbiVersion}`}
                                 </p>
                                 <div className="flex items-center justify-start mb-2 max-[400px]:flex-col max-[400px]:items-start">
                                     <div className={`${bgOfStatus(sbiDetails.status)} flex w-fit py-1 px-5 text-sm rounded-md my-2 font-semibold`}>
@@ -90,26 +90,26 @@ function ViewAdminSbiDetails() {
                                 </div>
                                 <div className={`mb-5 w-[100%] ${isLoginLanguageRTL ? "mr-1" : "ml-1"}`}>
                                     <p className="text-suva-gray text-sm">
-                                        {t("viewSbiDetails.sbiVersion")}
+                                        {t("viewSbiDetails.organisation")}
                                     </p>
                                     <p className="text-vulcan text-md">
-                                        {sbiDetails.sbiVersion}
+                                        {sbiDetails.orgName}
                                     </p>
                                 </div>
                                 <div className={`mb-5 max-[600px]:w-[100%] w-[48%] ${isLoginLanguageRTL ? "mr-1" : "ml-1"}`}>
                                     <p className="text-suva-gray text-sm">
-                                        {t("viewSbiDetails.sbiCreatedDateTime")}
+                                        {t("viewSbiDetails.sbiCreatedDate")}
                                     </p>
                                     <p className="text-vulcan text-md">
-                                    {formatDate(sbiDetails.sbiCreatedDateTime, "dateTime", false)}
+                                    {formatDate(sbiDetails.sbiCreatedDateTime, "date", false)}
                                     </p>
                                 </div>
                                 <div className={`mb-5 max-[600px]:w-[100%] w-[50%] ${isLoginLanguageRTL ? "mr-1" : "ml-1"}`}>
                                     <p className={`text-sm ${(sbiDetails.sbiExpiryStatus === 'expired') ? 'text-crimson-red' : 'text-suva-gray' }`}>
-                                        {t("viewSbiDetails.sbiExpiryDateTime")}
+                                        {t("viewSbiDetails.sbiExpiryDate")}
                                     </p>
                                     <p className={`${(sbiDetails.sbiExpiryStatus === 'expired') && 'font-bold text-black'}text-vulcan text-md`}>
-                                    {formatDate(sbiDetails.sbiExpiryDateTime, "dateTime", false)}
+                                    {formatDate(sbiDetails.sbiExpiryDateTime, "date", false)}
                                     </p>
                                 </div>
                             </div>