diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index e8e53209a..539d01234 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) { +angular.module('copayApp.controllers').controller('amountController', function($scope, $filter, $timeout, $ionicScrollDelegate, $ionicHistory, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, popupService, bwcError, payproService, profileService, bitcore, amazonService) { var _cardId; var unitToSatoshi; var satToUnit; @@ -22,20 +22,19 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.currency = data.stateParams.currency; $scope.forceCurrency = data.stateParams.forceCurrency; - $scope.cardId = data.stateParams.cardId; $scope.showMenu = $ionicHistory.backView() && $ionicHistory.backView().stateName == 'tabs.send'; var isWallet = data.stateParams.isWallet || 'false'; $scope.isWallet = (isWallet.toString().trim().toLowerCase() == 'true' ? true : false); $scope.toAddress = data.stateParams.toAddress; $scope.toName = data.stateParams.toName; $scope.toEmail = data.stateParams.toEmail; - $scope.showAlternativeAmount = !!$scope.cardId || !!$scope.nextStep; + $scope.showAlternativeAmount = !!$scope.nextStep; $scope.toColor = data.stateParams.toColor; $scope.showSendMax = false; $scope.customAmount = data.stateParams.customAmount; - if (!$scope.cardId && !$scope.nextStep && !data.stateParams.toAddress) { + if (!$scope.nextStep && !data.stateParams.toAddress) { $log.error('Bad params at amount') throw ('bad params'); } @@ -67,8 +66,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.unitName = config.unitName; if (data.stateParams.currency) { $scope.alternativeIsoCode = data.stateParams.currency; - } else { - $scope.alternativeIsoCode = !!$scope.cardId ? 'USD' : config.alternativeIsoCode; } $scope.specificAmount = $scope.specificAlternativeAmount = ''; $scope.isCordova = platformInfo.isCordova; @@ -218,72 +215,10 @@ angular.module('copayApp.controllers').controller('amountController', function($ return result.replace('x', '*'); }; - $scope.getRates = function() { - bitpayCardService.getRates($scope.alternativeIsoCode, function(err, res) { - if (err) { - $log.warn(err); - return; - } - if ($scope.unitName == 'bits') { - $scope.exchangeRate = '1,000,000 bits ~ ' + res.rate + ' ' + $scope.alternativeIsoCode; - } else { - $scope.exchangeRate = '1 BTC ~ ' + res.rate + ' ' + $scope.alternativeIsoCode; - } - }); - }; - $scope.finish = function() { var _amount = evaluate(format($scope.amount)); - if ($scope.cardId) { - var amountUSD = $scope.showAlternativeAmount ? _amount : $filter('formatFiatAmount')(toFiat(_amount)); - - var dataSrc = { - amount: amountUSD, - currency: 'USD' - }; - - ongoingProcess.set('Preparing transaction...', true); - $timeout(function() { - - bitpayCardService.topUp($scope.cardId, dataSrc, function(err, invoiceId) { - if (err) { - ongoingProcess.set('Preparing transaction...', false); - popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); - return; - } - - bitpayCardService.getInvoice(invoiceId, function(err, data) { - if (err) { - ongoingProcess.set('Preparing transaction...', false); - popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); - return; - } - var payProUrl = data.paymentUrls.BIP73; - - payproService.getPayProDetails(payProUrl, function(err, payProDetails) { - ongoingProcess.set('Preparing transaction...', false); - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); - return; - } - var stateParams = { - cardId: $scope.cardId, - cardAmountUSD: amountUSD, - toName: $scope.toName, - toAmount: payProDetails.amount, - toAddress: payProDetails.toAddress, - description: payProDetails.memo, - paypro: payProDetails - }; - - $state.transitionTo('tabs.bitpayCard.confirm', stateParams); - }, true); - }); - }); - }); - - } else if ($scope.nextStep) { + if ($scope.nextStep) { $state.transitionTo($scope.nextStep, { id: _cardId, amount: _amount, diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 64e54a6d7..5d38db39a 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, bwcError, 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, bwcError) { var cachedTxp = {}; var toAmount; var isChromeApp = platformInfo.isChromeApp; @@ -16,8 +16,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.useSendMax = data.stateParams.useSendMax == 'true' ? true : false; var isWallet = data.stateParams.isWallet || 'false'; $scope.isWallet = (isWallet.toString().trim().toLowerCase() == 'true' ? true : false); - $scope.cardId = data.stateParams.cardId; - $scope.cardAmountUSD = data.stateParams.cardAmountUSD; $scope.toAddress = data.stateParams.toAddress; $scope.toName = data.stateParams.toName; $scope.toEmail = data.stateParams.toEmail; @@ -44,9 +42,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( function applyButtonText(multisig) { $scope.buttonText = $scope.isCordova ? gettextCatalog.getString('Slide') + ' ' : gettextCatalog.getString('Click') + ' '; - if ($scope.cardId) { - $scope.buttonText += gettextCatalog.getString('to complete'); - } else if ($scope.paypro) { + if ($scope.paypro) { $scope.buttonText += gettextCatalog.getString('to pay'); } else if (multisig) { $scope.buttonText += gettextCatalog.getString('to accept'); @@ -144,13 +140,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.amountStr = txFormatService.formatAmountStr(toAmount); $scope.displayAmount = getDisplayAmount($scope.amountStr); $scope.displayUnit = getDisplayUnit($scope.amountStr); - if ($scope.cardAmountUSD) { - $scope.alternativeAmountStr = $filter('formatFiatAmount')($scope.cardAmountUSD) + ' USD'; - } else { - txFormatService.formatAlternativeStr(toAmount, function(v) { - $scope.alternativeAmountStr = v; - }); - } + txFormatService.formatAlternativeStr(toAmount, function(v) { + $scope.alternativeAmountStr = v; + }); }; function resetValues() { @@ -532,7 +524,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.onSuccessConfirm = function() { var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName; - var fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false; $ionicHistory.nextViewOptions({ disableAnimate: true @@ -540,22 +531,14 @@ angular.module('copayApp.controllers').controller('confirmController', function( $ionicHistory.removeBackView(); $scope.sendStatus = ''; - if (fromBitPayCard) { - $timeout(function() { - $state.transitionTo('tabs.bitpayCard', { - id: $stateParams.cardId - }); - }, 100); - } else { - $ionicHistory.nextViewOptions({ - disableAnimate: true, - historyRoot: true - }); - $ionicHistory.clearHistory(); - $state.go('tabs.send').then(function() { - $state.transitionTo('tabs.home'); - }); - } + $ionicHistory.nextViewOptions({ + disableAnimate: true, + historyRoot: true + }); + $ionicHistory.clearHistory(); + $state.go('tabs.send').then(function() { + $state.transitionTo('tabs.home'); + }); }; function publishAndSign(wallet, txp, onSendStatusChange) { @@ -572,22 +555,4 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (err) return setSendError(err); }, onSendStatusChange); }; - - $scope.getRates = function() { - var config = configService.getSync().wallet.settings; - var unitName = config.unitName; - var alternativeIsoCode = config.alternativeIsoCode; - bitpayCardService.getRates(alternativeIsoCode, function(err, res) { - if (err) { - $log.warn(err); - return; - } - if (lodash.isEmpty(res)) return; - if (unitName == 'bits') { - $scope.exchangeRate = '1,000,000 bits ~ ' + res.rate + ' ' + alternativeIsoCode; - } else { - $scope.exchangeRate = '1 BTC ~ ' + res.rate + ' ' + alternativeIsoCode; - } - }); - }; }); diff --git a/www/views/amount.html b/www/views/amount.html index 438f7ae53..cd234b3a0 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -17,7 +17,7 @@
Recipient
-
+
@@ -25,10 +25,7 @@ - - -
- + {{toName || toAddress}}
@@ -40,7 +37,6 @@
Amount -
{{exchangeRate}}
Daily buy limit: diff --git a/www/views/confirm.html b/www/views/confirm.html index c1a22bb03..c4c1a1705 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -17,7 +17,6 @@
{{displayAmount || '...'}} {{displayUnit}}
-
{{exchangeRate}}
{{alternativeAmountStr || '...'}}
@@ -31,11 +30,7 @@
To - - - -
- +