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

fix calculator ui - resume send view ui

Browse source
This commit is contained in:
Javier 2016-08-12 16:55:14 -03:00
commit a260fcf8b7
197 changed files with 67 additions and 205658 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,8 +160,6 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
$ionicScrollDelegate.resize();
}, 100);
} else {
// self.setAmount(amount, $scope.showAlternativeAmount);
// $scope.cancel();
$scope.sending = true;
$scope.sendingAmount = profileService.formatAmount(amount * unitToSatoshi, true);
$scope.sendingAlternativeAmount = $filter('formatFiatAmount')(alternativeAmount);

10
src/js/controllers/tab-send.js
View file

@ -1,14 +1,12 @@
'use strict';
angular.module('copayApp.controllers').controller('tabSendController', function($scope, $ionicModal, addressbookService, profileService, configService, lodash) {
angular.module('copayApp.controllers').controller('tabSendController', function($scope, $ionicModal, $log, addressbookService, profileService, configService, lodash) {
var completeList;
$scope.init = function() {
addressbookService.list(function(err, ab) {
if (err) {
console.log('ERROR:', err);
return;
}
if (err) $log.error(err);
// $scope.contactList = lodash.isEmpty(ab) ? null : ab;
$scope.contactList = [{
label: 'Javier',
@ -29,7 +27,6 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
config.colorFor = config.colorFor || {};
config.aliasFor = config.aliasFor || {};
// Sanitize empty wallets (fixed in BWC 1.8.1, and auto fixed when wallets completes)
var credentials = lodash.filter(profileService.profile.credentials, 'walletName');
var ret = lodash.map(credentials, function(c) {
return {
@ -50,6 +47,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
var val = item.label || item.alias || item.name;
return lodash.includes(val.toLowerCase(), $scope.search.toLowerCase());
});
if (lodash.isEmpty(result) || lodash.isEmpty($scope.search)) {
$scope.list = completeList;
return;