diff --git a/app-template/bitcoincom/css/bitcoin.com.css b/app-template/bitcoincom/css/bitcoin.com.css
index e9b316761..19113dd2c 100644
--- a/app-template/bitcoincom/css/bitcoin.com.css
+++ b/app-template/bitcoincom/css/bitcoin.com.css
@@ -264,9 +264,30 @@ 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;
+}
+
+.bitpay-banner {
+ background: center center no-repeat #1A3A8B;
+ padding: 10px;
+ box-shadow: 0px 5px 10px 0px #cccccc;
+ height: 5em;
+}
+
+.bitpay-logo {
+ display: block;
+ max-height: 100%;
+ width: 100%;
+ height: 4em;
+}
+
.shapeshift-logo {
display: block;
float: left;
max-height: 100%;
- max-width: 100%;
+ max-width: 100%;
}
diff --git a/src/js/controllers/walletSelectorController.js b/src/js/controllers/walletSelectorController.js
index 1d52a715a..fd5b4f1cd 100644
--- a/src/js/controllers/walletSelectorController.js
+++ b/src/js/controllers/walletSelectorController.js
@@ -106,12 +106,7 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
}
function handleThirdPartyIfBip70PaymentProtocol() {
- if ($scope.thirdParty.id === 'bip70PaymentProtocol') {
- requestedSatoshis = $scope.thirdParty.details.amount;
- $scope.coin = $scope.thirdParty.coin;
- $scope.requestAmount = unitsFromSatoshis * requestedSatoshis;
- $scope.params.amount = requestedSatoshis;
- $scope.params.toAddr = $scope.thirdParty.details.toAddress;
+ if ($scope.thirdParty.id === 'bitpay') {
console.log('paypro details:', $scope.thirdParty.details);
}
}
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index fa5abd56b..e76627fcf 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -405,6 +405,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
return {
amount: payProData.outputs[0].amount,
caTrusted: true,
+ name: 'bitpay',
domain: 'bitpay.com',
expires: Math.floor(new Date(payProData.expires).getTime() / 1000),
memo: payProData.memo,
@@ -421,13 +422,13 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
function handlePayPro(payProDetails, coin) {
var thirdPartyData = {
- id: 'bip70PaymentProtocol',
- coin: coin,
+ id: payProDetails.name,
details: payProDetails
};
var stateParams = {
amount: payProDetails.amount,
- toAddress: payProDetails.toAddress,
+ toAddr: payProDetails.toAddress,
+ coin: coin,
thirdParty: JSON.stringify(thirdPartyData)
};
diff --git a/src/sass/views/review.scss b/src/sass/views/review.scss
index 22470a7b2..8bda83890 100644
--- a/src/sass/views/review.scss
+++ b/src/sass/views/review.scss
@@ -11,7 +11,7 @@
bottom: 92px;
}
- .shapeshift-banner {
+ .shapeshift-banner, .bitpay-banner {
box-shadow: none;
}
}
\ No newline at end of file
diff --git a/www/css/bitcoin.com.css b/www/css/bitcoin.com.css
index 9b69005c4..59e503ac7 100644
--- a/www/css/bitcoin.com.css
+++ b/www/css/bitcoin.com.css
@@ -314,9 +314,23 @@ div.slide-success__background.fill-screen {
height: 5em;
}
+.bitpay-banner {
+ background: #1A3A8B;
+ padding: 10px;
+ box-shadow: 0px 5px 10px 0px #cccccc;
+ height: 5em;
+}
+
+.bitpay-logo {
+ display: block;
+ max-height: 100%;
+ width: 100%;
+ height: 4em;
+}
+
.shapeshift-logo {
display: block;
float: left;
max-height: 100%;
- max-width: 100%;
+ max-width: 100%;
}
diff --git a/www/css/main.css b/www/css/main.css
index df39fda50..c2e4325f9 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -15262,7 +15262,7 @@ log-options #check-bar .checkbox-icon {
#view-review .fee-summary {
position: absolute;
bottom: 92px; }
- #view-review .shapeshift-banner {
+ #view-review .shapeshift-banner, #view-review .bitpay-banner {
box-shadow: none; }
.gravatar {
@@ -15325,8 +15325,10 @@ ion-content.padded-bottom-cta-with-summary {
.header {
padding: 29px 12px 61px;
- background-color: #FAB915;
+ background-color: #fab915;
color: #FFFFFF; }
+ .header.btc {
+ background-color: #535353; }
.header .title {
font-size: 18px;
font-weight: 400;
diff --git a/www/img/bitpay_banner.svg b/www/img/bitpay_banner.svg
new file mode 100644
index 000000000..cf5829899
--- /dev/null
+++ b/www/img/bitpay_banner.svg
@@ -0,0 +1,13 @@
+
+
+
+ Artboard
+ Created with Sketch.
+
+
+
+
+
\ No newline at end of file
diff --git a/www/views/thirdparty/bitpay-header.html b/www/views/thirdparty/bitpay-header.html
new file mode 100644
index 000000000..a5ffcb3a5
--- /dev/null
+++ b/www/views/thirdparty/bitpay-header.html
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/www/views/walletSelector.html b/www/views/walletSelector.html
index c863f4ea7..15b4935fa 100644
--- a/www/views/walletSelector.html
+++ b/www/views/walletSelector.html
@@ -5,6 +5,7 @@
+
+