Skip to content
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.

Sign up for GitHub

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

refactor: use prices api for dao fees #635

Merged
merged 8 commits into from
Feb 6, 2025
Merged

refactor: use prices api for dao fees #635

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1cbda8f
refactor: use prices api for dao fees
Jan 24, 2025
2e88c90
refactor: use 'Date.now()' instead of 'new Date.getTime()'
Feb 4, 2025
2c78bcc
refactor: add getTimeRange util function specific to prices api
Feb 4, 2025
10ad514
refactor: remove formatted date from pure data object
Feb 4, 2025
da8d37d
refactor: data is always available
Feb 4, 2025
a65e66e
fix: add back in conversion to local time for labels
Feb 4, 2025
855fb27
refactor: add and use formatDate for Date objects
Feb 5, 2025
242dc94
refactor: direct date comparison
Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/main/src/dao/components/PageAnalytics/VeCrvFeesChart/FeesBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { BarChart, Bar, Cell, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer } from 'recharts'

import { convertToLocaleTimestamp, formatDateFromTimestamp, formatNumber } from 'ui/src/utils'
import { formatDate, formatNumber } from 'ui/src/utils'

import FeesBarChartTooltip from './FeesBarChartTooltip'
import type { Distribution } from '@curvefi/prices-api/revenue'
Expand All @@ -28,7 +28,7 @@ const FeesBarChart: React.FC<FeesBarChartProps> = ({ data, height = 500 }) => (
<XAxis
dataKey="timestamp"
tick={{ fill: 'var(--page--text-color)', fontSize: 'var(--font-size-1)' }}
tickFormatter={(value: Date) => `${formatDateFromTimestamp(convertToLocaleTimestamp(value.getUTCTimestamp()))}`}
tickFormatter={formatDate}
0xAlunara marked this conversation as resolved.
Show resolved Hide resolved
tickLine={{ opacity: 0.3, strokeWidth: 0.3 }}
axisLine={{ opacity: 0.3, strokeWidth: 0.3 }}
minTickGap={20}
Expand Down
6 changes: 3 additions & 3 deletions apps/main/src/dao/components/PageAnalytics/VeCrvFeesChart/FeesBarChartTooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { TooltipProps } from 'recharts'
import styled from 'styled-components'
import { t } from '@lingui/macro'

import { convertToLocaleTimestamp, formatDateFromTimestamp, formatNumber } from '@ui/utils/utilsFormat'
import { formatDate, formatNumber } from '@ui/utils/utilsFormat'

import Box from '@ui/Box'
import type { Distribution } from '@curvefi/prices-api/revenue'
Expand All @@ -19,8 +19,8 @@ const FeesBarChartTooltip: React.FC<TooltipProps<ValueType, NameType>> = ({ acti
<TooltipColumn>
<TooltipDataTitle>{t`Distribution Date`}</TooltipDataTitle>
<TooltipData>
{formatDateFromTimestamp(convertToLocaleTimestamp(timestamp.getUTCTimestamp()))}
{timestamp.getTime() > Date.now() && <strong> {t`(in progress)`}</strong>}
{formatDate(timestamp)}
{timestamp > new Date() && <strong> {t`(in progress)`}</strong>}
</TooltipData>
</TooltipColumn>
</Box>
Expand Down
6 changes: 3 additions & 3 deletions apps/main/src/dao/components/PageAnalytics/VeCrvFeesTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { t } from '@lingui/macro'
import { useEffect } from 'react'

import useStore from '@/dao/store/useStore'
import { convertToLocaleTimestamp, formatDateFromTimestamp, formatNumber } from '@ui/utils'
import { formatDate, formatNumber } from '@ui/utils'

import Box from '@ui/Box'
import Spinner from '../../Spinner'
Expand Down Expand Up @@ -43,8 +43,8 @@ const VeCrcFees: React.FC = () => {
{veCrvFees.fees.map((item) => (
<FeeRow key={item.timestamp.getTime()}>
<FeeDate>
{formatDateFromTimestamp(convertToLocaleTimestamp(item.timestamp.getUTCTimestamp()))}
{item.timestamp.getTime() > Date.now() && <span> {t`(in progress)`}</span>}
{formatDate(item.timestamp)}
{item.timestamp > new Date() && <span> {t`(in progress)`}</span>}
</FeeDate>
<FeeData>
{formatNumber(item.feesUsd, {
Expand Down
8 changes: 6 additions & 2 deletions packages/ui/src/utils/utilsFormat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,16 @@ export function formatNumberWithPrecision(value: number, precisionDigits: number
return _formatNumber(value, opts)
}

export const formatDateFromTimestamp = (unixTime: number) => {
const date = new Date(unixTime * 1000)
export const formatDate = (date: Date) => {
const day = String(date.getDate()).padStart(2, '0')
const month = String(date.getMonth() + 1).padStart(2, '0')
const year = String(date.getFullYear()).slice(-2)
return `${day}/${month}/${year}`
}

export const formatDateFromTimestamp = (unixTime: number) => {
const date = new Date(unixTime * 1000)
return formatDate(date)
}

export const convertToLocaleTimestamp = (unixTime: number) => unixTime - new Date().getTimezoneOffset() * 60