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

Merge pull request #2255 from matiu/bug/wp3

Browse source 
Bug/wp3
This commit is contained in:
Ivan Socolsky 2014-12-31 13:31:12 -03:00
commit 256d79046e
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cordova/config.xml
View file

@ -7,7 +7,7 @@
<description> <description>
A secure bitcoin wallet for friends and companies. A secure bitcoin wallet for friends and companies.
</description> </description>
<author email="support@bitpay.com" href="http://copay.io"> <author email="support@bitpay.com" href="https://copay.io">
BitPay Inc. BitPay Inc.
</author> </author>
<content src="index.html" /> <content src="index.html" />

BIN
cordova/ios/icons/icon-300.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

5
js/controllers/send.js
View file

@ -14,7 +14,8 @@ 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 = w.requiresMultipleSignatures() ? 'Send Proposal' : 'Send'; $scope.requiresMultipleSignatures = w.requiresMultipleSignatures();
$rootScope.title =$scope.requiresMultipleSignatures ? 'Send Proposal' : 'Send';
$scope.loading = false; $scope.loading = false;
$scope.error = $scope.success = null; $scope.error = $scope.success = null;
@ -127,7 +128,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' + (w.requiresMultipleSignatures() ? ' proposal' : '') + var message = 'The transaction' + ($scope.requiresMultipleSignatures ? ' proposal' : '') +
' could not be created: ' + msg; ' could not be created: ' + msg;
$scope.error = message; $scope.error = message;