Merge branch 'release/1.3' of https://github.com/qubic/explorer-frontend

into release/1.4
qubic · May 7, 2024 · 8dd0c46 · 8dd0c46
2 parents 92a61da + 0681263
commit 8dd0c46
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git 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
@@ -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} className="text-primary-40" copy />
       </div>

diff --git a/src/app/main/apps/network/component/TxStatus.js b/src/app/main/apps/network/component/TxStatus.js
@@ -3,9 +3,8 @@ import FuseSvgIcon from '@fuse/core/FuseSvgIcon';
 
 function TxStatus(props) {
   const { executed } = props;
-
   return (
-    <div 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'}`}

diff --git 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>

diff --git a/src/app/main/apps/network/tx/TxPage.js b/src/app/main/apps/network/tx/TxPage.js
@@ -52,7 +52,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 || true} />
+            <TxStatus executed={tx?.executed && tx?.moneyFlew} />
           </div>
           <TxLink value={tx?.txId} className="opacity-70" copy />
         </div>