From f736b80fa4056cbe70fd78bd5bcfd54885067fa7 Mon Sep 17 00:00:00 2001
From: Gabriel Masclef <gabrielmasclef@hotmail.com>
Date: Tue, 31 Oct 2017 16:53:36 -0300
Subject: [PATCH] Fix: Message for receive view when there is no wallets

---
 src/pages/receive/receive.html | 44 +++++++++++++++-------------------
 src/pages/receive/receive.ts   | 13 ++++++----
 2 files changed, 28 insertions(+), 29 deletions(-)

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 @@
-<!--
-  Generated template for the ReceivePage page.
-
-  See http://ionicframework.com/docs/components/#navigation for more info on
-  Ionic pages and navigation.
--->
 <ion-header>
-
   <ion-navbar>
     <ion-title>Receive</ion-title>
   </ion-navbar>
-
 </ion-header>
 
-
 <ion-content padding>
-  <div class="qr-container">
-      <qr-code *ngIf="address" [value]="qrAddress" [level]="M" [size]="220" [foreground]="'#334'"></qr-code>
-      <div>
-        <span>{{ address }}</span>
-      </div>
-      <div>
-        <button [hidden]="!address" class="button-request" (click)="requestSpecificAmount()">
-          <span>Request Specific amount</span>
-          <ion-icon name="arrow-forward"></ion-icon> 
+  <div *ngIf="wallet" class="qr-container">
+    <qr-code *ngIf="address" [value]="qrAddress" [level]="M" [size]="220" [foreground]="'#334'"></qr-code>
+    <div>
+      <span>{{ address }}</span>
+    </div>
+    <div>
+      <button [hidden]="!address" class="button-request" (click)="requestSpecificAmount()">
+        <span>Request Specific amount</span>
+        <ion-icon name="arrow-forward"></ion-icon> 
+      </button>
+    </div>
+    <div>
+      <button [hidden]="!address" class="button-address" (click)="setAddress(true)">
+        <span>Generate new address</span>
         </button>
-      </div>
-      <div>
-        <button [hidden]="!address" class="button-address" (click)="setAddress(true)">
-          <span>Generate new address</span>
-        </button>
-      </div>
+    </div>
   </div>
-</ion-content>
+  <div *ngIf="!wallet">
+    <span>No wallet</span>
+  </div>
+</ion-content>
\ 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 {