Merge pull request #167 from Staketab/dev

fix modal title
Staketab · Jul 16, 2024 · 7e06737 · 7e06737
2 parents 01f35b3 + 823fe4f
commit 7e06737
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/ui/components/atoms/timeline/timeline.tsx b/ui/components/atoms/timeline/timeline.tsx
@@ -11,20 +11,17 @@ import Image from "next/image";
 import { StaticEllipse } from "@/components/molecules/staticEllipse";
 import { DOMAIN_STATUS } from "@/comman/types";
 import { chain } from "@/comman/constants";
-import Link from "next/link";
 
 const getPendingComponent = (message) => (
   <span style={{ display: "flex", alignItems: "center", gap: "12px" }}>
     <Image src={pendingIcon} alt="" width={18} height={18} /> {message}
   </span>
 );
 
-const getDescription = (value, hash?: string) => {
-  const text = value?.match(/[^\d]+/);
-  const number = value?.match(/\d+/);
+const getDescription = (value) => {
   return (
     <div className={styles.description}>
-      {text} <Link href={`https://minascan.io/${chain}/tx/${hash}`} target="_blank">{number}</Link>
+      {value}
     </div>
   );
 };
@@ -112,7 +109,7 @@ const Timeline: FC<TimelineProps> = ({
             hash: item?.hash,
             statusTime,
             status: "Block Created",
-            description: getDescription(status, item?.hash),
+            description: getDescription(status),
           },
           isLastItem && {
             pendingComponent: getPendingComponent("Validating block.."),
@@ -125,7 +122,7 @@ const Timeline: FC<TimelineProps> = ({
           {
             statusTime,
             status: "Block Validated",
-            description: getDescription(status, item?.hash),
+            description: getDescription(status),
             hash: item?.hash,
           },
           isLastItem && {
@@ -139,7 +136,7 @@ const Timeline: FC<TimelineProps> = ({
           {
             statusTime,
             status: "Block Proved",
-            description: getDescription(status, item?.hash),
+            description: getDescription(status),
             hash: item?.hash,
           },
           isLastItem && DOMAIN_STATUS.ACTIVE !== domainStatus
@@ -202,7 +199,7 @@ const Timeline: FC<TimelineProps> = ({
   return (
     <div className={classNames(styles.wrapper, "full-mobile-width", className)}>
       <div className={styles.dots} />
-      <p className={styles.title}>Timeline</p>
+      <p className={styles.title}>Purchase Progress</p>
       {newData.map(
         (
           { status, statusTime, hash, pendingComponent, description },

diff --git a/ui/components/molecules/modals/pendingModal/pendingInfo.tsx b/ui/components/molecules/modals/pendingModal/pendingInfo.tsx
@@ -41,10 +41,10 @@ const PendingModal: FC<PendingModalProps> = (props) => {
   return (
     <div className={styles.wrapper}>
       <Timeline
-        timelines={statuses}
         {...props}
+        timelines={statuses}
         zkTxId={availableZkTxId}
-        isSendToCloudWorker={isSendToCloudWorker || additionData?.zkTxId}
+        isSendToCloudWorker={isSendToCloudWorker || additionData?.isSendToCloudWorker}
         domainStatus={availableDomainStatus}
         transaction={transactionPay}
       />

diff --git a/ui/components/organisms/accountConent/components/names/allContent.tsx b/ui/components/organisms/accountConent/components/names/allContent.tsx
@@ -32,6 +32,7 @@ const AllContent = ({
   const {
     state: {
       walletData: { accountId },
+      modals,
     },
     actions: { openModal },
   } = useStoreContext();
@@ -48,7 +49,7 @@ const AllContent = ({
                 zkTxId: domain.zkTxId,
                 domainStatus: domain.domainStatus,
                 startTimestamp: domain.startTimestamp,
-                transaction: domain.transaction
+                transaction: domain.transaction,
               });
             },
           }
@@ -91,12 +92,17 @@ const AllContent = ({
     }
   }, [domainStatus, params?.id, accountId, size, page]);
 
-  useEffect(() => {
+  useEffect(() => {    
     if (selectedDomainId) {
-      const domain = accountDomains?.content?.find(
-        (item) => item.id === selectedDomainId
-      );
-      domain?.zkTxId && setAdditionData(domain);
+      const isOpenModal = modals.some(({ modal }) => modal === Modals.pending);
+      if (isOpenModal) {
+        const domain = accountDomains?.content?.find(
+          (item) => item.id === selectedDomainId
+        );
+        domain?.zkTxId && setAdditionData(domain);
+      } else {
+        setSelectedDomainId(null)
+      }
     }
   }, [accountDomains]);
 

diff --git a/ui/store/index.tsx b/ui/store/index.tsx
@@ -287,8 +287,10 @@ const Store = ({
   const openModal = (modal: Modals, data: unknown) =>
     dispatch({ type: "OPEN_MODAL", payload: { modal, data } });
 
-  const closeModal = (modal: Modals) =>
+  const closeModal = (modal: Modals) => {
     dispatch({ type: "CLOSE_MODAL", payload: modal });
+    dispatch({ type: "SET_ADDITION_DATA", payload: null });
+  }
 
   const addToBag = (domain: Domain) =>
     dispatch({ type: "ADD_TO_BAG", payload: domain });