neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure correct preimage is used for democracy (#8782)

Browse Source 
* Ensure correct preimage is used for democracy

* Remove cast
This commit is contained in:
Jaco 2023-01-13 09:54:29 +02:00 committed by GitHub
parent ea39392026
commit 20bc11708d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/page-democracy/src/Overview/ProposalCell.tsx
View File

@ -10,6 +10,7 @@ import styled from 'styled-components';
import usePreimage from '@polkadot/app-preimages/usePreimage';
import { CallExpander } from '@polkadot/react-components';
import { useApi } from '@polkadot/react-hooks';
import { useTranslation } from '../translate';
import ExternalCell from './ExternalCell';
@ -26,15 +27,15 @@ const METHOD_TREA = ['approveProposal', 'rejectProposal'];
function ProposalCell ({ className = '', imageHash, proposal }: Props): React.ReactElement<Props> {
const { t } = useTranslation();
const { api } = useApi();
const preimage = usePreimage(imageHash);
const details = proposal
? [proposal, proposal.registry.findMetaCall(proposal.callIndex)]
: preimage?.proposal
? [preimage.proposal, preimage.registry.findMetaCall(preimage.proposal.callIndex)]
: null;
// while we still have this endpoint, democracy will use it
const displayProposal = api.query.democracy.preimages
? proposal
: preimage?.proposal;
if (!details) {
if (!displayProposal) {
const textHash = imageHash.toString();
return (
@ -44,7 +45,7 @@ function ProposalCell ({ className = '', imageHash, proposal }: Props): React.Re
);
}
const { method, section } = details[1];
const { method, section } = displayProposal.registry.findMetaCall(displayProposal.callIndex);
const isTreasury = section === 'treasury' && METHOD_TREA.includes(method);
const isExternal = section === 'democracy' && METHOD_EXTE.includes(method);
@ -52,14 +53,14 @@ function ProposalCell ({ className = '', imageHash, proposal }: Props): React.Re
<td className={`${className} all`}>
<CallExpander
labelHash={t<string>('proposal hash')}
value={proposal}
value={displayProposal}
withHash={!isTreasury && !isExternal}
>
{isExternal && (
<ExternalCell value={details[0].args[0] as Hash} />
<ExternalCell value={displayProposal.args[0] as Hash} />
)}
{isTreasury && (
<TreasuryCell value={details[0].args[0] as Compact<ProposalIndex>} />
<TreasuryCell value={displayProposal.args[0] as Compact<ProposalIndex>} />
)}
</CallExpander>
</td>