Bug/multisig nonce selection

src/hooks/DAO/loaders/useFractalNode.ts

@@ -8,7 +8,6 @@ import { NodeAction } from '../../../providers/App/node/action';
 import { useNetworkConfig } from '../../../providers/NetworkConfig/NetworkConfigProvider';
 import { Node } from '../../../types';
 import { mapChildNodes } from '../../../utils/hierarchy';
-import { useAsyncRetry } from '../../utils/useAsyncRetry';
 import { useLazyDAOName } from '../useDAOName';
 import { useFractalModules } from './useFractalModules';
 
@@ -33,7 +32,6 @@ export const useFractalNode = (
   const { getDaoName } = useLazyDAOName();
 
   const lookupModules = useFractalModules();
-  const { requestWithRetries } = useAsyncRetry();
 
   const formatDAOQuery = useCallback((result: { data?: DAOQueryQuery }, _daoAddress: string) => {
     if (!result.data) {
@@ -98,21 +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 requestWithRetries(
-          () => safeAPI.getSafeInfo(utils.getAddress(_daoAddress)),
-          5,
-        );
+        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;
       }
@@ -121,15 +120,15 @@ 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, requestWithRetries, reset, safeAPI],
+    [action, lookupModules, reset, safeAPI],
   );
 
   useEffect(() => {

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/pages/daos/[daoAddress]/proposals/new/index.tsx

@@ -62,7 +62,7 @@ export default function ProposalCreatePage() {
   return (
     <Formik<CreateProposalForm>
       validationSchema={createProposalValidation}
-      initialValues={{ ...DEFAULT_PROPOSAL, nonce: safe.nonce }}
+      initialValues={{ ...DEFAULT_PROPOSAL, nonce: safe.nonceWithPending }}
       onSubmit={async values => {
         const { nonce } = values;
         const proposalData = await prepareProposal(values);

src/types/safeGlobal.ts

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