link to tx

Author: pettinarip

app/[locale]/10years/_components/CurrentTorchHolderCard.tsx

@@ -19,13 +19,13 @@ import Curved10YearsText from "./10y.svg"
 
 import {
   formatAddress,
-  getAddressEtherscanUrl,
   getAvatarImage,
-  type TorchHolderMetadata,
+  getTxEtherscanUrl,
+  type TorchHolderEvent,
 } from "@/lib/torch"
 
 interface CurrentTorchHolderCardProps {
-  currentHolder: TorchHolderMetadata | null
+  currentHolder: TorchHolderEvent | null
   isBurned?: boolean
   className?: string
 }
@@ -98,7 +98,7 @@ const CurrentTorchHolderCard = ({
               {/* Verify onchain link */}
               <BaseLink
                 className="mt-2 text-xs"
-                href={getAddressEtherscanUrl(currentHolder.address)}
+                href={getTxEtherscanUrl(currentHolder.event.transactionHash)}
               >
                 View on Etherscan
               </BaseLink>

app/[locale]/10years/page.tsx

@@ -49,7 +49,7 @@ import {
   getTransferEvents,
   isAddressFiltered,
   isTorchBurned,
-  TorchHolder,
+  TorchHolderEvent,
 } from "@/lib/torch"
 import TenYearLogo from "@/public/images/10-year-anniversary/10-year-logo.png"
 
@@ -101,24 +101,26 @@ const Page = async ({ params }: { params: Promise<{ locale: Lang }> }) => {
       {} as Record<string, (typeof allTorchHolders)[0]>
     )
 
+  const transferEvents = await getTransferEvents()
+  const torchHoldersEvents = await getHolderEvents(
+    torchHolderMap,
+    transferEvents
+  )
+
   let isBurned = false
-  let currentHolder: TorchHolder | null = null
+  let currentHolder: TorchHolderEvent | null = null
   try {
     isBurned = await isTorchBurned()
     const currentHolderAddress = await getCurrentHolderAddress()
     const isFiltered = isAddressFiltered(currentHolderAddress)
+    const currentHolderEvent = torchHoldersEvents.find(
+      (holder) => holder.address === currentHolderAddress
+    )
 
-    currentHolder = isFiltered
-      ? null
-      : torchHolderMap[currentHolderAddress.toLowerCase()]
+    currentHolder = !isFiltered ? (currentHolderEvent ?? null) : null
   } catch (error) {
     console.error("Error fetching torch data:", error)
   }
-  const transferEvents = await getTransferEvents()
-  const torchHoldersEvents = await getHolderEvents(
-    torchHolderMap,
-    transferEvents
-  )
 
   // Filter out events where the address is in the filtered list
   const torchHolders = torchHoldersEvents.filter(