BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #646 from isocolsky/fix/send 

Allow send when amount > 0
This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-21 16:51:09 -03:00 committed by GitHub
parent c689d4eb13 93caee3ca7
commit 2615027abd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/controllers/amount.js
View File

@ -133,6 +133,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.resetAmount = function() {
$scope.amount = $scope.alternativeResult = $scope.amountResult = $scope.globalResult = '';
$scope.allowSend = false;
checkFontSize();
};
@ -144,7 +146,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
var formatedValue = format(val);
var result = evaluate(formatedValue);
$scope.allowSend = lodash.isNumber(result) && +result > 0;
if (lodash.isNumber(result)) {
$scope.globalResult = isExpression(val) ? '= ' + processResult(result) : '';
$scope.amountResult = $filter('formatFiatAmount')(toFiat(result));

2
www/views/amount.html
View File

@ -52,7 +52,7 @@
<div class="keypad">
<div class="row">
<div class="col col-25 col-offset-75 operator-send"
ng-show="amount > 0 || alternativeResult > 0 || amountResult > 0" ng-click="finish()">
ng-show="allowSend" ng-click="finish()">
<i class="icon ion-ios-arrow-thin-right"></i>
</div>
</div>