From 46d123a755f7f9873d891843fd2e78519bb558f9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 5 Jan 2017 17:37:59 -0300 Subject: [PATCH] Uses appConfigService --- src/js/controllers/amount.js | 4 ++-- src/js/controllers/confirm.js | 4 ++-- src/js/services/coinbaseService.js | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index ad9f81f54..77bd6d0ec 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('amountController', function($scope, $filter, $timeout, $ionicScrollDelegate, $ionicHistory, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, bitpayCardService, popupService, bwcError, payproService, profileService, bitcore, amazonService, glideraService, coinbaseService) { +angular.module('copayApp.controllers').controller('amountController', function($scope, $filter, $timeout, $ionicScrollDelegate, $ionicHistory, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, bitpayCardService, popupService, bwcError, payproService, profileService, bitcore, amazonService, glideraService, coinbaseService, appConfigService) { var unitToSatoshi; var satToUnit; var unitDecimals; @@ -64,7 +64,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ }); var dataSrc = { - name: 'Received from ' + $window.appConfig.nameCase + name: 'Received from ' + appConfigService.nameCase }; coinbaseService.createAddress(data.accessToken, data.accountId, dataSrc, function(err, data) { $scope.toAddress = data.data.address; diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 66416f1a7..89de29963 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, amazonService, glideraService, bwcError, coinbaseService, bitpayCardService) { +angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, amazonService, glideraService, bwcError, coinbaseService, bitpayCardService, appConfigService) { var cachedTxp = {}; var toAmount; var isChromeApp = platformInfo.isChromeApp; @@ -1017,7 +1017,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( ctx['price_sensitivity'] = $scope.selectedPriceSensitivity.data; ctx['sell_price_amount'] = $scope.coinbaseSellPrice ? $scope.coinbaseSellPrice.amount : ''; ctx['sell_price_currency'] = $scope.coinbaseSellPrice ? $scope.coinbaseSellPrice.currency : 'USD'; - ctx['description'] = $window.appConfig.nameCase + ' Wallet: ' + $scope.wallet.name; + ctx['description'] = appConfigService.nameCase + ' Wallet: ' + $scope.wallet.name; coinbaseService.savePendingTransaction(ctx, null, function(err) { ongoingProcess.set('sellingBitcoin', false, onSendStatusChange); if (err) $log.debug(err); diff --git a/src/js/services/coinbaseService.js b/src/js/services/coinbaseService.js index 3c608a3ca..e8c6be185 100644 --- a/src/js/services/coinbaseService.js +++ b/src/js/services/coinbaseService.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.services').factory('coinbaseService', function($http, $log, $window, platformInfo, lodash, storageService, configService) { +angular.module('copayApp.services').factory('coinbaseService', function($http, $log, $window, platformInfo, lodash, storageService, configService, appConfigService) { var root = {}; var credentials = {}; var isCordova = platformInfo.isCordova; @@ -608,11 +608,12 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $ var _sendToWallet = function(tx, accessToken, accountId, coinbasePendingTransactions) { if (!tx) return; + var desc = 'To ' + appConfigService.nameCase + ' Wallet'; var data = { to: tx.toAddr, amount: tx.amount.amount, currency: tx.amount.currency, - description: 'To Wallet' + description: desc }; root.sendTo(accessToken, accountId, data, function(err, res) { console.log('[coinbaseService.js:591] SEND TO COPAY',err, res); //TODO