fix: Wait for relayed deployment before clearing counterfactual state

src/components/tx/GasParams/GasParams.test.tsx

@@ -65,7 +65,7 @@ describe('GasParams', () => {
     )
 
     expect(getByText('Estimated fee')).toBeInTheDocument()
-    expect(getByText('0.21 SepoliaETH')).toBeInTheDocument()
+    expect(getByText('0.42 SepoliaETH')).toBeInTheDocument()
   })
 
   it("Doesn't show an estimated fee if there is no gasLimit", () => {

src/features/counterfactual/ActivateAccount.tsx

@@ -1,13 +1,16 @@
 import { createNewSafe, relaySafeCreation } from '@/components/new-safe/create/logic'
 import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
 import { NetworkFee, SafeSetupOverview } from '@/components/new-safe/create/steps/ReviewStep'
+import { SafeCreationStatus } from '@/components/new-safe/create/steps/StatusStep/useSafeCreation'
 import ReviewRow from '@/components/new-safe/ReviewRow'
 import { TxModalContext } from '@/components/tx-flow'
 import TxCard from '@/components/tx-flow/common/TxCard'
+
+import TxLayout from '@/components/tx-flow/common/TxLayout'
 import ErrorMessage from '@/components/tx/ErrorMessage'
 import { ExecutionMethod, ExecutionMethodSelector } from '@/components/tx/ExecutionMethodSelector'
 import useDeployGasLimit from '@/features/counterfactual/hooks/useDeployGasLimit'
-import { removeUndeployedSafe, selectUndeployedSafe } from '@/features/counterfactual/store/undeployedSafeSlice'
+import { removeUndeployedSafe, selectUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
 import useChainId from '@/hooks/useChainId'
 import { useCurrentChain } from '@/hooks/useChains'
 import useGasPrice, { getTotalFeeFormatted } from '@/hooks/useGasPrice'
@@ -28,8 +31,6 @@ import type { DeploySafeProps } from '@safe-global/protocol-kit'
 import { FEATURES } from '@safe-global/safe-gateway-typescript-sdk'
 import React, { useContext, useState } from 'react'
 
-import TxLayout from '@/components/tx-flow/common/TxLayout'
-
 const useActivateAccount = () => {
   const chain = useCurrentChain()
   const [gasPrice] = useGasPrice()
@@ -78,6 +79,10 @@ const ActivateAccountFlow = () => {
 
   if (!undeployedSafe) return null
 
+  const onSuccess = () => {
+    dispatch(removeUndeployedSafe({ chainId, address: safeAddress }))
+  }
+
   const createSafe = async () => {
     if (!provider || !chain) return
 
@@ -94,16 +99,18 @@ const ActivateAccountFlow = () => {
         )
 
         waitForCreateSafeTx(taskId, (status) => {
-          console.log(status)
+          if (status === SafeCreationStatus.SUCCESS) {
+            onSuccess()
+          }
         })
       } else {
         await createNewSafe(provider, {
           safeAccountConfig: undeployedSafe.safeAccountConfig,
           saltNonce: undeployedSafe.safeDeploymentConfig?.saltNonce,
           options,
         })
+        onSuccess()
       }
-      dispatch(removeUndeployedSafe({ chainId, address: safeAddress }))
     } catch (_err) {
       const err = asError(_err)
       setIsSubmittable(true)

src/features/counterfactual/CounterfactualForm.tsx

@@ -1,6 +1,6 @@
 import { TxModalContext } from '@/components/tx-flow'
 import useDeployGasLimit from '@/features/counterfactual/hooks/useDeployGasLimit'
-import { removeUndeployedSafe } from '@/features/counterfactual/store/undeployedSafeSlice'
+import { removeUndeployedSafe } from '@/features/counterfactual/store/undeployedSafesSlice'
 import { deploySafeAndExecuteTx } from '@/features/counterfactual/utils'
 import useChainId from '@/hooks/useChainId'
 import useSafeInfo from '@/hooks/useSafeInfo'