anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix conflict

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-02 16:14:09 -03:00
commit cb98f4ce83
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/paperWallet.js
View file

@ -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;