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

fix signing multiple inputs with ledger

This commit is contained in:
Matias Alejo Garcia 2015-09-14 12:12:24 -03:00
parent a313222675
commit 9dc2c40242
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/controllers/walletHome.js
View File

@ -740,9 +740,17 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
return; return;
}; };
var comment = form.comment.$modelValue;
// ToDo: use a credential's (or fc's) function for this
if (comment && !fc.credentials.sharedEncryptingKey) {
var msg = 'Could not add message to imported wallet without shared encrypting key';
$log.warn(msg);
return self.setSendError(gettext(msg));
}
self.setOngoingProcess(gettext('Creating transaction')); self.setOngoingProcess(gettext('Creating transaction'));
$timeout(function() { $timeout(function() {
var comment = form.comment.$modelValue;
var paypro = self._paypro; var paypro = self._paypro;
var address, amount; var address, amount;

2
src/js/services/bwsError.js
View File

@ -103,6 +103,8 @@ angular.module('copayApp.services')
body = err.message || err.code; body = err.message || err.code;
break; break;
} }
} else {
body = gettextCatalog.getString(err);
} }
var msg = prefix + ( body ? ': ' + body : ''); var msg = prefix + ( body ? ': ' + body : '');

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

@ -570,11 +570,10 @@ angular.module('copayApp.services')
if (!result.success) if (!result.success)
return cb(result); return cb(result);
txp.signatures = []; txp.signatures = lodash.map(result.signatures, function(s) {
for (var i=0; i<result.signatures.length; i++) { return s.substring(0, s.length - 2);
txp.signatures.push(result.signatures[i].substring(0, result.signatures[i].length - 2)); });
return fc.signTxProposal(txp, cb); return fc.signTxProposal(txp, cb);
}
}); });
}; };