diff --git a/public/views/paperWallet.html b/public/views/paperWallet.html index e3ee4a219..e0f145c14 100644 --- a/public/views/paperWallet.html +++ b/public/views/paperWallet.html @@ -5,63 +5,66 @@
-
-
- -
-
-
-
-
-
-
-
-
- Scanning wallet funds... -
+
+
+
+
+
+
+
+
- -
- - {{paperWallet.error}} -
-
- - + Scanning wallet funds... +
+
+
+ + {{paperWallet.error|translate}} +
+
+
+
+ +
- -
-

{{paperWallet.message}}

-
- -
+ +

+ Decrypting a paper wallet could take around 5 minutes on this device. please be patient and keep the app open. +

+ +
-
-
+
+
+
+

Funds founds

+
+ {{paperWallet.balance}} BTC +
+
+ - Funds will be transfered to the wallet: {{index.alias || index.walletName}} -
-
- +
+
Funds will be transfered to
+ {{index.alias || index.walletName}} +
diff --git a/src/js/controllers/paperWallet.js b/src/js/controllers/paperWallet.js index 5616c74ea..2eecf1432 100644 --- a/src/js/controllers/paperWallet.js +++ b/src/js/controllers/paperWallet.js @@ -1,9 +1,9 @@ angular.module('copayApp.controllers').controller('paperWalletController', - function($scope, $http, $timeout, $rootScope, profileService, go, addressService, isCordova, gettext) { + function($scope, $http, $timeout, profileService, go, addressService, isCordova) { 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; @@ -12,7 +12,6 @@ angular.module('copayApp.controllers').controller('paperWalletController', self.createTx = function(privateKey, passphrase) { self.error = null; self.scanning = true; - $timeout(function() { self.getRawTx(privateKey, passphrase, function(err, rawtx, utxos) { self.scanning = false; @@ -27,7 +26,6 @@ angular.module('copayApp.controllers').controller('paperWalletController', $timeout(function() { $scope.$apply(); }, 1); - }); }, 100); }; @@ -84,4 +82,4 @@ angular.module('copayApp.controllers').controller('paperWalletController', rawtx: rawTx }); }; - }); \ No newline at end of file + });