diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json
index bd461bd31..f8ce8f195 100644
--- a/app-template/bitcoincom/appConfig.json
+++ b/app-template/bitcoincom/appConfig.json
@@ -17,6 +17,8 @@
"url": "https://wallet.bitcoin.com",
"appDescription": "Bitcoin.com Wallet",
"winAppName": "BitcoinWallet",
+ "WindowsStoreIdentityName": "18C7659D.Bitcoin.com-SecureBitcoinWallet",
+ "WindowsStoreDisplayName": "Bitcoin.com - Secure Bitcoin Wallet",
"wpPublisherId": "{31cdd08b-457c-413d-b440-f6665eec847d}",
"wpProductId": "{5381aa50-9069-11e4-84cc-293caf9cbdc8}",
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
diff --git a/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg
index aac839b0a..9088ea1f4 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-home-selected.svg
@@ -1,10 +1,54 @@
-
-
+
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-home.svg b/app-template/bitcoincom/img/tab-icons/ico-home.svg
index 4297cf20c..d57482412 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-home.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-home.svg
@@ -1,8 +1,54 @@
-
-
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg
index e79ee026e..deccc0f1e 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-receive-selected.svg
@@ -1,20 +1,107 @@
-
-
+
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-receive.svg b/app-template/bitcoincom/img/tab-icons/ico-receive.svg
index aab9aec69..3aa1fa70c 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-receive.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-receive.svg
@@ -1,16 +1,110 @@
-
-
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg
index e3b2472ea..3df861ae3 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-scan-selected.svg
@@ -1,17 +1,87 @@
-
-
+
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-scan.svg b/app-template/bitcoincom/img/tab-icons/ico-scan.svg
index ea08ae0f0..33affc34a 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-scan.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-scan.svg
@@ -1,17 +1,87 @@
-
-
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg
index 4500e9859..cf9c0329e 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-send-selected.svg
@@ -1,12 +1,66 @@
-
-
+
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-send.svg b/app-template/bitcoincom/img/tab-icons/ico-send.svg
index a5020691d..4d23e130e 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-send.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-send.svg
@@ -1,11 +1,66 @@
-
-
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg b/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg
index 1419d97ee..cf3ead3fc 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-settings-selected.svg
@@ -1,40 +1,57 @@
-
+
-
+
+
\ No newline at end of file
diff --git a/app-template/bitcoincom/img/tab-icons/ico-settings.svg b/app-template/bitcoincom/img/tab-icons/ico-settings.svg
index 605bdb2fc..ba20082eb 100644
--- a/app-template/bitcoincom/img/tab-icons/ico-settings.svg
+++ b/app-template/bitcoincom/img/tab-icons/ico-settings.svg
@@ -1,31 +1,57 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/js/controllers/pricechart.js b/src/js/controllers/pricechart.js
index 8db3ca757..aa4b4057c 100644
--- a/src/js/controllers/pricechart.js
+++ b/src/js/controllers/pricechart.js
@@ -20,7 +20,6 @@ angular.module('copayApp.controllers').controller('pricechartController',
request.onload = function () {
if (request.status >= 200 && request.status < 400) {
// Success!
- console.log(request.responseText);
var data = {
series: [
@@ -30,11 +29,10 @@ angular.module('copayApp.controllers').controller('pricechartController',
}
]
};
- console.log(data);
rawData = JSON.parse("" + request.responseText + "");
for (var i = rawData.length - 1; i > 0; i--) {
var tuple = rawData[i];
- data.series[0].data.push({x: new Date(tuple[0]), y: tuple[1]});
+ data.series[0].data.push({x: new Date(tuple[0]*1000), y: tuple[1]});
if (priceHigh < tuple[1])
{
@@ -52,19 +50,12 @@ angular.module('copayApp.controllers').controller('pricechartController',
document.getElementById("high-price").innerHTML = (priceHigh / 100).toFixed(2);
var chartContainer = document.querySelector('.chart-container');
- var chartHeader = document.querySelector('.chart-header');
- console.log("Height: " + window.getComputedStyle(chartContainer).height);
- console.log("Height2: " + window.getComputedStyle(chartHeader).height);
- console.log("Width: " + window.getComputedStyle(chartContainer).width);
- var chartHeight = window.getComputedStyle(chartContainer).height - window.getComputedStyle(chartHeader).height;
var chartWidth = window.getComputedStyle(chartContainer).width;
- console.log(chartHeight);
-
var options = {
width: chartWidth,
- height: 570,
+ height: 250,
// Don't draw the line chart points
showPoint: false,
// Disable line smoothing
diff --git a/src/js/services/pricechartService.js b/src/js/services/pricechartService.js
index d29704565..d26e02a74 100644
--- a/src/js/services/pricechartService.js
+++ b/src/js/services/pricechartService.js
@@ -13,7 +13,7 @@ angular.module('copayApp.services').factory('pricechartService', function($http,
var nextStepItem = {
name: 'pricechart',
title: 'Bitcoin Price Chart',
- icon: 'icon-bitcoincom',
+ icon: 'icon-chart',
sref: 'tabs.pricechart',
};
diff --git a/www/css/bitcoin.com.css b/www/css/bitcoin.com.css
index 5972e92da..073725ead 100644
--- a/www/css/bitcoin.com.css
+++ b/www/css/bitcoin.com.css
@@ -202,27 +202,37 @@ div.slide-success__background.fill-screen {
}
.latest-price {
box-sizing: border-box;
- padding: .6em .2em 0 .4em;
font-size: 1.6em;
- background-color: #F9B016;
- width:40%;
+ width: 100%;
+ display: block;
+ text-align: center;
+ margin-top: 20px;
}
.high-price {
box-sizing: border-box;
- padding:.7em 1em;
font-size: 1em;
- background-color: #EFA406;
- width:30%;
- height:64px;
+ width: 100%;
+ height: 64px;
+ text-align: center;
+ margin-top: 20px;
}
.low-price {
box-sizing: border-box;
- padding:.7em 0em;
font-size: 1em;
- background-color: #EFA406;
- width:30%;
- height:64px;
+ width: 100%;
+ height: 64px;
+ text-align: center;
+ margin-top: 20px;
}
.light-yellow {
- color:#FFD579;
+ color:#555;
}
+
+.icon-chart {
+ background: url('../img/chart.svg');
+}
+
+.tabs .tab-item .icon {
+ background-size: contain;
+}
+
diff --git a/www/css/main.css b/www/css/main.css
index c795d37a7..01017927d 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -10374,6 +10374,8 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
float: none; }
#view-confirm .item-note .fee-rate {
display: inline-block; }
+ #view-confirm .item-note .fee-rate .warn {
+ color: red; }
#view-confirm .icon-amazon {
background-image: url("../img/icon-amazon.svg"); }
#view-confirm .tx-details-content > .scroll {
@@ -10438,6 +10440,8 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
display: table-cell;
vertical-align: middle;
text-align: center; }
+ #starting .block-spinner {
+ display: block; }
#tab-home .icon-create-wallet {
background-color: #4A90E2; }
@@ -11254,7 +11258,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
font-size: 14px;
font-weight: 300;
color: #727272;
- padding: 2px 1rem;
+ padding: 1rem;
background: #f8f8f9; }
#walletDetails {
@@ -11369,7 +11373,8 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm
display: block;
text-decoration: none;
z-index: 9999;
- position: relative; }
+ position: relative;
+ padding: 2px 5px; }
a.item {
cursor: pointer; }
@@ -11415,7 +11420,7 @@ a.item {
font-size: 14px;
font-weight: 300;
color: #727272;
- padding: 2px 1rem;
+ padding: 1rem;
background: #f8f8f9; }
#bitpayCard .status-label i {
position: absolute;
@@ -11444,8 +11449,8 @@ a.item {
margin-right: 1rem;
height: 35px;
width: 35px; }
- #bitpayCard .head .sending-label span {
- text-transform: capitalize; }
+ #bitpayCard .head .sending-label .big-icon-svg {
+ padding: 0 12px 0 0; }
#bitpayCard .head .amount-label {
line-height: 30px; }
#bitpayCard .head .amount-label .amount-final {
@@ -11478,6 +11483,8 @@ a.item {
#bitpayCard .item.activity.pending .tx-icon .houston {
stroke: #fab915;
color: #fab915; }
+ #bitpayCard .item .total {
+ font-weight: bold; }
#bitpayCard .tx-icon {
margin-right: 25px; }
#bitpayCard .tx-icon .houston {
@@ -13108,7 +13115,6 @@ click-to-accept {
height: 100%;
width: 100%;
z-index: 4;
- text-transform: capitalize;
-webkit-transform: translateY(2rem);
transform: translateY(2rem);
opacity: 0;
@@ -13289,7 +13295,6 @@ slide-to-accept {
width: 100%;
font-size: 17px;
letter-spacing: 0.02rem;
- text-transform: capitalize;
-webkit-transform: translateY(2rem);
transform: translateY(2rem);
opacity: 0; }
@@ -13330,6 +13335,11 @@ slide-to-accept-success {
display: flex;
align-items: center;
justify-content: center; }
+ slide-to-accept-success .slide-success__windows-background {
+ background: #11D1A6;
+ height: 100%;
+ width: 100%;
+ position: fixed; }
slide-to-accept-success .slide-success__background {
height: 10vmax;
width: 10vmax;
@@ -13401,6 +13411,13 @@ slide-to-accept-success {
#tx-details .action-rejected {
color: red; }
+#txp-details .item-note,
+#view-confirm .item-note {
+ float: none; }
+ #txp-details .item-note .fee-rate,
+ #view-confirm .item-note .fee-rate {
+ display: inline-block; }
+
#txp-details .list,
#view-confirm .list {
background: #f5f5f5; }
@@ -13424,9 +13441,6 @@ slide-to-accept-success {
margin-right: 1rem;
height: 35px;
width: 35px; }
- #txp-details .head .sending-label span,
- #view-confirm .head .sending-label span {
- text-transform: capitalize; }
#txp-details .head .amount-label,
#view-confirm .head .amount-label {
line-height: 30px; }
@@ -13487,7 +13501,7 @@ slide-to-accept-success {
#view-confirm .info .item.low-fees {
display: flex;
font-size: 14px;
- color: #aaa;
+ color: #777;
align-items: center; }
#txp-details .info .item.low-fees i,
#view-confirm .info .item.low-fees i {
@@ -13831,8 +13845,6 @@ account-selector {
margin-right: 1rem;
height: 35px;
width: 35px; }
- #coinbase .head .sending-label span {
- text-transform: capitalize; }
#coinbase .head .amount-label {
line-height: 30px; }
#coinbase .head .amount-label .amount {
@@ -13923,8 +13935,6 @@ account-selector {
margin-right: 1rem;
height: 35px;
width: 35px; }
- #glidera .head .sending-label span {
- text-transform: capitalize; }
#glidera .head .amount-label {
line-height: 30px; }
#glidera .head .amount-label .amount {
@@ -14043,8 +14053,6 @@ account-selector {
margin-right: 1rem;
height: 35px;
width: 35px; }
- #amazon .head .sending-label span {
- text-transform: capitalize; }
#amazon .head .sending-label .big-icon-svg {
margin-right: 0.6rem; }
#amazon .head .amount-label {
diff --git a/www/img/chart.svg b/www/img/chart.svg
new file mode 100644
index 000000000..d1cf0f66a
--- /dev/null
+++ b/www/img/chart.svg
@@ -0,0 +1,153 @@
+
+
+
+
diff --git a/www/img/tab-icons/ico-home-selected.svg b/www/img/tab-icons/ico-home-selected.svg
index 011b1ad8d..9088ea1f4 100644
--- a/www/img/tab-icons/ico-home-selected.svg
+++ b/www/img/tab-icons/ico-home-selected.svg
@@ -1,10 +1,54 @@
-
-
+
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-home.svg b/www/img/tab-icons/ico-home.svg
index 4297cf20c..d57482412 100644
--- a/www/img/tab-icons/ico-home.svg
+++ b/www/img/tab-icons/ico-home.svg
@@ -1,8 +1,54 @@
-
-
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-receive-selected.svg b/www/img/tab-icons/ico-receive-selected.svg
index 1b544dda5..deccc0f1e 100644
--- a/www/img/tab-icons/ico-receive-selected.svg
+++ b/www/img/tab-icons/ico-receive-selected.svg
@@ -1,20 +1,107 @@
-
-
+
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-receive.svg b/www/img/tab-icons/ico-receive.svg
index aab9aec69..3aa1fa70c 100644
--- a/www/img/tab-icons/ico-receive.svg
+++ b/www/img/tab-icons/ico-receive.svg
@@ -1,16 +1,110 @@
-
-
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-scan-selected.svg b/www/img/tab-icons/ico-scan-selected.svg
index 6a5c8f589..3df861ae3 100644
--- a/www/img/tab-icons/ico-scan-selected.svg
+++ b/www/img/tab-icons/ico-scan-selected.svg
@@ -1,17 +1,87 @@
-
-
+
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-scan.svg b/www/img/tab-icons/ico-scan.svg
index ea08ae0f0..33affc34a 100644
--- a/www/img/tab-icons/ico-scan.svg
+++ b/www/img/tab-icons/ico-scan.svg
@@ -1,17 +1,87 @@
-
-
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-send-selected.svg b/www/img/tab-icons/ico-send-selected.svg
index 2f812b891..cf9c0329e 100644
--- a/www/img/tab-icons/ico-send-selected.svg
+++ b/www/img/tab-icons/ico-send-selected.svg
@@ -1,12 +1,66 @@
-
-
+
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-send.svg b/www/img/tab-icons/ico-send.svg
index a5020691d..4d23e130e 100644
--- a/www/img/tab-icons/ico-send.svg
+++ b/www/img/tab-icons/ico-send.svg
@@ -1,11 +1,66 @@
-
-
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-settings-selected.svg b/www/img/tab-icons/ico-settings-selected.svg
index 220c8ca5f..cf3ead3fc 100644
--- a/www/img/tab-icons/ico-settings-selected.svg
+++ b/www/img/tab-icons/ico-settings-selected.svg
@@ -1,40 +1,57 @@
-
+
-
+
+
\ No newline at end of file
diff --git a/www/img/tab-icons/ico-settings.svg b/www/img/tab-icons/ico-settings.svg
index 605bdb2fc..ba20082eb 100644
--- a/www/img/tab-icons/ico-settings.svg
+++ b/www/img/tab-icons/ico-settings.svg
@@ -1,31 +1,57 @@
-
+
-
+
\ No newline at end of file
diff --git a/www/index.html b/www/index.html
index 7ffd0805d..6d5e112c9 100644
--- a/www/index.html
+++ b/www/index.html
@@ -31,7 +31,6 @@
-
diff --git a/www/views/pricechart.html b/www/views/pricechart.html
index 16ca36f4c..46b8daa60 100644
--- a/www/views/pricechart.html
+++ b/www/views/pricechart.html
@@ -6,13 +6,12 @@
-
+
+
Latest price:
$2500
+
High:
$2500
+
Low:
$2500