From 6d185443b2cdad3e57e03d0df9016e8fdf88498f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Riquelme=20Guzm=C3=A1n?=
 <nrriquelme@gmail.com>
Date: Fri, 5 Jul 2024 12:04:18 -0400
Subject: [PATCH] fix: render issue on detail view for transfers with execution
 property as null

---
 src/pages/DetailView/DetailView.tsx | 36 ++++++++++++++++-------------
 src/utils/Helpers.tsx               |  4 ++--
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/pages/DetailView/DetailView.tsx b/src/pages/DetailView/DetailView.tsx
index dc7a10f..7176272 100644
--- a/src/pages/DetailView/DetailView.tsx
+++ b/src/pages/DetailView/DetailView.tsx
@@ -113,7 +113,7 @@ export default function DetailView() {
           <span className={classes.detailsInnerContentTitle}>Source transaction hash:</span>
           <span className={classes.detailsInnerContent}>
             <Link
-              to={txHashLinks(fromDomainInfo!.type, transfer?.deposit?.txHash!, fromDomainExplorerUrl!.url)}
+              to={txHashLinks(fromDomainInfo!.type, fromDomainExplorerUrl!.url, transfer?.deposit?.txHash!)}
               style={{ color: "black" }}
               target="_blank"
             >
@@ -139,26 +139,30 @@ export default function DetailView() {
           <span className={classes.detailsInnerContentTitle}>Destination transaction hash:</span>
           <span className={classes.detailsInnerContent}>
             <Link
-              to={txHashLinks(toDomainInfo!.type, transfer?.execution?.txHash!, toDomainExplorerUrl!.url)}
+              to={txHashLinks(toDomainInfo!.type, toDomainExplorerUrl!.url, transfer?.execution?.txHash!)}
               style={{ color: "black" }}
               target="_blank"
             >
               {transfer?.execution && transfer?.execution?.txHash}
             </Link>
-            <span
-              className={classes.copyIcon}
-              onClick={() => {
-                void navigator.clipboard?.writeText(transfer?.execution?.txHash!)
-                dispatcher({
-                  type: "set_clipboard_message_t2",
-                  payload: "Copied to clipboard!",
-                })
-              }}
-            >
-              <Tooltip title={state.clipboardMessageT2} placement="top" arrow>
-                <ContentCopyIcon fontSize="small" />
-              </Tooltip>
-            </span>
+            {transfer?.execution ? (
+              <span
+                className={classes.copyIcon}
+                onClick={() => {
+                  void navigator.clipboard?.writeText(transfer?.execution?.txHash!)
+                  dispatcher({
+                    type: "set_clipboard_message_t2",
+                    payload: "Copied to clipboard!",
+                  })
+                }}
+              >
+                <Tooltip title={state.clipboardMessageT2} placement="top" arrow>
+                  <ContentCopyIcon fontSize="small" />
+                </Tooltip>
+              </span>
+            ) : (
+              <span>Pending proposal execution</span>
+            )}
           </span>
         </div>
         <div className={classes.detailsContainer}>
diff --git a/src/utils/Helpers.tsx b/src/utils/Helpers.tsx
index 1310836..1871285 100644
--- a/src/utils/Helpers.tsx
+++ b/src/utils/Helpers.tsx
@@ -306,12 +306,12 @@ export const renderFormatedConvertedAmount = (type: ResourceTypes, usdValue: num
   return ""
 }
 
-export const txHashLinks = (type: DomainTypes, txHash: string, domainExplorerUrl: string): string => {
+export const txHashLinks = (type: DomainTypes, domainExplorerUrl: string, txHash?: string): string => {
   switch (type) {
     case DomainTypes.EVM:
       return `${domainExplorerUrl}/tx/${txHash}`
     case DomainTypes.SUBSTRATE:
-      return `${domainExplorerUrl}/${txHash.split("-")[0]}`
+      return `${domainExplorerUrl}/${txHash?.split("-")[0] || ""}`
     default:
       return ""
   }