diff --git a/src/pages/receive/receive.html b/src/pages/receive/receive.html index c579da77d..2d972e62c 100644 --- a/src/pages/receive/receive.html +++ b/src/pages/receive/receive.html @@ -1,34 +1,28 @@ - - Receive - - -
- -
- {{ address }} -
-
- +
+
+ -
-
- -
+
-
+
+ No wallet +
+ \ No newline at end of file diff --git a/src/pages/receive/receive.ts b/src/pages/receive/receive.ts index 867e5dc01..7f9e6a6f7 100644 --- a/src/pages/receive/receive.ts +++ b/src/pages/receive/receive.ts @@ -24,19 +24,24 @@ export class ReceivePage { private profileProvider: ProfileProvider, private walletProvider: WalletProvider ) { - this.wallets = this.profileProvider.getWallets(); - this.updateQrAddress(); } ionViewDidLoad() { console.log('ionViewDidLoad ReceivePage'); + } + + ionViewDidEnter() { + this.wallets = this.profileProvider.getWallets(); + this.updateQrAddress(); this.onSelect(this.checkSelectedWallet(this.wallet, this.wallets)); } private onSelect(wallet: any): any { this.wallet = wallet; - this.setProtocolHandler(); - this.setAddress(); + if (this.wallet) { + this.setProtocolHandler(); + this.setAddress(); + } } private setProtocolHandler(): void {