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

fix UI

Browse source
This commit is contained in:
Javier 2016-07-25 11:23:05 -03:00
commit f6f9e5d7fc
4 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/js/controllers/modals/inputAmount.js
View file

@ -37,15 +37,19 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
amount = format($scope.alternativeAmount);
$scope.amountResult = isOperator(lodash.last(amount)) ? evaluate(amount.slice(0, -1)) : evaluate(amount);
}
$scope.globalResult = null;
};
$scope.pushDigit = function(digit) {
var amount = $scope.showAlternativeAmount ? $scope.alternativeAmount.toString() : $scope.amount.toString();
if (amount.length >= 10) return;
if (amount == '0' && digit == 0) return;
var val = amount ? amount + digit : digit;
processAmount(val);
if (amount.length >= 20) return;
if (amount == '0') {
if (digit == 0) return;
processAmount(digit);
return;
}
processAmount(amount + digit);
};
$scope.pushOperator = function(operator) {
@ -93,6 +97,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
function resetAmount() {
$scope.amount = $scope.alternativeAmount = $scope.alternativeResult = $scope.amountResult = 0;
$scope.globalResult = null;
};
function processAmount(val) {
@ -116,6 +121,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
if (lodash.isNumber(result)) {
$scope.amount = $scope.alternativeAmount = val;
$scope.globalResult = result + ' =';
$scope.amountResult = toFiat(result);
$scope.alternativeResult = fromFiat(result);
}
@ -168,10 +174,10 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
$scope.specificAmountBtc = (amountSat * satToBtc).toFixed(8);
}
$scope.specificAmount = amount;
$scope.specificAlternativeAmount = alternativeAmount;
$scope.specificAmount = amount.toFixed(2);
$scope.specificAlternativeAmount = alternativeAmount.toFixed(2);
} else {
self.setAmount(amount, alternativeAmount, $scope.showAlternativeAmount);
self.setAmount(amount.toFixed(2), alternativeAmount.toFixed(2), $scope.showAlternativeAmount);
$scope.cancel();
}
};

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

@ -557,6 +557,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
});
};
$scope.openAmountModal = function(address) {
if (isCordova)
$scope.openInputAmountModal(address);
else
$scope.openCustomAmountModal(address);
};
$scope.openInputAmountModal = function(addr) {
var fc = profileService.focusedClient;
$scope.color = fc.backgroundColor;