Skip to content

Commit

Permalink
minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
evavirseda committed Apr 3, 2024
1 parent ebdbaa5 commit b16991a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
handleMultipleAccounts()
} else if (
$selectedWallet?.implicitAccountOutputs?.length === 0 &&
!$selectedWallet?.hasImplicitAccountCreationTransactionInProgress
!$selectedWallet?.isImplicitAccountCreationStarted
) {
$implicitAccountCreationRoute = ImplicitAccountCreationRoute.Init
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
onMount(() => {
updateActiveWallet($selectedWallet.id, {
hasImplicitAccountCreationTransactionInProgress: true,
isImplicitAccountCreationStarted: true,
})
})
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export async function handleNewOutputEventInternal(walletId: string, payload: Ne
} else {
updateActiveWallet(walletId, {
hasImplicitAccountCreationTransactionInProgress: false,
isImplicitAccountCreationStarted: false,
isTransferring: false,
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface IWalletState extends IWallet, IPersistedWalletData {
hasVotingTransactionInProgress: boolean
hasConsolidatingOutputsTransactionInProgress: boolean
hasImplicitAccountCreationTransactionInProgress: boolean
isImplicitAccountCreationStarted: boolean
hasDelegationTransactionInProgress: boolean
votingPower: string
walletOutputs: OutputData[]
Expand Down

0 comments on commit b16991a

Please sign in to comment.