update to useObservedTransactions

latticexyz · Oct 16, 2024 · eb1c954 · eb1c954
1 parent 99f4945
commit eb1c954
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/...orer/src/app/(explorer)/[chainName]/worlds/[worldAddress]/observe/TransactionTableRow.tsx b/...orer/src/app/(explorer)/[chainName]/worlds/[worldAddress]/observe/TransactionTableRow.tsx
@@ -8,15 +8,15 @@ import { cn } from "../../../../../../utils";
 import { Confirmations } from "./Confirmations";
 import { TimingRowExpanded } from "./TimingRowExpanded";
 import { columns } from "./TransactionsTable";
-import { WatchedTransaction } from "./useTransactionsWatcher";
+import { ObservedTransaction } from "./useObservedTransactions";
 
 function TransactionTableRowDataCell({
   label,
   status,
   children,
 }: {
   label: string;
-  status: WatchedTransaction["status"];
+  status: ObservedTransaction["status"];
   children: React.ReactNode;
 }) {
   return (
@@ -30,7 +30,7 @@ function TransactionTableRowDataCell({
   );
 }
 
-export function TransactionTableRow({ row }: { row: Row<WatchedTransaction> }) {
+export function TransactionTableRow({ row }: { row: Row<ObservedTransaction> }) {
   const data = row?.original;
   const status = data.status;
   const logs = data?.logs;

diff --git a/...plorer/src/app/(explorer)/[chainName]/worlds/[worldAddress]/observe/TransactionsTable.tsx b/...plorer/src/app/(explorer)/[chainName]/worlds/[worldAddress]/observe/TransactionsTable.tsx
@@ -12,9 +12,9 @@ import { BlockExplorerLink } from "./BlockExplorerLink";
 import { TimeAgo } from "./TimeAgo";
 import { TimingRowHeader } from "./TimingRowHeader";
 import { TransactionTableRow } from "./TransactionTableRow";
-import { WatchedTransaction, useTransactionsWatcher } from "./useTransactionsWatcher";
+import { ObservedTransaction, useObservedTransactions } from "./useObservedTransactions";
 
-const columnHelper = createColumnHelper<WatchedTransaction>();
+const columnHelper = createColumnHelper<ObservedTransaction>();
 export const columns = [
   columnHelper.accessor("receipt.blockNumber", {
     header: "Block",
@@ -94,7 +94,7 @@ export const columns = [
 ];
 
 export function TransactionsTable() {
-  const transactions = useTransactionsWatcher();
+  const transactions = useObservedTransactions();
   const [expanded, setExpanded] = useState<ExpandedState>({});
 
   const table = useReactTable({

diff --git a/...ddress]/observe/useTransactionsWatcher.ts → ...dress]/observe/useObservedTransactions.ts b/...ddress]/observe/useTransactionsWatcher.ts → ...dress]/observe/useObservedTransactions.ts
@@ -16,7 +16,7 @@ import { Message } from "../../../../../../observer/messages";
 import { type Write, store as observerStore } from "../../../../../../observer/store";
 import { store as worldStore } from "../store";
 
-export type WatchedTransaction = {
+export type ObservedTransaction = {
   writeId: string;
   hash?: Hex;
   from?: Address;
@@ -31,13 +31,13 @@ export type WatchedTransaction = {
   error?: BaseError;
 };
 
-export function useTransactionsWatcher() {
+export function useObservedTransactions() {
   const { worldAddress } = useParams();
   const { transactions } = useStore(worldStore);
   const observerWrites = useStore(observerStore, (state) => state.writes);
 
-  const mergedTransactions = useMemo((): WatchedTransaction[] => {
-    const mergedMap = new Map<string | undefined, WatchedTransaction>();
+  const mergedTransactions = useMemo((): ObservedTransaction[] => {
+    const mergedMap = new Map<string | undefined, ObservedTransaction>();
 
     for (const write of Object.values(observerWrites)) {
       if (write.address !== worldAddress) continue;

diff --git a/packages/explorer/src/app/(explorer)/[chainName]/worlds/[worldAddress]/store.ts b/packages/explorer/src/app/(explorer)/[chainName]/worlds/[worldAddress]/store.ts
@@ -1,10 +1,10 @@
 import { createStore } from "zustand";
-import { WatchedTransaction } from "./observe/useTransactionsWatcher";
+import { ObservedTransaction } from "./observe/useObservedTransactions";
 
 export type State = {
-  transactions: WatchedTransaction[];
-  setTransaction: (transaction: WatchedTransaction) => void;
-  updateTransaction: (hash: string, updatedTransaction: Partial<WatchedTransaction>) => void;
+  transactions: ObservedTransaction[];
+  setTransaction: (transaction: ObservedTransaction) => void;
+  updateTransaction: (hash: string, updatedTransaction: Partial<ObservedTransaction>) => void;
 };
 
 export const store = createStore<State>()((set) => ({
@@ -13,7 +13,7 @@ export const store = createStore<State>()((set) => ({
     set((state) => ({
       transactions: [...state.transactions, transaction],
     })),
-  updateTransaction: (hash: string, updatedTransaction: Partial<WatchedTransaction>) =>
+  updateTransaction: (hash: string, updatedTransaction: Partial<ObservedTransaction>) =>
     set((state) => ({
       transactions: state.transactions.map((tx) => (tx.hash === hash ? { ...tx, ...updatedTransaction } : tx)),
     })),