Skip to content

Commit

Permalink
SOV-3010: Individual Proposal page (#583)
Browse files Browse the repository at this point in the history
* SOV-2922: voting proposals page (#552)

* SOV-2922: voting proposals page

* Create proud-rivers-give.md

* chore: added changes from comments

* chore: remove condition for past proposals

* chore: added tooltip + added view button

* chore: update proposal link + new proposal btn

* feat: ProposalPage added

* Create pink-buckets-rhyme.md

* feat: update proposal page

* feat: vote query

* feat: resolve PR comments

* feat: update cast vote in proposal

* update proposal query

* fix: mobile view

* update gql

* fix: proposal result issue

* fix: show loading on proposal page

* fix: cast vote error message

* SOV-3009: voting actions (#597)

* SOV-3009: voting actions

* Create yellow-tips-sip.md

* chore: fixes from comments

* chore: update proposal status

* chore: update proposal status

* chore: update from comments

* fix: proposal execution

---------

Co-authored-by: Victor Creed <[email protected]>

* fix: execution eta

* SOV-3196: add voting tooltips to Voting proposals page (#603)

* SOV-3196: add voting tooltips to Voting proposals page

* Create angry-mails-enjoy.md

* chore: force deployment

* chore: force deployment

---------

Co-authored-by: Victor Creed <[email protected]>

* SOV-3211-3207: Bitocracy proposal issues (#614)

* fix: bitocracy proposal title

* Create many-fishes-hang.md

* fix: define title limit

* fix: update proposal title

* SOV-3195: add voting power section (#600)

* SOV-3195: add voting power section

* chore: add a tooltip for VP

* chore: refactoring

* Create giant-ducks-laugh.md

* chore: updates from comments

* fix: proposal status hook

* chore: remove hrefExternal in view proposal button

---------

Co-authored-by: Victor Creed <[email protected]>

* SOV-3225: Proposal row click (#625)

* Fix individual proposal opening

* Fix review remarks

* Change title tooltip trigger to hover

* Create fresh-goats-begin.md

* SOV-3011: Voting - Proposal CSV export (#627)

* SOV-3011: add CSV export

* chore: update text in proposal CSV file

* SOV-3239: Support/Reject button in Cast your vote (#616)

* feat: support reject proposal

* Create olive-olives-obey.md

* fix: refetch when voting is done

* fix: casting issue

* fix: hide when loading

* fix: resolve PR comments

* fix: casting vote issue

* chore: increase gas limit

---------

Co-authored-by: Victor Creed <[email protected]>

---------

Co-authored-by: Pietro Maximoff <[email protected]>
Co-authored-by: Victor Creed <[email protected]>
Co-authored-by: Victor Creed <[email protected]>
Co-authored-by: tiltom <[email protected]>
  • Loading branch information
5 people committed Oct 11, 2023
1 parent 12802fa commit bdf7701
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 166 deletions.
141 changes: 0 additions & 141 deletions apps/frontend/src/app/3_organisms/ProposalVotingResults/index.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions apps/frontend/src/app/5_pages/BitocracyPage/BitocracyPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,17 @@ import {
ParagraphSize,
} from '@sovryn/ui';

import { ProposalVotingResults } from '../../3_organisms/ProposalVotingResults';
import { useAccount } from '../../../hooks/useAccount';
import { translations } from '../../../locales/i18n';
import { sharedState } from '../../../store/rxjs/shared-state';
import { useGetPersonalStakingStatistics } from '../StakePage/components/PersonalStakingStatistics/hooks/useGetPersonalStakingStatistics';
import { Proposals } from './components/Proposals/Proposals';
import { useGetProposals } from './hooks/useGetProposals';
import { Proposal } from '../../../utils/graphql/rsk/generated';

// TODO: This is just a temporary solution until we merge new proposal PR.
const isNewProposalEnabled = false;

const pageTranslations = translations.bitocracyPage;

// DUMMY DATA, REMOVE WHEN REAL DATA IS AVAILABLE
const proposal = {
id: '0x6496df39d000478a7a7352c01e0e713835051ccd-32',
votesFor: '25642394317449679336562867',
votesAgainst: '9204395962492958076500991',
endBlock: 5505959,
startBlock: 5505952,
quorum: '20928484835262004265672060',
majorityPercentage: '73249696923417014929852210',
emittedBy: {
id: '0x6496df39d000478a7a7352c01e0e713835051ccd',
majorityPercentageVotes: 70,
quorumPercentageVotes: 20,
},
} as Proposal;

const BitocracyPage: FC = () => {
const { account } = useAccount();
const { votingPower } = useGetPersonalStakingStatistics();
Expand Down Expand Up @@ -92,11 +73,6 @@ const BitocracyPage: FC = () => {
</div>
)}
<Proposals proposals={proposals} loading={loading} />

<div className="mt-12" />
<ProposalVotingResults proposal={proposal} />
<div className="mt-12" />
<ProposalVotingResults proposal={{ ...proposal, endBlock: 0 }} />
</div>
</>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { FC, useMemo } from 'react';
import React, { FC } from 'react';

import classNames from 'classnames';
import { t } from 'i18next';
Expand Down

0 comments on commit bdf7701

Please sign in to comment.