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

Merge pull request #3977 from matiu/v19

Browse source 
fix prevent submit
This commit is contained in:
Matias Alejo Garcia 2016-03-09 08:20:48 -03:00
commit 139adb9974
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, txService){ angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $interval, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, isMobile, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go, feeService, txService) {
var self = this; var self = this;
window.ignoreMobilePause = false; window.ignoreMobilePause = false;
@ -351,7 +351,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.paymentExpired = true; $scope.paymentExpired = true;
$interval.cancel(countDown); $interval.cancel(countDown);
} }
$scope.expires --; $scope.expires--;
}, 1000); }, 1000);
}; };
@ -835,7 +835,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}, 1); }, 1);
}; };
// subscription // subscription
this.setOngoingProcess = function(name) { this.setOngoingProcess = function(name) {
var self = this; var self = this;
self.blockUx = !!name; self.blockUx = !!name;
@ -856,6 +856,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}; };
this.submitForm = function() { this.submitForm = function() {
if (!$scope._amount || !$scope._address || self.destinationWalletNeedsBackup) return;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var unitToSat = this.unitToSatoshi; var unitToSat = this.unitToSatoshi;
var currentSpendUnconfirmed = configWallet.spendUnconfirmed; var currentSpendUnconfirmed = configWallet.spendUnconfirmed;
@ -870,11 +871,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
} }
var form = $scope.sendForm; var form = $scope.sendForm;
if (form.$invalid) {
this.error = gettext('Unable to send transaction proposal');
return;
}
var comment = form.comment.$modelValue; var comment = form.comment.$modelValue;
// ToDo: use a credential's (or fc's) function for this // ToDo: use a credential's (or fc's) function for this
@ -1125,7 +1121,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
setExpiredPaymentValues(); setExpiredPaymentValues();
$interval.cancel(countDown); $interval.cancel(countDown);
} }
self.timeToExpire --; self.timeToExpire--;
}, 1000); }, 1000);
function setExpiredPaymentValues() { function setExpiredPaymentValues() {
@ -1134,7 +1130,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self._paypro = null; self._paypro = null;
self.error = gettext('Cannot sign: The payment request has expired'); self.error = gettext('Cannot sign: The payment request has expired');
}; };
}; };
this.setFromUri = function(uri) { this.setFromUri = function(uri) {
var self = this; var self = this;