From 879f16d5211f9b25a3393c33dcb820e4f73e29a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Fri, 29 Jul 2016 15:30:38 -0300
Subject: [PATCH] little refactors

---
 src/js/controllers/buyAmazon.js |  3 +--
 src/js/controllers/index.js     | 12 +-----------
 util/amazon.js                  | 20 +++-----------------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js
index 0f615ae88..f6a805a93 100644
--- a/src/js/controllers/buyAmazon.js
+++ b/src/js/controllers/buyAmazon.js
@@ -58,9 +58,8 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
       self.error = null;
       self.errorInfo = null;
 
-      var currency_code = configService.getSync().amazon.testnet ? window.amazon_sandbox_currency_code : window.amazon_currency_code;
       var dataSrc = {
-        currency: currency_code,
+        currency: 'USD',
         amount: $scope.fiat,
         uuid: self.selectedWalletId
       };
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index f7f673f7b..682d006b9 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, $ionicSideMenuDelegate, $httpBackend, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwcError, txFormatService, uxLanguage, glideraService, coinbaseService, amazonService, platformInfo, addressbookService, openURLService, ongoingProcess) {
+angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, $ionicScrollDelegate, $ionicPopup, $ionicSideMenuDelegate, $httpBackend, latestReleaseService, feeService, bwcService, pushNotificationsService, lodash, go, profileService, configService, rateService, storageService, addressService, gettext, gettextCatalog, amMoment, addonManager, bwcError, txFormatService, uxLanguage, glideraService, coinbaseService, platformInfo, addressbookService, openURLService, ongoingProcess) {
 
   var self = this;
   var SOFT_CONFIRMATION_LIMIT = 12;
@@ -161,7 +161,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
       self.initGlidera();
       self.initCoinbase();
-      self.initAmazon();
 
       self.hideBalance();
 
@@ -1391,15 +1390,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
-
-  self.initAmazon = function() {
-    self.amazonEnabled = configService.getSync().amazon.enabled;
-    self.amazonTestnet = configService.getSync().amazon.testnet;
-    var network = self.amazonTestnet ? 'testnet' : 'livenet';
-    if (!self.amazonEnabled) return;
-    amazonService.setCredentials(network);
-  };
-
   self.isInFocus = function(walletId) {
     var fc = profileService.focusedClient;
     return fc && fc.credentials.walletId == walletId;
diff --git a/util/amazon.js b/util/amazon.js
index be6a1e008..ec1aa52de 100755
--- a/util/amazon.js
+++ b/util/amazon.js
@@ -5,30 +5,16 @@
 var fs = require('fs');
 var file;
 
-try { 
-    file = fs.readFileSync('./amazon.json', 'utf8');
-} catch(err) {
+try {
+  file = fs.readFileSync('./amazon.json', 'utf8');
+} catch (err) {
   return;
 }
 
 var json = JSON.parse(file);
-console.log('Amazon Partner ID: ' + json.production.partner_id);
 
-var content = 'window.amazon_sandbox_access_key="' + json.sandbox.access_key + '";';
-content = content + '\nwindow.amazon_sandbox_secret_key="' + json.sandbox.secret_key + '";';
-content = content + '\nwindow.amazon_sandbox_partner_id="' + json.sandbox.partner_id + '";';
-content = content + '\nwindow.amazon_sandbox_currency_code="' + json.sandbox.currency_code + '";';
-content = content + '\nwindow.amazon_sandbox_region="' + json.sandbox.region + '";';
-content = content + '\nwindow.amazon_sandbox_endpoint="' + json.sandbox.endpoint + '";';
 content = 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_access_key="' + json.production.access_key + '";';
-content = content + '\nwindow.amazon_secret_key="' + json.production.secret_key + '";';
-content = content + '\nwindow.amazon_partner_id="' + json.production.partner_id + '";';
-content = content + '\nwindow.amazon_currency_code="' + json.production.currency_code + '";';
-content = content + '\nwindow.amazon_region="' + json.production.region + '";';
-content = content + '\nwindow.amazon_endpoint="' + json.production.endpoint + '";';
 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);
-