BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

duplicated toast message and home redirection fixed

This commit is contained in:
Gabriel Masclef 2017-11-22 11:58:49 -03:00
parent a0c8088fc8
commit abbc6b7639
No known key found for this signature in database
GPG Key ID: DD6D7EAADE12280D
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/add/copayers/copayers.html
View File

@ -10,12 +10,12 @@
<ion-content>
<div *ngIf="wallet" [hidden]="wallet.notAuthorized">
<ion-list class="copayers-secret">
<ion-item translate>
Share this invitation with your copayers
<ion-item>
{{ 'Share this invitation with your copayers' | translate }}
</ion-item>
<ion-item>
<div class="qr-code-container" copy-to-clipboard="{{ secret }}">
<qr-code [level]="L" [size]="220" [foreground]="'#334'" [value]="secret" copy-to-clipboard="{{ secret }}"></qr-code>
<qr-code [level]="L" [size]="220" [foreground]="'#334'" [value]="secret"></qr-code>
<div [hidden]="secret" class="spinner">
<ion-spinner></ion-spinner>
</div>

2
src/pages/add/copayers/copayers.ts
View File

@ -27,7 +27,6 @@ export class CopayersPage {
public isCordova: boolean = this.platformProvider.isCordova;
public wallet: any;
public shareIcon: string;
public copayers: any;
public secret: any;
@ -51,7 +50,6 @@ export class CopayersPage {
console.log('ionViewDidLoad CopayersPage');
this.wallet = this.profileProvider.getWallet(this.navParams.data.walletId);
this.updateWallet();
this.shareIcon = this.platformProvider.isIOS ? 'iOS' : 'Android';
this.events.subscribe('bwsEvent', (walletId, type, n) => {
if (this.wallet && walletId == this.wallet.id && type == ('NewCopayer' || 'WalletComplete')) {

22
src/pages/home/home.ts
View File

@ -1,15 +1,20 @@
import { Component } from '@angular/core';
import { NavController } from 'ionic-angular';
import { AddPage } from "../add/add";
import { ProfileProvider } from '../../providers/profile/profile';
import { ReleaseProvider } from '../../providers/release/release';
import { WalletProvider } from '../../providers/wallet/wallet';
import { BwcErrorProvider } from '../../providers/bwc-error/bwc-error';
import { WalletDetailsPage } from '../wallet-details/wallet-details';
import { Logger } from '@nsalaun/ng-logger';
import * as _ from 'lodash';
import * as moment from 'moment';
// Pages
import { AddPage } from "../add/add";
import { CopayersPage } from '../add/copayers/copayers';
import { WalletDetailsPage } from '../wallet-details/wallet-details';
// Providers
import { BwcErrorProvider } from '../../providers/bwc-error/bwc-error';
import { ProfileProvider } from '../../providers/profile/profile';
import { ReleaseProvider } from '../../providers/release/release';
import { WalletProvider } from '../../providers/wallet/wallet';
@Component({
selector: 'page-home',
templateUrl: 'home.html'
@ -27,7 +32,7 @@ export class HomePage {
private walletProvider: WalletProvider,
private bwcErrorProvider: BwcErrorProvider,
private logger: Logger
) {
) {
this.cachedBalanceUpdateOn = '';
}
@ -85,6 +90,9 @@ export class HomePage {
}
goToWalletDetails(wallet: any) {
if (!wallet.isComplete()) {
return this.navCtrl.push(CopayersPage, { walletId: wallet.credentials.walletId });
}
this.navCtrl.push(WalletDetailsPage, { walletId: wallet.credentials.walletId });
}
}