diff --git a/src/TokenTransferItem.tsx b/src/TokenTransferItem.tsx
index 2cf91a0..940d9e2 100644
--- a/src/TokenTransferItem.tsx
+++ b/src/TokenTransferItem.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useContext } from "react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCaretRight } from "@fortawesome/free-solid-svg-icons/faCaretRight";
 import TransactionAddress from "./components/TransactionAddress";
@@ -9,13 +9,17 @@ import {
   ChecksummedAddress,
   TokenMeta,
   TokenTransfer,
+  TransactionData,
 } from "./types";
+import { RuntimeContext } from "./useRuntime";
+import { useHasCode } from "./useErigonHooks";
 import { Metadata } from "./sourcify/useSourcify";
 
 type TokenTransferItemProps = {
   t: TokenTransfer;
   tokenMeta?: TokenMeta | null | undefined;
   metadatas: Record<ChecksummedAddress, Metadata | null | undefined>;
+  txData: TransactionData;
 };
 
 // TODO: handle partial
@@ -23,42 +27,59 @@ const TokenTransferItem: React.FC<TokenTransferItemProps> = ({
   t,
   tokenMeta,
   metadatas,
-}) => (
-  <div className="flex items-baseline space-x-2 px-2 py-1 truncate hover:bg-gray-100">
-    <span className="text-gray-500">
-      <FontAwesomeIcon icon={faCaretRight} size="1x" />
-    </span>
-    <div className="grid grid-cols-7 gap-x-1 w-full">
-      <div className="col-span-2 flex space-x-1">
-        <span className="font-bold">From</span>
-        <TransactionAddress
-          address={t.from}
-          addressCtx={AddressContext.FROM}
-          metadata={metadatas[t.from]}
-        />
-      </div>
-      <div className="col-span-2 flex space-x-1">
-        <span className="font-bold">To</span>
-        <TransactionAddress
-          address={t.to}
-          addressCtx={AddressContext.TO}
-          metadata={metadatas[t.to]}
-        />
-      </div>
-      <div className="col-span-3 flex space-x-1">
-        <span className="font-bold">For</span>
-        <span>
-          <ValueHighlighter value={t.value}>
-            <FormattedBalance
-              value={t.value}
-              decimals={tokenMeta?.decimals ?? 0}
-            />
-          </ValueHighlighter>
-        </span>
-        <TransactionAddress address={t.token} metadata={metadatas[t.token]} />
+  txData,
+}) => {
+  const { provider } = useContext(RuntimeContext);
+  const fromHasCode = useHasCode(
+    provider,
+    t.from,
+    txData.confirmedData ? txData.confirmedData.blockNumber - 1 : undefined
+  );
+  const toHasCode = useHasCode(
+    provider,
+    t.to,
+    txData.confirmedData ? txData.confirmedData.blockNumber - 1 : undefined
+  );
+
+  return (
+    <div className="flex items-baseline space-x-2 px-2 py-1 truncate hover:bg-gray-100">
+      <span className="text-gray-500">
+        <FontAwesomeIcon icon={faCaretRight} size="1x" />
+      </span>
+      <div className="grid grid-cols-7 gap-x-1 w-full">
+        <div className="col-span-2 flex space-x-1">
+          <span className="font-bold">From</span>
+          <TransactionAddress
+            address={t.from}
+            addressCtx={AddressContext.FROM}
+            metadata={metadatas[t.from]}
+            eoa={fromHasCode === undefined ? undefined : !fromHasCode}
+          />
+        </div>
+        <div className="col-span-2 flex space-x-1">
+          <span className="font-bold">To</span>
+          <TransactionAddress
+            address={t.to}
+            addressCtx={AddressContext.TO}
+            metadata={metadatas[t.to]}
+            eoa={toHasCode === undefined ? undefined : !toHasCode}
+          />
+        </div>
+        <div className="col-span-3 flex space-x-1">
+          <span className="font-bold">For</span>
+          <span>
+            <ValueHighlighter value={t.value}>
+              <FormattedBalance
+                value={t.value}
+                decimals={tokenMeta?.decimals ?? 0}
+              />
+            </ValueHighlighter>
+          </span>
+          <TransactionAddress address={t.token} metadata={metadatas[t.token]} />
+        </div>
       </div>
     </div>
-  </div>
-);
+  );
+};
 
 export default React.memo(TokenTransferItem);
diff --git a/src/transaction/Details.tsx b/src/transaction/Details.tsx
index 258cb84..fd8acab 100644
--- a/src/transaction/Details.tsx
+++ b/src/transaction/Details.tsx
@@ -314,6 +314,7 @@ const Details: React.FC<DetailsProps> = ({
               t={t}
               tokenMeta={txData.tokenMetas[t.token]}
               metadatas={metadatas}
+              txData={txData}
             />
           ))}
         </InfoRow>