From bbbfa91aa992a01ba50223c3e3faa69acdf8f1d3 Mon Sep 17 00:00:00 2001
From: "tai.truong" <tai.truong@sotatek.com>
Date: Thu, 22 Feb 2024 14:15:44 +0700
Subject: [PATCH 1/3] fix: show wrong time format

---
 src/components/Account/OverviewTab/index.tsx  |  2 +-
 .../CIPComplianceModal/CIP25Modal.tsx         | 29 ++++++++++---------
 src/locales/en/translation.json               |  3 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/components/Account/OverviewTab/index.tsx b/src/components/Account/OverviewTab/index.tsx
index 34bedef15f..e74729e6ed 100644
--- a/src/components/Account/OverviewTab/index.tsx
+++ b/src/components/Account/OverviewTab/index.tsx
@@ -98,7 +98,7 @@ const OverviewTab = () => {
       />
       <RowItem
         label={t("account.lastLogin")}
-        value={moment(userData?.lastLogin).format("MM/DD/YYYY hh:mm:ss")}
+        value={moment(userData?.lastLogin).format("MM/DD/YYYY HH:mm:ss")}
         isTablet={isTablet}
       />
       {openModal && <ConnectWalletModal open={openModal} setOpen={setOpenModal} />}
diff --git a/src/components/CIPComplianceModal/CIP25Modal.tsx b/src/components/CIPComplianceModal/CIP25Modal.tsx
index be90aa65ed..83ab397c48 100644
--- a/src/components/CIPComplianceModal/CIP25Modal.tsx
+++ b/src/components/CIPComplianceModal/CIP25Modal.tsx
@@ -19,7 +19,8 @@ import {
   CIPPropertyTable,
   TokenLabel,
   ButtonContainer,
-  CIPLabel
+  CIPLabel,
+  BoxTooltip
 } from "./styles";
 import ViewAllButtonExternal from "../commons/ViewAllButtonExternal";
 
@@ -105,19 +106,19 @@ const CIP25Modal: React.FC<TCIP25ModalProps> = (props) => {
             </Typography>
           </CustomTooltip>
         ) : (
-          <CustomTooltip title={r.value}>
-            <CustomTooltip title={r.value}>
-              <Typography
-                textOverflow="ellipsis"
-                overflow="hidden"
-                whiteSpace="nowrap"
-                display="inline-block"
-                maxWidth={120}
-                fontSize={14}
-              >
-                {r.value}
-              </Typography>
-            </CustomTooltip>
+          <CustomTooltip
+            title={<BoxTooltip>{typeof r.value === "string" ? r.value : JSON.stringify(r.value)}</BoxTooltip>}
+          >
+            <Typography
+              textOverflow="ellipsis"
+              overflow="hidden"
+              whiteSpace="nowrap"
+              display="inline-block"
+              maxWidth={120}
+              fontSize={14}
+            >
+              {typeof r.value === "string" ? r.value : JSON.stringify(r.value)}
+            </Typography>
           </CustomTooltip>
         )
     },
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index f0ffc6d014..a18cee1925 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -1011,5 +1011,6 @@
   "bolnisi.titleModal": "Georgian Wine",
   "bolnisi.verifyErrorTooltip": "A connection to the verification service could not be established.",
   "bolnisi.verifyErrorTooltipTryAgain": "Please, refresh the page to try again.",
-  "bolnisi.verifyError": "Verification Unavailable"
+  "bolnisi.verifyError": "Verification Unavailable",
+  "account.myProfile":"My Profile"
 }

From 9c70d4a7af7bed3d60a85d74af86b6819dd453ab Mon Sep 17 00:00:00 2001
From: "tai.truong" <tai.truong@sotatek.com>
Date: Thu, 22 Feb 2024 16:06:17 +0700
Subject: [PATCH 2/3] fix: show cip25

---
 src/components/CIPComplianceModal/CIP25Modal.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/CIPComplianceModal/CIP25Modal.tsx b/src/components/CIPComplianceModal/CIP25Modal.tsx
index 83ab397c48..e18abc7600 100644
--- a/src/components/CIPComplianceModal/CIP25Modal.tsx
+++ b/src/components/CIPComplianceModal/CIP25Modal.tsx
@@ -107,7 +107,7 @@ const CIP25Modal: React.FC<TCIP25ModalProps> = (props) => {
           </CustomTooltip>
         ) : (
           <CustomTooltip
-            title={<BoxTooltip>{typeof r.value === "string" ? r.value : JSON.stringify(r.value)}</BoxTooltip>}
+            title={<BoxTooltip>{typeof r.value === "object" ? JSON.stringify(r.value) : r.value}</BoxTooltip>}
           >
             <Typography
               textOverflow="ellipsis"
@@ -117,7 +117,7 @@ const CIP25Modal: React.FC<TCIP25ModalProps> = (props) => {
               maxWidth={120}
               fontSize={14}
             >
-              {typeof r.value === "string" ? r.value : JSON.stringify(r.value)}
+              {typeof r.value === "object" && r.value !== null ? JSON.stringify(r.value) : r.value}
             </Typography>
           </CustomTooltip>
         )
@@ -174,12 +174,11 @@ const CIP25Modal: React.FC<TCIP25ModalProps> = (props) => {
   return (
     <CustomModal
       modalContainerProps={{ style: { maxWidth: "min(1000px, 98vw)" } }}
-      maxWidth={920}
       open={props.open}
       style={{ maxHeight: "unset" }}
       onClose={props.onClose}
       title={
-        <CIPLabel data-testid="cip25-modal-title">
+        <CIPLabel data-testid="token-CIP25Compliance">
           <span>{t("cip25.modal.title")}</span>
           <ButtonContainer>
             <ViewAllButtonExternal tooltipTitle={t("cip25.viewDocs")} to={CIP25_DOCS_URL} />
@@ -188,8 +187,7 @@ const CIP25Modal: React.FC<TCIP25ModalProps> = (props) => {
       }
     >
       <ModalContent>
-        <CIPModalDesc data-testid="cip25-modal-subtitle">{t("cip25.modal.subtitle")}</CIPModalDesc>
-
+        <CIPModalDesc>{t("cip25.modal.subtitle")}</CIPModalDesc>
         {tokenMaps.map((token, index) => (
           <React.Fragment key={index}>
             {token.tokenName && (

From c19f501e1dd9e978a29ba0288fcc25286e081eef Mon Sep 17 00:00:00 2001
From: "tai.truong" <tai.truong@sotatek.com>
Date: Thu, 22 Feb 2024 16:08:36 +0700
Subject: [PATCH 3/3] fix: update show cip 60

---
 src/components/CIPComplianceModal/CIP60Modal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/CIPComplianceModal/CIP60Modal.tsx b/src/components/CIPComplianceModal/CIP60Modal.tsx
index 6e8bde129b..efa56119d3 100644
--- a/src/components/CIPComplianceModal/CIP60Modal.tsx
+++ b/src/components/CIPComplianceModal/CIP60Modal.tsx
@@ -158,7 +158,7 @@ const CIP60Modal: React.FC<TCIP60ComplianceModalProps> = (props) => {
             </Typography>
           </CustomTooltip>
         ) : (
-          <CustomTooltip title={typeof r.value === "object" ? JSON.stringify(r.value) : r.value}>
+          <CustomTooltip title={typeof r.value === "object" && r.value !== null ? JSON.stringify(r.value) : r.value}>
             <Typography
               textOverflow="ellipsis"
               overflow="hidden"
@@ -167,7 +167,7 @@ const CIP60Modal: React.FC<TCIP60ComplianceModalProps> = (props) => {
               maxWidth={120}
               fontSize={14}
             >
-              {typeof r.value === "object" ? JSON.stringify(r.value) : r.value}
+              {typeof r.value === "object" && r.value !== null ? JSON.stringify(r.value) : r.value}
             </Typography>
           </CustomTooltip>
         );