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

Jump to bottom

Proposal discussion fixes #3969

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
Open

Proposal discussion fixes #3969

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2743e59
Reverse order of proposal discussion posts (#3236)
Dec 11, 2022
2ae6a8d
Proposal discussion mode tooltip text (#3900)
Dec 11, 2022
4f84c6f
Merge branch 'dev' into fix/reply-3967
traumschule Dec 12, 2022
375a07d
Optimize hook order (#3970)
Dec 11, 2022
14334ee
Show proposal stake (#3966)
Dec 11, 2022
4ad354f
ProposalHistory: Show block number (#3966)
Dec 12, 2022
97015a5
Merge branch 'dev' into fix/reply-3967
traumschule Dec 28, 2022
4802472
fix tooltip text
traumschule Jan 28, 2023
6ef31ac
spacing
traumschule Feb 13, 2023
bc91735
revert `ProposalHistory.tsx`
Mar 29, 2023
2201a36
Merge branch 'dev' into fix/reply-3967
traumschule Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions packages/ui/src/app/pages/Proposals/ProposalPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { PageTitle } from '@/common/components/page/PageTitle'
import { PreviousPage } from '@/common/components/page/PreviousPage'
import { SidePanel } from '@/common/components/page/SidePanel'
import { Label, TextInlineMedium, TextMedium } from '@/common/components/typography'
import { TokenValue } from '@/common/components/typography/TokenValue'
import { camelCaseToText } from '@/common/helpers'
import { useModal } from '@/common/hooks/useModal'
import { useRefetchQueries } from '@/common/hooks/useRefetchQueries'
Expand All @@ -40,20 +41,19 @@ import { VoteRationaleModalCall } from '@/proposals/modals/VoteRationale/types'
import { proposalPastStatuses } from '@/proposals/model/proposalStatus'

export const ProposalPreview = () => {
const { id } = useParams<{ id: string }>()
const history = useHistory()
const { id } = useParams<{ id: string }>()
const { isLoading, proposal } = useProposal(id)
const { council } = useElectedCouncil()
const constants = useProposalConstants(proposal?.details.type)
const loc = useLocation()
const voteId = new URLSearchParams(loc.search).get('showVote')
const blocksToProposalExecution = useBlocksToProposalExecution(proposal, constants)
useRefetchQueries({ interval: MILLISECONDS_PER_BLOCK, include: ['getProposal', 'GetProposalVotes'] }, [proposal])

const { council } = useElectedCouncil()
const loc = useLocation()
const voteId = new URLSearchParams(loc.search).get('showVote')
const votingRounds = useVotingRounds(proposal?.votes, proposal?.proposalStatusUpdates)
const [currentVotingRound, setVotingRound] = useState(0)

const votes = votingRounds[currentVotingRound] ?? votingRounds[0]
useRefetchQueries({ interval: MILLISECONDS_PER_BLOCK, include: ['getProposal', 'GetProposalVotes'] }, [proposal])
traumschule marked this conversation as resolved.
Show resolved Hide resolved
const notVoted = useMemo(() => {
if (
!proposal ||
Expand Down Expand Up @@ -198,6 +198,11 @@ export const ProposalPreview = () => {
<Label>Proposer</Label>
<MemberInfo member={proposal.proposer} />
</RowGapBlock>

<RowGapBlock gap={16}>
<Label>Stake</Label>
{constants ? <TokenValue value={constants.requiredStake} /> : 'Loading...'}
</RowGapBlock>
</RowGapBlock>
</SidePanel>
}
Expand Down