Add new property to SafeInfoResponseWithGuard

called `nonceWithPending`, which will be the next nonce to use which takes into account all "pending" transactions on the safe

src/hooks/DAO/loaders/useFractalNode.ts

@@ -96,18 +96,22 @@ export const useFractalNode = (
       currentValidSafe.current = _addressPrefix + _daoAddress;
       setErrorLoading(false);
 
-      let safeInfo;
+      let safeInfoResponseWithGuard;
 
       try {
         if (!safeAPI) throw new Error('SafeAPI not set');
-
-        safeInfo = await safeAPI.getSafeInfo(utils.getAddress(_daoAddress));
+        const address = utils.getAddress(_daoAddress);
+        const safeInfo = await safeAPI.getSafeInfo(address);
+        const allTransactions = await safeAPI.getAllTransactions(address);
+        safeInfoResponseWithGuard = { ...safeInfo, nonceWithPending: allTransactions.count };
       } catch (e) {
         reset({ error: true });
         return;
       }
 
-      if (!safeInfo) {
+      // comment to pick up in review: will `safeInfoResponseWithGuard` ever not be set?
+      // typescript doesn't think so.
+      if (!safeInfoResponseWithGuard) {
         reset({ error: true });
         return;
       }
@@ -116,12 +120,12 @@ export const useFractalNode = (
 
       action.dispatch({
         type: NodeAction.SET_FRACTAL_MODULES,
-        payload: await lookupModules(safeInfo.modules),
+        payload: await lookupModules(safeInfoResponseWithGuard.modules),
       });
 
       action.dispatch({
         type: NodeAction.SET_SAFE_INFO,
-        payload: safeInfo,
+        payload: safeInfoResponseWithGuard,
       });
     },
     [action, lookupModules, reset, safeAPI],

src/hooks/DAO/loaders/useLoadDAONode.ts

@@ -54,13 +54,18 @@ export const useLoadDAONode = () => {
             logError('graphQL query failed');
             return { error: 'errorFailedSearch' };
           }
-          const safe = await safeAPI.getSafeInfo(_daoAddress);
-          const fractalModules = await lookupModules(safe.modules);
-          const daoName = await getDaoName(utils.getAddress(safe.address), graphNodeInfo.daoName);
+          const safeInfo = await safeAPI.getSafeInfo(_daoAddress);
+          const allTransactions = await safeAPI.getAllTransactions(_daoAddress);
+          const safeInfoWithGuard = { ...safeInfo, nonceWithPending: allTransactions.count };
+          const fractalModules = await lookupModules(safeInfo.modules);
+          const daoName = await getDaoName(
+            utils.getAddress(safeInfo.address),
+            graphNodeInfo.daoName,
+          );
 
           const node: FractalNode = Object.assign(graphNodeInfo, {
             daoName,
-            safe,
+            safe: safeInfoWithGuard,
             fractalModules,
           });
 

src/types/safeGlobal.ts

@@ -28,6 +28,7 @@ export declare type DataDecoded = {
 };
 
 export type SafeInfoResponseWithGuard = SafeInfoResponse & {
+  nonceWithPending: number;
   guard?: string;
 };