Merge branch 'main' into dev

safe-global · Oct 2, 2024 · cfd86bc · cfd86bc
2 parents ee1eed9 + 437689a
commit cfd86bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "safe-wallet-web",
   "homepage": "https://github.com/safe-global/safe-wallet-web",
   "license": "GPL-3.0",
-  "version": "1.43.1",
+  "version": "1.44.0",
   "type": "module",
   "scripts": {
     "dev": "next dev",

diff --git a/src/components/tx-flow/flows/ExecuteBatch/ReviewBatch.tsx b/src/components/tx-flow/flows/ExecuteBatch/ReviewBatch.tsx
@@ -117,6 +117,7 @@ export const ReviewBatch = ({ params }: { params: ExecuteBatchFlowProps }) => {
       wallet.address,
       safe.address.value,
       overrides as Overrides & { nonce: number },
+      safe.nonce,
     )
   }
 

diff --git a/src/services/tx/tx-sender/dispatch.ts b/src/services/tx/tx-sender/dispatch.ts
@@ -253,6 +253,7 @@ export const dispatchCustomTxSpeedUp = async (
     to,
     groupKey: result?.hash,
     txType: 'Custom',
+    nonce,
   })
 
   return result.hash
@@ -320,6 +321,7 @@ export const dispatchBatchExecution = async (
   signerAddress: string,
   safeAddress: string,
   overrides: Omit<Overrides, 'nonce'> & { nonce: number },
+  nonce: number,
 ) => {
   const groupKey = multiSendTxData
 
@@ -337,11 +339,11 @@ export const dispatchBatchExecution = async (
     result = await multiSendContract.contract.connect(signer).multiSend(multiSendTxData, overrides)
 
     txIds.forEach((txId) => {
-      txDispatch(TxEvent.EXECUTING, { txId, groupKey })
+      txDispatch(TxEvent.EXECUTING, { txId, groupKey, nonce })
     })
   } catch (err) {
     txIds.forEach((txId) => {
-      txDispatch(TxEvent.FAILED, { txId, error: asError(err), groupKey })
+      txDispatch(TxEvent.FAILED, { txId, error: asError(err), groupKey, nonce })
     })
     throw err
   }
@@ -357,6 +359,7 @@ export const dispatchBatchExecution = async (
       txType: 'Custom',
       data: txData,
       to: txTo,
+      nonce,
     })
   })