diff --git a/package-lock.json b/package-lock.json
index 8b582fe..d3f7ea8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
         "@testing-library/user-event": "^12.1.10",
         "@types/jest": "^26.0.24",
         "@types/node": "^14.17.5",
-        "@types/react": "^17.0.34",
+        "@types/react": "^17.0.35",
         "@types/react-blockies": "^1.4.1",
         "@types/react-dom": "^17.0.11",
         "@types/react-highlight": "^0.12.5",
@@ -3127,9 +3127,9 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "17.0.34",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz",
-      "integrity": "sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==",
+      "version": "17.0.35",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.35.tgz",
+      "integrity": "sha512-r3C8/TJuri/SLZiiwwxQoLAoavaczARfT9up9b4Jr65+ErAUX3MIkU0oMOQnrpfgHme8zIqZLX7O5nnjm5Wayw==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -21607,9 +21607,9 @@
       "version": "1.5.4"
     },
     "@types/react": {
-      "version": "17.0.34",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz",
-      "integrity": "sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==",
+      "version": "17.0.35",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.35.tgz",
+      "integrity": "sha512-r3C8/TJuri/SLZiiwwxQoLAoavaczARfT9up9b4Jr65+ErAUX3MIkU0oMOQnrpfgHme8zIqZLX7O5nnjm5Wayw==",
       "requires": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
diff --git a/package.json b/package.json
index f49441c..386cded 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "@testing-library/user-event": "^12.1.10",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.17.5",
-    "@types/react": "^17.0.34",
+    "@types/react": "^17.0.35",
     "@types/react-blockies": "^1.4.1",
     "@types/react-dom": "^17.0.11",
     "@types/react-highlight": "^0.12.5",
diff --git a/src/components/DecoratedAddressLink.tsx b/src/components/DecoratedAddressLink.tsx
index 087da7f..333e1ff 100644
--- a/src/components/DecoratedAddressLink.tsx
+++ b/src/components/DecoratedAddressLink.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { NavLink } from "react-router-dom";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faStar } from "@fortawesome/free-solid-svg-icons/faStar";
 import { faBomb } from "@fortawesome/free-solid-svg-icons/faBomb";
@@ -75,7 +76,10 @@ const DecoratedAddressLink: React.FC<DecoratedAddressLinkProps> = ({
         </span>
       )}
       {metadata && (
-        <span className="self-center flex-shrink-0 flex items-center">
+        <NavLink
+          className="self-center flex-shrink-0 flex items-center"
+          to={`/address/${address}/contract`}
+        >
           <img
             src={SourcifyLogo}
             alt="Sourcify logo"
@@ -83,7 +87,7 @@ const DecoratedAddressLink: React.FC<DecoratedAddressLinkProps> = ({
             width={16}
             height={16}
           />
-        </span>
+        </NavLink>
       )}
       <AddressOrENSName
         address={address}
diff --git a/src/transaction/decoder/DecodedParamRow.tsx b/src/transaction/decoder/DecodedParamRow.tsx
index 9bd64b6..78467d3 100644
--- a/src/transaction/decoder/DecodedParamRow.tsx
+++ b/src/transaction/decoder/DecodedParamRow.tsx
@@ -17,7 +17,7 @@ type DecodedParamRowProps = {
   paramType: ParamType;
   arrayElem?: number | undefined;
   help?: string | undefined;
-  resolvedAddresses?: ResolvedAddresses | undefined;
+  resolvedAddresses: ResolvedAddresses | undefined;
 };
 
 const DecodedParamRow: React.FC<DecodedParamRowProps> = ({
@@ -102,6 +102,7 @@ const DecodedParamRow: React.FC<DecodedParamRowProps> = ({
             i={idx}
             r={e}
             paramType={paramType.components[idx]}
+            resolvedAddresses={resolvedAddresses}
           />
         ))}
       {paramType.baseType === "array" &&
@@ -112,6 +113,7 @@ const DecodedParamRow: React.FC<DecodedParamRowProps> = ({
             r={e}
             paramType={paramType.arrayChildren}
             arrayElem={idx}
+            resolvedAddresses={resolvedAddresses}
           />
         ))}
     </>