Fix send, settings and addressbook views

public/views/addressbook.view.html

@@ -18,7 +18,7 @@
         <h3 translate>Name</h3>
         <strong>{{addressbookEntry.name}}</strong>
       </div>
-      <div class="item item-text-wrap">
+      <div class="item item-text-wrap" ng-show="addressbookEntry.email">
         <h3 translate>Email</h3>
         <strong>{{addressbookEntry.email}}</strong>
       </div>

src/js/controllers/addressbookView.js

@@ -2,27 +2,32 @@
 
 angular.module('copayApp.controllers').controller('addressbookViewController', function($scope, $state, $timeout, $stateParams, lodash, addressbookService, popupService, $ionicHistory) {
 
-  var address = $stateParams.address;
+  $scope.$on("$ionicView.beforeEnter", function(event, data){
+    var address = data.stateParams.address;
 
-  if (!address) {
+    if (!address) {
-    $state.go('tabs.addressbook');
+      $ionicHistory.back();
-    return;
-  }
-
-  addressbookService.get(address, function(err, obj) {
-    if (err) {
-      popupService.showAlert(err);
       return;
     }
-    if (!lodash.isObject(obj)) {
+
-      var name = obj;
+    addressbookService.get(address, function(err, obj) {
-      obj = {
+      if (err) {
-        'name': name,
+        popupService.showAlert(err);
-        'address': address,
+        return;
-        'email': ''
+      }
-      };
+      if (!lodash.isObject(obj)) {
-    }
+        var name = obj;
-    $scope.addressbookEntry = obj;
+        obj = {
+          'name': name,
+          'address': address,
+          'email': ''
+        };
+      }
+      $scope.addressbookEntry = obj;
+      $timeout(function() {
+        $scope.$apply();
+      });
+    });
   });
 
   $scope.sendTo = function() {

src/js/controllers/tab-send.js

@@ -3,10 +3,12 @@
 angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService) {
 
   var originalList;
-  var CONTACTS_SHOW_LIMIT = 10;
+  var CONTACTS_SHOW_LIMIT;
-  var currentContactsPage = 0;
+  var currentContactsPage;
 
   var updateList = function() {
+    CONTACTS_SHOW_LIMIT = 10;
+    currentContactsPage = 0;
     originalList = [];
 
     var wallets = profileService.getWallets({
@@ -15,16 +17,18 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
     $scope.hasWallets = lodash.isEmpty(wallets) ? false : true;
     $scope.oneWallet = wallets.length == 1;
 
-    lodash.each(wallets, function(v) {
+    if (!$scope.oneWallet) {
-      originalList.push({
+      lodash.each(wallets, function(v) {
-        color: v.color,
+        originalList.push({
-        name: v.name,
+          color: v.color,
-        isWallet: true,
+          name: v.name,
-        getAddress: function(cb) {
+          isWallet: true,
-          walletService.getAddress(v, false, cb);
+          getAddress: function(cb) {
-        },
+            walletService.getAddress(v, false, cb);
+          },
+        });
       });
-    });
+    }
 
     addressbookService.list(function(err, ab) {
       if (err) $log.error(err);
@@ -50,7 +54,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       $timeout(function() {
         $ionicScrollDelegate.resize();
         $scope.$apply();
-      }, 10);
+      }, 100);
     });
   };
 

src/js/controllers/tab-settings.js

@@ -1,13 +1,12 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $rootScope, $log, $window, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService) {
+angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, $window, uxLanguage, platformInfo, profileService, feeService, configService) {
 
   var updateConfig = function() {
 
     var config = configService.getSync();
     var isCordova = platformInfo.isCordova;
     var isWP = platformInfo.isWP;
-    var isIOS = platformInfo.isIOS;
 
     $scope.usePushNotifications = isCordova && !isWP;
 
@@ -22,13 +21,10 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     $scope.feeOpts = feeService.feeOpts;
     $scope.currentFeeLevel = feeService.getCurrentFeeLevel();
 
-    $scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
-      return w.id != self.walletId;
-    });
     $scope.wallets = profileService.getWallets();
   };
 
-  $scope.$on("$ionicView.enter", function(event, data) {
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
     updateConfig();
   });