Merge pull request #76 from CudoVentures/CUDOS-1536_infinite_load_pro…

…posal_details fix: using the proposal id from the link when fetching data
cudoventures · Aug 25, 2022 · 0c13f08 · 0c13f08
2 parents 7b37f67 + bf21f0f
commit 0c13f08
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/containers/Proposals/ProposalDetails/components/ProposalVoting/hooks.ts b/src/containers/Proposals/ProposalDetails/components/ProposalVoting/hooks.ts
@@ -4,6 +4,7 @@ import { chainConfig } from 'configs'
 import { updateProposalDetails } from 'store/proposalDetails'
 import { useDispatch, useSelector } from 'react-redux'
 import { RootState } from 'store'
+import { useParams } from 'react-router-dom'
 import {
   useProposalDetailsTallyQuery,
   ProposalDetailsTallyQuery,
@@ -12,6 +13,7 @@ import {
 
 export const useVotesGraph = () => {
   const dispatch = useDispatch()
+  const { proposalId } = useParams()
   const proposalState = useSelector((state: RootState) => state.proposalDetails)
 
   const handleSetState = (stateChange: any) => {
@@ -70,7 +72,7 @@ export const useVotesGraph = () => {
 
   useProposalDetailsTallyQuery({
     variables: {
-      proposalId: proposalState.id ? proposalState.id : 0
+      proposalId: Number(proposalId) || 0
     },
     onCompleted: (data) => {
       handleSetState(foramtProposalTally(data))
@@ -79,7 +81,7 @@ export const useVotesGraph = () => {
 
   useProposalDetailsTallySubscriptionSubscription({
     variables: {
-      proposalId: proposalState.id ? proposalState.id : 0
+      proposalId: Number(proposalId) || 0
     },
     onSubscriptionData: (data: any) => {
       handleSetState(foramtProposalTallySub(data.subscriptionData.data))

diff --git a/src/containers/Proposals/ProposalDetails/hooks.ts b/src/containers/Proposals/ProposalDetails/hooks.ts
@@ -1,15 +1,16 @@
-import { useState } from 'react'
 import * as R from 'ramda'
 import { updateProposalDetails } from 'store/proposalDetails'
 import { RootState } from 'store'
 import { useDispatch, useSelector } from 'react-redux'
+import { useParams } from 'react-router-dom'
 import {
   useProposalDetailsSubSubscription,
   ProposalDetailsQuery
 } from '../../../graphql/types'
 
 export const useProposalDetails = () => {
   const dispatch = useDispatch()
+  const { proposalId } = useParams()
   const proposalState = useSelector((state: RootState) => state.proposalDetails)
 
   const handleSetState = (stateChange: any) => {
@@ -75,7 +76,7 @@ export const useProposalDetails = () => {
   // ==========================
   useProposalDetailsSubSubscription({
     variables: {
-      proposalId: proposalState.id ? proposalState.id : 0
+      proposalId: Number(proposalId) || 0
     },
     onSubscriptionData: (data) => {
       handleSetState(formatProposalQuery(data.subscriptionData.data))