Fix address detail loading states

frontend/src/pages/addresses/[address].tsx

@@ -51,14 +51,17 @@ export default function AddressDetailPage() {
   const [watchlistEntries, setWatchlistEntries] = useState<string[]>([])
   const [methodResults, setMethodResults] = useState<Record<string, { loading: boolean; value?: string; error?: string }>>({})
   const [methodInputs, setMethodInputs] = useState<Record<string, string[]>>({})
-  const [loading, setLoading] = useState(true)
+  const [addressInfoLoading, setAddressInfoLoading] = useState(true)
+  const [activityLoading, setActivityLoading] = useState(true)
 
   const loadAddressInfo = useCallback(async () => {
+    setAddressInfoLoading(true)
     try {
       const { ok, data } = await addressesApi.getSafe(chainId, address)
       if (!ok) {
         setAddressInfo(null)
         setContractProfile(null)
+        setGruProfile(null)
         return
       }
       setAddressInfo(data ?? null)
@@ -82,10 +85,13 @@ export default function AddressDetailPage() {
       setAddressInfo(null)
       setContractProfile(null)
       setGruProfile(null)
+    } finally {
+      setAddressInfoLoading(false)
     }
   }, [chainId, address])
 
   const loadTransactions = useCallback(async () => {
+    setActivityLoading(true)
     try {
       const [transactionsResult, balancesResult, transfersResult] = await Promise.all([
         addressesApi.getTransactionsSafe(chainId, address, 1, 20),
@@ -102,27 +108,37 @@ export default function AddressDetailPage() {
       setTokenBalances([])
       setTokenTransfers([])
     } finally {
-      setLoading(false)
+      setActivityLoading(false)
     }
   }, [chainId, address])
 
   useEffect(() => {
     if (!router.isReady || !address) {
-      setLoading(router.isReady ? false : true)
+      setAddressInfoLoading(!router.isReady)
+      setActivityLoading(!router.isReady)
       if (router.isReady && !address) {
         setAddressInfo(null)
         setTransactions([])
+        setTokenBalances([])
+        setTokenTransfers([])
       }
       return
     }
     if (!isValidAddressParam) {
-      setLoading(false)
+      setAddressInfoLoading(false)
+      setActivityLoading(false)
       setAddressInfo(null)
       setTransactions([])
+      setTokenBalances([])
+      setTokenTransfers([])
       return
     }
-    loadAddressInfo()
+    setAddressInfo(null)
-    loadTransactions()
+    setTransactions([])
+    setTokenBalances([])
+    setTokenTransfers([])
+    void loadAddressInfo()
+    void loadTransactions()
   }, [address, isValidAddressParam, loadAddressInfo, loadTransactions, router.isReady])
 
   useEffect(() => {
@@ -403,6 +419,8 @@ export default function AddressDetailPage() {
   const gruTransferCount = tokenTransfers.filter((transfer) =>
     Boolean(getGruExplorerMetadata({ address: transfer.token_address, symbol: transfer.token_symbol })),
   ).length
+  const showPrimaryLoadingState = !router.isReady || (addressInfoLoading && !addressInfo)
+  const resolvedAddressInfo = addressInfo as AddressInfo
 
   return (
     <div className="container mx-auto px-4 py-6 sm:py-8">
@@ -426,7 +444,7 @@ export default function AddressDetailPage() {
             Search this address
           </Link>
         )}
-        {watchlistAddress && router.isReady && !loading && (
+        {watchlistAddress && router.isReady && !addressInfoLoading && (
           <button
             type="button"
             onClick={handleWatchlistToggle}
@@ -437,7 +455,7 @@ export default function AddressDetailPage() {
         )}
       </div>
 
-      {!router.isReady || loading ? (
+      {showPrimaryLoadingState ? (
         <Card className="mb-6">
           <p className="text-sm text-gray-600 dark:text-gray-400">Loading address...</p>
         </Card>
@@ -453,7 +471,7 @@ export default function AddressDetailPage() {
             </Link>
           </div>
         </Card>
-      ) : !addressInfo ? (
+      ) : !addressInfoLoading && !addressInfo ? (
         <Card className="mb-6">
           <p className="text-sm text-gray-600 dark:text-gray-400">Address not found.</p>
           <div className="mt-4 flex flex-wrap gap-3 text-sm">
@@ -470,68 +488,69 @@ export default function AddressDetailPage() {
           <Card title="Address Information" className="mb-6">
             <dl className="space-y-4">
               <DetailRow label="Address">
-                <Address address={addressInfo.address} />
+                <Address address={resolvedAddressInfo.address} />
               </DetailRow>
-              {addressInfo.balance && (
+              {resolvedAddressInfo.balance && (
-                <DetailRow label="Coin Balance">{formatWeiAsEth(addressInfo.balance)}</DetailRow>
+                <DetailRow label="Coin Balance">{formatWeiAsEth(resolvedAddressInfo.balance)}</DetailRow>
               )}
               <DetailRow label="Watchlist">
                 {isSavedToWatchlist ? 'Saved for quick access' : 'Not saved yet'}
               </DetailRow>
               <DetailRow label="Verification">
                 <div className="flex flex-wrap gap-2">
-                  <EntityBadge label={addressInfo.is_contract ? (addressInfo.is_verified ? 'verified' : 'contract') : 'eoa'} />
+                  <EntityBadge label={resolvedAddressInfo.is_contract ? (resolvedAddressInfo.is_verified ? 'verified' : 'contract') : 'eoa'} />
                   {contractProfile?.source_verified ? <EntityBadge label="source available" tone="success" /> : null}
                   {contractProfile?.abi_available ? <EntityBadge label="abi available" tone="info" /> : null}
-                  {addressInfo.token_contract ? <EntityBadge label={addressInfo.token_contract.type || 'token'} tone="info" /> : null}
+                  {resolvedAddressInfo.token_contract ? <EntityBadge label={resolvedAddressInfo.token_contract.type || 'token'} tone="info" /> : null}
                 </div>
               </DetailRow>
-              {addressInfo.token_contract && (
+              {resolvedAddressInfo.token_contract && (
                 <DetailRow label="Token Contract">
                   <div className="space-y-2">
                     <div>
-                      {addressInfo.token_contract.symbol || addressInfo.token_contract.name || 'Token contract'} · {addressInfo.token_contract.type || 'Token'}
+                      {resolvedAddressInfo.token_contract.symbol || resolvedAddressInfo.token_contract.name || 'Token contract'} · {resolvedAddressInfo.token_contract.type || 'Token'}
                     </div>
-                    <Link href={`/tokens/${addressInfo.token_contract.address}`} className="text-primary-600 hover:underline">
+                    <Link href={`/tokens/${resolvedAddressInfo.token_contract.address}`} className="text-primary-600 hover:underline">
                       Open token detail →
                     </Link>
                   </div>
                 </DetailRow>
               )}
-              {addressInfo.tags.length > 0 && (
+              {resolvedAddressInfo.tags.length > 0 && (
                 <DetailRow label="Tags" valueClassName="flex flex-wrap gap-2">
-                    {addressInfo.tags.map((tag, i) => (
+                    {resolvedAddressInfo.tags.map((tag, i) => (
                       <EntityBadge key={i} label={tag} className="px-2 py-1 text-[11px]" />
                     ))}
                 </DetailRow>
               )}
-              <DetailRow label="Transactions">{addressInfo.transaction_count}</DetailRow>
+              <DetailRow label="Transactions">{resolvedAddressInfo.transaction_count}</DetailRow>
-              <DetailRow label="Tokens">{addressInfo.token_count}</DetailRow>
+              <DetailRow label="Tokens">{resolvedAddressInfo.token_count}</DetailRow>
-              <DetailRow label="Type">{addressInfo.is_contract ? 'Contract' : 'EOA'}</DetailRow>
+              <DetailRow label="Type">{resolvedAddressInfo.is_contract ? 'Contract' : 'EOA'}</DetailRow>
               <DetailRow label="Recent Activity">
-                {incomingTransactions} incoming / {outgoingTransactions} outgoing txs
+                {activityLoading ? 'Loading recent activity...' : `${incomingTransactions} incoming / ${outgoingTransactions} outgoing txs`}
               </DetailRow>
-              {addressInfo.internal_transaction_count != null && (
+              {resolvedAddressInfo.internal_transaction_count != null && (
-                <DetailRow label="Internal Calls">{addressInfo.internal_transaction_count}</DetailRow>
+                <DetailRow label="Internal Calls">{resolvedAddressInfo.internal_transaction_count}</DetailRow>
               )}
-              {addressInfo.logs_count != null && (
+              {resolvedAddressInfo.logs_count != null && (
-                <DetailRow label="Indexed Logs">{addressInfo.logs_count}</DetailRow>
+                <DetailRow label="Indexed Logs">{resolvedAddressInfo.logs_count}</DetailRow>
               )}
               <DetailRow label="Token Flow">
-                {incomingTokenTransfers} incoming / {outgoingTokenTransfers} outgoing token transfers
+                {activityLoading
-                {addressInfo.token_transfer_count != null ? ` · ${addressInfo.token_transfer_count} total indexed` : ''}
+                  ? 'Loading token transfer activity...'
+                  : `${incomingTokenTransfers} incoming / ${outgoingTokenTransfers} outgoing token transfers${resolvedAddressInfo.token_transfer_count != null ? ` · ${resolvedAddressInfo.token_transfer_count} total indexed` : ''}`}
               </DetailRow>
-              {addressInfo.creation_transaction_hash && (
+              {resolvedAddressInfo.creation_transaction_hash && (
                 <DetailRow label="Created In">
-                  <Link href={`/transactions/${addressInfo.creation_transaction_hash}`} className="text-primary-600 hover:underline">
+                  <Link href={`/transactions/${resolvedAddressInfo.creation_transaction_hash}`} className="text-primary-600 hover:underline">
-                    <Address address={addressInfo.creation_transaction_hash} truncate showCopy={false} />
+                    <Address address={resolvedAddressInfo.creation_transaction_hash} truncate showCopy={false} />
                   </Link>
                 </DetailRow>
               )}
             </dl>
           </Card>
 
-          {addressInfo.is_contract && (
+          {resolvedAddressInfo.is_contract && (
             <Card title="Contract Profile" className="mb-6">
               <dl className="space-y-4">
                 <DetailRow label="Interaction Surface">
@@ -771,12 +790,16 @@ export default function AddressDetailPage() {
                 </Link>
               </div>
             ) : null}
-            <Table
+            {activityLoading ? (
-              columns={tokenBalanceColumns}
+              <p className="text-sm text-gray-600 dark:text-gray-400">Loading token balances...</p>
-              data={tokenBalances}
+            ) : (
-              emptyMessage="No token balances were indexed for this address."
+              <Table
-              keyExtractor={(balance) => balance.token_address || `${balance.token_symbol}-${balance.value}`}
+                columns={tokenBalanceColumns}
-            />
+                data={tokenBalances}
+                emptyMessage="No token balances were indexed for this address."
+                keyExtractor={(balance) => balance.token_address || `${balance.token_symbol}-${balance.value}`}
+              />
+            )}
           </Card>
 
           <Card title="Recent Token Transfers" className="mb-6">
@@ -791,21 +814,29 @@ export default function AddressDetailPage() {
                 </Link>
               </div>
             ) : null}
-            <Table
+            {activityLoading ? (
-              columns={tokenTransferColumns}
+              <p className="text-sm text-gray-600 dark:text-gray-400">Loading token transfers...</p>
-              data={tokenTransfers}
+            ) : (
-              emptyMessage="No token transfers were found for this address."
+              <Table
-              keyExtractor={(transfer) => `${transfer.transaction_hash}-${transfer.token_address}-${transfer.value}`}
+                columns={tokenTransferColumns}
-            />
+                data={tokenTransfers}
+                emptyMessage="No token transfers were found for this address."
+                keyExtractor={(transfer) => `${transfer.transaction_hash}-${transfer.token_address}-${transfer.value}`}
+              />
+            )}
           </Card>
 
           <Card title="Transactions">
-            <Table
+            {activityLoading ? (
-              columns={transactionColumns}
+              <p className="text-sm text-gray-600 dark:text-gray-400">Loading recent transactions...</p>
-              data={transactions}
+            ) : (
-              emptyMessage="No recent transactions were found for this address."
+              <Table
-              keyExtractor={(tx) => tx.hash}
+                columns={transactionColumns}
-            />
+                data={transactions}
+                emptyMessage="No recent transactions were found for this address."
+                keyExtractor={(tx) => tx.hash}
+              />
+            )}
           </Card>
         </>
       )}