From 6fb8511c04567a2fc409cafa913d0d05be2a64f6 Mon Sep 17 00:00:00 2001
From: mireiaGomariz <mireiapgomariz@gmail.com>
Date: Mon, 12 Aug 2024 11:18:15 +0200
Subject: [PATCH 1/2] package json fix pdf issue

---
 package.json | 63 ++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 1a0d630..be453c2 100644
--- a/package.json
+++ b/package.json
@@ -13,44 +13,39 @@
     "translations": "i18next"
   },
   "dependencies": {
-    "@ant-design/icons": "^5.2.6",
-    "@bloock/sdk": "^2.8.5",
-    "antd": "^5.11.0",
-    "date-fns": "^2.30.0",
-    "i18next": "^23.7.7",
-    "i18next-browser-languagedetector": "^7.2.0",
-    "iconoir-react": "^7.1.0",
+    "@ant-design/icons": "^5.4.0",
+    "@bloock/sdk": "^2.9.3",
+    "antd": "^5.20.0",
+    "date-fns": "^3.6.0",
+    "i18next": "^23.12.2",
+    "i18next-browser-languagedetector": "^8.0.0",
+    "iconoir-react": "^7.8.0",
     "isomorphic-fetch": "^3.0.0",
-    "magic-bytes.js": "^1.5.0",
-    "moment": "^2.29.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "magic-bytes.js": "^1.10.0",
+    "moment": "^2.30.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-dropzone": "^14.2.3",
-    "react-extension-icons": "^1.1.6",
-    "react-i18next": "^13.5.0",
-    "react-pdf": "^8.0.2",
-    "react-router-dom": "^6.23.0",
-    "tar": "7.1.0"
+    "react-i18next": "^15.0.0",
+    "react-pdf": "^9.1.0",
+    "react-router-dom": "^6.26.0"
   },
   "devDependencies": {
-    "@types/react": "^18.2.15",
-    "@types/react-dom": "^18.2.7",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "@vitejs/plugin-react-swc": "^3.3.2",
-    "autoprefixer": "^10.4.16",
-    "eslint": "^8.45.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.3",
-    "i18next-parser": "^8.9.0",
-    "postcss": "^8.4.31",
-    "tailwindcss": "^3.3.5",
-    "typescript": "^5.0.2",
-    "vite": "^5.2.11",
-    "vite-plugin-top-level-await": "^1.4.1",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
+    "@vitejs/plugin-react-swc": "^3.7.0",
+    "autoprefixer": "^10.4.20",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-plugin-react-refresh": "^0.4.9",
+    "i18next-parser": "^9.0.1",
+    "postcss": "^8.4.40",
+    "tailwindcss": "^3.4.7",
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5",
+    "vite-plugin-top-level-await": "^1.4.2",
     "vite-plugin-wasm": "^3.3.0"
-  },
-  "resolutions": {
-    "pdfjs-dist": "^4.2.67"
   }
 }

From 2e27295f76417d8c237efcca8b43550fbbb0ac08 Mon Sep 17 00:00:00 2001
From: mireiaGomariz <mireiapgomariz@gmail.com>
Date: Fri, 30 Aug 2024 06:18:16 +0200
Subject: [PATCH 2/2] add special character translation in certificate subject,
 fix secret label translation, add state in certificate subject

---
 src/components/DirectoryPreview.tsx | 13 ++++++++++--
 src/components/Results.tsx          | 31 +++++++++++++++--------------
 src/i18n/locales/es.json            |  3 ++-
 src/utils/utils.ts                  |  6 ++++++
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/components/DirectoryPreview.tsx b/src/components/DirectoryPreview.tsx
index 042cd4e..4f6837f 100644
--- a/src/components/DirectoryPreview.tsx
+++ b/src/components/DirectoryPreview.tsx
@@ -1,15 +1,16 @@
-import { Card, List } from "antd";
+import { Button, Card, List } from "antd";
 import Wrapper from "./Wrapper";
 import { useVerification } from "../providers/VerificationProvider";
 import { useTranslation } from "react-i18next";
 import { IPFSCid } from "../models/ReadDirectory";
 import { ArrowRightCircle } from "iconoir-react";
 import { Icon } from "react-extension-icons";
+import { CloseOutlined } from "@ant-design/icons";
 
 function DirectoryPreview() {
   const { t } = useTranslation();
 
-  const { directoryResponse, onInputChange, isLoading, error } =
+  const { directoryResponse, onInputChange, isLoading, error, reset } =
     useVerification();
 
   return (
@@ -23,6 +24,14 @@ function DirectoryPreview() {
               backgroundColor: "rgba(255, 255, 255, 0.9)",
             }}
             bordered={false}
+            extra={
+              <Button
+                type="text"
+                shape="circle"
+                icon={<CloseOutlined />}
+                onClick={() => reset()}
+              />
+            }
           >
             <h2 className="text-center mb-4">{t("directory.title")}</h2>
             <List loading={isLoading}>
diff --git a/src/components/Results.tsx b/src/components/Results.tsx
index dd6fb9c..b81d527 100644
--- a/src/components/Results.tsx
+++ b/src/components/Results.tsx
@@ -24,6 +24,7 @@ import { PropsWithChildren } from "react";
 import { useTranslation } from "react-i18next";
 import { useVerification } from "../providers/VerificationProvider";
 import {
+  decodeString,
   formatBytes,
   getNetworkTranslation,
   getTxHashURL,
@@ -257,7 +258,7 @@ function Results() {
                     <>
                       <Divider />
                       <Field label={t("results.authenticity.common-name")}>
-                        {signature.subject?.CN}
+                        {decodeString(signature.subject?.CN)}
                       </Field>
                     </>
                   )}
@@ -267,7 +268,7 @@ function Results() {
                       <Field
                         label={t("results.authenticity.organization-unit")}
                       >
-                        {signature.subject?.OU}
+                        {decodeString(signature.subject?.OU)}
                       </Field>
                     </>
                   )}
@@ -275,7 +276,7 @@ function Results() {
                     <>
                       <Divider />
                       <Field label={t("results.authenticity.organization")}>
-                        {signature.subject?.O}
+                        {decodeString(signature.subject?.O)}
                       </Field>
                     </>
                   )}
@@ -283,15 +284,15 @@ function Results() {
                     <>
                       <Divider />
                       <Field label={t("results.authenticity.location")}>
-                        {signature.subject?.L}
+                        {decodeString(signature.subject?.L)}
                       </Field>
                     </>
                   )}
-                  {signature.subject?.S && (
+                  {signature.subject?.ST && (
                     <>
                       <Divider />
                       <Field label={t("results.authenticity.state")}>
-                        {signature.subject?.S}
+                        {decodeString(signature.subject?.ST)}
                       </Field>
                     </>
                   )}
@@ -299,7 +300,7 @@ function Results() {
                     <>
                       <Divider />
                       <Field label={t("results.authenticity.country")}>
-                        {signature.subject?.C}
+                        {decodeString(signature.subject?.C)}
                       </Field>
                     </>
                   )}
@@ -339,7 +340,7 @@ function Results() {
           <>
             <Divider />
             <Field label={t("results.encryption.common-name")}>
-              {encryptionDetails.subject?.CN}
+              {decodeString(encryptionDetails.subject?.CN)}
             </Field>
           </>
         )}
@@ -347,7 +348,7 @@ function Results() {
           <>
             <Divider />
             <Field label={t("results.encryption.organization-unit")}>
-              {encryptionDetails.subject?.OU}
+              {decodeString(encryptionDetails.subject?.OU)}
             </Field>
           </>
         )}
@@ -355,7 +356,7 @@ function Results() {
           <>
             <Divider />
             <Field label={t("results.encryption.organization")}>
-              {encryptionDetails.subject?.O}
+              {decodeString(encryptionDetails.subject?.O)}
             </Field>
           </>
         )}
@@ -363,15 +364,15 @@ function Results() {
           <>
             <Divider />
             <Field label={t("results.encryption.location")}>
-              {encryptionDetails.subject?.L}
+              {decodeString(encryptionDetails.subject?.L)}
             </Field>
           </>
         )}
-        {encryptionDetails?.subject?.S && (
+        {encryptionDetails?.subject?.ST && (
           <>
             <Divider />
             <Field label={t("results.encryption.state")}>
-              {encryptionDetails.subject?.S}
+              {decodeString(encryptionDetails.subject?.ST)}
             </Field>
           </>
         )}
@@ -379,7 +380,7 @@ function Results() {
           <>
             <Divider />
             <Field label={t("results.encryption.country")}>
-              {encryptionDetails.subject?.C}
+              {decodeString(encryptionDetails.subject?.C)}
             </Field>
           </>
         )}
@@ -552,7 +553,7 @@ function Results() {
                 <br />
                 <p className="font-bold">{t("results.general.issuer")}</p>
                 <p className="text-gray-500 text-sm">
-                  {authenticityDetails?.subject?.CN ||
+                  {decodeString(authenticityDetails?.subject?.CN) ||
                     t("results.not-available")}
                 </p>
                 <br />
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 9ec86d0..e2ad217 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -29,7 +29,7 @@
         "label": "Código"
       },
       "secret": {
-        "description": "This key has Secret access control enabled. In order to use it, add the secret below.",
+        "description": "Esta clave tiene control de acceso habilitado para Secreto. Para usarla, añade el secreto a continuación.",
         "label": "Secreto"
       }
     },
@@ -124,6 +124,7 @@
         "bloock_chain": "Bloock Chain",
         "ethereum_goerli": "",
         "ethereum_mainnet": "Ethereum",
+        "ethereum_sepolia": "Ethereum Sepolia",
         "gnosis_chain": "Gnosis",
         "label": "Redes",
         "polygon_chain": "Polygon",
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index ea27af6..dea088f 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -148,3 +148,9 @@ export function readBlob(file: Blob): Promise<Uint8Array> {
     reader.readAsArrayBuffer(file);
   });
 }
+
+export const decodeString = (encodedStr?: string) => {
+  if (encodedStr) {
+    return decodeURIComponent(escape(encodedStr));
+  }
+};