Merge pull request #161 from Staketab/dev

added transaction value
Staketab · Jul 16, 2024 · e7ca023 · e7ca023
2 parents bd8b37b + 0f83357
commit e7ca023
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ui/components/molecules/modals/pendingModal/pendingInfo.tsx b/ui/components/molecules/modals/pendingModal/pendingInfo.tsx
@@ -12,9 +12,10 @@ export type PendingModalProps = {
   zkTxId: string | null;
   domainStatus: DOMAIN_STATUS;
   startTimestamp: number | null;
+  transaction: string;
 };
 const PendingModal: FC<PendingModalProps> = (props) => {
-  const { isSendToCloudWorker, zkTxId, domainStatus } = props;
+  const { isSendToCloudWorker, zkTxId, domainStatus, transaction } = props;
   const {
     state: { additionData },
   } = useStoreContext();
@@ -26,7 +27,7 @@ const PendingModal: FC<PendingModalProps> = (props) => {
     ? domainStatus
     : additionData?.domainStatus;
 
-  const transaction = additionData?.transaction;
+  const transactionPay = transaction || additionData?.transaction;
 
   useEffect(() => {
     if (availableZkTxId) {
@@ -45,7 +46,7 @@ const PendingModal: FC<PendingModalProps> = (props) => {
         zkTxId={availableZkTxId}
         isSendToCloudWorker={isSendToCloudWorker || additionData?.zkTxId}
         domainStatus={availableDomainStatus}
-        transaction={transaction}
+        transaction={transactionPay}
       />
     </div>
   );

diff --git a/ui/components/organisms/accountConent/components/names/allContent.tsx b/ui/components/organisms/accountConent/components/names/allContent.tsx
@@ -9,7 +9,6 @@ import { useStoreContext } from "@/store";
 import { addMinaText } from "@/helpers/name.helper";
 import { Modals } from "@/components/molecules/modals/modals.types";
 
-
 const initPage = 0;
 const initSize = 50;
 
@@ -49,6 +48,7 @@ const AllContent = ({
                 zkTxId: domain.zkTxId,
                 domainStatus: domain.domainStatus,
                 startTimestamp: domain.startTimestamp,
+                transaction: domain.transaction
               });
             },
           }