From 18c0d829c7b4668a501895d12dd5f8eb39979652 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 30 Sep 2016 12:27:31 -0300
Subject: [PATCH] Fix tab-receibe view. Fix wallet-details

---
 public/views/tab-receive.html       | 37 +++++++++++++++++++++--------
 public/views/walletDetails.html     |  2 +-
 src/js/controllers/tab-home.js      |  2 +-
 src/js/controllers/tab-receive.js   |  3 +++
 src/js/controllers/walletDetails.js |  7 +-----
 src/sass/views/tab-receive.scss     |  5 +++-
 6 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index cbec1d415..8de6a921a 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -8,7 +8,27 @@
     </ion-nav-buttons>
   </ion-nav-bar>
   <ion-content>
-    <div id="address">
+    <div class="list card padding text-center" ng-if="!wallets[0]">
+      <span translate>No Wallet</span>
+    </div>
+    <div id="address" ng-if="wallets[0]">
+      <article class="text-center" ng-if="!wallet">
+        <div class="row qr">
+          <div class="text-center col center-block">
+            <div style="height:225px; width:220px; margin:auto; background: white; padding-top: 25%;">
+              ...
+            </div>
+          </div>
+        </div>
+        <div class="row border-top">
+          <div class="col col-90 center-block bit-address text-center">
+            <div class="item item-icon-left">
+              <i class="icon ion-social-bitcoin-outline"></i>
+              <span class="bit-address-gen-address">...</span>
+            </div>
+          </div>
+        </div>
+      </article>
       <article class="text-center" ng-if="wallet && !wallet.isComplete()">
         <div class="incomplete">
           <div class="title">
@@ -32,14 +52,14 @@
       </article>
       <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">
+          <div class="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>
           </div>
         </div>
         <div class="row qr">
-          <div class="m15t text-center col center-block" copy-to-clipboard="addr">
+          <div class="text-center col center-block" copy-to-clipboard="addr">
             <qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}"></qrcode>
-            <div ng-if="!addr" style="height:220px; width:220px; margin:auto; background: white; padding-top: 20%;">
+            <div ng-if="!addr" style="height:225px; width:220px; margin:auto; background: white; padding-top: 25%;">
               ...
             </div>
           </div>
@@ -62,18 +82,15 @@
           <div class="col col-90 center-block bit-address text-center">
             <div class="item item-icon-left">
               <i class="icon ion-social-bitcoin-outline"></i>
-              <span ng-if="generatingAddress">...</span>
+              <span class="bit-address-gen-address" ng-if="generatingAddress">...</span>
               <span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
             </div>
           </div>
         </div>
       </article>
     </div>
-    <article id="wallets">
-      <div class="list card padding text-center" ng-if="!wallets[0]">
-        <span translate>No Wallet</span>
-      </div>
-      <div class="list" ng-if="wallets[0]">
+    <article id="wallets" ng-if="wallets[0]">
+      <div class="list">
         <wallets wallets="wallets"></wallets>
       </div>
     </article>
diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html
index e630506f3..cbb759b6a 100644
--- a/public/views/walletDetails.html
+++ b/public/views/walletDetails.html
@@ -111,7 +111,7 @@
         No transactions yet
       </div>
 
-      <div ng-show="updatingTxHistory && updatingTxHistoryProgress>5" class="updatingHistory">
+      <div ng-show="updatingTxHistory" class="updatingHistory">
         <div  class="row" >
             <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
         </div>
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 5fd146fa5..7cc36c532 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
   function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService) {
     var wallet;
     var listeners = [];
+    var notifications = [];
     $scope.externalServices = {};
     $scope.bitpayCardEnabled = true; // TODO
     $scope.openTxpModal = txpModalService.open;
@@ -102,7 +103,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       var i = $scope.wallets.length;
       var j = 0;
       var timeSpan = 60 * 60 * 24 * 7;
-      var notifications = [];
 
       lodash.each($scope.wallets, function(wallet) {
         walletService.getStatus(wallet, {}, function(err, status) {
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index a5571fed8..bd4641d40 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -38,6 +38,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
       if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
       $scope.addr = addr;
       if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
+      $timeout(function() {
+        $scope.$apply();
+      }, 100);
     });
   };
 
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 4bcdbebbd..83cf90735 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -122,9 +122,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
       $scope.updatingTxHistoryProgress = txs ? txs.length : 0;
       $scope.completeTxHistory = txs;
       $scope.showHistory();
-      $timeout(function() {
-        $scope.$apply();
-      });
     };
 
     $timeout(function() {
@@ -139,9 +136,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
         }
         $scope.completeTxHistory = txHistory;
         $scope.showHistory();
-        $timeout(function() {
-          $scope.$apply();
-        });
+        $scope.$apply();
         return cb();
       });
     });
diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss
index e24ba8739..0bdbdbb88 100644
--- a/src/sass/views/tab-receive.scss
+++ b/src/sass/views/tab-receive.scss
@@ -11,6 +11,7 @@
     background: #fff;
     .incomplete {
       padding: 50px;
+      height: 350px;
       .title {
         padding: 20px;
         font-size: 25px;
@@ -44,11 +45,13 @@
       &-gen-address {}
     }
     .qr {
-      padding: 30px;
+      padding: 50px 0 20px 0;
     }
     .backup {
       background-color: orange;
       color: #fff;
+      position: absolute;
+      top: 5px;
       i {
         padding: 10px;
       }