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

fix parameters

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-08-12 11:49:13 -03:00
commit d61206d2c0
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,7 +175,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.alternativeAmountStr = tx.alternativeAmountStr;
$scope.copayers = copayers $scope.copayers = copayers
$scope.copayerId = fc.credentials.copayerId; $scope.copayerId = fc.credentials.copayerId;
$scope.canSign= fc.canSign(); $scope.canSign = fc.canSign();
$scope.loading = null; $scope.loading = null;
$scope.color = fc.backgroundColor; $scope.color = fc.backgroundColor;
refreshUntilItChanges = false; refreshUntilItChanges = false;
@ -259,7 +259,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
$scope.loading = false; $scope.loading = false;
if (err) { if (err) {
$scope.error = bwsError.msg('Could not broadcast payment'); $scope.error = bwsError.msg(err, gettext('Could not broadcast payment'));
$scope.$digest(); $scope.$digest();
} else { } else {
$log.debug('Transaction signed and broadcasted') $log.debug('Transaction signed and broadcasted')
@ -288,7 +288,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
$scope.loading = false; $scope.loading = false;
if (err) { if (err) {
$scope.error = bwsError.msg(err,gettext('Could not reject payment')); $scope.error = bwsError.msg(err, gettext('Could not reject payment'));
$scope.$digest(); $scope.$digest();
} else { } else {
$modalInstance.close(txpr); $modalInstance.close(txpr);
@ -327,7 +327,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess(); self.setOngoingProcess();
$scope.loading = false; $scope.loading = false;
if (err) { if (err) {
$scope.error = bwsError.msg(gettext('Could not broadcast payment')); $scope.error = bwsError.msg(err, gettext('Could not broadcast payment'));
$scope.$digest(); $scope.$digest();
} else { } else {
@ -397,9 +397,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
addressService.getAddress(fc.credentials.walletId, forceNew, function(err, addr) { addressService.getAddress(fc.credentials.walletId, forceNew, function(err, addr) {
self.generatingAddress = false; self.generatingAddress = false;
if (err) { if (err) {
self.addrError = err; self.addrError = err;
} else { } else {
if (addr) if (addr)
self.addr[fc.credentials.walletId] = addr; self.addr[fc.credentials.walletId] = addr;
} }
@ -657,7 +657,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var prefix = var prefix =
fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment'); fc.credentials.m > 1 ? gettext('Could not create payment proposal') : gettext('Could not send payment');
this.error = bwsError.msg(err, prefix); this.error = bwsError.msg(err, prefix);
$timeout(function() { $timeout(function() {
$scope.$digest(); $scope.$digest();
@ -691,7 +691,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.submitForm = function() { this.submitForm = function() {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var unitToSat = this.unitToSatoshi; var unitToSat = this.unitToSatoshi;
if (isCordova && this.isWindowsPhoneApp) { if (isCordova && this.isWindowsPhoneApp) {
this.hideAddress = false; this.hideAddress = false;
this.hideAmount = false; this.hideAmount = false;
@ -722,7 +722,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) { feeService.getCurrentFeeValue(self.currentSendFeeLevel, function(err, feePerKb) {
if (err) $log.debug(err); if (err) $log.debug(err);
console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO console.log('[walletHome.js.757:amount:]', amount, feePerKb); //TODO
fc.sendTxProposal({ fc.sendTxProposal({
toAddress: address, toAddress: address,
amount: amount, amount: amount,
@ -1046,7 +1046,7 @@ console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO
}; };
this.confirmDialog = function(msg, cb) { this.confirmDialog = function(msg, cb) {
if (isCordova) { if (isCordova) {
navigator.notification.confirm( navigator.notification.confirm(
msg, msg,
function(buttonIndex) { function(buttonIndex) {
@ -1074,11 +1074,11 @@ console.log('[walletHome.js.757:amount:]',amount, feePerKb); //TODO
fee: feeStr fee: feeStr
}); });
this.confirmDialog(msg, function(confirmed){ this.confirmDialog(msg, function(confirmed) {
if (confirmed) if (confirmed)
self._doSendAll(amount); self._doSendAll(amount);
}); });
}; };
/* Start setup */ /* Start setup */