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

Merge remote-tracking branch 'origin/wallet/task/416' into wallet/task/416

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-19 17:11:43 +02:00
commit 66f8ac5a5a
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
5 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/services/clipboardService.js
View file

@ -31,10 +31,10 @@ angular.module('copayApp.services').factory('clipboardService', function ($http,
},0);
} else {
navigator.clipboard.readText()
.then(text => {
.then(function (text) {
cb(text);
})
.catch(err => {
.catch(function (err) {
$log.debug("Clipboard reading is not supported in browser..");
});

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

@ -228,10 +228,12 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
} else if (/^https?:\/\//.test(data)) {
payproService.getPayProDetails(data, coin, function(err, details) {
if (err) {
root.showMenu({
data: data,
type: 'url'
});
if ($state.includes('tabs.scan')) {
root.showMenu({
data: data,
type: 'url'
});
}
return;
}
handlePayPro(details);