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

Fix routes

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-16 21:01:19 -03:00
commit 10cc7fdf53
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
13 changed files with 76 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
// data extensions for Payment Protocol with non-backwards-compatible request
if ((/^bitcoin:\?r=[\w+]/).exec(data)) {
data = decodeURIComponent(data.replace('bitcoin:?r=', ''));
$state.go('send.confirm', {paypro: data})
$state.go('tabs.send.confirm', {paypro: data})
}
@ -42,25 +42,25 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
var amount = parsed.amount ? parsed.amount : '';
if (parsed.r) {
$state.go('send.confirm', {paypro: parsed.r});
$state.go('tabs.send.confirm', {paypro: parsed.r});
} else {
if (amount) {
$state.go('send.confirm', {toAmount: amount, toAddress: addr, description:message})
$state.go('tabs.send.confirm', {toAmount: amount, toAddress: addr, description:message})
} else {
$state.go('send.amount', {toAddress: addr})
$state.go('tabs.send.amount', {toAddress: addr})
}
}
return true;
// Plain URL
} else if (/^https?:\/\//.test(data)) {
return $state.go('send.confirm', {paypro: data})
return $state.go('tabs.send.confirm', {paypro: data})
// Plain Address
} else if (bitcore.Address.isValid(data, 'livenet')) {
return $state.go('send.amount', {toAddress: data})
return $state.go('tabs.send.amount', {toAddress: data})
} else if (bitcore.Address.isValid(data, 'testnet')) {
return $state.go('send.amount', {toAddress: data})
return $state.go('tabs.send.amount', {toAddress: data})
// Protocol
@ -71,11 +71,11 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
// Join
} else if (data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
return $state.go('add.join', {url: data})
return $state.go('tabs.add.join', {url: data})
// Old join
} else if (data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
return $state.go('add.join', {url: data})
return $state.go('tabs.add.join', {url: data})
}

9
src/js/services/popupService.js
View file

@ -32,9 +32,10 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
opts = opts || {};
$ionicPopup.prompt({
title: title,
template: message,
inputType: opts.inputType || 'password',
inputPlaceholder: opts.inputPlaceholder || 'Your password'
subTitle: message,
inputType: opts.inputType,
inputPlaceholder: opts.inputPlaceholder,
defaultText: opts.defaultText
}).then(function(res) {
return cb(res)
});
@ -106,7 +107,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
*
* @param {String} Title
* @param {String} Message
* @param {Object} Object{ inputType, inputPlaceholder } (optional)
* @param {Object} Object{ inputType, inputPlaceholder, defaultText } (optional)
* @param {Callback} Function
* @returns {Callback} Return the value of the input if user presses OK
*/