From 5349454a9ef00c7e0e4c151adccad25f0ffbf5ff Mon Sep 17 00:00:00 2001
From: ndkazu <ndongmefane@gmail.com>
Date: Tue, 26 Mar 2024 14:27:17 +0900
Subject: [PATCH] Problem with council page not refreshing

---
 fs-dapp_2.0/src/components/pages/Council.tsx | 18 +++++++-----------
 fs-dapp_2.0/src/components/pages/Roles.tsx   | 10 +++++++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/fs-dapp_2.0/src/components/pages/Council.tsx b/fs-dapp_2.0/src/components/pages/Council.tsx
index d1c6a0c1..9a68564e 100644
--- a/fs-dapp_2.0/src/components/pages/Council.tsx
+++ b/fs-dapp_2.0/src/components/pages/Council.tsx
@@ -41,7 +41,8 @@ export default function Council() {
         
       let acc_list = proposals;
       if (acc && !acc_list.includes(acc1 as InjectedAccountWithMeta) && acc1){
-        acc_list.push(acc1);                    
+        acc_list.push(acc1);
+        dispatch1({type:`SET_PROPOSALS`,payload:[]});                     
         dispatch1({type:`SET_PROPOSALS`,payload:acc_list}); 
         
         
@@ -96,12 +97,14 @@ export default function Council() {
       if (hash.length > 0) {
         setHash0(hash);
         update()
+        console.log(`Number of active proposals: ${proposals.length}`)
         
       }    
     });   
    
 
   }, [hash0,blocks,selectedAccount,api]);
+
   return(<div id="scrollableDiv"
   style={{
     height: 400,
@@ -109,21 +112,14 @@ export default function Council() {
     padding: '0 16px',
     border: '1px solid rgba(140, 140, 140, 0.35)',
   }}>
-    <InfiniteScroll
-     dataLength={proposals.length}
-     next={update}
-     hasMore={proposals.length < 50}
-     loader={<Skeleton avatar paragraph={{ rows: 1 }} active />}
-     endMessage={<Divider plain>It is all, nothing more 🤐</Divider>}
-     scrollableTarget="scrollableDiv"
-    >
+    
        <List
           dataSource={data}
           
           renderItem={item => (
             <Card 
             hoverable
-      style={{ width: 300 }}>
+      style={{ width: 300, height:120}}>
             <List.Item key={item.address}>
               <List.Item.Meta
                 title={<p>{item.name}</p>}
@@ -136,7 +132,7 @@ export default function Council() {
 
         />
 
-    </InfiniteScroll>
+   
     <Button
     type="primary"
     className="bg-blue-600 text-white font-bold py-2 text-xl" 
diff --git a/fs-dapp_2.0/src/components/pages/Roles.tsx b/fs-dapp_2.0/src/components/pages/Roles.tsx
index ab14505b..ecd0f3b8 100644
--- a/fs-dapp_2.0/src/components/pages/Roles.tsx
+++ b/fs-dapp_2.0/src/components/pages/Roles.tsx
@@ -21,14 +21,18 @@ export default function Roles() {
     let address0 = selectedAccount.address;
     api.query.rolesModule.requestedRoles(address0, (data: any) => {
       let data0 = data.toHuman();
-      if(!data0) return;
-      console.log(`requested roles:${data}`);
+      if(data0) {
+        console.log(`requested roles:${data}`);
       let r_session = data0.role.toString();
 
       dispatch1({ type: 'SET_ROLE_IN_SESSION', payload: r_session });
+      }else{
+        dispatch1({ type: 'SET_ROLE_IN_SESSION', payload: `` });
+      }
+      
     });
     console.log(`role in session:${role_in_session}`)
-  }, [selectedAccount, blocks, dispatch1, api]);
+  }, [role_in_session,selectedAccount, blocks, dispatch1, api]);
 
   useEffect(() => {
     if (!api || !selectedAccount) return;