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

Merge pull request #3805 from matiu/bug/trezor-multisig

Browse source 
fix multisig + trezor
This commit is contained in:
Gustavo Maximiliano Cortez 2016-01-22 10:14:41 -03:00
commit e354a2eb0d
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/services/txSignService.js
View file

@ -90,7 +90,7 @@ angular.module('copayApp.services').factory('txSignService', function($rootScope
};
var _signWithLedger = function(txp, cb) {
var fc = root.focusedClient;
var fc = profileService.focusedClient;
$log.info('Requesting Ledger Chrome app to sign the transaction');
ledger.signTx(txp, fc.credentials.account, function(result) {
@ -106,7 +106,7 @@ angular.module('copayApp.services').factory('txSignService', function($rootScope
};
var _signWithTrezor = function(txp, cb) {
var fc = root.focusedClient;
var fc = profileService.focusedClient;
$log.info('Requesting Trezor to sign the transaction');
var xPubKeys = lodash.pluck(fc.credentials.publicKeyRing, 'xPubKey');
@ -151,8 +151,10 @@ angular.module('copayApp.services').factory('txSignService', function($rootScope
return cb(bwsError.msg(err), gettextCatalog.getString('Could not accept payment'));
};
if (txp.status != 'accepted')
return (null, txp);
if (txp.status != 'accepted') {
stopReport(opts);
return cb(null, txp);
}
reportBroadcastingStatus(opts);
fc.broadcastTxProposal(txp, function(err, txp, memo) {