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

29
app-template/bitcoincom/css/bitcoin.com.css
View file

@ -264,15 +264,15 @@ div.onboarding-topic {
height: 5em;
}
.shapeshift-banner {
background: url(../img/shapeshiftbg.jpg) center center no-repeat #28394d;
padding: 10px;
box-shadow: 0px 5px 10px 0px #cccccc;
height: 5em;
.shapeshift-logo {
display: block;
float: left;
max-height: 100%;
max-width: 100%;
}
.bitpay-banner {
background: center center no-repeat #1A3A8B;
background: #1A3A8B;
padding: 10px;
box-shadow: 0px 5px 10px 0px #cccccc;
height: 5em;
@ -285,9 +285,16 @@ div.onboarding-topic {
height: 4em;
}
.shapeshift-logo {
display: block;
float: left;
max-height: 100%;
max-width: 100%;
.egifter-banner {
background: #1A3A8B;
padding: 10px;
box-shadow: 0px 5px 10px 0px #cccccc;
height: 5em;
}
.egifter-logo {
display: block;
max-height: 100%;
width: 100%;
height: 4em;
}

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;
}

24
www/css/bitcoin.com.css
View file

@ -314,6 +314,13 @@ div.slide-success__background.fill-screen {
height: 5em;
}
.shapeshift-logo {
display: block;
float: left;
max-height: 100%;
max-width: 100%;
}
.bitpay-banner {
background: #1A3A8B;
padding: 10px;
@ -328,9 +335,16 @@ div.slide-success__background.fill-screen {
height: 4em;
}
.shapeshift-logo {
display: block;
float: left;
max-height: 100%;
max-width: 100%;
.egifter-banner {
background: #1A3A8B;
padding: 10px;
box-shadow: 0px 5px 10px 0px #cccccc;
height: 5em;
}
.egifter-logo {
display: block;
max-height: 100%;
width: 100%;
height: 4em;
}

23
www/css/main.css
View file

@ -15262,8 +15262,10 @@ log-options #check-bar .checkbox-icon {
#view-review .fee-summary {
position: absolute;
bottom: 92px; }
#view-review .shapeshift-banner, #view-review .bitpay-banner {
#view-review .shapeshift-banner, #view-review .bitpay-banner, #view-review .egifter-banner {
box-shadow: none; }
#view-review .warning {
color: #b7664d; }
.gravatar {
border-radius: 3px;
@ -15410,7 +15412,7 @@ ion-content.padded-bottom-cta-with-summary {
.fee-summary {
position: relative;
display: flex;
justify-content: space-between;
flex-direction: column;
width: 100%;
padding: 5px 12px 15px;
box-sizing: border-box;
@ -15423,12 +15425,17 @@ ion-content.padded-bottom-cta-with-summary {
width: 100%;
height: 15px;
background: linear-gradient(to bottom, rgba(242, 242, 242, 0) 0%, #f2f2f2 100%); }
.fee-summary .fee-fiat.positive {
color: #70955F; }
.fee-summary .fee-fiat.negative {
color: #C24633; }
.fee-summary .fee-crypto {
color: #A7A7A7; }
.fee-summary .amount {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 100%; }
.fee-summary .amount .fee-fiat.positive {
color: #70955F; }
.fee-summary .amount .fee-fiat.negative {
color: #C24633; }
.fee-summary .amount .fee-crypto {
color: #A7A7A7; }
.amount .start,
.amount .middle,

3
www/views/thirdparty/egifter-header.html vendored Normal file
View file

@ -0,0 +1,3 @@
<div class="send-header-wrapper egifter-banner">
<img class="egifter-logo" src="img/egifter_banner.svg"/>
</div>

3
www/views/walletSelector.html
View file

@ -5,7 +5,8 @@
</ion-nav-bar>
<ion-content>
<div ng-if="thirdParty && thirdParty.id === 'shapeshift'" ng-include="'views/thirdparty/shapeshift-header.html'"></div>
<div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'bitpay'" ng-include="'views/thirdparty/bitpay-header.html'"></div>
<div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'BitPay'" ng-include="'views/thirdparty/bitpay-header.html'"></div>
<div ng-if="thirdParty && thirdParty.id === 'bip70' && thirdParty.name === 'eGifter'" ng-include="'views/thirdparty/egifter-header.html'"></div>
<div class="header--request" ng-if="isPaymentRequest">
<div class="header--request__title" translate>Paying</div>
<div class="header--request__amount" translate>{{requestAmount}} {{requestCurrency}}</div>