Skip to content

Commit

Permalink
Merge branch 'release/1.1.0-RC2' of https://github.com/particl/partic…
Browse files Browse the repository at this point in the history
…l-desktop into release/1.1.0-RC2

Conflicts:
	src/app/wallet/overview/widgets/coldstake/coldstake.component.ts
  • Loading branch information
kewde committed Jan 21, 2018
2 parents 3e66db8 + 9466d55 commit 021b364
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Log } from 'ng2-logger';
import { Observable } from 'rxjs/Observable';
import { Subscription } from 'rxjs/Subscription';


import { ModalsService } from 'app/modals/modals.service';
import { RpcService } from 'app/core/rpc/rpc.module';

Expand Down Expand Up @@ -63,8 +62,9 @@ export class ColdstakeComponent implements OnDestroy {
}

ngOnDestroy() {
if (this.obsprogress)
if (this.obsprogress) {
this.obsprogress.unsubscribe();
}
}

private stakingStatus() {
Expand Down

0 comments on commit 021b364

Please sign in to comment.