BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5074 from JDonadio/fix/import-from-file 

Fix importing wallet from file
This commit is contained in:
Gustavo Maximiliano Cortez 2016-11-17 16:12:47 -03:00 committed by GitHub
parent 0a4db7430d 61c5f34b6a
commit 15dabe859a
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/services/profileService.js
View File

@ -598,14 +598,6 @@ angular.module('copayApp.services')
return cb(gettext('Could not import. Check input file and spending password'));
}
if (walletClient.hasPrivKeyEncrypted()) {
try {
walletClient.disablePrivateKeyEncryption();
} catch (e) {
$log.warn(e);
}
}
str = JSON.parse(str);
if (!str.n) {
@ -862,7 +854,7 @@ angular.module('copayApp.services')
var finale = shown; // GROUPING DISABLED!
var finale = [],
prev;
prev;
// Item grouping... DISABLED.