Use that helper in all the places

decentdao · Apr 10, 2024 · 2218084 · 2218084
1 parent d1ec2a7
commit 2218084
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/hooks/DAO/loaders/useFractalNode.ts b/src/hooks/DAO/loaders/useFractalNode.ts
@@ -100,11 +100,8 @@ export const useFractalNode = (
 
       try {
         if (!safeAPI) throw new Error('SafeAPI not set');
-
         const address = utils.getAddress(_daoAddress);
-        const safeInfoResponse = await safeAPI.getSafeInfo(address);
-        const nextNonce = await safeAPI.getNextNonce(address);
-        safeInfo = { ...safeInfoResponse, nonce: nextNonce };
+        safeInfo = await safeAPI.getSafeData(address);
       } catch (e) {
         reset({ error: true });
         return;

diff --git a/src/hooks/DAO/loaders/useLoadDAONode.ts b/src/hooks/DAO/loaders/useLoadDAONode.ts
@@ -56,14 +56,12 @@ export const useLoadDAONode = () => {
           }
 
           const sanitizedDaoAddress = utils.getAddress(_daoAddress);
-          const safeInfo = await safeAPI.getSafeInfo(sanitizedDaoAddress);
-          const nextNonce = await safeAPI.getNextNonce(sanitizedDaoAddress);
-          const safeInfoWithGuard = { ...safeInfo, nonce: nextNonce };
+          const safeInfoWithGuard = await safeAPI.getSafeData(sanitizedDaoAddress);
 
           const node: FractalNode = Object.assign(graphNodeInfo, {
             daoName: await getDaoName(sanitizedDaoAddress, graphNodeInfo.daoName),
             safe: safeInfoWithGuard,
-            fractalModules: await lookupModules(safeInfo.modules),
+            fractalModules: await lookupModules(safeInfoWithGuard.modules),
           });
 
           // TODO we could cache node here, but should be careful not to cache

diff --git a/src/hooks/DAO/useClawBack.ts b/src/hooks/DAO/useClawBack.ts
@@ -27,8 +27,7 @@ export default function useClawBack({ childSafeInfo, parentAddress }: IUseClawBa
       );
 
       const santitizedParentAddress = utils.getAddress(parentAddress);
-      const parentSafeInfo = await safeAPI.getSafeInfo(santitizedParentAddress);
-      const parentSafeNextNonce = await safeAPI.getNextNonce(santitizedParentAddress);
+      const parentSafeInfo = await safeAPI.getSafeData(santitizedParentAddress);
 
       if (canUserCreateProposal && parentAddress && childSafeInfo && parentSafeInfo) {
         const abiCoder = new ethers.utils.AbiCoder();
@@ -92,7 +91,7 @@ export default function useClawBack({ childSafeInfo, parentAddress }: IUseClawBa
               values: transactions.map(tx => tx.value),
               calldatas: transactions.map(tx => tx.calldata),
             },
-            nonce: parentSafeNextNonce,
+            nonce: parentSafeInfo.nonce,
             pendingToastMessage: t('clawBackPendingToastMessage'),
             failedToastMessage: t('clawBackFailedToastMessage'),
             successToastMessage: t('clawBackSuccessToastMessage'),