diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json index 6e030bc93..8b4cfa91b 100644 --- a/app-template/bitcoincom/appConfig.json +++ b/app-template/bitcoincom/appConfig.json @@ -25,7 +25,7 @@ "pushSenderId": "1036948132229", "description": "A Secure Bitcoin Wallet", "version": "3.5.8", - "androidVersion": "350801", + "androidVersion": "350802", "_extraCSS": "", "_enabledExtensions": { "coinbase": false, diff --git a/app-template/bitcoincom/img/tab-icons/ico-send.svg b/app-template/bitcoincom/img/tab-icons/ico-send.svg index 4d23e130e..a5020691d 100644 --- a/app-template/bitcoincom/img/tab-icons/ico-send.svg +++ b/app-template/bitcoincom/img/tab-icons/ico-send.svg @@ -1,66 +1,11 @@ - -image/svg+xml + + + + + diff --git a/app-template/copay/img/tab-icons/ico-send.svg b/app-template/copay/img/tab-icons/ico-send.svg deleted file mode 100644 index a5020691d..000000000 --- a/app-template/copay/img/tab-icons/ico-send.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/src/js/controllers/bitcoincom.js b/src/js/controllers/bitcoincom.js index f94bf57a3..e9e88ff5b 100644 --- a/src/js/controllers/bitcoincom.js +++ b/src/js/controllers/bitcoincom.js @@ -11,7 +11,6 @@ angular.module('copayApp.controllers').controller('bitcoincomController', }; $scope.$on("$ionicView.beforeEnter", function(event, data) { - $scope.network = bitcoincomController.getNetwork(); - initBitcoincom; + }); }); diff --git a/src/js/controllers/buyandsellController.js b/src/js/controllers/buyandsellController.js index a685b3b5a..62bcfd5ab 100644 --- a/src/js/controllers/buyandsellController.js +++ b/src/js/controllers/buyandsellController.js @@ -10,27 +10,7 @@ angular.module('copayApp.controllers').controller('buyandsellController', functi } $scope.$on("$ionicView.enter", function(event, data) { - console.log("Enter buy page"); - var r = new XMLHttpRequest(); - r.open("GET", "https://www.bitcoin.com/api/rv/promoted-exchange", true); - r.onreadystatechange = function () { - if (r.readyState != 4 || r.status != 200) return; - console.log(r.responseText); - var adResponse = JSON.parse(r.responseText) - document.getElementById("exchange-logo").setAttribute('src', "https://www.bitcoin.com" + adResponse.image) - document.getElementById("exchange-link").setAttribute('href', "https://www.bitcoin.com" + adResponse.url) - document.getElementById("exchange-link").setAttribute('ng-click', "openExternalLink('"+ "https://www.bitcoin.com" + adResponse.url +"')") - document.getElementById("exchange-name").textContent = adResponse.bannerName; - document.getElementById("exchange-text").textContent = adResponse.description; - var exchangeLink = document.getElementById("exchange-link"); - - exchangeLink.addEventListener('click', function() { - externalLinkService.open("https://www.bitcoin.com" + adResponse.url); - }); - - }; - r.send("defaultpromotion=360"); }); if (lodash.isEmpty($scope.services)) diff --git a/src/js/services/buydotbitcoindotcomService.js b/src/js/services/buydotbitcoindotcomService.js index fee4e5a9a..085c61285 100644 --- a/src/js/services/buydotbitcoindotcomService.js +++ b/src/js/services/buydotbitcoindotcomService.js @@ -13,7 +13,7 @@ angular.module('copayApp.services').factory('buydotbitcoindotcomService', functi buyAndSellService.register({ name: 'buydotbitcoindotcom', - logo: 'img/bitcoin-com-logo.png', + logo: 'img/bitcoin-com-logo-grey.png', location: 'Buy Bitcoin With Credit Card', sref: 'tabs.buyandsell.bitcoindotcom' }); diff --git a/www/css/bitcoin.com.css b/www/css/bitcoin.com.css index 073725ead..88bacdbe9 100644 --- a/www/css/bitcoin.com.css +++ b/www/css/bitcoin.com.css @@ -229,7 +229,8 @@ div.slide-success__background.fill-screen { } .icon-chart { - background: url('../img/chart.svg'); + background-color: #494949; + background-image: url('../img/chart.svg'); } .tabs .tab-item .icon { diff --git a/www/img/chart.svg b/www/img/chart.svg index d1cf0f66a..31cad1714 100644 --- a/www/img/chart.svg +++ b/www/img/chart.svg @@ -21,7 +21,7 @@ image/svg+xml - + @@ -55,15 +55,6 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-32.41665)"> - @@ -134,20 +125,10 @@ d="m 76.35119,217.54939 v 48.45656" style="fill:none;stroke:#fab915;stroke-width:2.16499996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - - - - + diff --git a/www/img/tab-icons/ico-send.svg b/www/img/tab-icons/ico-send.svg index 4d23e130e..a5020691d 100644 --- a/www/img/tab-icons/ico-send.svg +++ b/www/img/tab-icons/ico-send.svg @@ -1,66 +1,11 @@ - -image/svg+xml + + + + + diff --git a/www/index.html b/www/index.html index 6d5e112c9..a1bc7c0a8 100644 --- a/www/index.html +++ b/www/index.html @@ -29,10 +29,10 @@ + + - - diff --git a/www/views/buyBitcoindotcom.html b/www/views/buyBitcoindotcom.html index d18090956..2c8ef36f1 100644 --- a/www/views/buyBitcoindotcom.html +++ b/www/views/buyBitcoindotcom.html @@ -14,6 +14,9 @@
Click on the link below to go to Buy.Bitcoin.com
+
+ +