diff --git a/src/features/counterfactual/ActivateAccount.tsx b/src/features/counterfactual/ActivateAccount.tsx index ba732c6fb8..82847d5473 100644 --- a/src/features/counterfactual/ActivateAccount.tsx +++ b/src/features/counterfactual/ActivateAccount.tsx @@ -1,9 +1,12 @@ 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' @@ -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,7 +99,9 @@ const ActivateAccountFlow = () => { ) waitForCreateSafeTx(taskId, (status) => { - console.log(status) + if (status === SafeCreationStatus.SUCCESS) { + onSuccess() + } }) } else { await createNewSafe(provider, { @@ -102,8 +109,8 @@ const ActivateAccountFlow = () => { saltNonce: undeployedSafe.safeDeploymentConfig?.saltNonce, options, }) + onSuccess() } - dispatch(removeUndeployedSafe({ chainId, address: safeAddress })) } catch (_err) { const err = asError(_err) setIsSubmittable(true)