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

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

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-08-07 09:54:43 +02:00
commit 52ca7bafd7
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
7 changed files with 60 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -397,6 +397,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
function handlePayPro(payProData, coin) {
console.log(payProData);
var toAddr = payProData.toAddress;
var amount = payProData.amount;
var paymentUrl = payProData.url;
@ -413,7 +415,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
}
var name = payProData.domain;
if (paymentUrl.indexOf('https://bitpay.com') > -1) {
if (payProData.memo.indexOf('eGifter') > -1) {
name = 'eGifter'
} else if (paymentUrl.indexOf('https://bitpay.com') > -1) {
name = 'BitPay';
}

2
src/sass/views/review.scss
View file

@ -11,7 +11,7 @@
bottom: 92px;
}
.shapeshift-banner, .bitpay-banner {
.shapeshift-banner, .bitpay-banner, .egifter-banner {
box-shadow: none;
}