From 905aaafa2bb28ce1b5603bebc91e9c924596da61 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Mon, 4 Apr 2022 15:21:28 -0600 Subject: [PATCH] dont hang on update and downgrade --- .../components/install-wizard/prebaked-wizards.ts | 5 ++++- .../ui/src/app/services/api/api.fixures.ts | 14 +++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts b/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts index 0f1e1a6d8..835a2b169 100644 --- a/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts +++ b/frontend/projects/ui/src/app/components/install-wizard/prebaked-wizards.ts @@ -11,6 +11,7 @@ import { } from './install-wizard.component' import { ConfigService } from 'src/app/services/config.service' import { MarketplaceService } from 'src/app/services/marketplace.service' +import { first } from 'rxjs/operators' @Injectable({ providedIn: 'root' }) export class WizardBaker { @@ -84,6 +85,7 @@ export class WizardBaker { id, 'version-spec': version ? `=${version}` : undefined, }) + .pipe(first()) .toPromise(), }, }, @@ -221,6 +223,7 @@ export class WizardBaker { id, 'version-spec': version ? `=${version}` : undefined, }) + .pipe(first()) .toPromise(), }, }, @@ -332,7 +335,7 @@ export class WizardBaker { whileLoading: {}, afterLoading: { text: 'Cancel' }, }, - next: 'Stop Service', + next: 'Stop Anyway', }, }, { diff --git a/frontend/projects/ui/src/app/services/api/api.fixures.ts b/frontend/projects/ui/src/app/services/api/api.fixures.ts index 71f0431c4..6c0327747 100644 --- a/frontend/projects/ui/src/app/services/api/api.fixures.ts +++ b/frontend/projects/ui/src/app/services/api/api.fixures.ts @@ -37,7 +37,7 @@ export module Mock { export const MockManifestBitcoind: Manifest = { id: 'bitcoind', title: 'Bitcoin Core', - version: '0.20.0', + version: '0.21.0', description: { short: 'A Bitcoin full node by Bitcoin Core.', long: 'Bitcoin is a decentralized consensus protocol and settlement network.', @@ -1731,9 +1731,17 @@ export module Mock { 'dependency-errors': {}, }, 'interface-addresses': { + ui: { + 'tor-address': 'bitcoind-ui-address.onion', + 'lan-address': 'bitcoind-ui-address.local', + }, rpc: { - 'tor-address': 'bitcoinproxy-rpc-address.onion', - 'lan-address': 'bitcoinproxy-rpc-address.local', + 'tor-address': 'bitcoind-rpc-address.onion', + 'lan-address': 'bitcoind-rpc-address.local', + }, + p2p: { + 'tor-address': 'bitcoind-p2p-address.onion', + 'lan-address': 'bitcoind-p2p-address.local', }, }, 'system-pointers': [],