Merge pull request #2256 from isocolsky/1-N

Do not show proposals on 1-of-N wallets
This commit is contained in:
Matias Alejo Garcia 2014-12-31 11:36:57 -03:00
commit 09b219d881
3 changed files with 4 additions and 3 deletions

View File

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

View File

@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('SendController',
preconditions.checkState(w.settings.unitToSatoshi);
$scope.isShared = w.isShared();
$rootScope.title =$scope.isShared ? 'Send Proposal' : 'Send';
$rootScope.title = w.requiresMultipleSignatures() ? 'Send Proposal' : 'Send';
$scope.loading = false;
$scope.error = $scope.success = null;
@ -127,7 +127,7 @@ angular.module('copayApp.controllers').controller('SendController',
if (msg.match('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;
$scope.error = message;

View File

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