📦 Gnosis fix state not updating (#1091)

* Gnosis Safe fix state not updating
TrueFiEng · Feb 21, 2023 · d5056ed · d5056ed · github-actions · Feb 21, 2023
1 parent 94092d3
commit d5056ed
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/.changeset/pretty-olives-cough.md b/.changeset/pretty-olives-cough.md
@@ -0,0 +1,5 @@
+---
+'@usedapp/core': patch
+---
+
+Gnosis Safe fix state not updating
diff --git a/packages/core/src/helpers/gnosisSafeUtils.ts b/packages/core/src/helpers/gnosisSafeUtils.ts
@@ -99,6 +99,7 @@ export const getLatestNonce = async (chainId: number, safeAddress: string): Prom
 }
 
 export const waitForSafeTransaction = async (
+  transactionPromise: Promise<TransactionResponse>,
   contract: Contract,
   chainId: number,
   safeTx: SafeTransaction
@@ -109,7 +110,13 @@ export const waitForSafeTransaction = async (
 }> => {
   const safeTxHash = calculateSafeTransactionHash(contract, safeTx, chainId)
 
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
+    void transactionPromise.catch((err: any) => {
+      if (err?.message === 'Transaction was rejected') {
+        reject(err)
+      }
+    })
+
     const onExecutionSuccess = async (txHash: string, _payment: BigNumber, event: Event) => {
       if (txHash === safeTxHash) {
         contract.removeListener('ExecutionSuccess', onExecutionSuccess)

diff --git a/packages/core/src/hooks/usePromiseTransaction.ts b/packages/core/src/hooks/usePromiseTransaction.ts
@@ -119,7 +119,10 @@ export function usePromiseTransaction(chainId: number | undefined, options?: Tra
         return { transaction, receipt }
       }
 
-      const handleContractWallet = async ({ safeTransaction }: PromiseTransactionOpts = {}) => {
+      const handleContractWallet = async (
+        transactionPromise: Promise<TransactionResponse>,
+        { safeTransaction }: PromiseTransactionOpts = {}
+      ) => {
         if (!chainId || !library || !account) return
         setState({ status: 'CollectingSignaturePool', chainId, transactionName: options?.transactionName })
 
@@ -138,7 +141,12 @@ export function usePromiseTransaction(chainId: number | undefined, options?: Tra
           nonce: latestNonce ? latestNonce + 1 : await gnosisSafeContract.nonce(),
         })
 
-        const { transaction, receipt, rejected } = await waitForSafeTransaction(gnosisSafeContract, chainId, safeTx)
+        const { transaction, receipt, rejected } = await waitForSafeTransaction(
+          transactionPromise,
+          gnosisSafeContract,
+          chainId,
+          safeTx
+        )
 
         if (rejected) {
           const errorMessage = 'On-chain rejection created'
@@ -195,12 +203,17 @@ export function usePromiseTransaction(chainId: number | undefined, options?: Tra
             chainId: chainId,
           })
         }
-        transaction = await transactionPromise
-        const result = (await isNonContractWallet(library, account))
-          ? await handleNonContractWallet(transaction)
-          : await handleContractWallet({ safeTransaction })
-        transaction = result?.transaction
-        return result?.receipt
+        const isContractWallet = !(await isNonContractWallet(library, account))
+        if (isContractWallet) {
+          const result = await handleContractWallet(transactionPromise, { safeTransaction })
+          transaction = result?.transaction
+          return result?.receipt
+        } else {
+          transaction = await transactionPromise
+          const result = await handleNonContractWallet(transaction)
+          transaction = result?.transaction
+          return result?.receipt
+        }
       } catch (e: any) {
         const parsedErrorCode = parseInt(e.error?.data?.code ?? e.error?.code ?? e.data?.code ?? e.code)
         const errorCode = isNaN(parsedErrorCode) ? undefined : parsedErrorCode