From 9439172422ff5a0e15f8773fba2c0fa090daba3e Mon Sep 17 00:00:00 2001
From: konan-5 <ikedahiroshi517@gmail.com>
Date: Tue, 7 May 2024 10:11:18 +0000
Subject: [PATCH 1/2] Update executed in txstatus

---
 src/app/main/apps/network/address/AddressPage.js | 12 +-----------
 src/app/main/apps/network/component/TxItem.js    |  4 ++--
 src/app/main/apps/network/component/TxStatus.js  |  7 +++----
 src/app/main/apps/network/tick/TickPage.js       | 12 +-----------
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/app/main/apps/network/address/AddressPage.js b/src/app/main/apps/network/address/AddressPage.js
index 8b8931c..0808c15 100644
--- a/src/app/main/apps/network/address/AddressPage.js
+++ b/src/app/main/apps/network/address/AddressPage.js
@@ -164,17 +164,7 @@ function AddressPage() {
         >
           <div className="flex flex-col gap-12">
             {displayTransactions.map((item, index) => (
-              <TxItem
-                key={index}
-                executed={item.executed}
-                id={item.id}
-                sourceId={item.sourceId}
-                tick={tick}
-                destId={item.destId}
-                type={item.type}
-                amount={item.amount}
-                data={item.data}
-              />
+              <TxItem key={index} {...item} />
             ))}
           </div>
         </InfiniteScroll>
diff --git a/src/app/main/apps/network/component/TxItem.js b/src/app/main/apps/network/component/TxItem.js
index 0b2fc52..8bab6cf 100644
--- a/src/app/main/apps/network/component/TxItem.js
+++ b/src/app/main/apps/network/component/TxItem.js
@@ -13,7 +13,7 @@ function TxItem(props) {
   const [entries, setEntries] = useState([]);
   const [isOpen, setIsOpen] = useState(false);
 
-  const { executed, id, sourceId, tick, destId, type, amount, data } = props;
+  const { executed, id, sourceId, tick, destId, type, amount, data, moneyFlew } = props;
 
   useEffect(() => {
     const fetchData = async () => {
@@ -49,7 +49,7 @@ function TxItem(props) {
     <CardItem className="flex flex-col pt-12 px-12 transition-all duration-300">
       <div className="flex flex-col md:flex-row md:items-center gap-10 md:gap-16 mb-14">
         <div className="">
-          <TxStatus executed={executed} />
+          <TxStatus executed={executed && moneyFlew} />
         </div>
         <TxLink value={id} />
       </div>
diff --git a/src/app/main/apps/network/component/TxStatus.js b/src/app/main/apps/network/component/TxStatus.js
index fc6386e..d4f5650 100644
--- a/src/app/main/apps/network/component/TxStatus.js
+++ b/src/app/main/apps/network/component/TxStatus.js
@@ -1,18 +1,17 @@
-import { IconButton, Typography } from '@mui/material';
+import { Typography } from '@mui/material';
 import FuseSvgIcon from '@fuse/core/FuseSvgIcon';
 
 function TxStatus(props) {
   const { executed } = props;
-
   return (
-    <IconButton className="flex gap-4 py-2 px-8 bg-gray-70 rounded-full items-center">
+    <div className="inline-flex gap-4 py-2 px-8 bg-gray-70 rounded-full items-center">
       <Typography className=" tex-16 leading-20 text-gray-50 font-space ">TX</Typography>
       <FuseSvgIcon
         className={`text-20 w-20 h-20 ${executed ? 'text-success-40' : 'text-error-40'}`}
       >
         {executed ? 'heroicons-solid:check' : 'heroicons-solid:x'}
       </FuseSvgIcon>
-    </IconButton>
+    </div>
   );
 }
 
diff --git a/src/app/main/apps/network/tick/TickPage.js b/src/app/main/apps/network/tick/TickPage.js
index ba3cfd8..a6afac1 100644
--- a/src/app/main/apps/network/tick/TickPage.js
+++ b/src/app/main/apps/network/tick/TickPage.js
@@ -165,17 +165,7 @@ function TickPage() {
         >
           <div className="flex flex-col gap-12">
             {displayTransactions.map((item, index) => (
-              <TxItem
-                key={index}
-                executed={item.executed}
-                id={item.id}
-                sourceId={item.sourceId}
-                tick={tick}
-                destId={item.destId}
-                type={item.type}
-                amount={item.amount}
-                data={item.data}
-              />
+              <TxItem key={index} {...item} />
             ))}
           </div>
         </InfiniteScroll>

From 28a48186b2f58cfc3363a617da1cf86fc448ac9e Mon Sep 17 00:00:00 2001
From: konan-5 <ikedahiroshi517@gmail.com>
Date: Tue, 7 May 2024 12:35:13 +0000
Subject: [PATCH 2/2] Fix executed status in tx page

---
 src/app/main/apps/network/tx/TxPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/main/apps/network/tx/TxPage.js b/src/app/main/apps/network/tx/TxPage.js
index 4269844..12bac77 100644
--- a/src/app/main/apps/network/tx/TxPage.js
+++ b/src/app/main/apps/network/tx/TxPage.js
@@ -54,7 +54,7 @@ function TxPage() {
         </Typography>
         <div className="flex flex-col md:flex-row md:items-center gap-10 md:gap-16 mb-24">
           <div className="">
-            <TxStatus executed={tx?.executed} />
+            <TxStatus executed={tx?.executed && tx?.moneyFlew} />
           </div>
           <TxLink value={tx?.id} />
         </div>