Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tjayrush committed Jul 22, 2024
2 parents 677a1d0 + 41d038c commit 0fbcc66
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
15 changes: 7 additions & 8 deletions frontend/src/views/History/HistoryTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { IconCircleCheck } from "@tabler/icons-react";
import { app } from "@gocode/models";
import { createColumnHelper, ColumnDef } from "@tanstack/react-table";
import { CustomMeta } from "../CustomMeta";
import lClasses from "../Columns.module.css";

type CustomColumnDef<TData, TValue> = ColumnDef<TData, TValue> & {
meta?: CustomMeta;
Expand All @@ -16,17 +15,17 @@ export const txColumns: CustomColumnDef<app.TransactionEx, any>[] = [
id: "blockTx",
header: () => "Id",
cell: (info) => info.getValue(),
meta: { className: lClasses.small },
meta: { className: "small" },
}),
txColumnHelper.accessor("date", {
header: () => "Date",
cell: (info) => info.renderValue(),
meta: { className: lClasses.medium },
meta: { className: "medium" },
}),
txColumnHelper.accessor("fromName", {
header: () => "From",
cell: (info) => info.renderValue(),
meta: { className: lClasses.wide },
meta: { className: "wide" },
}),
txColumnHelper.accessor("toName", {
header: () => "To",
Expand All @@ -36,21 +35,21 @@ export const txColumns: CustomColumnDef<app.TransactionEx, any>[] = [
txColumnHelper.accessor("logCount", {
header: () => "nEvents",
cell: (info) => info.renderValue(),
meta: { className: lClasses.medium },
meta: { className: "medium" },
}),
txColumnHelper.accessor("ether", {
header: () => "Ether",
cell: (info) => info.renderValue(),
meta: { className: lClasses.medium },
meta: { className: "medium" },
}),
txColumnHelper.accessor("hasToken", {
header: () => "hasToken",
cell: (info) => (info.getValue() ? <IconCircleCheck size={20} color="white" fill="green" /> : ""),
meta: { className: lClasses.centered },
meta: { className: "small-centered" },
}),
txColumnHelper.accessor("isError", {
header: () => "isError",
cell: (info) => (info.getValue() ? <IconCircleCheck size={20} color="green" fill="red" /> : ""),
meta: { className: lClasses.centered },
meta: { className: "small-centered" },
}),
];
17 changes: 8 additions & 9 deletions frontend/src/views/Names/NameTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { IconCircleCheck } from "@tabler/icons-react";
import { types } from "@gocode/models";
import { createColumnHelper, ColumnDef } from "@tanstack/react-table";
import { CustomMeta } from "../CustomMeta";
import lClasses from "../Columns.module.css";

type CustomColumnDef<TData, TValue> = ColumnDef<TData, TValue> & {
meta?: CustomMeta;
Expand All @@ -15,41 +14,41 @@ export const nameColumns: CustomColumnDef<types.Name, any>[] = [
nameColumnHelper.accessor("address", {
header: () => "Address",
cell: (info) => info.renderValue(),
meta: { className: lClasses.wide },
meta: { className: "wide" },
}),
nameColumnHelper.accessor("tags", {
header: () => "Tags",
cell: (info) => info.renderValue(),
meta: { className: lClasses.wide },
meta: { className: "wide" },
}),
nameColumnHelper.accessor("name", {
header: () => "Name",
cell: (info) => info.renderValue(),
meta: { className: lClasses.wide },
meta: { className: "wide" },
}),
nameColumnHelper.accessor("symbol", {
header: () => "Symbol",
cell: (info) => info.renderValue(),
meta: { className: lClasses.small },
meta: { className: "small" },
}),
nameColumnHelper.accessor("decimals", {
header: () => "Decimals",
cell: (info) => info.renderValue(),
meta: { className: lClasses.small },
meta: { className: "small" },
}),
nameColumnHelper.accessor("isContract", {
header: () => "isContract",
cell: (info) => (info.getValue() ? <IconCircleCheck size={20} color="white" fill="green" /> : ""),
meta: { className: lClasses.centered },
meta: { className: "small-centered" },
}),
nameColumnHelper.accessor("isErc20", {
header: () => "isErc20",
cell: (info) => (info.getValue() ? <IconCircleCheck size={20} color="white" fill="green" /> : ""),
meta: { className: lClasses.centered },
meta: { className: "small-centered" },
}),
nameColumnHelper.accessor("isErc721", {
header: () => "isErc721",
cell: (info) => (info.getValue() ? <IconCircleCheck size={20} color="white" fill="green" /> : ""),
meta: { className: lClasses.centered },
meta: { className: "small-centered" },
}),
];

0 comments on commit 0fbcc66

Please sign in to comment.