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

Merge pull request #4521 from gabrielbazan7/fix/NoSignTx

Browse source 
allow creating transaction proposal without a private key
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-30 15:33:43 -03:00 • committed by GitHub
commit b291ae3967
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/modals/txpDetails.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, platformInfo, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwsError, gettextCatalog, lodash, profileService, walletService) { angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, platformInfo, txStatus, $ionicScrollDelegate, txFormatService, fingerprintService, bwsError, gettextCatalog, lodash, profileService, walletService) {
var self = $scope.self; var self = $scope.self;
var tx = $scope.tx; var tx = $scope.tx;
var copayers = $scope.copayers; var copayers = $scope.copayers;

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

@ -1,5 +1,5 @@
angular.module('copayApp.controllers').controller('paperWalletController', angular.module('copayApp.controllers').controller('paperWalletController',
function($scope, $timeout, $log, configService, profileService, go, addressService, txStatus, bitcore, ongoingProcess) { function($scope, $timeout, $log, $ionicModal, configService, profileService, go, addressService, txStatus, bitcore, ongoingProcess) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var rawTx; var rawTx;

16
src/js/controllers/walletHome.js
View file

@ -439,10 +439,18 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
if (!client.canSign() && !client.isPrivKeyExternal()) { if (!client.canSign() && !client.isPrivKeyExternal()) {
$log.info('No signing proposal: No private key'); $log.info('No signing proposal: No private key');
self.resetForm(); ongoingProcess.set('sendingTx', true);
var type = txStatus.notify(createdTxp); walletService.publishTx(client, createdTxp, function(err, publishedTxp) {
$scope.openStatusModal(type, createdTxp, function() { ongoingProcess.set('sendingTx', false);
return $scope.$emit('Local/TxProposalAction'); if (err) {
return self.setSendError(err);
}
self.resetForm();
go.walletHome();
var type = txStatus.notify(createdTxp);
$scope.openStatusModal(type, createdTxp, function() {
return $scope.$emit('Local/TxProposalAction');
});
}); });
} else { } else {
$rootScope.$emit('Local/NeedsConfirmation', createdTxp, function(accept) { $rootScope.$emit('Local/NeedsConfirmation', createdTxp, function(accept) {