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

a little cleanup

Browse source
This commit is contained in:
Marty Alcala 2016-10-26 16:09:21 -04:00
commit 0e5f342198
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/controllers/confirm.js
View file

@ -15,7 +15,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.toEmail = data.stateParams.toEmail; $scope.toEmail = data.stateParams.toEmail;
$scope.description = data.stateParams.description; $scope.description = data.stateParams.description;
$scope.paypro = data.stateParams.paypro; $scope.paypro = data.stateParams.paypro;
$scope._paypro = $scope.paypro;
$scope.paymentExpired = { $scope.paymentExpired = {
value: false value: false
}; };
@ -287,7 +286,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}; };
$scope.approve = function(onSendStatusChange) { $scope.approve = function(onSendStatusChange) {
if ($scope._paypro && $scope.paymentExpired.value) { if ($scope.paypro && $scope.paymentExpired.value) {
popupService.showAlert(null, gettextCatalog.getString('The payment request has expired')); popupService.showAlert(null, gettextCatalog.getString('The payment request has expired'));
$scope.sendStatus = ''; $scope.sendStatus = '';
$timeout(function() { $timeout(function() {

2
src/js/routes.js
View file

@ -885,7 +885,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
.state('tabs.bitpayCard.confirm', { .state('tabs.bitpayCard.confirm', {
url: '/confirm/:cardId/:toAddress/:toName/:toAmount/:toEmail/:description/:payProUrl', url: '/confirm/:cardId/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
controller: 'confirmController', controller: 'confirmController',

3
src/js/services/incomingData.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services').factory('incomingData', function($log, $state, $window, $timeout, bitcore, profileService, popupService, ongoingProcess, platformInfo, gettextCatalog, $rootScope, payproService) { angular.module('copayApp.services').factory('incomingData', function($log, $state, $window, $timeout, bitcore, $rootScope, payproService) {
var root = {}; var root = {};
@ -47,7 +47,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
} }
data = sanitizeUri(data); data = sanitizeUri(data);
//data = 'https://test.bitpay.com:443/i/YSHFLkxxVAZhQMGFi9Ptq9';
// BIP21 // BIP21
if (bitcore.URI.isValid(data)) { if (bitcore.URI.isValid(data)) {

2
src/js/services/payproService.js
View file

@ -1,7 +1,7 @@
'use strict'; 'use strict';
angular.module('copayApp.services').factory('payproService', angular.module('copayApp.services').factory('payproService',
function($window, profileService, platformInfo, popupService, gettextCatalog, ongoingProcess, $log, $state) { function($window, profileService, platformInfo, popupService, gettextCatalog, ongoingProcess, $log) {
var ret = {}; var ret = {};