diff --git a/public/views/amount.html b/public/views/amount.html index 207ca5c11..07460c375 100644 --- a/public/views/amount.html +++ b/public/views/amount.html @@ -12,10 +12,15 @@
Recipient
-
+
- - {{toName || toAddress}} + + + +
+ + + {{toName || toAddress}}
diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html index 5480dc787..2b15d9aa6 100644 --- a/public/views/bitpayCard.html +++ b/public/views/bitpayCard.html @@ -101,7 +101,7 @@
- +
diff --git a/public/views/confirm.html b/public/views/confirm.html index 721ef18c8..aa039f4b4 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -26,14 +26,21 @@
- - To: {{toAddress}} -

{{toName}}

+
+ + +
+ +
+
+ To: {{toAddress}} +

{{toName}}

-
- - - {{_paypro.domain}} +
+ + + {{_paypro.domain}} +
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html index 20eecb676..e3fc96488 100644 --- a/public/views/modals/paypro.html +++ b/public/views/modals/paypro.html @@ -1,60 +1,57 @@ - -
- - Close - + + +
+ Payment request
-

Payment request

 - -
-
-
- {{amountStr}} -
-
+ +
+ {{amountStr}} +
-

Details

-
    -
  • - Pay To - {{_paypro.domain}} -
    • -
  • - Address - {{_paypro.toAddress}} -
    • -
  • - Certified by - +
    +
    + Details +
    +
    + {{'Pay To'|translate}} + {{_paypro.domain}} +
    +
    + {{'Address'|translate}} + {{_paypro.toAddress}} +
    +
    + {{'Certified by'|translate}} + - + {{_paypro.caName}}
    (Trusted)     - Self-signed Certificate + Self-signed Certificate - {{_paypro.caName}}
    + {{_paypro.caName}}
    WARNING: UNTRUSTED CERTIFICATE     -
    • -
  • - Memo - {{_paypro.memo}} -
    • -
  • - Expires - {{_paypro.expires * 1000 | amTimeAgo }} -
    • -
+
+
+ {{'Memo'|translate}} + {{_paypro.memo}} +
+
+ {{'Expires'|translate}} + {{_paypro.expires * 1000 | amTimeAgo }} +
-
diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 6d808fafb..426c762af 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -4,13 +4,14 @@
{{tx.amountStr}}
-
- Sent +
+ Sent + Funds sent
-
+
OKAY
-
+

Would you like to add this address to your address book?

@@ -40,7 +41,7 @@
-
+
Payment Proposal Created
@@ -52,7 +53,7 @@
-
+
Payment Accepted
@@ -62,7 +63,7 @@
-
+
Payment Rejected
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index c8e3abf4e..8478aaaec 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($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) { +angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, bitpayCardService, popupService) { var unitToSatoshi; var satToUnit; @@ -10,18 +10,20 @@ angular.module('copayApp.controllers').controller('amountController', function($ var SMALL_FONT_SIZE_LIMIT = 13; var LENGTH_EXPRESSION_LIMIT = 19; - $scope.isWallet = $stateParams.isWallet; - $scope.toAddress = $stateParams.toAddress; - $scope.toName = $stateParams.toName; - $scope.toEmail = $stateParams.toEmail; - $scope.$on('$ionicView.leave', function() { angular.element($window).off('keydown'); }); $scope.$on("$ionicView.enter", function(event, data) { - if (!$stateParams.toAddress) { + $scope.isWallet = data.stateParams.isWallet; + $scope.isCard = data.stateParams.isCard; + $scope.toAddress = data.stateParams.toAddress; + $scope.toName = data.stateParams.toName; + $scope.toEmail = data.stateParams.toEmail; + $scope.showAlternativeAmount = !!$scope.isCard; + + if (!$scope.isCard && !$stateParams.toAddress) { $log.error('Bad params at amount') throw ('bad params'); } @@ -97,7 +99,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ }; $scope.pushOperator = function(operator) { - console.log('[amount.js.90:operator:]', operator); //TODO if (!$scope.amount || $scope.amount.length == 0) return; $scope.amount = _pushOperator($scope.amount); @@ -185,14 +186,50 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.finish = function() { var _amount = evaluate(format($scope.amount)); - var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals); - $state.transitionTo('tabs.send.confirm', { - isWallet: $scope.isWallet, - toAmount: amount * unitToSatoshi, - toAddress: $scope.toAddress, - toName: $scope.toName, - toEmail: $scope.toEmail - }); + if ($scope.isCard) { + var amountUSD = $scope.showAlternativeAmount ? _amount : $filter('formatFiatAmount')(toFiat(_amount)); + + var dataSrc = { + amount: amountUSD, + currency: 'USD' + }; + ongoingProcess.set('Processing Transaction...', true); + $timeout(function() { + + bitpayCardService.topUp(dataSrc, function(err, invoiceId) { + if (err) { + ongoingProcess.set('Processing Transaction...', false); + popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); + return; + } + + bitpayCardService.getInvoice(invoiceId, function(err, data) { + ongoingProcess.set('Processing Transaction...', false); + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); + return; + } + var payProUrl = data.paymentUrls.BIP73; + + $state.transitionTo('tabs.bitpayCard.confirm', { + isCard: $scope.isCard, + toName: $scope.toName, + paypro: payProUrl + }); + }); + }); + }); + + } else { + var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals); + $state.transitionTo('tabs.send.confirm', { + isWallet: $scope.isWallet, + toAmount: amount * unitToSatoshi, + toAddress: $scope.toAddress, + toName: $scope.toName, + toEmail: $scope.toEmail + }); + } }; }); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 0b6654842..1a73ddd2d 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -4,15 +4,15 @@ angular.module('copayApp.controllers').controller('confirmController', function( var cachedTxp = {}; var isChromeApp = platformInfo.isChromeApp; - $scope.isWallet = $stateParams.isWallet; - $scope.toAmount = $stateParams.toAmount; - $scope.toAddress = $stateParams.toAddress; - $scope.toName = $stateParams.toName; - $scope.toEmail = $stateParams.toEmail; - $scope.description = $stateParams.description; - $scope.paypro = $stateParams.paypro; - $scope.$on("$ionicView.enter", function(event, data) { + $scope.isWallet = data.stateParams.isWallet; + $scope.isCard = data.stateParams.isCard; + $scope.toAmount = data.stateParams.toAmount; + $scope.toAddress = data.stateParams.toAddress; + $scope.toName = data.stateParams.toName; + $scope.toEmail = data.stateParams.toEmail; + $scope.description = data.stateParams.description; + $scope.paypro = data.stateParams.paypro; initConfirm(); }); @@ -243,7 +243,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( walletService.createTx(wallet, txp, function(err, ctxp) { if (err) { - return setSendError(err); + setSendError(err); + return cb(err); } return cb(null, ctxp); }); @@ -312,8 +313,4 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (err) return setSendError(err); }); }; - - $scope.cancel = function() { - $state.go('tabs.send'); - }; }); diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js index 9b9cdd7e4..6ac660181 100644 --- a/src/js/controllers/modals/txStatus.js +++ b/src/js/controllers/modals/txStatus.js @@ -1,9 +1,13 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) { +angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $stateParams, $ionicHistory, $log, addressbookService) { if ($scope.cb) $timeout($scope.cb, 100); - $scope.fromSendTab = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount" ||  "tabs.send"; + + var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName; + $scope.fromSendTab = previousView.match(/tabs.send/) ? true : false; + $scope.fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false; + $scope.fromPayPro = $stateParams.paypro ? true : false; $scope.cancel = function() { $scope.txStatusModal.hide(); @@ -13,6 +17,11 @@ angular.module('copayApp.controllers').controller('txStatusController', function $timeout(function() { $state.transitionTo('tabs.home'); }, 100); + } else if ($scope.fromBitPayCard) { + $ionicHistory.removeBackView(); + $timeout(function() { + $state.transitionTo('tabs.bitpayCard'); + }, 100); } }; @@ -24,7 +33,7 @@ angular.module('copayApp.controllers').controller('txStatusController', function }); $ionicHistory.removeBackView(); $state.go('tabs.send.addressbook', { - fromSendTab: true, + fromSendTab: $scope.fromSendTab, addressbookEntry: addressbookEntry }); } diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js index bfb12da45..3e93df45d 100644 --- a/src/js/controllers/tabsController.js +++ b/src/js/controllers/tabsController.js @@ -33,6 +33,8 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro 'tabs.preferences.backup', 'tabs.receive.backupWarning', 'tabs.receive.backup', + 'tabs.bitpayCard.amount', + 'tabs.bitpayCard.confirm', ]; $rootScope.$on('$ionicView.beforeEnter', function() { diff --git a/src/js/routes.js b/src/js/routes.js index e81fa76b2..b8301f47f 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -852,6 +852,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('tabs.bitpayCard.amount', { + url: '/amount/:isCard/:toName', + views: { + 'tab-home@tabs': { + controller: 'amountController', + templateUrl: 'views/amount.html' + } + } + }) + .state('tabs.bitpayCard.confirm', { + url: '/confirm/:isCard/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro', + views: { + 'tab-home@tabs': { + controller: 'confirmController', + templateUrl: 'views/confirm.html' + } + } + }) .state('tabs.bitpayCard.preferences', { url: '/preferences', views: { diff --git a/src/sass/common.scss b/src/sass/common.scss index b2a7677af..23da004f3 100644 --- a/src/sass/common.scss +++ b/src/sass/common.scss @@ -116,3 +116,16 @@ ion-header-bar{ .card{ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3); } + +/* Wrap text from item-note */ +.item-note{ + white-space: -moz-pre-wrap !important; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + white-space: pre-wrap; + word-wrap: break-word; + white-space: -webkit-pre-wrap; + word-break: break-all; + white-space: normal; +} + diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss index e459a46dd..83f1c3b14 100644 --- a/src/sass/views/amount.scss +++ b/src/sass/views/amount.scss @@ -1,4 +1,7 @@ #view-amount { + .icon-bitpay-card { + background-image: url("../img/icon-bitpay.svg"); + } @media(max-width: 480px) { .bitcoin-address { .icon { diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss index 425850d92..667184165 100644 --- a/src/sass/views/confirm.scss +++ b/src/sass/views/confirm.scss @@ -1,4 +1,7 @@ #view-confirm { + .icon-bitpay-card { + background-image: url("../img/icon-bitpay.svg"); + } .slide-to-pay{ bottom: 149px; }