fix: fix the number of requested trust relationships

Greenstand · May 7, 2024 · 267930e · 267930e
1 parent c11c1d4
commit 267930e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/src/components/Routes/ClientRoutes.js b/src/components/Routes/ClientRoutes.js
@@ -72,12 +72,11 @@ const ClientRoutes = () => {
           path="/trust-relationship"
           exact
           element={
+            <TrustRelationshipsProvider>
             <Layout>
-              <TrustRelationshipsProvider>
                 <TrustRelationship />
-              </TrustRelationshipsProvider>
-
             </Layout>
+            </TrustRelationshipsProvider>
           }
         />
         <Route

diff --git a/src/components/layout/Menu/Menu.js b/src/components/layout/Menu/Menu.js
@@ -6,7 +6,6 @@ import * as React from 'react';
 import MenuItem from './MenuItem/MenuItem';
 import { DrawerHeaderStyled, DrawerStyled } from './MenuStyled';
 import TopMenu from './TopMenu/TopMenu';
-import { TrustRelationshipsProvider } from '../../../store/TrustRelationshipsContext';
 
 const Menu = ({ open, handleDrawerClose, handleDrawerOpen }) => {
   const theme = useTheme();
@@ -24,9 +23,7 @@ const Menu = ({ open, handleDrawerClose, handleDrawerOpen }) => {
             )}
           </IconButton>
         </DrawerHeaderStyled>
-        <TrustRelationshipsProvider>
           <MenuItem open={open} />
-        </TrustRelationshipsProvider>
       </DrawerStyled>
     </>
   );

diff --git a/src/components/layout/Menu/MenuItem/MenuItem.js b/src/components/layout/Menu/MenuItem/MenuItem.js
@@ -7,23 +7,12 @@ import DriveFileMoveIcon from '@mui/icons-material/DriveFileMove';
 import * as React from 'react';
 import LinkItem from './LinkItem';
 import { useTrustRelationshipsContext } from '../../../../store/TrustRelationshipsContext';
-import { useState, useEffect } from 'react';
+import { useState } from 'react';
 
 const MenuItem = ({ open }) => {
   const [isHovered, setIsHovered] = useState(false);
-  const [pendingCount, setPendingCount] = useState(0);
-  const { tableRows } = useTrustRelationshipsContext();
+  const { count } = useTrustRelationshipsContext();
 
-  useEffect(() => {
-    let count = 0;
-
-    for (let i = 0; i < tableRows.length; i++) {
-      if (tableRows[i].state === 'requested') {
-        count++;
-      }
-    }
-    setPendingCount(count);
-  }, [tableRows]);
     return (
     <>
       <LinkItem
@@ -54,7 +43,7 @@ const MenuItem = ({ open }) => {
         isActive={location.pathname === '/list-wallets'}
         open={open}
       />
-      {pendingCount > 0 && open ? (
+      {count > 0 && open ? (
         <div
           style={{
             display: 'flex',
@@ -70,7 +59,7 @@ const MenuItem = ({ open }) => {
             itemIcon={<HandshakeIcon />}
             isActive={location.pathname === '/trust-relationship'}
             open={open}
-            pendingCount={pendingCount}
+            pendingCount={count}
           />
         </div>
       ) : (

diff --git a/src/store/TrustRelationshipsContext.js b/src/store/TrustRelationshipsContext.js
@@ -37,6 +37,7 @@ const TrustRelationshipsProvider = ({ children }) => {
   const [searchString, setSearchString] = useState('');
 
   const [refetch, setRefetch] = useState(false);
+  const [count, setCount] = useState(0);
 
   // Loader
   const [isLoading, setIsLoading] = useState(false);
@@ -188,6 +189,13 @@ const TrustRelationshipsProvider = ({ children }) => {
         sorting,
       });
 
+      let local_count = 0;
+      for (const item of data.trust_relationships) {
+        if (item.state === 'requested') {
+          local_count++;
+        }
+      }
+      setCount(local_count);
       const preparedRows = prepareRows(await data.trust_relationships);
 
       setTableRows(preparedRows);
@@ -206,6 +214,7 @@ const TrustRelationshipsProvider = ({ children }) => {
   }, [pagination, filter, sorting, refetch]);
 
   const value = {
+    count,
     pagination,
     setPagination,
     isLoading,