From b16991aaa52c2ca668fe599dfdce1e641c93917c Mon Sep 17 00:00:00 2001
From: evavirseda <evirseda@boxfish.studio>
Date: Wed, 3 Apr 2024 11:36:15 +0200
Subject: [PATCH] minor fix

---
 .../dashboard/wallet/views/ImplicitAccountCreationView.svelte  | 2 +-
 .../AccountCreationView.svelte                                 | 3 +--
 .../OneTimeDepositView.svelte                                  | 2 +-
 .../lib/core/network/utils/getNetworkIdFromNetworkName.ts      | 2 +-
 .../wallet/actions/events-handlers/handleNewOutputEvent.ts     | 1 +
 .../lib/core/wallet/interfaces/wallet-state.interface.ts       | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte b/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte
index d99b2b8912c..a8973872334 100644
--- a/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/ImplicitAccountCreationView.svelte
@@ -35,7 +35,7 @@
                 handleMultipleAccounts()
             } else if (
                 $selectedWallet?.implicitAccountOutputs?.length === 0 &&
-                !$selectedWallet?.hasImplicitAccountCreationTransactionInProgress
+                !$selectedWallet?.isImplicitAccountCreationStarted
             ) {
                 $implicitAccountCreationRoute = ImplicitAccountCreationRoute.Init
             }
diff --git a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte
index 3ddc974dd73..8aa14f49d2b 100644
--- a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/AccountCreationView.svelte
@@ -69,8 +69,7 @@
                     showRevealToggle
                     submitHandler={unlockWalletAndCreateAccount}
                     placeholder={localize('views.implicit-account-creation.steps.step3.view.placeholder')}
-                    disabled={$selectedWallet?.hasImplicitAccountCreationTransactionInProgress &&
-                        $selectedWallet?.isTransferring}
+                    disabled={$selectedWallet?.hasImplicitAccountCreationTransactionInProgress}
                 />
             {:else}
                 <LedgerAnimation illustration={IllustrationEnum.LedgerConnected2Desktop} {iconNetwork} />
diff --git a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte
index bf31e52ee9f..2bd7eb40c83 100644
--- a/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte
+++ b/packages/desktop/views/dashboard/wallet/views/implicit-account-creation-multistep/OneTimeDepositView.svelte
@@ -20,7 +20,7 @@
 
     onMount(() => {
         updateActiveWallet($selectedWallet.id, {
-            hasImplicitAccountCreationTransactionInProgress: true,
+            isImplicitAccountCreationStarted: true,
         })
     })
 </script>
diff --git a/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts b/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
index 73e5391c05f..bf92ee1807e 100644
--- a/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
+++ b/packages/shared/lib/core/network/utils/getNetworkIdFromNetworkName.ts
@@ -14,7 +14,7 @@ export function getNetworkIdFromNetworkName(networkName: string): NetworkId {
         case 'testnet-1':
         case 'testnet-2':
         case 'docker':
-        case 'docker-1711022286':
+        case 'docker-1712129396':
             return NetworkId.Testnet
         default:
             return NetworkId.Custom
diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts
index 0e2d230f58c..1dbded721ed 100644
--- a/packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts
@@ -100,6 +100,7 @@ export async function handleNewOutputEventInternal(walletId: string, payload: Ne
             } else {
                 updateActiveWallet(walletId, {
                     hasImplicitAccountCreationTransactionInProgress: false,
+                    isImplicitAccountCreationStarted: false,
                     isTransferring: false,
                 })
             }
diff --git a/packages/shared/lib/core/wallet/interfaces/wallet-state.interface.ts b/packages/shared/lib/core/wallet/interfaces/wallet-state.interface.ts
index 3ea2574d42c..0128103b31c 100644
--- a/packages/shared/lib/core/wallet/interfaces/wallet-state.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wallet-state.interface.ts
@@ -12,6 +12,7 @@ export interface IWalletState extends IWallet, IPersistedWalletData {
     hasVotingTransactionInProgress: boolean
     hasConsolidatingOutputsTransactionInProgress: boolean
     hasImplicitAccountCreationTransactionInProgress: boolean
+    isImplicitAccountCreationStarted: boolean
     hasDelegationTransactionInProgress: boolean
     votingPower: string
     walletOutputs: OutputData[]