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

manual rebase to https://github.com/bitpay/copay/pull/3313

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-11-04 11:18:00 -03:00
commit 5214074d05
7 changed files with 18 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/services/hwWallet.js
View file

@ -13,7 +13,7 @@ angular.module('copayApp.services')
root._err = function(data) {
var msg = 'Hardware Wallet Error: ' + (data.error || data.message || 'unknown');
$log.warn(msg);
return msg;
return JSON.parse(JSON.stringify(msg));
};
root.getAddressPath = function(isMultisig, account) {

8
src/js/services/trezor.js
View file

@ -198,11 +198,11 @@ angular.module('copayApp.services')
outputs = JSON.parse(JSON.stringify(outputs));
$log.debug('Signing with TREZOR', inputs, outputs);
TrezorConnect.signTx(inputs, outputs, function(result) {
if (!data.success)
return callback(hwWallet._err(data));
TrezorConnect.signTx(inputs, outputs, function(res) {
if (!res.success)
return callback(hwWallet._err(res));
callback(null, result);
callback(null, res);
});
};