Skip to content

Commit c57869f

Browse files
committed
small fixes to v5 project bendy query handling
1 parent 029c5f8 commit c57869f

2 files changed

Lines changed: 17 additions & 16 deletions

File tree

src/components/Projects/TrendingProjectCard.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Skeleton } from 'antd'
44
import ETHAmount from 'components/currency/ETHAmount'
55
import Loading from 'components/Loading'
66
import ProjectLogo from 'components/ProjectLogo'
7-
import { PV_V2, PV_V4 } from 'constants/pv'
7+
import { PV_V2, PV_V4, PV_V5 } from 'constants/pv'
88
import { useProjectMetadata } from 'hooks/useProjectMetadata'
99
import { useProjectTrendingPercentageIncrease } from 'hooks/useProjectTrendingPercentageIncrease'
1010
import { JBChainId } from 'juice-sdk-core'
@@ -65,7 +65,8 @@ export default function TrendingProjectCard({
6565
prefetch={false}
6666
key={project.handle}
6767
href={
68-
project.pv === PV_V4 && project.chainIds?.length
68+
(project.pv === PV_V4 || project.pv === PV_V5) &&
69+
project.chainIds?.length
6970
? v4ProjectRoute({
7071
projectId: project.projectId,
7172
chainId: project.chainIds[0],
@@ -100,7 +101,7 @@ export default function TrendingProjectCard({
100101
<Skeleton paragraph={false} title={{ width: 120 }} active />
101102
)}
102103

103-
<div className="flex w-full flex-wrap items-center text-black dark:text-slate-100 gap-1">
104+
<div className="flex w-full flex-wrap items-center gap-1 text-black dark:text-slate-100">
104105
<span className="font-medium">
105106
<ETHAmount amount={project.trendingVolume} />
106107
</span>
@@ -120,7 +121,7 @@ export default function TrendingProjectCard({
120121
/>
121122
</div>
122123

123-
<div className="flex gap-2 mt-2">
124+
<div className="mt-2 flex gap-2">
124125
{project.chainIds ? (
125126
project.chainIds?.map(c => (
126127
<ChainLogo key={c} chainId={c} width={18} height={18} />

src/components/VolumeChart/hooks/useProjectTimeline.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PV_V2, PV_V4 } from 'constants/pv'
1+
import { PV_V2, PV_V4, PV_V5 } from 'constants/pv'
22
import { useProjectTlQuery, useProjectsQuery } from 'generated/graphql'
33
import { useProjectQuery, useSuckerGroupTlQuery } from 'generated/v4v5/graphql'
44
import { daysToMS, minutesToMS } from 'utils/units'
@@ -109,14 +109,14 @@ export function useProjectTimeline({
109109
variables: {
110110
chainId: chainId || 0,
111111
projectId,
112-
version: parseInt(pv)
112+
version: parseInt(pv),
113113
},
114-
skip: pv !== PV_V4 || !chainId || !projectId,
114+
skip: (pv !== PV_V4 && pv !== PV_V5) || !chainId || !projectId,
115115
})
116116

117-
const { data: v4QueryResult } = useSuckerGroupTlQuery({
117+
const { data: v4v5QueryResult } = useSuckerGroupTlQuery({
118118
client: bendystrawClient,
119-
skip: pv !== PV_V4 || !project?.project?.suckerGroupId,
119+
skip: (pv !== PV_V4 && pv !== PV_V5) || !project?.project?.suckerGroupId,
120120
variables: {
121121
suckerGroupId: project?.project?.suckerGroupId,
122122
startTimestamp: timestamps?.[0],
@@ -166,15 +166,15 @@ export function useProjectTimeline({
166166

167167
// unlike v1v2v3 points where we always query an arbitrary number of points for a specified time window, we can trust that v4 points only exist where a change has occurred, leaving no need to "fill in the gaps".
168168
const v4Points: ProjectTimelinePoint[] | undefined = useMemo(() => {
169-
if (!v4QueryResult || !timestamps || !project?.project) return
169+
if (!v4v5QueryResult || !timestamps || !project?.project) return
170170

171171
// first point before the current timestamp range. If undefined, assume project was created within timestamp range
172-
const previous = v4QueryResult.previous.items.length
173-
? v4QueryResult.previous.items[0]
172+
const previous = v4v5QueryResult.previous.items.length
173+
? v4v5QueryResult.previous.items[0]
174174
: undefined
175175
// last point within the timestamp range
176-
const final = v4QueryResult.range.items.length
177-
? v4QueryResult.range.items[v4QueryResult.range.items.length - 1]
176+
const final = v4v5QueryResult.range.items.length
177+
? v4v5QueryResult.range.items[v4v5QueryResult.range.items.length - 1]
178178
: undefined
179179

180180
// extrapolate first point. If project was created before timestamp window, use previous point data. Otherwise use project.createdAt
@@ -205,7 +205,7 @@ export function useProjectTimeline({
205205

206206
return [
207207
firstPoint,
208-
...v4QueryResult.range.items.map(
208+
...v4v5QueryResult.range.items.map(
209209
({ volume, balance, trendingScore, timestamp }) => ({
210210
timestamp,
211211
volume: wadToFloat(volume),
@@ -215,7 +215,7 @@ export function useProjectTimeline({
215215
),
216216
lastPoint,
217217
]
218-
}, [v4QueryResult, timestamps, project?.project])
218+
}, [v4v5QueryResult, timestamps, project?.project])
219219

220220
return {
221221
v1v2v3Points,

0 commit comments

Comments
 (0)