From 23417fe1b39c1e6ea547d4c266d725e24276b0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 4 Aug 2016 12:44:27 -0300
Subject: [PATCH] delete amazon utils and token use on amazon service

---
 src/js/controllers/index.js      |  3 ++-
 src/js/services/amazonService.js |  7 ++-----
 src/js/services/configService.js |  2 +-
 util/amazon.js                   | 20 --------------------
 4 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100755 util/amazon.js

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 7e5a33ec4..c12ac1318 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1691,8 +1691,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
       var config = configService.getSync();
 
-      $scope.color = config.colorFor[txp.walletId];
+      $scope.color = config.colorFor[txp.walletId] || '#4A90E2';
       $scope.tx = txFormatService.processTx(txp);
+
       self.confirmationPopup = $ionicPopup.show({
         templateUrl: 'views/includes/confirm-tx.html',
         scope: $scope,
diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js
index 1ec71b47c..e22947dba 100644
--- a/src/js/services/amazonService.js
+++ b/src/js/services/amazonService.js
@@ -5,11 +5,9 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
 
   root.setCredentials = function(network) {
     if (network == 'testnet') {
-      credentials.BITPAY_API_URL = window.amazon_sandbox_bitpay_api_url;
-      credentials.BITPAY_API_TOKEN = window.amazon_sandbox_bitpay_api_token;
+      credentials.BITPAY_API_URL = "https://test.bitpay.com";
     } else {
-      credentials.BITPAY_API_URL = window.amazon_bitpay_api_url;
-      credentials.BITPAY_API_TOKEN = window.amazon_bitpay_api_token;
+      credentials.BITPAY_API_URL = "https://bitpay.com";
     };
   };
 
@@ -24,7 +22,6 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
   };
 
   var _postBitPay = function(endpoint, data) {
-    data.token = credentials.BITPAY_API_TOKEN;
     return {
       method: 'POST',
       url: credentials.BITPAY_API_URL + endpoint,
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index c956d2945..9c0eb270a 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -127,7 +127,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
 
       // Amazon
       // Disabled for testnet
-      configCache.amazon.testnet = true;
+      configCache.amazon.testnet = false;
 
       $log.debug('Preferences read:', configCache)
       return cb(err, configCache);
diff --git a/util/amazon.js b/util/amazon.js
deleted file mode 100755
index 310593e1b..000000000
--- a/util/amazon.js
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-var fs = require('fs');
-var file;
-
-try {
-  file = fs.readFileSync('./amazon.json', 'utf8');
-} catch (err) {
-  return;
-}
-
-var json = JSON.parse(file);
-
-var content = '\nwindow.amazon_sandbox_bitpay_api_token="' + json.sandbox.bitpay_api_token + '";';
-content = content + '\nwindow.amazon_sandbox_bitpay_api_url="' + json.sandbox.bitpay_api_url + '";';
-content = content + '\nwindow.amazon_bitpay_api_token="' + json.production.bitpay_api_token + '";';
-content = content + '\nwindow.amazon_bitpay_api_url="' + json.production.bitpay_api_url + '";';
-fs.writeFileSync("./src/js/amazon.js", content);