diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html index e0f145c14..332094c19 100644 --- a/public/views/paperWallet.html +++ b/public/views/paperWallet.html @@ -5,7 +5,7 @@
-
+
@@ -14,7 +14,8 @@
- Scanning wallet funds... + Scanning wallet funds... + Sending funds...
@@ -56,10 +57,11 @@
Funds will be transfered to
diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js index 44135aa1c..29d45a73f 100644 --- a/src/js/controllers/paperWallet.js +++ b/src/js/controllers/paperWallet.js @@ -1,10 +1,9 @@ angular.module('copayApp.controllers').controller('paperWalletController', - function($scope, $http, $timeout, $rootScope, profileService, go, addressService, isCordova, gettext, bitcore) { + function($scope, $http, $timeout, profileService, go, addressService, isCordova, bitcore) { self = this; var fc = profileService.focusedClient; var rawTx; - - if (isCordova) self.message = "Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open." + self.isCordova = isCordova; self.onQrCodeScanned = function(data) { $scope.privateKey = data; @@ -81,12 +80,21 @@ angular.module('copayApp.controllers').controller('paperWalletController', }; self.transaction = function() { - self.doTransaction(rawTx).then(function(err, response) { + self.error = null; + self.sending = true; + $timeout(function() { + self.doTransaction(rawTx).then(function(err, response) { + self.sending = false; self.goHome(); }, function(err) { + self.sending = false; self.error = err.toString(); + $timeout(function() { + $scope.$apply(); + }, 1); }); + }, 100); }; self.goHome = function() {