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

Changes as per PR feedback (Igor), and cleared build warnings caused …
stratisproject · Aug 10, 2018 · 2f5bb21 · 2f5bb21
2 parents 214e01e + f40d3ca
commit 2f5bb21
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/Breeze.UI/src/app/shared/classes/serialDisposable.ts b/Breeze.UI/src/app/shared/classes/serialDisposable.ts
@@ -1,4 +1,4 @@
-import { Subscription } from 'rxJs/Subscription';
+import { Subscription } from 'rxjs/Subscription';
 
 export class SerialDisposable {
     private subscription: Subscription;

diff --git a/Breeze.UI/src/app/shared/services/navigation.service.ts b/Breeze.UI/src/app/shared/services/navigation.service.ts
@@ -1,8 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Router, Event, NavigationEnd } from '@angular/router';
-import { filter } from 'rxjs/operator/filter';
-import { map } from 'rxjs/operator/map';
-import { ReplaySubject } from 'rxJs/ReplaySubject';
+import { Router, NavigationEnd } from '@angular/router';
+import { ReplaySubject } from 'rxjs/ReplaySubject';
 
 export enum Page {
     Bitcoin, Stratis

diff --git a/Breeze.UI/src/app/wallet/advanced/advanced.component.ts b/Breeze.UI/src/app/wallet/advanced/advanced.component.ts
@@ -53,7 +53,7 @@ export class AdvancedComponent implements OnInit, OnDestroy {
     }
 
     generateAddresses() {
-        this.addresses = [];
+        this.addresses.length = 0;
         this.generateAddressesSubs.disposable = this.advancedService.generateAddresses(Number(this.addressCount))
                                                          .monitor(this.generateAddressesLoadingState)
                                                          .subscribe(x => this.addresses = x);

diff --git a/Breeze.UI/src/app/wallet/wallet.module.ts b/Breeze.UI/src/app/wallet/wallet.module.ts
@@ -4,7 +4,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ClipboardModule } from 'ngx-clipboard';
 import { HttpClientModule } from '@angular/common/http';
-import { NgDatepickerModule } from 'ng2-datepicker';
 
 import { WalletComponent } from './wallet.component';
 import { MenuComponent } from './menu/menu.component';
@@ -29,8 +28,7 @@ import { FeedbackComponent } from './advanced/feedback/feedback.component';
     SharedModule.forRoot(),
     NgbModule,
     ReactiveFormsModule,
-    WalletRoutingModule,
-    NgDatepickerModule
+    WalletRoutingModule
   ],
   declarations: [
     WalletComponent,

diff --git a/build.sh b/build.sh
@@ -41,7 +41,7 @@ git submodule update --init --recursive
 
 cd $TRAVIS_BUILD_DIR/Breeze.UI
 
-npm install -g cross-env
+npm install
 npm install -g npx
 echo $log_prefix FINISHED restoring dotnet and npm packages