Update SearchBar.tsx

Author: Pymmdrza

src/components/SearchBar.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Search } from 'lucide-react';
 import { useNavigate } from 'react-router-dom';
-import { isBitcoinAddress, isTransactionId, isBlockHash, isBlockHeight } from '../utils/validation';
+import { isBitcoinAddress, isTransactionId, isBlockHash, isBlockHeight } from '../utils/validation'; // Make sure to import the updated validation functions
 import { Notification } from './Notification';
 
 export const SearchBar: React.FC = () => {
@@ -15,72 +15,72 @@ export const SearchBar: React.FC = () => {
       return 'Please enter a search term';
     }
 
+    const trimmedInput = input.trim(); // Trim input once to avoid repetition
+
+    // Check if it's a Bitcoin address (FIRST, because addresses are shorter and have specific prefixes)
+    if (isBitcoinAddress(trimmedInput)) {
+      return null; // Valid Bitcoin address
+    }
+
     // Check if it's a block height (numeric)
-    if (/^\d+$/.test(input)) {
-      if (!isBlockHeight(parseInt(input, 10))) {
+    if (/^\d+$/.test(trimmedInput)) {
+      if (!isBlockHeight(parseInt(trimmedInput, 10))) {
         return 'Invalid block height';
       }
-      return null;
+      return null; // Valid block height
     }
 
-    // Check if it's a block hash (64 hex chars)
-    if (input.length === 64 && /^[a-fA-F0-9]+$/.test(input)) {
-      if (!isBlockHash(input)) {
-        return 'Invalid block hash format';
+    // Check if it's a block hash (64 hex chars and starts with zeros - heuristic)
+    if (trimmedInput.length === 64 && /^[a-fA-F0-9]+$/.test(trimmedInput)) {
+      if (isBlockHash(trimmedInput)) { // Use the updated isBlockHash function
+        return null; // Valid Block Hash (heuristic)
       }
-      return null;
-    }
-
-    // Check if it's a transaction ID (64 hex chars)
-    if (input.length === 64) {
-      if (!isTransactionId(input)) {
-        return 'Invalid transaction ID format';
+      // If not likely a block hash, check if it's a Transaction ID
+      if (isTransactionId(trimmedInput)) { // Use the updated isTransactionId function
+        return null; // Valid Transaction ID (heuristic)
       }
-      return null;
+      return 'Invalid Block Hash or Transaction ID format'; // Neither Block Hash nor Transaction ID (heuristic)
     }
 
-    // Check if it's a Bitcoin address
-    if (!isBitcoinAddress(input)) {
-      return 'Invalid Bitcoin address format';
-    }
 
-    return null;
+    // If none of the above, and not a valid address in the first check, then it's an invalid address format
+    return 'Invalid Bitcoin address format'; // Fallback to invalid address format if not caught earlier
   };
 
   const handleSearch = (e: React.FormEvent) => {
     e.preventDefault();
-    
+
     const trimmedQuery = query.trim();
     const validationError = validateInput(trimmedQuery);
-    
+
     if (validationError) {
       setError(validationError);
       setShowNotification(true);
       return;
     }
 
-    // Check if it's a block height (numeric)
+    // Check if it's a block height (numeric) - Order is important, check block height first for numbers
     if (/^\d+$/.test(trimmedQuery)) {
       navigate(`/block/${trimmedQuery}`);
       setQuery('');
       return;
     }
 
-    // Check if it's a block hash (64 hex chars)
-    if (trimmedQuery.length === 64 && isBlockHash(trimmedQuery)) {
+    // Check if it's a block hash (64 hex chars and starts with zeros - heuristic)
+    if (trimmedQuery.length === 64 && isBlockHash(trimmedQuery)) { // Use updated isBlockHash
       navigate(`/block/${trimmedQuery}`);
       setQuery('');
       return;
     }
 
-    // Check if it's a transaction ID (64 hex chars)
-    if (trimmedQuery.length === 64) {
+    // Check if it's a transaction ID (64 hex chars and NOT starting with many zeros - heuristic)
+    if (trimmedQuery.length === 64 && isTransactionId(trimmedQuery)) { // Use updated isTransactionId
       navigate(`/tx/${trimmedQuery}`);
       setQuery('');
       return;
     }
 
-    // Must be a Bitcoin address
+    // Must be a Bitcoin address (if it passed validation and is not block height/hash/txid)
     navigate(`/address/${trimmedQuery}`);
     setQuery('');
   };