From a25292fb559dd7a8eaf9c29c97be5f1bc57a7af2 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 24 Nov 2016 16:26:15 -0300 Subject: [PATCH] fix apply --- src/js/controllers/confirm.js | 14 ++++++++------ www/views/tab-send.html | 11 ----------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 7dc98407e..4309c8668 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -275,11 +275,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.wallet = wallet; $scope.fee = $scope.txp = null; - $timeout(function() { - $ionicScrollDelegate.resize(); - $scope.$apply(); - }); - if (stop) { $timeout.cancel(stop); stop = null; @@ -296,6 +291,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); }, delayed ? 2000 : 1); } + + $timeout(function() { + $ionicScrollDelegate.resize(); + $scope.$apply(); + }); }; var setSendError = function(msg) { @@ -309,7 +309,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( function apply(txp) { $scope.fee = txFormatService.formatAmountStr(txp.fee); $scope.txp = txp; - $scope.$apply(); + $timeout(function() { + $scope.$apply(); + }); }; var createTx = function(wallet, dryRun, cb) { diff --git a/www/views/tab-send.html b/www/views/tab-send.html index 45d7c86de..805eb616d 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -20,17 +20,6 @@
Recipient
-