feat: add incoming txs

Author: catalyst17

apps/dashboard/src/app/(dashboard)/hackweek/[chain_id]/[address]/actions/fetchTxActivity.ts

@@ -48,26 +48,37 @@ interface InsightsResponse {
 export async function fetchTxActivity(args: {
   chainId: number;
   address: string;
-  limit?: number,
+  limit_per_type?: number,
   page?: number;
-}): Promise<InsightsResponse> {
-  let { chainId, address, limit, page } = args;
-  if (!limit) limit = 100;
+}): Promise<Transaction[]> {
+  let { chainId, address, limit_per_type, page } = args;
+  if (!limit_per_type) limit_per_type = 100;
   if (!page) page = 0;
 
-  const response = await fetch(
-    `https://insight.thirdweb-dev.com/v1/transactions?chain=${chainId}&filter_from_address=${address}&page=${page}&limit=${limit}&sort_by=block_number&sort_order=desc`,
+  const outgoingTxsResponse = await fetch(
+    `https://insight.thirdweb-dev.com/v1/transactions?chain=${chainId}&filter_from_address=${address}&page=${page}&limit=${limit_per_type}&sort_by=block_number&sort_order=desc`,
     {
       headers: {
         "x-client-id": DASHBOARD_THIRDWEB_CLIENT_ID,
       },
     },
   );
 
-  if (!response.ok) {
+  const incomingTxsResponse = await fetch(
+    `https://insight.thirdweb-dev.com/v1/transactions?chain=${chainId}&filter_to_address=${address}&page=${page}&limit=${limit_per_type}&sort_by=block_number&sort_order=desc`,
+    {
+      headers: {
+        "x-client-id": DASHBOARD_THIRDWEB_CLIENT_ID,
+      },
+    },
+  );
+
+  if (!outgoingTxsResponse.ok || !incomingTxsResponse.ok) {
     throw new Error('Failed to fetch transaction history');
   }
 
-  const data: InsightsResponse = await response.json();
-  return data;
+  const outgoingTxsData: InsightsResponse = await outgoingTxsResponse.json();
+  const incomingTxsData: InsightsResponse = await incomingTxsResponse.json();
+
+  return [...outgoingTxsData.data, ...incomingTxsData.data].sort((a, b) => b.block_number - a.block_number);
 } 

apps/dashboard/src/app/(dashboard)/hackweek/[chain_id]/[address]/components/ActivityOverview.tsx

@@ -14,7 +14,7 @@ import { useState } from "react";
 
 interface Transaction {
   id: string;
-  // type: string;
+  type: "out" | "in";
   amount: string;
   to?: string;
   from?: string;
@@ -84,7 +84,7 @@ export function ActivityOverview({
             <Table>
               <TableHeader>
                 <TableRow>
-                  {/* <TableHead>Type</TableHead> */}
+                  <TableHead>Type</TableHead>
                   <TableHead>Amount</TableHead>
                   <TableHead>Details</TableHead>
                   <TableHead>Date</TableHead>
@@ -93,7 +93,7 @@ export function ActivityOverview({
               <TableBody>
                 {currentTransactions.map((tx) => (
                   <TableRow key={tx.id}>
-                    {/* <TableCell>{tx.type}</TableCell> */}
+                    <TableCell>{tx.type}</TableCell>
                     <TableCell>{tx.amount}</TableCell>
                     <TableCell>
                       {tx.to && `To: ${tx.to} `}

apps/dashboard/src/app/(dashboard)/hackweek/[chain_id]/[address]/hooks/useGetTxActivity.ts

@@ -5,7 +5,7 @@ interface TxActivityItem {
     id: string;
     // all txs we retrieve for now are outgoing
     // TODO: add incoming
-    // type: string;
+    type: "out" | "in";
     amount: string;
     to?: string;
     from?: string;
@@ -20,11 +20,11 @@ export function useGetTxActivity(chainId: number, address: string) {
   useEffect(() => {
     (async () => {
       const response = await fetchTxActivity({ chainId, address });
-      const activity = response.data.map((tx): TxActivityItem => {
-        // let type = tx.to_address?.toLowerCase() === address.toLowerCase() ? "Receive" : "Send";
+      const activity = response.map((tx): TxActivityItem => {
+        let type = tx.to_address?.toLowerCase() === address.toLowerCase() ? "in" : "out";
         return {
           id: tx.hash,
-          // type,
+          type,
           amount: `${tx.value / Math.pow(10, 18)} ETH`,
           to: tx.to_address || undefined,
           from: tx.from_address,