git.iko.soy/bridge
on master help sign in
senate: fix post-vote return behavior
92f0a05fang
src/views/Senate/Documents.js+8−4
compare with master
unifiedsplit
@@ -52,7 +52,7 @@ export default function Documents() {
52 const _contracts = need.contracts(contracts);
52 const _contracts = need.contracts(contracts);
53 const _point = convertToInt(need.point(pointCursor), 10);
53 const _point = convertToInt(need.point(pointCursor), 10);
54
54
55− const { construct, bind } = useCastDocumentVote();
55+ const { construct, reset, unconstruct, bind } = useCastDocumentVote();
56
56
57 // const [documentHash, setDocumentHash] = useState('0x...');
57 // const [documentHash, setDocumentHash] = useState('0x...');
58 const [majorities, setMajorities] = useState([]);
58 const [majorities, setMajorities] = useState([]);
@@ -109,10 +109,14 @@ export default function Documents() {
109 );
109 );
110
110
111 const didVote = useCallback(() => {
111 const didVote = useCallback(() => {
112+ reset();
113+ unconstruct();
114+ setPolls(polls => {
112− polls[votingOn].hasVoted = true;
115+ polls[votingOn.hash].hasVoted = true;
113− setPolls(polls);
116+ return polls;
117+ });
114 setVotingOn({});
118 setVotingOn({});
115− }, [polls, setPolls, votingOn]);
119+ }, [votingOn, reset, unconstruct]);
116
120
117 const majorityList = useMemo(() => {
121 const majorityList = useMemo(() => {
118 return majorities.map(doc => {
122 return majorities.map(doc => {
src/views/Senate/Upgrades.js+8−4
@@ -48,7 +48,7 @@ export default function Upgrades() {
48 const _contracts = need.contracts(contracts);
48 const _contracts = need.contracts(contracts);
49 const _point = convertToInt(need.point(pointCursor), 10);
49 const _point = convertToInt(need.point(pointCursor), 10);
50
50
51− const { construct, bind } = useCastUpgradeVote();
51+ const { construct, reset, unconstruct, bind } = useCastUpgradeVote();
52
52
53 const [proposals, setProposals] = useState([]);
53 const [proposals, setProposals] = useState([]);
54 const [polls, setPolls] = useState({});
54 const [polls, setPolls] = useState({});
@@ -101,10 +101,14 @@ export default function Upgrades() {
101 );
101 );
102
102
103 const didVote = useCallback(() => {
103 const didVote = useCallback(() => {
104+ reset();
105+ unconstruct();
106+ setPolls(polls => {
104− polls[votingOn].hasVoted = true;
107+ polls[votingOn.address].hasVoted = true;
105− setPolls(polls);
108+ return polls;
109+ });
106 setVotingOn({});
110 setVotingOn({});
107− }, [polls, setPolls, votingOn]);
111+ }, [votingOn, reset, unconstruct]);
108
112
109 const openList = useMemo(() => {
113 const openList = useMemo(() => {
110 return open.map(address => {
114 return open.map(address => {