dont hang on update and downgrade

This commit is contained in:
Matt Hill
2022-04-04 15:21:28 -06:00
committed by Aiden McClelland
parent 12ca3e0aea
commit 905aaafa2b
2 changed files with 15 additions and 4 deletions

View File

@@ -11,6 +11,7 @@ import {
} from './install-wizard.component' } from './install-wizard.component'
import { ConfigService } from 'src/app/services/config.service' import { ConfigService } from 'src/app/services/config.service'
import { MarketplaceService } from 'src/app/services/marketplace.service' import { MarketplaceService } from 'src/app/services/marketplace.service'
import { first } from 'rxjs/operators'
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class WizardBaker { export class WizardBaker {
@@ -84,6 +85,7 @@ export class WizardBaker {
id, id,
'version-spec': version ? `=${version}` : undefined, 'version-spec': version ? `=${version}` : undefined,
}) })
.pipe(first())
.toPromise(), .toPromise(),
}, },
}, },
@@ -221,6 +223,7 @@ export class WizardBaker {
id, id,
'version-spec': version ? `=${version}` : undefined, 'version-spec': version ? `=${version}` : undefined,
}) })
.pipe(first())
.toPromise(), .toPromise(),
}, },
}, },
@@ -332,7 +335,7 @@ export class WizardBaker {
whileLoading: {}, whileLoading: {},
afterLoading: { text: 'Cancel' }, afterLoading: { text: 'Cancel' },
}, },
next: 'Stop Service', next: 'Stop Anyway',
}, },
}, },
{ {

View File

@@ -37,7 +37,7 @@ export module Mock {
export const MockManifestBitcoind: Manifest = { export const MockManifestBitcoind: Manifest = {
id: 'bitcoind', id: 'bitcoind',
title: 'Bitcoin Core', title: 'Bitcoin Core',
version: '0.20.0', version: '0.21.0',
description: { description: {
short: 'A Bitcoin full node by Bitcoin Core.', short: 'A Bitcoin full node by Bitcoin Core.',
long: 'Bitcoin is a decentralized consensus protocol and settlement network.', long: 'Bitcoin is a decentralized consensus protocol and settlement network.',
@@ -1731,9 +1731,17 @@ export module Mock {
'dependency-errors': {}, 'dependency-errors': {},
}, },
'interface-addresses': { 'interface-addresses': {
ui: {
'tor-address': 'bitcoind-ui-address.onion',
'lan-address': 'bitcoind-ui-address.local',
},
rpc: { rpc: {
'tor-address': 'bitcoinproxy-rpc-address.onion', 'tor-address': 'bitcoind-rpc-address.onion',
'lan-address': 'bitcoinproxy-rpc-address.local', 'lan-address': 'bitcoind-rpc-address.local',
},
p2p: {
'tor-address': 'bitcoind-p2p-address.onion',
'lan-address': 'bitcoind-p2p-address.local',
}, },
}, },
'system-pointers': [], 'system-pointers': [],