Minor bug fixes

src/js/controllers/addressbook.js

@@ -20,6 +20,9 @@ angular.module('copayApp.controllers').controller('addressbookListController', f
       });
 
       $scope.addressbook = lodash.clone(contacts);
+      $timeout(function() {
+        $scope.$apply();
+      }, 100);
     });
   };
 

src/js/controllers/confirm.js

@@ -89,13 +89,16 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
 
   $scope.showDescriptionPopup = function() {
-    var title = gettextCatalog.getString('Add description');
+    var message = gettextCatalog.getString('Add description');
     var opts = {
       defaultText: $scope.description
     };
 
-    popupService.showPrompt(title, null, opts, function(res) {
+    popupService.showPrompt(null, message, opts, function(res) {
       if (res) $scope.description = res;
+      $timeout(function() {
+        $scope.$apply();
+      }, 100);
     });
   };
 

src/js/controllers/modals/txStatus.js

@@ -16,6 +16,7 @@ angular.module('copayApp.controllers').controller('txStatusController', function
       disableAnimate: true,
       disableBack: true
     });
+    $ionicHistory.removeBackView();
     $state.go('tabs.send.addressbook', {
       fromSendTab: true,
       addressbookEntry: addressbookEntry

src/js/controllers/tab-receive.js

@@ -5,10 +5,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
   $scope.isCordova = platformInfo.isCordova;
   $scope.isNW = platformInfo.isNW;
 
-  $scope.wallets = profileService.getWallets({
-    onlyComplete: true
-  });
-
   $scope.checkTips = function(force) {
     storageService.getReceiveTipsAccepted(function(err, accepted) {
       if (err) $log.warn(err);
@@ -25,16 +21,6 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     });
   };
 
-  $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();
-  });
-
   $scope.shareAddress = function(addr) {
     if ($scope.generatingAddress) return;
     if ($scope.isCordova) {
@@ -61,5 +47,19 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     }, 1);
   };
 
-  if (!$scope.isCordova) $scope.checkTips();
+  $scope.$on("$ionicView.enter", function(event, data) {
+    if (!$scope.isCordova) $scope.checkTips();
+    $scope.wallets = profileService.getWallets({
+      onlyComplete: true
+    });
+    $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();
+    });
+  });
 });

src/sass/views/confirm.scss

@@ -12,6 +12,16 @@
      bottom: 49px;
      width: 100%;
      height: 100px;
-     background-color: #f5f5f5;
-   }
+     background-color: #647CE8;
+     color: #ffffff;
+     font-size: 25px;
+     text-align: center;
+     padding-top: 34px;
+     line-height: 32px;
+  }
+  .accept-slide i {
+    float: right;
+    font-size: 32px;
+    margin-right: 20px;
+  }
 }