Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book

public/views/buyAmazon.html

@@ -42,7 +42,7 @@
                    ng-attr-placeholder="{{'Amount in USD'}}"
                    min="0.01"
                    max="500"
-                   ng-model="fiat"
+                   ng-model="formData.fiat"
                    ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/"
                    step="0.01"
                    autocomplete="off" ignore-mouse-wheel required>
@@ -53,7 +53,7 @@
         <wallets ng-if="wallets[0]" wallets="wallets"></wallets>
 
         <button class="button button-block button-positive"
-                ng-disabled="!fiat"
+                ng-disabled="!formData.fiat"
                 type="submit">
           Buy now
         </button>

public/views/modals/tx-details.html

@@ -75,7 +75,7 @@
       </div>
 
       <div class="item">
-        <div ng-if="btx.action == 'received'">
+        <div ng-if="btx.action == 'received' || 'moved'">
           <span translate>Date</span>
           <span class="item-note">
             <time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>

public/views/preferences.html

@@ -19,7 +19,7 @@
       <a class="item" ng-show="wallet.isPrivKeyExternal()">
         <span translate>Hardware Wallet</span>
         <span class="item-note">
-          {{wallet.externalSource}}
+          {{externalSource}}
         </span>
       </div>
       <a class="item item-icon-right" ui-sref="tabs.preferences.preferencesColor">
@@ -45,12 +45,12 @@
         <i class="icon nav-item-arrow-right"></i>
       </a>
       <div ng-show="wallet.canSign()">
-        <ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()">
+        <ion-toggle ng-model="encryptEnabled.value" toggle-class="toggle-balanced" ng-change="encryptChange()">
           <span class="toggle-label" translate>Request Spending Password</span>
         </ion-toggle>
       </div>
       <div ng-show="wallet.canSign() && touchIdAvailable">
-        <ion-toggle  ng-model="touchIdEnabled" toggle-class="toggle-balanced" ng-change="touchIdChange()">
+        <ion-toggle  ng-model="touchIdEnabled.value" toggle-class="toggle-balanced" ng-change="touchIdChange()">
           <span class="toggle-label" translate>Request Fingerprint</span>
         </ion-toggle>
       </div>

public/views/preferencesAlias.html

@@ -11,7 +11,7 @@
       <div class="card list">
         <label class="item item-input item-stacked-label">
           <span class="input-label" transalate>Alias for {{walletName}}</span>
-          <input type="text" id="alias" name="alias" ng-model="alias" placeholder="John" required>
+          <input type="text" id="alias" name="alias" ng-model="alias.value" placeholder="John" required>
         </label>
       </div>
       <button type="submit"

public/views/preferencesBwsUrl.html

@@ -9,7 +9,7 @@
     <div class="card list">
       <label class="item item-input item-stacked-label no-border">
         <span class="input-label">Wallet Service URL</span>
-        <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl">
+        <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl.value">
         <a class="postfix" on-tap="resetDefaultUrl()">
           <i class="icon ion-ios-reload"></i>
         </a>

public/views/preferencesEmail.html

@@ -11,7 +11,7 @@
       <div class="card list">
         <label class="item item-input item-stacked-label">
           <span class="input-label" transalate>Email for wallet notifications</span>
-          <input type="email" id="email" name="email" ng-model="email" required></input>
+          <input type="email" id="email" name="email" ng-model="email.value" required></input>
         </label>
       </div>
       <button type="submit"

public/views/tab-export-file.html

@@ -29,7 +29,7 @@
     </ion-checkbox>
   </div>
 
-  <div class="box-notification error" ng-show="!canSign">
+  <div class="box-notification error ng-hide" ng-show="!canSign">
     <span class="size-14">
       <i class="ion-alert-circled"></i>
       <span translate>
@@ -38,7 +38,7 @@
     </span>
   </div>
 
-  <div class="box-notification error" ng-show="formData.noSignEnabled">
+  <div class="box-notification error ng-hide" ng-show="formData.noSignEnabled">
     <span class="size-14">
       <i class="ion-alert-circled"></i>
       <span translate>

public/views/tab-send.html

@@ -10,8 +10,8 @@
         <i class="icon ion-search placeholder-icon"></i>
         <input type="text"
                placeholder="Search or enter bitcoin address"
-               ng-model="search"
+               ng-model="formData.search"
-               ng-change="findContact(search)"
+               ng-change="findContact(formData.search)"
                ng-model-onblur>
       </label>
     </div>

src/js/controllers/addressbookAdd.js

@@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
   };
 
   $scope.goHome = function() {
-    $ionicHistory.clearHistory();
+    $ionicHistory.removeBackView();
     $state.go('tabs.home');
   };
 

src/js/controllers/amazon.js

@@ -3,12 +3,13 @@
 angular.module('copayApp.controllers').controller('amazonController',
   function($scope, $timeout, $ionicModal, $log, lodash, bwcError, amazonService, platformInfo, externalLinkService, popupService) {
 
+    $scope.network = amazonService.getEnvironment();
+
     $scope.openExternalLink = function(url, target) {
       externalLinkService.open(url, target);
     };
 
     var initAmazon = function() {
-      $scope.network = amazonService.getEnvironment();
       amazonService.getPendingGiftCards(function(err, gcds) {
         if (err) {
           popupService.showAlert(err);
@@ -82,7 +83,7 @@ angular.module('copayApp.controllers').controller('amazonController',
       });
     };
 
-    $scope.$on("$ionicView.enter", function(event, data){
+    $scope.$on("$ionicView.beforeEnter", function(event, data){
       initAmazon();
     });
   });

src/js/controllers/amount.js

@@ -10,7 +10,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
   var SMALL_FONT_SIZE_LIMIT = 13;
   var LENGTH_EXPRESSION_LIMIT = 19;
 
-  $scope.$on("$ionicView.enter", function(event, data){
+  $scope.toAddress = $stateParams.toAddress;
+  $scope.toName = $stateParams.toName;
+  $scope.toEmail = $stateParams.toEmail;
+
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
 
     if (!$stateParams.toAddress) {
       $log.error('Bad params at amount')
@@ -46,11 +50,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
       angular.element($window).off('keydown');
     });
 
-
-    $scope.toAddress = $stateParams.toAddress;
-    $scope.toName = $stateParams.toName;
-    $scope.toEmail = $stateParams.toEmail;
-
     var config = configService.getSync().wallet.settings;
     $scope.unitName = config.unitName;
     $scope.alternativeIsoCode = config.alternativeIsoCode;

src/js/controllers/backup.js

@@ -97,7 +97,7 @@ angular.module('copayApp.controllers').controller('backupController',
       if ($stateParams.fromOnboarding) {
         $state.go('onboarding.disclaimer');
       } else {
-        $ionicHistory.clearHistory();
+        $ionicHistory.removeBackView();
         $state.go('tabs.home');
       }
     };

src/js/controllers/buyAmazon.js

@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
   function($scope, $log, $timeout, $state, lodash, profileService, bwcError, gettextCatalog, configService, walletService, amazonService, ongoingProcess, platformInfo, externalLinkService, popupService) {
 
     var self = this;
+    var network = amazonService.getEnvironment();
     var wallet;
 
     $scope.$on('Wallet/Changed', function(event, w) {
@@ -20,7 +21,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
     };
 
     this.confirm = function() {
-      var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat});
+      var message = gettextCatalog.getString('Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.formData.fiat});
       var ok = gettextCatalog.getString('Buy');
       popupService.showConfirm(null, message, ok, null, function(res) {
         if (res) self.createTx();
@@ -40,7 +41,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
 
       var dataSrc = {
         currency: 'USD',
-        amount: $scope.fiat,
+        amount: $scope.formData.fiat,
         uuid: wallet.id
       };
       var outputs = [];
@@ -209,7 +210,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
     };
 
     $scope.$on("$ionicView.enter", function(event, data){
-      var network = amazonService.getEnvironment();
+      $scope.formData = { fiat: null };
       $scope.wallets = profileService.getWallets({
         network: network,
         onlyComplete: true

src/js/controllers/buyGlidera.js

@@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
     var self = this;
     this.show2faCodeInput = null;
     this.success = null;
+    $scope.network = glideraService.getEnvironment();
 
     $scope.$on('Wallet/Changed', function(event, w) {
       if (lodash.isEmpty(w)) {
@@ -116,9 +117,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
     };
 
     $scope.$on("$ionicView.enter", function(event, data){
-      $scope.network = glideraService.getEnvironment();
+      $scope.token = null;
-
-      $scope.token = accessToken;
       $scope.permissions = null;
       $scope.email = null;
       $scope.personalInfo = null;

src/js/controllers/confirm.js

@@ -4,6 +4,16 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 
+  $scope.toAddress = $stateParams.toAddress;
+  $scope.toName = $stateParams.toName;
+  $scope.toEmail = $stateParams.toEmail;
+  $scope.description = $stateParams.description;
+  $scope.paypro = $stateParams.paypro;
+
+  $scope.$on("$ionicView.enter", function(event, data) {
+    initConfirm();
+  });
+
   var initConfirm = function() {
     if ($stateParams.paypro) {
       return setFromPayPro($stateParams.paypro, function(err) {
@@ -26,12 +36,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     var amount = $scope.toAmount = parseInt($stateParams.toAmount);
     $scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
 
-    $scope.toAddress = $stateParams.toAddress;
-    $scope.toName = $stateParams.toName;
-    $scope.toEmail = $stateParams.toEmail;
-    $scope.description = $stateParams.description;
-    $scope.paypro = $stateParams.paypro;
-
     var networkName = (new bitcore.Address($scope.toAddress)).network.name;
     $scope.network = networkName;
 
@@ -309,8 +313,4 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   $scope.cancel = function() {
     $state.go('tabs.send');
   };
-
-  $scope.$on("$ionicView.enter", function(event, data) {
-    initConfirm();
-  });
 });

src/js/controllers/create.js

@@ -175,12 +175,11 @@ angular.module('copayApp.controllers').controller('createController',
           if ($scope.seedSource.id == 'set') {
             profileService.setBackupFlag(client.credentials.walletId);
           }
-
+          $ionicHistory.removeBackView();
           if (!client.isComplete()) {
             $ionicHistory.nextViewOptions({
               disableAnimate: true
             });
-            $ionicHistory.removeBackView();
             $state.go('tabs.home');
             $timeout(function() {
               $state.transitionTo('tabs.copayers', {

src/js/controllers/export.js

@@ -71,7 +71,7 @@ angular.module('copayApp.controllers').controller('exportController',
             popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Failed to export'));
             return;
           }
-          $ionicHistory.clearHistory();
+          $ionicHistory.removeBackView();
           $state.go('tabs.home');
         });
       });
@@ -158,7 +158,7 @@ angular.module('copayApp.controllers').controller('exportController',
       });
     };
 
-    $scope.$on("$ionicView.enter", function(event, data){
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
       init();
     });
 

src/js/controllers/glidera.js

@@ -3,13 +3,13 @@
 angular.module('copayApp.controllers').controller('glideraController',
   function($scope, $timeout, $ionicModal, $log, storageService, glideraService, ongoingProcess, platformInfo, externalLinkService, popupService, gettextCatalog) {
 
+    $scope.network = glideraService.getEnvironment();
+
     $scope.openExternalLink = function(url, target) {
       externalLinkService.open(url, target);
     };
 
     var initGlidera = function(accessToken) {
-      $scope.network = glideraService.getEnvironment();
-
       $scope.token = null;
       $scope.permissions = null;
       $scope.email = null;
@@ -113,7 +113,7 @@ angular.module('copayApp.controllers').controller('glideraController',
       });
     };
 
-    $scope.$on("$ionicView.enter", function(event, data){
+    $scope.$on("$ionicView.beforeEnter", function(event, data){
       initGlidera();
     });
 

src/js/controllers/import.js

@@ -345,6 +345,7 @@ angular.module('copayApp.controllers').controller('importController',
           if (err) $log.error(err);
         });
       }
+      $ionicHistory.removeBackView();
       $state.go('tabs.home', {
         fromOnboarding: $stateParams.fromOnboarding
       });

src/js/controllers/join.js

@@ -145,7 +145,7 @@ angular.module('copayApp.controllers').controller('joinController',
           walletService.updateRemotePreferences(client, {}, function() {
             $log.debug('Remote preferences saved for:' + client.credentials.walletId)
           });
-
+          $ionicHistory.removeBackView();
           $state.go('tabs.home');
         });
       }, 100);

src/js/controllers/modals/txStatus.js

@@ -3,11 +3,14 @@
 angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) {
 
   if ($scope.cb) $timeout($scope.cb, 100);
+  $scope.fromSendTab = $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount";
 
   $scope.cancel = function() {
-    $ionicHistory.clearHistory();
-    $state.go('tabs.home');
     $scope.txStatusModal.hide();
+    if ($scope.fromSendTab) {
+      $ionicHistory.removeBackView();
+      $state.go('tabs.home');
+    }
   };
 
   $scope.save = function(addressbookEntry) {
@@ -23,7 +26,6 @@ angular.module('copayApp.controllers').controller('txStatusController', function
     });
   }
 
-  $scope.fromSendTab = $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount";
   addressbookService.list(function(err, ab) {
     if (err) $log.error(err);
     if (ab[$scope.tx.toAddress]) {

src/js/controllers/paperWallet.js

@@ -96,7 +96,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
             popupService.showAlert(gettextCatalog.getString('Error sweeping wallet:'), err || err.toString());
           } else {
             $scope.openStatusModal('broadcasted', function() {
-              $ionicHistory.clearHistory();
+              $ionicHistory.removeBackView();
               $state.go('tabs.home');
             });
           }
@@ -120,7 +120,7 @@ angular.module('copayApp.controllers').controller('paperWalletController',
       });
     };
 
-    $scope.$on("$ionicView.enter", function(event, data){
+    $scope.$on("$ionicView.enter", function(event, data) {
       var wallet = profileService.getWallet($stateParams.walletId);
       $scope.wallet = wallet;
       $scope.isCordova = platformInfo.isCordova;

src/js/controllers/paymentUri.js

@@ -47,7 +47,7 @@ angular.module('copayApp.controllers').controller('paymentUriController',
     this.selectWallet = function(wid) {
       var self = this;
       profileService.setAndStoreFocus(wid, function() {});
-      $ionicHistory.clearHistory();
+      $ionicHistory.removeBackView();
       $state.go('tabs.home');
       $timeout(function() {
         $rootScope.$emit('paymentUri', self.bitcoinURI);

src/js/controllers/preferences.js

@@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
 
     $scope.encryptChange = function() {
       if (!wallet) return;
-      var val = $scope.encryptEnabled;
+      var val = $scope.encryptEnabled.value;
 
       if (val && !walletService.isEncrypted(wallet)) {
         $log.debug('Encrypting private key for', wallet.name);
@@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
             $log.warn(err);
 
             // ToDo show error?
-            $scope.encryptEnabled = false;
+            $scope.encryptEnabled.value = false;
             return;
           }
           profileService.updateCredentials(JSON.parse(wallet.export()), function() {
@@ -31,7 +31,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
             $log.warn(err);
 
             // ToDo show error?
-            $scope.encryptEnabled = true;
+            $scope.encryptEnabled.value = true;
             return;
           }
           profileService.updateCredentials(JSON.parse(wallet.export()), function() {
@@ -43,10 +43,10 @@ angular.module('copayApp.controllers').controller('preferencesController',
     };
 
     $scope.touchIdChange = function() {
-      var newStatus = $scope.touchIdEnabled;
+      var newStatus = $scope.touchIdEnabled.value;
       walletService.setTouchId(wallet, !!newStatus, function(err) {
         if (err) {
-          $scope.touchIdEnabled = !newStatus;
+          $scope.touchIdEnabled.value = !newStatus;
           $timeout(function() {
             $scope.$apply();
           }, 1);
@@ -56,7 +56,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
       });
     };
 
-    $scope.$on("$ionicView.beforeEnter", function(event, data){
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
       $scope.externalSource = null;
 
       if (!wallet)
@@ -64,12 +64,17 @@ angular.module('copayApp.controllers').controller('preferencesController',
 
       var config = configService.getSync();
 
-      $scope.encryptEnabled = walletService.isEncrypted(wallet);
+      $scope.encryptEnabled = {
+        value: walletService.isEncrypted(wallet)
+      };
+
       if (wallet.isPrivKeyExternal)
         $scope.externalSource = wallet.getPrivKeyExternalSourceName() == 'ledger' ? 'Ledger' : 'Trezor';
 
       $scope.touchIdAvailable = fingerprintService.isAvailable();
-      $scope.touchIdEnabled = config.touchIdFor ? config.touchIdFor[walletId] : null;
+      $scope.touchIdEnabled = {
+        value: config.touchIdFor ? config.touchIdFor[walletId] : null
+      };
 
       $scope.deleted = false;
       if (wallet.credentials && !wallet.credentials.mnemonicEncrypted && !wallet.credentials.mnemonic) {

src/js/controllers/preferencesAlias.js

@@ -3,18 +3,20 @@
 angular.module('copayApp.controllers').controller('preferencesAliasController',
   function($scope, $timeout, $stateParams, $ionicHistory, gettextCatalog, configService, profileService, walletService) {
     var wallet = profileService.getWallet($stateParams.walletId);
-    $scope.wallet = wallet;
     var walletId = wallet.credentials.walletId;
     var config = configService.getSync();
 
     $scope.walletName = wallet.credentials.walletName;
-    $scope.alias = (config.aliasFor && config.aliasFor[walletId]) || wallet.walletName;
+    $scope.alias = {
+      value: (config.aliasFor && config.aliasFor[walletId]) || wallet.credentials.walletName
+    };
 
     $scope.save = function() {
       var opts = {
         aliasFor: {}
       };
-      opts.aliasFor[walletId] = $scope.alias;
+
+      opts.aliasFor[walletId] = $scope.alias.value;
 
       configService.set(opts, function(err) {
         if (err) $log.warn(err);

src/js/controllers/preferencesBwsUrl.js

@@ -9,16 +9,18 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
     var defaults = configService.getDefaults();
     var config = configService.getSync();
 
-    $scope.bwsurl = (config.bwsFor && config.bwsFor[walletId]) || defaults.bws.url;
+    $scope.bwsurl = {
+      value: (config.bwsFor && config.bwsFor[walletId]) || defaults.bws.url
+    };
 
     $scope.resetDefaultUrl = function() {
-      $scope.bwsurl = defaults.bws.url;
+      $scope.bwsurl.value = defaults.bws.url;
     };
 
     $scope.save = function() {
 
       var bws;
-      switch ($scope.bwsurl) {
+      switch ($scope.bwsurl.value) {
         case 'prod':
         case 'production':
           bws = 'https://bws.bitpay.com/bws/api'
@@ -34,13 +36,13 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
       };
       if (bws) {
         $log.info('Using BWS URL Alias to ' + bws);
-        $scope.bwsurl = bws;
+        $scope.bwsurl.value = bws;
       }
 
       var opts = {
         bwsFor: {}
       };
-      opts.bwsFor[walletId] = $scope.bwsurl;
+      opts.bwsFor[walletId] = $scope.bwsurl.value;
 
       configService.set(opts, function(err) {
         if (err) $log.debug(err);

src/js/controllers/preferencesEmail.js

@@ -7,16 +7,18 @@ angular.module('copayApp.controllers').controller('preferencesEmailController',
 
   var config = configService.getSync();
   config.emailFor = config.emailFor || {};
-  $scope.email = config.emailFor && config.emailFor[walletId];
+  $scope.email = {
+    value: config.emailFor && config.emailFor[walletId]
+  };
 
-  $scope.save = function(form) {
+  $scope.save = function() {
     var opts = {
       emailFor: {}
     };
-    opts.emailFor[walletId] = $scope.email;
+    opts.emailFor[walletId] = $scope.email.value;
 
     walletService.updateRemotePreferences(wallet, {
-      email: $scope.email,
+      email: $scope.email.value,
     }, function(err) {
       if (err) $log.warn(err);
       configService.set(opts, function(err) {

src/js/controllers/preferencesHistory.js

@@ -125,13 +125,13 @@ angular.module('copayApp.controllers').controller('preferencesHistory',
         $scope.$emit('Local/ClearHistory');
 
         $timeout(function() {
-          $ionicHistory.clearHistory();
+          $ionicHistory.removeBackView();
           $state.go('tabs.home');
         }, 100);
       });
     };
 
-    $scope.$on("$ionicView.enter", function(event, data){
+    $scope.$on("$ionicView.enter", function(event, data) {
       $scope.csvHistory();
     });
   });

src/js/controllers/preferencesInformation.js

@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesInformation',
-  function($scope, $log, $timeout, $ionicHistory, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) {
+  function($scope, $log, $timeout, $ionicHistory, $ionicScrollDelegate, platformInfo, gettextCatalog, lodash, profileService, configService, $stateParams, walletService, $state) {
     var base = 'xpub';
     var wallet = profileService.getWallet($stateParams.walletId);
     var walletId = wallet.id;
@@ -65,7 +65,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
         opts.colorFor[walletId] = color;
 
         configService.set(opts, function(err) {
-          $ionicHistory.clearHistory();
+          $ionicHistory.removeBackView();
           $state.go('tabs.home');
           if (err) $log.warn(err);
         });
@@ -77,11 +77,11 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
 
     $scope.scan = function() {
       walletService.startScan(wallet);
-      $ionicHistory.clearHistory();
+      $ionicHistory.removeBackView();
       $state.go('tabs.home');
     };
 
-    $scope.$on("$ionicView.enter", function(event, data){
+    $scope.$on("$ionicView.enter", function(event, data) {
       var c = wallet.credentials;
       var basePath = c.getBaseAddressDerivationPath();
 
@@ -116,7 +116,7 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
         $timeout(function() {
           $scope.$apply();
         });
-
+        $ionicScrollDelegate.resize();
       });
     });
 

src/js/controllers/preferencesLogs.js

@@ -3,32 +3,33 @@
 angular.module('copayApp.controllers').controller('preferencesLogs',
   function($scope, historicLog, gettextCatalog) {
 
-    $scope.prepare = function() {
+    $scope.$on("$ionicView.enter", function(event, data) {
-      var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
-      log += '\n\n';
-      log += $scope.logs.map(function(v) {
-        return v.msg;
-      }).join('\n');
-
-      return log;
-    };
-
-    $scope.sendLogs = function() {
-      var body = $scope.prepare();
-
-      window.plugins.socialsharing.shareViaEmail(
-        body,
-        'Copay Logs',
-        null, // TO: must be null or an array
-        null, // CC: must be null or an array
-        null, // BCC: must be null or an array
-        null, // FILES: can be null, a string, or an array
-        function() {},
-        function() {}
-      );
-    };
-
-    $scope.$on("$ionicView.enter", function(event, data){
       $scope.logs = historicLog.get();
+
+      $scope.prepare = function() {
+        var log = 'Copay Session Logs\n Be careful, this could contain sensitive private data\n\n';
+        log += '\n\n';
+        log += $scope.logs.map(function(v) {
+          return v.msg;
+        }).join('\n');
+
+        return log;
+      };
+
+      $scope.sendLogs = function() {
+        var body = $scope.prepare();
+
+        window.plugins.socialsharing.shareViaEmail(
+          body,
+          'Copay Logs',
+          null, // TO: must be null or an array
+          null, // CC: must be null or an array
+          null, // BCC: must be null or an array
+          null, // FILES: can be null, a string, or an array
+          function() {},
+          function() {}
+        );
+      };
+
     });
   });

src/js/controllers/sellGlidera.js

@@ -8,6 +8,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
     this.show2faCodeInput = null;
     this.success = null;
     var wallet;
+    $scope.network = glideraService.getEnvironment();
 
     $scope.$on('Wallet/Changed', function(event, w) {
       if (lodash.isEmpty(w)) {
@@ -189,9 +190,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
     };
 
     $scope.$on("$ionicView.enter", function(event, data){
-      $scope.network = glideraService.getEnvironment();
+      $scope.token = null;
-
-      $scope.token = accessToken;
       $scope.permissions = null;
       $scope.email = null;
       $scope.personalInfo = null;

src/js/controllers/tab-send.js

@@ -84,6 +84,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
   };
 
   $scope.$on("$ionicView.enter", function(event, data){
+    $scope.formData = { search: null };
     updateList();
   });
 

src/js/controllers/tab-settings.js

@@ -28,10 +28,16 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
         $scope.$digest();
       });
     }
-    $scope.spendUnconfirmed = {value : config.wallet.spendUnconfirmed};
+    $scope.spendUnconfirmed = {
-    $scope.glideraEnabled = {value: config.glidera.enabled};
+      value: config.wallet.spendUnconfirmed
+    };
+    $scope.glideraEnabled = {
+      value: config.glidera.enabled
+    };
     $scope.coinbaseEnabled = config.coinbase.enabled;
-    $scope.pushNotifications = {value: config.pushNotifications.enabled};
+    $scope.pushNotifications = {
+      value: config.pushNotifications.enabled
+    };
     $scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) {
       return w.id != self.walletId;
     });
@@ -94,7 +100,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
     });
   };
 
-  $scope.$on("$ionicView.enter", function(event, data){
+  $scope.$on("$ionicView.enter", function(event, data) {
     updateConfig();
   });
 

src/js/services/applicationService.js

@@ -19,7 +19,7 @@ angular.module('copayApp.services')
         if (isChromeApp) {
           chrome.runtime.reload();
         } else if (isNW) {
-          $ionicHistory.clearHistory();
+          $ionicHistory.removeBackView();
           $state.go('tabs.home');
           $timeout(function() {
             var win = require('nw.gui').Window.get();