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

do not show proposals on 1-of-N wallets

Browse source
This commit is contained in:
Ivan Socolsky 2014-12-31 10:14:29 -03:00
commit 5cd5287baf
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/controllers/homeWallet.js
View file

@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi
$rootScope.title = 'Home'; $rootScope.title = 'Home';
var w = $rootScope.wallet; var w = $rootScope.wallet;
$scope.isShared = w.isShared(); $scope.isShared = w.isShared();
$scope.requiresMultipleSignatures = w.requiresMultipleSignatures();
if ($scope.isShared) if ($scope.isShared)
$scope.copayers = w.getRegisteredPeerIds(); $scope.copayers = w.getRegisteredPeerIds();
}; };

4
js/controllers/send.js
View file

@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('SendController',
preconditions.checkState(w.settings.unitToSatoshi); preconditions.checkState(w.settings.unitToSatoshi);
$scope.isShared = w.isShared(); $scope.isShared = w.isShared();
$rootScope.title =$scope.isShared ? 'Send Proposal' : 'Send'; $rootScope.title = w.requiresMultipleSignatures() ? 'Send Proposal' : 'Send';
$scope.loading = false; $scope.loading = false;
$scope.error = $scope.success = null; $scope.error = $scope.success = null;
@ -127,7 +127,7 @@ angular.module('copayApp.controllers').controller('SendController',
if (msg.match('expired')) if (msg.match('expired'))
msg = 'The payment request has expired'; msg = 'The payment request has expired';
var message = 'The transaction' + ($scope.isShared ? ' proposal' : '') + var message = 'The transaction' + (w.requiresMultipleSignatures() ? ' proposal' : '') +
' could not be created: ' + msg; ' could not be created: ' + msg;
$scope.error = message; $scope.error = message;

2
views/homeWallet.html
View file

@ -50,7 +50,7 @@
</div> </div>
<div ng-show="isShared"> <div ng-show="requiresMultipleSignatures">
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="panel oh"> <div class="panel oh">