Merge pull request #157 from lidofinance/fix/start-vote-event-fetch

fix: StartVote event fetch fallback
lidofinance · Feb 21, 2024 · 0f2ad56 · 0f2ad56
2 parents 290a521 + deeaec3
commit 0f2ad56
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/modules/dashboard/ui/DashboardVote/DashboardVote.tsx b/modules/dashboard/ui/DashboardVote/DashboardVote.tsx
@@ -25,7 +25,7 @@ import * as urls from 'modules/network/utils/urls'
 type Props = {
  voteId: number
  vote: Vote
- eventStart: StartVoteEventObject
+ eventStart: StartVoteEventObject | null
  status: VoteStatus
  voteTime: number
  objectionPhaseTime: number
@@ -79,9 +79,6 @@ export function DashboardVote({
 
  const isEnded =
  status === VoteStatus.Rejected || status === VoteStatus.Executed
-
- const { metadata } = eventStart
-
  return (
  <Link passHref href={urls.vote(voteId)}>
  <Wrap>
@@ -98,7 +95,7 @@ export function DashboardVote({
  <VoteBody>
  <VoteTitle>Vote #{voteId}</VoteTitle>
  <VoteDescriptionWrap>
- <VoteDescription metadata={metadata} />
+ <VoteDescription metadata={eventStart?.metadata} />
  </VoteDescriptionWrap>
  </VoteBody>
 

diff --git a/modules/shared/utils/csp.ts b/modules/shared/utils/csp.ts
@@ -33,6 +33,7 @@ export const contentSecurityPolicy = {
  'https://*.infura.io',
  'https://*.alchemyapi.io',
  'https://*.alchemy.com',
+ 'https://*.drpc.org',
  'https://*.etherscan.io/api',
  'https://*.ipfs.w3s.link',
  'https://*.ipfs.dweb.link',

diff --git a/modules/votes/ui/VoteDescription/VoteDescription.tsx b/modules/votes/ui/VoteDescription/VoteDescription.tsx
@@ -10,22 +10,26 @@ import { fetcherIPFS } from 'modules/network/utils/fetcherIPFS'
 import { useSWR } from 'modules/network/hooks/useSwr'
 
 type Props = {
- metadata: string
+ metadata: string | undefined
  allowMD?: boolean
 }
 
 const trimStart = (string = '') => `${string}`.replace(/^\s+/, '')
 
 export function VoteDescription({ metadata, allowMD }: Props) {
- const cid = metadata.match(REGEX_LIDO_VOTE_CID)?.[1] || null
+ const cid = metadata?.match(REGEX_LIDO_VOTE_CID)?.[1] || null
 
  const {
  data = '',
  error,
  initialLoading,
  } = useSWR(cid, fetcherIPFS, { onError: noop })
 
- if (!cid) {
+ if (!metadata) {
+ return <DescriptionText>Failed to fetch vote description.</DescriptionText>
+ }
+
+ if (!cid && metadata) {
  return <DescriptionText>{replaceJsxElements(metadata)}</DescriptionText>
  }
 

diff --git a/modules/votes/utils/getEventVoteStart.ts b/modules/votes/utils/getEventVoteStart.ts
@@ -16,7 +16,7 @@ export async function getEventStartVote(
  )
  const event = events[0]
  if (!events[0] || !event.decode) {
- throw new Error('Start vote event parsing error')
+ return null
  }
  const decoded = event.decode(event.data, event.topics)
  return decoded as StartVoteEventObject