diff --git a/public/views/amount.html b/public/views/amount.html index 207ca5c11..8e961d3b7 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 9e10307a7..ab8457b30 100644 --- a/public/views/bitpayCard.html +++ b/public/views/bitpayCard.html @@ -1,21 +1,18 @@ - + - - - + + BitPay Card - - - + -
+
Sandbox version. Only for testing purpose
@@ -35,7 +32,7 @@
@@ -71,7 +68,7 @@
@@ -92,47 +89,43 @@
-
-
+
+
-
- ${{bitpayCard.bitpayCardCurrentBalance}} -
Available balance
+
+
${{bitpayCard.bitpayCardCurrentBalance}}
+ + {{'Add Funds'|translate}} +
-
+
...
-
- - - -
- -
- No transactions yet + !bitpayCard.bitpayCardInvoiceHistory[0] && (!loadingHistory || !bitpayCardCached)"> + +

Get started

+

Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.

-
- -
- -
+
+
+ +
-
+
@@ -146,7 +139,7 @@
+ class="col size-12"> {{desc}}
@@ -165,55 +158,5 @@
- -
-
- -
- - - - -
- -

- You selected a multisignature wallet. Please note that the transaction will only appear on your card's - Activity when the payment is fully signed. -

- -
-
- -
-
- -
-
-
-
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/public/views/tab-home.html b/public/views/tab-home.html index e17426e5b..d3592e704 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -76,14 +76,15 @@

-

BitPay Card

-

Add funds to get started

+

Add funds to get started

+ ${{bitpayCard.balance}}
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index c8e3abf4e..baa1cfdc4 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) { + $scope.$on("$ionicView.beforeEnter", 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/bitpayCard.js b/src/js/controllers/bitpayCard.js index fe199d85d..54a9c09a5 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -3,15 +3,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, popupService, gettextCatalog, bwcError) { var self = this; - var wallet; + $scope.dateRange = 'last30Days'; + $scope.network = bitpayCardService.getEnvironment(); - $scope.$on('Wallet/Changed', function(event, w) { - if (lodash.isEmpty(w)) { - $log.debug('No wallet provided'); - return; - } - wallet = w; - $log.debug('Wallet changed: ' + w.name); + bitpayCardService.getCacheData(function(err, data) { + if (err || lodash.isEmpty(data)) return; + $scope.bitpayCardCached = true; + self.bitpayCardTransactionHistory = data.transactions; + self.bitpayCardCurrentBalance = data.balance; }); var processTransactions = function(invoices, history) { @@ -89,6 +88,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi self.bitpayCardTransactionHistory = processTransactions(invoices, history.transactionList); self.bitpayCardCurrentBalance = history.currentCardBalance; + + var cacheData = { + balance: self.bitpayCardCurrentBalance, + transactions: self.bitpayCardTransactionHistory + }; + bitpayCardService.setCacheData(cacheData, function(err) { + if (err) $log.error(err); + }); }); }); } @@ -98,103 +105,11 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }); }; - this.init = function() { - $scope.dateRange = 'last30Days'; - - $scope.network = bitpayCardService.getEnvironment(); - $scope.wallets = profileService.getWallets({ - network: $scope.network, - onlyComplete: true - }); - - self.update(); - - wallet = $scope.wallets[0]; - - if (wallet && wallet.credentials.n > 1) - self.isMultisigWallet = true; - }; - - this.sendFunds = function() { - if (lodash.isEmpty(wallet)) return; - - if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { - $log.info('No signing proposal: No private key'); - popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg('MISSING_PRIVATE_KEY')); - return; - } - - var dataSrc = { - amount: $scope.fiat, - currency: 'USD' - }; - var outputs = []; - var config = configService.getSync(); - var configWallet = config.wallet; - var walletSettings = configWallet.settings; - - - 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) { - var address, comment, amount; - - address = data.bitcoinAddress; - amount = parseInt((data.btcPrice * 100000000).toFixed(0)); - comment = data.itemDesc; - - outputs.push({ - 'toAddress': address, - 'amount': amount, - 'message': comment - }); - - var txp = { - toAddress: address, - amount: amount, - outputs: outputs, - message: comment, - payProUrl: null, - excludeUnconfirmedUtxos: configWallet.spendUnconfirmed ? false : true, - feeLevel: walletSettings.feeLevel || 'normal' - }; - - walletService.createTx(wallet, txp, function(err, createdTxp) { - ongoingProcess.set('Processing Transaction...', false); - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); - return; - } - walletService.publishAndSign(wallet, createdTxp, function(err, tx) { - if (err) { - popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err)); - return; - } - self.update(); - $scope.addFunds = false; - $timeout(function() { - $scope.$digest(); - }); - }); - }); - }); - }); - }, 100); - }; - - this.authenticate = function() { + this.authenticate = function(email, password) { var data = { - emailAddress : $scope.email, - hashedPassword : pbkdf2Service.pbkdf2Sync($scope.password, '..............', 200, 64).toString('hex') + emailAddress : email, + hashedPassword : pbkdf2Service.pbkdf2Sync(password, '..............', 200, 64).toString('hex') }; // POST /authenticate @@ -215,10 +130,10 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }); }; - this.authenticate2FA = function() { + this.authenticate2FA = function(twoFactorCode) { var data = { - twoFactorCode : $scope.twoFactorCode + twoFactorCode : twoFactorCode }; self.authenticating = true; @@ -258,5 +173,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi return tx.description; }; + $scope.$on("$ionicView.beforeEnter", function(event, data){ + self.update(); + }); + }); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 0b6654842..868a45856 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.$on("$ionicView.beforeEnter", 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/preferencesBitpayCard.js b/src/js/controllers/preferencesBitpayCard.js index 9e4c9da8a..2abf6a8c4 100644 --- a/src/js/controllers/preferencesBitpayCard.js +++ b/src/js/controllers/preferencesBitpayCard.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesBitpayCardController', - function($scope, $state, $timeout, bitpayCardService, popupService) { + function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) { $scope.logout = function() { var title = 'Are you sure you would like to log out of your Bitpay Card account?'; @@ -12,8 +12,9 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll var logout = function() { bitpayCardService.logout(function() { + $ionicHistory.removeBackView(); $timeout(function() { - $state.go('bitpayCard.main'); + $state.go('tabs.home'); }, 100); }); }; diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 41444b0d9..0dec2cc7f 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('tabHomeController', - function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window) { + function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService) { var wallet; $scope.externalServices = {}; $scope.bitpayCardEnabled = true; // TODO @@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); } - $state.go('tabs.details', { + $state.go('tabs.wallet', { walletId: wallet.credentials.walletId }); }; @@ -206,7 +206,15 @@ angular.module('copayApp.controllers').controller('tabHomeController', }); }); + var bitpayCardCache = function() { + bitpayCardService.getCacheData(function(err, data) { + if (err || lodash.isEmpty(data)) return; + $scope.bitpayCard = data; + }); + }; + $scope.$on("$ionicView.enter", function(event, data) { + $scope.bitpayCard = null; configService.whenAvailable(function() { var config = configService.getSync(); var isWindowsPhoneApp = platformInfo.isWP && platformInfo.isCordova; @@ -217,6 +225,8 @@ angular.module('copayApp.controllers').controller('tabHomeController', $scope.bitpayCardEnabled = config.bitpayCard.enabled; $scope.nextStepEnabled = $scope.glideraEnabled || $scope.coinbaseEnabled || $scope.amazonEnabled || $scope.bitpayCardEnabled; $scope.recentTransactionsEnabled = config.recentTransactions.enabled; + + if ($scope.bitpayCardEnabled) bitpayCardCache(); }); $scope.nextStep(); $scope.updateAllWallets(); 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 ba828213c..b8301f47f 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -150,10 +150,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('tabs.details', { - url: '/details/{walletId}/{fromOnboarding}', + .state('tabs.wallet', { + url: '/wallet/{walletId}/{fromOnboarding}', views: { - 'tab-home': { + 'tab-home@tabs': { controller: 'walletDetailsController', templateUrl: 'views/walletDetails.html' } @@ -166,7 +166,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('tabs.activity', { url: '/activity', views: { - 'tab-home': { + 'tab-home@tabs': { controller: 'activityController', templateUrl: 'views/activity.html', } @@ -175,7 +175,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('tabs.proposals', { url: '/proposals', views: { - 'tab-home': { + 'tab-home@tabs': { controller: 'proposalsController', templateUrl: 'views/proposals.html', } @@ -836,29 +836,44 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) - /* - * - * BitPay Card - * - */ + /* + * + * BitPay Card + * + */ - .state('bitpayCard', { - url: '/bitpayCard', - abstract: true, - template: '' - }) - .state('bitpayCard.main', { - url: '/main', + .state('tabs.bitpayCard', { + url: '/bitpay-card', views: { - 'bitpayCard': { + 'tab-home@tabs': { + controller: 'bitpayCardController', + controllerAs: 'bitpayCard', templateUrl: 'views/bitpayCard.html' } } }) - .state('bitpayCard.preferences', { + .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: { - 'bitpayCard': { + 'tab-home@tabs': { templateUrl: 'views/preferencesBitpayCard.html' } } diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js index d01b1cf89..c49bc5ffa 100644 --- a/src/js/services/bitpayCardService.js +++ b/src/js/services/bitpayCardService.js @@ -187,8 +187,38 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http, }); }; + root.getCacheData = function(cb) { + _setCredentials(); + storageService.getBitpayCardCache(credentials.NETWORK, function(err, data) { + if (err) return cb(err); + if (lodash.isString(data)) { + data = JSON.parse(data); + } + data = data || {}; + return cb(null, data); + }); + }; + + root.setCacheData = function(data, cb) { + _setCredentials(); + data = JSON.stringify(data); + storageService.setBitpayCardCache(credentials.NETWORK, data, function(err) { + if (err) return cb(err); + return cb(); + }); + }; + + root.removeCacheData = function(cb) { + _setCredentials(); + storageService.removeBitpayCardCache(credentials.NETWORK, function(err) { + if (err) return cb(err); + return cb(); + }); + }; + root.logout = function(cb) { _setCredentials(); + root.removeCacheData(function() {}); storageService.removeBitpayCard(credentials.NETWORK, function(err) { $http(_getBitPay('/visa-api/logout')).then(function(data) { $log.info('BitPay Logout: SUCCESS'); diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 0dea73fb0..ace8bbb11 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -833,7 +833,7 @@ angular.module('copayApp.services') x.action = function() { // TODO? - // $state.go('tabs.details', { + // $state.go('tabs.wallet', { // walletId: x.walletId, // txpId: x.txpId, // txid: x.txid, diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js index a1daeb36e..3e07547ac 100644 --- a/src/js/services/storageService.js +++ b/src/js/services/storageService.js @@ -337,6 +337,18 @@ angular.module('copayApp.services') storage.remove('bitpayCard-' + network, cb); }; + root.setBitpayCardCache = function(network, data, cb) { + storage.set('bitpayCardCache-' + network, data, cb); + }; + + root.getBitpayCardCache = function(network, cb) { + storage.get('bitpayCardCache-' + network, cb); + }; + + root.removeBitpayCardCache = function(network, cb) { + storage.remove('bitpayCardCache-' + network, cb); + }; + root.removeAllWalletData = function(walletId, cb) { root.clearLastAddress(walletId, function(err) { if (err) return cb(err); 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/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 4d431a4d4..5d7b045b6 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -3,8 +3,7 @@ width: 100%; text-align: center; padding: 2rem 1rem 1.5rem 1rem; - min-height: 115px; - margin-bottom: 25px; + min-height: 140px; border-color: #172565; background-color: #1e3186; background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%); @@ -13,4 +12,13 @@ strong { line-height: 100%; } + .select-style { + border: none; + box-shadow: none; + background-color: transparent; + background-image: none; + margin: 0; + padding: 0; + width: 100%; + } } 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; }