-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'james/acx-1651-op-update-bridge-fees-preview-if-optimis…
…m-is-destination' into james/acx-1624-update-rewards-page
- Loading branch information
Showing
32 changed files
with
1,960 additions
and
564 deletions.
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ yarn-error.log* | |
|
|
||
| # storybook | ||
| build-storybook.log | ||
| storybook-static | ||
|
|
||
| # Amplitude | ||
| ampli.json | ||
This file contains 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| import styled from "@emotion/styled"; | ||
| import { BigNumber, utils } from "ethers"; | ||
| import { DateTime } from "luxon"; | ||
|
|
||
| import { Deposit } from "hooks/useDeposits"; | ||
| import { | ||
| COLORS, | ||
| getConfig, | ||
| fallbackSuggestedRelayerFeePct, | ||
| suggestedFeesDeviationBufferMultiplier, | ||
| fixedPointAdjustment, | ||
| } from "utils"; | ||
|
|
||
| import { HeaderCells, ColumnKey } from "./HeadRow"; | ||
| import { AssetCell } from "./cells/AssetCell"; | ||
| import { AmountCell } from "./cells/AmountCell"; | ||
| import { RouteCell } from "./cells/RouteCell"; | ||
| import { AddressCell } from "./cells/AddressCell"; | ||
| import { DateCell } from "./cells/DateCell"; | ||
| import { StatusCell } from "./cells/StatusCell"; | ||
| import { TxCell } from "./cells/TxCell"; | ||
| import { FeeCell } from "./cells/FeeCell"; | ||
| import { RateCell } from "./cells/RateCell"; | ||
| import { RewardsCell } from "./cells/RewardsCell"; | ||
| import { ActionsCell } from "./cells/ActionsCell"; | ||
|
|
||
| type Props = { | ||
| deposit: Deposit; | ||
| headerCells: HeaderCells; | ||
| disabledColumns?: ColumnKey[]; | ||
| onClickSpeedUp?: () => void; | ||
| }; | ||
|
|
||
| const config = getConfig(); | ||
|
|
||
| const MAX_PENDING_STATE_TIME_UNTIL_SLOW = 15 * 60; // 15 mins | ||
|
|
||
| function isColumnDisabled(disabledColumns: ColumnKey[], column: ColumnKey) { | ||
| return disabledColumns.includes(column); | ||
| } | ||
|
|
||
| export function DataRow({ | ||
| deposit, | ||
| headerCells, | ||
| disabledColumns = [], | ||
| onClickSpeedUp, | ||
| }: Props) { | ||
| const token = config.getTokenInfoByAddressSafe( | ||
| deposit.sourceChainId, | ||
| deposit.assetAddr | ||
| ); | ||
|
|
||
| const isProfitable = BigNumber.from( | ||
| deposit.suggestedRelayerFeePct || fallbackSuggestedRelayerFeePct | ||
| ).lte( | ||
| BigNumber.from(deposit.depositRelayerFeePct) | ||
| .mul(utils.parseEther(String(suggestedFeesDeviationBufferMultiplier))) | ||
| .div(fixedPointAdjustment) | ||
| ); | ||
| const isSlowRelay = | ||
| deposit.status === "pending" && | ||
| DateTime.fromSeconds(deposit.depositTime).diffNow("seconds").as("seconds") < | ||
| MAX_PENDING_STATE_TIME_UNTIL_SLOW; | ||
|
|
||
| // Hide unsupported or unknown token deposits | ||
| if (!token) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <StyledRow> | ||
| {isColumnDisabled(disabledColumns, "asset") ? null : ( | ||
| <AssetCell token={token} width={headerCells.asset.width} /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "amount") ? null : ( | ||
| <AmountCell | ||
| deposit={deposit} | ||
| token={token} | ||
| width={headerCells.amount.width} | ||
| /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "route") ? null : ( | ||
| <RouteCell | ||
| deposit={deposit} | ||
| token={token} | ||
| width={headerCells.route.width} | ||
| /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "address") ? null : ( | ||
| <AddressCell deposit={deposit} width={headerCells.address.width} /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "date") ? null : ( | ||
| <DateCell deposit={deposit} width={headerCells.date.width} /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "status") ? null : ( | ||
| <StatusCell | ||
| deposit={deposit} | ||
| width={headerCells.status.width} | ||
| isProfitable={isProfitable} | ||
| /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "transactions") ? null : ( | ||
| <TxCell deposit={deposit} width={headerCells.transactions.width} /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "netFee") ? null : ( | ||
| <FeeCell deposit={deposit} width={headerCells.netFee.width} /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "loyaltyRate") ? null : ( | ||
| <RateCell deposit={deposit} width={headerCells.loyaltyRate.width} /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "rewards") ? null : ( | ||
| <RewardsCell deposit={deposit} width={headerCells.rewards.width} /> | ||
| )} | ||
| {isColumnDisabled(disabledColumns, "actions") ? null : ( | ||
| <ActionsCell | ||
| deposit={deposit} | ||
| isProfitable={isProfitable} | ||
| isSlowRelay={isSlowRelay} | ||
| onClickSpeedUp={onClickSpeedUp} | ||
| /> | ||
| )} | ||
| </StyledRow> | ||
| ); | ||
| } | ||
|
|
||
| const StyledRow = styled.tr` | ||
| display: flex; | ||
| flex-direction: row; | ||
| align-items: center; | ||
| gap: 16px; | ||
| padding: 0px 24px; | ||
| border-width: 0px 1px 1px 1px; | ||
| border-style: solid; | ||
| border-color: ${COLORS["grey-600"]}; | ||
| :hover { | ||
| #speed-up-icon { | ||
| display: block; | ||
| } | ||
| } | ||
| `; |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import styled from "@emotion/styled"; | ||
|
|
||
| import { HeadRow, headerCells, ColumnKey } from "./HeadRow"; | ||
| import { DataRow } from "./DataRow"; | ||
| import { Deposit } from "hooks/useDeposits"; | ||
|
|
||
| type Props = { | ||
| disabledColumns?: ColumnKey[]; | ||
| onClickSpeedUp?: () => void; | ||
| deposits: Deposit[]; | ||
| }; | ||
|
|
||
| export function DepositsTable({ | ||
| disabledColumns = [], | ||
| deposits, | ||
| onClickSpeedUp, | ||
| }: Props) { | ||
| return ( | ||
| <Wrapper> | ||
| <StyledTable> | ||
| <HeadRow disabledColumns={disabledColumns} /> | ||
| <tbody> | ||
| {deposits.map((deposit) => ( | ||
| <DataRow | ||
| disabledColumns={disabledColumns} | ||
| headerCells={headerCells} | ||
| key={deposit.depositId} | ||
| deposit={deposit} | ||
| onClickSpeedUp={onClickSpeedUp} | ||
| /> | ||
| ))} | ||
| </tbody> | ||
| </StyledTable> | ||
| </Wrapper> | ||
| ); | ||
| } | ||
|
|
||
| const Wrapper = styled.div` | ||
| display: flex; | ||
| flex-direction: column; | ||
| overflow-x: auto; | ||
| `; | ||
|
|
||
| const StyledTable = styled.table` | ||
| width: 1666px; | ||
| white-space: nowrap; | ||
| table-layout: fixed; | ||
| `; |
Oops, something went wrong.