diff --git a/fs-dapp_2.0/src/components/pages/Council.tsx b/fs-dapp_2.0/src/components/pages/Council.tsx index fa06c273..b3e9e40c 100644 --- a/fs-dapp_2.0/src/components/pages/Council.tsx +++ b/fs-dapp_2.0/src/components/pages/Council.tsx @@ -38,7 +38,7 @@ export default function Council() { let acc_list = proposals; if (acc && !acc_list.includes(acc1 as InjectedAccountWithMeta) && acc1){ acc_list.push(acc1); - dispatch1({type:`SET_PROPOSALS`,payload:[]}); + dispatch1({type:`SET_PROPOSALS`,payload:acc_list}); @@ -77,19 +77,10 @@ export default function Council() { if (hash.length > 0) { setHash0(hash); + dispatch1({type:`SET_PROPOSALS`,payload:[]}); + dispatch1({type:`SET_DATAS`,payload:[]}); + update() - let tdata0:DataType[]=[]; - datas.forEach(elemnt=>{ - if (hash0.includes(elemnt.hash) && !tdata0.includes(elemnt) && elemnt.status!==`AWAITING`){ - tdata0.push(elemnt); - console.log(`Number of active proposals: ${tdata0.length}`) - } - if (hash0.includes(elemnt.hash) && !tdata0.includes(elemnt)){ - tdata0.push(elemnt); - console.log(`Number of active proposals: ${tdata0.length}`) - }else{tdata0=datas} - }) - dispatch1({type:`SET_DATAS`,payload:tdata0}); } @@ -114,11 +105,11 @@ export default function Council() { renderItem={item => ( + style={{ width: 300, height:150}}> {item.name}

} - description={

Requested Role: {item.role}

Request Status: {item.status}

} + description={

Requested Role: {item.role}

Request Status: {item.status}

Session is closed: {item.referendum}

} />
Content
diff --git a/fs-dapp_2.0/src/components/pages/Roles.tsx b/fs-dapp_2.0/src/components/pages/Roles.tsx index ecd0f3b8..d39fd01f 100644 --- a/fs-dapp_2.0/src/components/pages/Roles.tsx +++ b/fs-dapp_2.0/src/components/pages/Roles.tsx @@ -80,13 +80,13 @@ export default function Roles() { }); } }); - }, [selectedAccount, api, dispatch0, dispatch1, dispatch, web3Name, blocks]); + }, [blocks,selectedAccount, api, dispatch0, dispatch1, dispatch]); return (
- - - + + + {selectedAccount ? (

@@ -116,8 +116,8 @@ export default function Roles() { - - + +

Your Roles:{' '} {!(role.length > 0) @@ -131,7 +131,7 @@ export default function Roles() { - +

Last Requested Role:{' '} diff --git a/fs-dapp_2.0/src/components/shared/modal.tsx b/fs-dapp_2.0/src/components/shared/modal.tsx index 7512a944..1ff4b3a9 100644 --- a/fs-dapp_2.0/src/components/shared/modal.tsx +++ b/fs-dapp_2.0/src/components/shared/modal.tsx @@ -80,7 +80,7 @@ const RolesApp: React.FC = () => {
diff --git a/fs-dapp_2.0/src/components/shared/referendum.tsx b/fs-dapp_2.0/src/components/shared/referendum.tsx index 7e3807ca..6eacd2b2 100644 --- a/fs-dapp_2.0/src/components/shared/referendum.tsx +++ b/fs-dapp_2.0/src/components/shared/referendum.tsx @@ -8,6 +8,7 @@ function Referendum() { const { role } = useAccountContext(); const yes = Number(((ayes / council_members.length) * 100).toFixed(1)); + console.log(`Number of yes:${ayes}`) return (