From f57383e2cf6abda0bea28954337dc2e549676580 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 29 Sep 2016 19:52:26 -0300
Subject: [PATCH] Fix receive and copayers views

---
 public/views/copayers.html        |  8 ++---
 public/views/tab-receive.html     |  4 +--
 src/js/controllers/tab-receive.js | 50 +++++++++++++++----------------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/public/views/copayers.html b/public/views/copayers.html
index 62590dba8..89d97ca40 100644
--- a/public/views/copayers.html
+++ b/public/views/copayers.html
@@ -20,7 +20,7 @@
                 <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
               </div>
             </div>
-            <div class="secret" ng-show="!isCordova">
+            <div class="secret">
               {{secret || ('Loading...'|translate)}}
             </div>
           </div>
@@ -29,11 +29,11 @@
 
       <div ng-show="secret">
         <div class="text-center m10t" ng-if="isCordova">
-          <span class="button outline round dark-gray tiny m0"
+          <button class="button button-outline button-positive"
             ng-click="shareSecret()">
-            <i class="fi-share"></i>
+            <i class="icon ion-ios-upload-outline"></i>
             <span translate>Share invitation</span>
-          </span>
+          </button>
         </div>
 
         <div class="m30v line-t">
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 29a605958..cbec1d415 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -9,7 +9,7 @@
   </ion-nav-bar>
   <ion-content>
     <div id="address">
-      <article class="text-center" ng-if="!wallet.isComplete()">
+      <article class="text-center" ng-if="wallet && !wallet.isComplete()">
         <div class="incomplete">
           <div class="title">
             <span translate>Incomplete wallet</span>
@@ -30,7 +30,7 @@
           </div>
         </div>
       </article>
-      <article ng-if="wallet.isComplete()">
+      <article ng-if="wallet && wallet.isComplete()">
         <div class="row backup" ng-show="!wallet.showBackupNeededModal && wallet.needsBackup" ng-click="goToBackupFlow()">
           <div class="m15t text-center col center-block">
             <i class="icon ion-alert"></i><span translate>Wallet not backed up</span><i class="icon ion-ios-arrow-thin-right"></i>
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 9b7b2c672..a5571fed8 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -33,31 +33,13 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
 
     $scope.addr = null;
     $scope.generatingAddress = true;
-    $timeout(function() {
-      walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
-        $scope.generatingAddress = false;
-        if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
-        $scope.addr = addr;
-        if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
-        $scope.$apply();
-      });
-    }, 100);
-
-  };
-
-  $scope.$on("$ionicView.beforeEnter", function(event, data) {
-    if (!$scope.isCordova) $scope.checkTips();
-    $scope.wallets = profileService.getWallets();
-    $scope.$on('Wallet/Changed', function(event, wallet) {
-      if (!wallet) {
-        $log.debug('No wallet provided');
-        return;
-      }
-      $scope.wallet = wallet;
-      $log.debug('Wallet changed: ' + wallet.name);
-      $scope.setAddress();
+    walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
+      $scope.generatingAddress = false;
+      if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
+      $scope.addr = addr;
+      if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
     });
-  });
+  };
 
   $scope.goCopayers = function() {
     $ionicHistory.removeBackView();
@@ -99,5 +81,23 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
       from: 'tabs.receive',
       walletId: $scope.wallet.credentials.walletId
     });
-  }
+  };
+
+  if (!$scope.isCordova) $scope.checkTips();
+  $scope.$on('Wallet/Changed', function(event, wallet) {
+    if (!wallet) {
+      $log.debug('No wallet provided');
+      return;
+    }
+    $scope.wallet = wallet;
+    $log.debug('Wallet changed: ' + wallet.name);
+    $scope.setAddress();
+    $timeout(function() {
+      $scope.$apply();
+    }, 100);
+  });
+
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+    $scope.wallets = profileService.getWallets();
+  });
 });