show the original tx in case the searched hash is an sc call

multiversx · Jul 17, 2024 · bf6d519 · bf6d519
1 parent 8797c7c
commit bf6d519
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/pages/TransactionDetails/TransactionDetails.tsx b/src/pages/TransactionDetails/TransactionDetails.tsx
@@ -24,25 +24,29 @@ export const TransactionDetails = () => {
   const [dataReady, setDataReady] = useState<boolean | undefined>();
 
   const fetchTransaction = async () => {
-    if (transactionId) {
+    if (transactionId && isHash(transactionId)) {
       const { data, success } = await getTransaction(transactionId);
-      if (!success && !data && isHash(transactionId)) {
+      let originalTxHash = data?.originalTxHash;
+
+      if (!success && !data) {
         const { data: scData, success: scSuccess } = await getScResult(
           transactionId
         );
-        if (scData?.originalTxHash && scData.hash && scSuccess) {
-          const options = {
-            pathname: networkRoute(
-              urlBuilder.transactionDetails(scData.originalTxHash)
-            ),
-            hash: scData.hash
-          };
-          navigate(options, { replace: true });
-
-          return;
+        if (scSuccess) {
+          originalTxHash = scData?.originalTxHash;
         }
       }
 
+      if (originalTxHash) {
+        const options = {
+          pathname: networkRoute(urlBuilder.transactionDetails(originalTxHash)),
+          hash: transactionId
+        };
+        navigate(options, { replace: true });
+
+        return;
+      }
+
       setTransaction(data);
       setDataReady(success);
     }