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

use ui-router non-url params for paypro

Browse source
This commit is contained in:
Marty Alcala 2016-10-21 11:53:04 -04:00
commit 2fb99dd7c1
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/amount.js
View file

@ -188,6 +188,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
}; };
$scope.finish = function() { $scope.finish = function() {
console.log('in finish');
var _amount = evaluate(format($scope.amount)); var _amount = evaluate(format($scope.amount));
if ($scope.cardId) { if ($scope.cardId) {
@ -225,13 +226,15 @@ angular.module('copayApp.controllers').controller('amountController', function($
}); });
} else { } else {
console.log('about to transitionTo');
var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals); var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
$state.transitionTo('tabs.send.confirm', { $state.transitionTo('tabs.send.confirm', {
isWallet: $scope.isWallet, isWallet: $scope.isWallet,
toAmount: amount * unitToSatoshi, toAmount: amount * unitToSatoshi,
toAddress: $scope.toAddress, toAddress: $scope.toAddress,
toName: $scope.toName, toName: $scope.toName,
toEmail: $scope.toEmail toEmail: $scope.toEmail//,
//paypro: {hi: 'there'}
}); });
} }
}; };

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

@ -261,7 +261,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txp.outputs = outputs; txp.outputs = outputs;
txp.message = description; txp.message = description;
txp.payProUrl = paypro.url; if(paypro) {
txp.payProUrl = paypro.url;
}
txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true; txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
txp.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal'; txp.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
txp.dryRun = dryRun; txp.dryRun = dryRun;

5
src/js/routes.js
View file

@ -260,13 +260,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
.state('tabs.send.confirm', { .state('tabs.send.confirm', {
url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description/{paypro:json}', url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description',
views: { views: {
'tab-send@tabs': { 'tab-send@tabs': {
controller: 'confirmController', controller: 'confirmController',
templateUrl: 'views/confirm.html' templateUrl: 'views/confirm.html'
} }
} },
params: { paypro: null }
}) })
.state('tabs.send.addressbook', { .state('tabs.send.addressbook', {
url: '/addressbook/add/:fromSendTab/:addressbookEntry', url: '/addressbook/add/:fromSendTab/:addressbookEntry',

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

@ -47,6 +47,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
} }
data = sanitizeUri(data); data = sanitizeUri(data);
//data = 'msEVvmpiFEtXv3MdsFLUYMbnNLeNYrqBEA';
// BIP21 // BIP21
if (bitcore.URI.isValid(data)) { if (bitcore.URI.isValid(data)) {