Unverified Commit 2f5bb217 authored by Jeremy Bokobza's avatar Jeremy Bokobza Committed by GitHub

Merge pull request #390 from herbepau/advanced-pr-tweaks

Changes as per PR feedback (Igor), and cleared build warnings caused …
parents 214e01ee f40d3ca2
import { Subscription } from 'rxJs/Subscription'; import { Subscription } from 'rxjs/Subscription';
export class SerialDisposable { export class SerialDisposable {
private subscription: Subscription; private subscription: Subscription;
......
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Router, Event, NavigationEnd } from '@angular/router'; import { Router, NavigationEnd } from '@angular/router';
import { filter } from 'rxjs/operator/filter'; import { ReplaySubject } from 'rxjs/ReplaySubject';
import { map } from 'rxjs/operator/map';
import { ReplaySubject } from 'rxJs/ReplaySubject';
export enum Page { export enum Page {
Bitcoin, Stratis Bitcoin, Stratis
......
...@@ -53,7 +53,7 @@ export class AdvancedComponent implements OnInit, OnDestroy { ...@@ -53,7 +53,7 @@ export class AdvancedComponent implements OnInit, OnDestroy {
} }
generateAddresses() { generateAddresses() {
this.addresses = []; this.addresses.length = 0;
this.generateAddressesSubs.disposable = this.advancedService.generateAddresses(Number(this.addressCount)) this.generateAddressesSubs.disposable = this.advancedService.generateAddresses(Number(this.addressCount))
.monitor(this.generateAddressesLoadingState) .monitor(this.generateAddressesLoadingState)
.subscribe(x => this.addresses = x); .subscribe(x => this.addresses = x);
......
...@@ -4,7 +4,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; ...@@ -4,7 +4,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { ClipboardModule } from 'ngx-clipboard'; import { ClipboardModule } from 'ngx-clipboard';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { NgDatepickerModule } from 'ng2-datepicker';
import { WalletComponent } from './wallet.component'; import { WalletComponent } from './wallet.component';
import { MenuComponent } from './menu/menu.component'; import { MenuComponent } from './menu/menu.component';
...@@ -29,8 +28,7 @@ import { FeedbackComponent } from './advanced/feedback/feedback.component'; ...@@ -29,8 +28,7 @@ import { FeedbackComponent } from './advanced/feedback/feedback.component';
SharedModule.forRoot(), SharedModule.forRoot(),
NgbModule, NgbModule,
ReactiveFormsModule, ReactiveFormsModule,
WalletRoutingModule, WalletRoutingModule
NgDatepickerModule
], ],
declarations: [ declarations: [
WalletComponent, WalletComponent,
......
...@@ -41,7 +41,7 @@ git submodule update --init --recursive ...@@ -41,7 +41,7 @@ git submodule update --init --recursive
cd $TRAVIS_BUILD_DIR/Breeze.UI cd $TRAVIS_BUILD_DIR/Breeze.UI
npm install -g cross-env npm install
npm install -g npx npm install -g npx
echo $log_prefix FINISHED restoring dotnet and npm packages echo $log_prefix FINISHED restoring dotnet and npm packages
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment