-
Couldn't load subscription status.
- Fork 4
Refactor markets table #438
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
229 changes: 121 additions & 108 deletions
229
apps/hyperdrive-trading/src/ui/markets/MarketsTable/MarketsTable.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,139 @@ | ||
| import uniqBy from "lodash.uniqby"; | ||
| import { ReactElement, useMemo, useState } from "react"; | ||
| import { | ||
| createColumnHelper, | ||
| flexRender, | ||
| getCoreRowModel, | ||
| useReactTable, | ||
| } from "@tanstack/react-table"; | ||
| import { ReactElement } from "react"; | ||
| import { useNavigate } from "react-router-dom"; | ||
| import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays"; | ||
| import { useAppConfig } from "src/ui/appconfig/useAppConfig"; | ||
| import { | ||
| Row, | ||
| SortableGridTable, | ||
| } from "src/ui/base/components/tables/SortableGridTable"; | ||
| import { formatBalance } from "src/ui/base/formatting/formatBalance"; | ||
| import { MARKETS_MODAL_KEY } from "src/ui/markets/MarketSelect/AllMarketsBreadcrumb"; | ||
| import { | ||
| MarketTableRowData, | ||
| useMarketRowData, | ||
| } from "src/ui/markets/MarketsTable/useMarketRowData"; | ||
| import { YieldSourceLabel } from "src/ui/markets/YieldSourceLabel/YieldSourceLabel"; | ||
| import { usePublicClient } from "wagmi"; | ||
|
|
||
| const ALL_PROTOCOLS_KEY = "All Markets"; | ||
| const ALL_TERM_LENGTHS_KEY = 0; | ||
| const columnHelper = createColumnHelper<MarketTableRowData>(); | ||
|
|
||
| function getColumns() { | ||
| return [ | ||
| columnHelper.accessor("market.name", { | ||
| header: "Name", | ||
| cell: ({ getValue, row }) => { | ||
| const marketName = getValue(); | ||
| return ( | ||
| <span key="name" className="font-bold"> | ||
| <p>{marketName}</p> | ||
| <YieldSourceLabel yieldSource={row.original.yieldSource} /> | ||
| </span> | ||
| ); | ||
| }, | ||
| }), | ||
| columnHelper.accessor("market.termLengthMS", { | ||
| header: "Term", | ||
| cell: ({ getValue }) => { | ||
| const termLength = getValue(); | ||
| return ( | ||
| <p key="term" className="font-semibold"> | ||
| {convertMillisecondsToDays(termLength)} days | ||
| </p> | ||
| ); | ||
| }, | ||
| }), | ||
| columnHelper.accessor("liquidity", { | ||
| header: "Liquidity", | ||
| cell: ({ getValue, row }) => { | ||
| const liquidity = getValue(); | ||
| return ( | ||
| <span | ||
| key="liquidity" | ||
| className="flex flex-row items-center justify-start font-semibold" | ||
| > | ||
| <img | ||
| className="mr-1 h-4" | ||
| src={row.original.market.baseToken.iconUrl} | ||
| /> | ||
| {formatBalance({ | ||
| balance: liquidity, | ||
| decimals: row.original.market.baseToken.decimals, | ||
| places: 0, | ||
| })} | ||
| </span> | ||
| ); | ||
| }, | ||
| }), | ||
| columnHelper.accessor("longAPR", { | ||
| header: "Fixed Rate", | ||
| cell: ({ getValue }) => { | ||
| const fixedRate = getValue(); | ||
| return <span key="fixed-rate">{fixedRate}%</span>; | ||
| }, | ||
| }), | ||
| ]; | ||
| } | ||
|
|
||
| export function MarketsTable(): ReactElement { | ||
| const { appConfig: config } = useAppConfig(); | ||
| const publicClient = usePublicClient(); | ||
|
|
||
| const allProtocols = config?.hyperdrives.map( | ||
| (market) => config?.yieldSources[market.yieldSource], | ||
| ); | ||
| const protocols = uniqBy(allProtocols, (protocol) => protocol.name); | ||
| const allTermLengths = config?.hyperdrives.map( | ||
| (market) => market.termLengthMS, | ||
| ); | ||
| const termLengths = uniqBy(allTermLengths, (termLength) => termLength); | ||
|
|
||
| const [protocolFilter, setSelectedProtocolFilter] = | ||
| useState<string>(ALL_PROTOCOLS_KEY); | ||
| const [termLengthFilter, setSelectedTermLengthFilter] = | ||
| useState<number>(ALL_TERM_LENGTHS_KEY); | ||
|
|
||
| const navigate = useNavigate(); | ||
| // TODO: no loading state for now | ||
| const { data: marketsRowData = [], status: marketRowDataStatus } = | ||
| useMarketRowData(config?.hyperdrives); | ||
|
|
||
| const filteredMarkets = useMemo(() => { | ||
| const marketFilteredByTermLength = termLengthFilter | ||
| ? marketsRowData.filter( | ||
| (marketRowData) => | ||
| marketRowData.market.termLengthMS === termLengthFilter, | ||
| ) | ||
| : marketsRowData; | ||
|
|
||
| if (protocolFilter !== ALL_PROTOCOLS_KEY) { | ||
| return marketFilteredByTermLength.filter( | ||
| (marketRowData) => marketRowData.market.yieldSource === protocolFilter, | ||
| ); | ||
| } | ||
|
|
||
| return marketFilteredByTermLength; | ||
| }, [marketsRowData, protocolFilter, termLengthFilter]); | ||
| const { data: marketsRowData = [] } = useMarketRowData(config?.hyperdrives); | ||
| const tableInstance = useReactTable({ | ||
| columns: getColumns(), | ||
| data: marketsRowData || [], | ||
| getCoreRowModel: getCoreRowModel(), | ||
| }); | ||
|
|
||
| return ( | ||
| <div className="flex flex-col space-y-8 overflow-x-auto rounded-sm bg-base-300"> | ||
| {/* Markets sortable table */} | ||
| <div> | ||
| <SortableGridTable | ||
| headingRowClassName="grid-cols-auto bg-base-300 bg-opacity-100" | ||
| bodyRowClassName="grid-cols-auto bg-transparent text-base-content" | ||
| cols={[ | ||
| { | ||
| cell: "Name", | ||
| sortKey: "name", | ||
| }, | ||
| { | ||
| cell: "Term Length", | ||
| sortKey: "termLength", | ||
| }, | ||
| { | ||
| cell: "Liquidity", | ||
| sortKey: "liquidity", | ||
| }, | ||
| { | ||
| cell: "Fixed Rate", | ||
| sortKey: "longAPR", | ||
| }, | ||
| ]} | ||
| rows={filteredMarkets.map((marketRowData) => | ||
| createMarketRow(marketRowData), | ||
| )} | ||
| showSkeleton={marketRowDataStatus === "loading"} | ||
| /> | ||
| </div> | ||
| <div className="flex max-h-96 flex-col items-center overflow-y-scroll"> | ||
| <h3 className="mb-4 font-lato">Markets</h3> | ||
| <table className="daisy-table-zebra daisy-table daisy-table-lg"> | ||
| <thead> | ||
| {tableInstance.getHeaderGroups().map((headerGroup) => ( | ||
| <tr key={headerGroup.id}> | ||
| {headerGroup.headers.map((header) => ( | ||
| <th key={header.id}> | ||
| {header.isPlaceholder | ||
| ? null | ||
| : flexRender( | ||
| header.column.columnDef.header, | ||
| header.getContext(), | ||
| )} | ||
| </th> | ||
| ))} | ||
| </tr> | ||
| ))} | ||
| </thead> | ||
| <tbody> | ||
| {tableInstance.getRowModel().rows.map((row) => { | ||
| return ( | ||
| <tr | ||
| key={row.id} | ||
| className="daisy-hover h-16 cursor-pointer grid-cols-4 items-center" | ||
| onClick={() => { | ||
| navigate(`/trade/${row.original.market}`); | ||
| (window as any)[MARKETS_MODAL_KEY].close(); | ||
| }} | ||
| > | ||
| <> | ||
| {row.getVisibleCells().map((cell) => { | ||
| return ( | ||
| <td key={cell.id}> | ||
| {flexRender( | ||
| cell.column.columnDef.cell, | ||
| cell.getContext(), | ||
| )} | ||
| </td> | ||
| ); | ||
| })} | ||
| </> | ||
| </tr> | ||
| ); | ||
| })} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| function createMarketRow({ | ||
| market, | ||
| yieldSource, | ||
| liquidity, | ||
| }: MarketTableRowData): Row { | ||
| return { | ||
| href: `/trade/${market.address}`, | ||
| cells: [ | ||
| <span key="name" className="font-bold"> | ||
| <p>{market.name}</p> | ||
| <YieldSourceLabel yieldSource={yieldSource} /> | ||
| </span>, | ||
| <p key="term" className="font-semibold"> | ||
| {convertMillisecondsToDays(market.termLengthMS)} days | ||
| </p>, | ||
|
|
||
| <span | ||
| key="liquidity" | ||
| className="flex flex-row items-center justify-start font-semibold" | ||
| > | ||
| <img className="mr-1 h-4" src={market.baseToken.iconUrl} /> | ||
| {formatBalance({ | ||
| balance: liquidity, | ||
| decimals: market.baseToken.decimals, | ||
| places: 0, | ||
| })} | ||
| </span>, | ||
| <span key="apy" className="font-semibold"> | ||
| 1.25% | ||
| </span>, | ||
| ], | ||
| }; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed the value here like we talked about on the implied yield call yesterday.