diff --git a/public/views/amazon.html b/public/views/amazon.html index 319826c1e..1d43633f0 100644 --- a/public/views/amazon.html +++ b/public/views/amazon.html @@ -10,8 +10,7 @@ -
- +
Sandbox version. Only for testing purpose
@@ -22,47 +21,43 @@
-
Amazon.com Gift Cards never expire and can be redeemed towards millions of items at - www.amazon.com + www.amazon.com
-
    -
  • - - Buy Gift Card - - - -
    • -
-

Your cards

-
-
+
+ + + Buy Gift Card + + +
+ +

Your cards

+
+
{{id}} -
-
- {{item.amount | currency : '$ ' : 2}} -
-
- - -
-
- Error - Pending to confirmation - Canceled - {{item.date | amTimeAgo}} -
-
- +

+ {{item.amount | currency : '$ ' : 2}} +

+

+ - +

+

+ Error + Pending to confirmation + Canceled + {{item.date | amTimeAgo}} +

diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html index b52acfb2d..79289a5a7 100644 --- a/public/views/bitpayCard.html +++ b/public/views/bitpayCard.html @@ -15,7 +15,7 @@ -
+
Sandbox version. Only for testing purpose
@@ -24,7 +24,7 @@
-
+

diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html index 1eb985b1a..55e820458 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -10,7 +10,7 @@ -
+
{{buy.error}} @@ -22,14 +22,14 @@ BitPay Invoice ID: {{buy.errorInfo.invoiceId}}.
- Open invoice + Open invoice
-
+
Amazon.com Gift Card -
+
Use your Amazon.com Gift Card* to shop from a huge selection of books, electronics, music, movies, software, apparel, toys, and more.
@@ -51,7 +51,6 @@ ng-model="fiat" autocomplete="off" ignore-mouse-wheel required> - USD @@ -69,7 +68,7 @@
-
- Claim code: {{buy.giftCard.claimCode}} + Claim code: {{buy.giftCard.claimCode}}
- See invoice + See invoice

To redeem your gift card, follow these steps:
    -
  1. 1. Visit www.amazon.com/gc +
  2. 1. Visit www.amazon.com/gc
  3. 2. Click Apply to Account and enter the Claim Code when prompted.
  4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
  5. 4. You must pay for any remaining balance on your order with another payment method. @@ -148,7 +147,7 @@

    If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

    @@ -157,14 +156,14 @@
- * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
diff --git a/public/views/modals/amazon-card-details.html b/public/views/modals/amazon-card-details.html index 07668def6..528933a6c 100644 --- a/public/views/modals/amazon-card-details.html +++ b/public/views/modals/amazon-card-details.html @@ -1,20 +1,15 @@ -
- - Close - -
-

- Details -

+ +

Details

 -
- Amazon.com Gift Card
@@ -25,11 +20,11 @@
- Claim code: {{card.claimCode}} + Claim code: {{card.claimCode}}
@@ -54,7 +49,7 @@
- See invoice + See invoice
@@ -72,7 +67,7 @@ To redeem your gift card, follow these steps:
    -
  1. 1. Visit www.amazon.com/gc +
  2. 1. Visit www.amazon.com/gc
  3. 2. Click Apply to Account and enter the Claim Code when prompted.
  4. 3. Gift card funds will be applied automatically to eligible orders during the checkout process.
  5. 4. You must pay for any remaining balance on your order with another payment method. @@ -85,35 +80,33 @@

    If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. + www.amazon.com/gc-redeem. If you have questions regarding the BitPay Introductory offer, please contact BitPay.

- * Amazon.com is not a sponsor of this promotion. - Except as required by law, Amazon.com + * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of - eligible goods at Amazon.com or certain of its + eligible goods at Amazon.com or certain of its affiliated websites. For complete terms and conditions, see - www.amazon.com/gc-legal. + www.amazon.com/gc-legal. GCs are issued by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP - of Amazon.com, Inc. or its affiliates. + of Amazon.com, Inc. or its affiliates. No expiration date or service fees.
- + Remove + +
-
-
diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index c242238f5..a5ca07ea5 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -1,47 +1,47 @@ -
- -
+
+ +
{{tx.amountStr}}
-
+
Sent
- OKAY + OKAY
-
- -
+
+ +
Payment Proposal Created
- OKAY + OKAY
-
- -
+
+ +
Payment Accepted
- OKAY + OKAY
-
- -
+
+ +
Payment Rejected
- OKAY + OKAY
diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 8b8c8a426..58d71bc2b 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -47,7 +47,7 @@
-
+
@@ -73,23 +73,21 @@
- + TODO

Next steps

-
-
    -
  • +
    +
    BitPay Card -
    • -
  • +
+
Gift Cards - - +
diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js index bf908a702..f36d984bf 100644 --- a/src/js/controllers/amazon.js +++ b/src/js/controllers/amazon.js @@ -1,15 +1,24 @@ 'use strict'; angular.module('copayApp.controllers').controller('amazonController', - function($scope, $timeout, $ionicModal, $log, lodash, bwcError, amazonService, platformInfo) { + function($scope, $timeout, $ionicModal, $log, lodash, bwcError, amazonService, platformInfo, nodeWebkit) { if (platformInfo.isCordova && StatusBar.isVisible) { StatusBar.backgroundColorByHexString("#4B6178"); } + $scope.openExternalLink = function(url, target) { + if (platformInfo.isNW) { + nodeWebkit.openExternalLink(url); + } else { + target = target || '_blank'; + var ref = window.open(url, target, 'location=no'); + } + }; + this.init = function() { var self = this; - self.sandbox = amazonService.getEnvironment() == 'testnet' ? true : false; + $scope.network = amazonService.getEnvironment(); amazonService.getPendingGiftCards(function(err, gcds) { if (err) { self.error = err; diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index 4e1897d28..b861275e7 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -3,22 +3,12 @@ angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $rootScope, $timeout, $log, $ionicModal, lodash, bitpayCardService, configService, profileService, walletService, fingerprintService, ongoingProcess, bwcError, bitcore, pbkdf2Service, moment, platformInfo) { var self = this; - var client; - - self.sandbox = bitpayCardService.getEnvironment() == 'testnet' ? true : false; + var wallet; if (platformInfo.isCordova && StatusBar.isVisible) { StatusBar.backgroundColorByHexString("#293C92"); } - var handleEncryptedWallet = function(client, cb) { - if (!walletService.isEncrypted(client)) return cb(); - $rootScope.$emit('Local/NeedsPassword', false, function(err, password) { - if (err) return cb(err); - return cb(walletService.unlock(client, password)); - }); - }; - var processTransactions = function(invoices, history) { for (var i = 0; i < invoices.length; i++) { var matched = false; @@ -89,7 +79,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi bitpayCardService.transactionHistory(dateRange, function(err, history) { $scope.loadingHistory = false; if (err) { - self.error = err; + self.error = err.error || err; return; } @@ -106,25 +96,26 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi this.init = function() { $scope.dateRange = 'last30Days'; - self.update(); - var network = bitpayCardService.getEnvironment(); + $scope.network = bitpayCardService.getEnvironment(); self.allWallets = profileService.getWallets({ - network: network, + network: $scope.network, n: 1, onlyComplete: true }); + self.update(); + if (lodash.isEmpty(self.allWallets)) return; - client = self.allWallets[0]; + wallet = self.allWallets[0]; - if (client.credentials.n > 1) + if (wallet.credentials.n > 1) self.isMultisigWallet = true; $timeout(function() { - self.selectedWalletId = client.credentials.walletId; - self.selectedWalletName = client.credentials.walletName; + self.selectedWalletId = wallet.credentials.walletId; + self.selectedWalletName = wallet.credentials.walletName; $scope.$apply(); }, 100); }; @@ -146,11 +137,11 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi $scope.$on('walletSelected', function(ev, walletId) { $timeout(function() { - client = profileService.getClient(walletId); + wallet = profileService.getClient(walletId); self.isMultisigWallet = false; self.selectedWalletId = walletId; - self.selectedWalletName = client.credentials.walletName; - if (client.credentials.n > 1) + self.selectedWalletName = wallet.credentials.walletName; + if (wallet.credentials.n > 1) self.isMultisigWallet = true; $scope.$apply(); }, 100); @@ -161,6 +152,12 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi this.sendFunds = function() { self.error = null; + if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { + $log.info('No signing proposal: No private key'); + self.error = bwcError.msg('MISSING_PRIVATE_KEY'); + return; + } + var dataSrc = { amount: $scope.fiat, currency: 'USD' @@ -185,56 +182,52 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi } bitpayCardService.getInvoice(invoiceId, function(err, data) { - var address, comment, amount; + var address, comment, amount; - address = data.bitcoinAddress; - amount = parseInt((data.btcPrice * 100000000).toFixed(0)); - comment = data.itemDesc; + address = data.bitcoinAddress; + amount = parseInt((data.btcPrice * 100000000).toFixed(0)); + comment = data.itemDesc; - outputs.push({ - 'toAddress': address, - 'amount': amount, - 'message': comment - }); + 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' - }; + var txp = { + toAddress: address, + amount: amount, + outputs: outputs, + message: comment, + payProUrl: null, + excludeUnconfirmedUtxos: configWallet.spendUnconfirmed ? false : true, + feeLevel: walletSettings.feeLevel || 'normal' + }; - walletService.createTx(client, txp, function(err, createdTxp) { - ongoingProcess.set('Processing Transaction...', false); - if (err) { - self.error = bwcError.msg(err); - $timeout(function() { - $scope.$digest(); - }); - return; - } - $scope.$emit('Local/NeedsConfirmation', createdTxp, function(accept) { - if (accept) { - self.confirmTx(createdTxp, function(err, tx) { - ongoingProcess.set('Processing Transaction...', false); - if (err) { - self.error = bwcError.msg(err); - $timeout(function() { - $scope.$digest(); - }); - return; - } - self.update(); - $scope.addFunds = false; + walletService.createTx(wallet, txp, function(err, createdTxp) { + ongoingProcess.set('Processing Transaction...', false); + if (err) { + self.error = bwcError.msg(err); + $timeout(function() { + $scope.$digest(); + }); + return; + } + self.confirmTx(createdTxp, function(err, tx) { + ongoingProcess.set('Processing Transaction...', false); + if (err) { + self.error = bwcError.msg(err); $timeout(function() { $scope.$digest(); }); + return; + } + self.update(); + $scope.addFunds = false; + $timeout(function() { + $scope.$digest(); }); - } - }); + }); }); }); }); @@ -243,39 +236,39 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi this.confirmTx = function(txp, cb) { - fingerprintService.check(client, function(err) { + fingerprintService.check(wallet, function(err) { if (err) { $log.debug(err); return cb(err); } - handleEncryptedWallet(client, function(err) { + walletService.handleEncryptedWallet(wallet, function(err) { if (err) { $log.debug(err); return bwcError.cb(err, null, cb); } ongoingProcess.set('Processing Transaction...', true); - walletService.publishTx(client, txp, function(err, publishedTxp) { + walletService.publishTx(wallet, txp, function(err, publishedTxp) { if (err) { $log.debug(err); return bwcError.cb(err, null, cb); } - walletService.signTx(client, publishedTxp, function(err, signedTxp) { - walletService.lock(client); + walletService.signTx(wallet, publishedTxp, function(err, signedTxp) { + walletService.lock(wallet); if (err) { $log.debug(err); - walletService.removeTx(client, signedTxp, function(err) { + walletService.removeTx(wallet, signedTxp, function(err) { if (err) $log.debug(err); }); return bwcError.cb(err, null, cb); } - walletService.broadcastTx(client, signedTxp, function(err, broadcastedTxp) { + walletService.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) { if (err) { $log.debug(err); - walletService.removeTx(client, broadcastedTxp, function(err) { + walletService.removeTx(wallet, broadcastedTxp, function(err) { if (err) $log.debug(err); }); return bwcError.cb(err, null, cb); diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index 7066c4ecb..d1f65c01a 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -1,17 +1,18 @@ 'use strict'; angular.module('copayApp.controllers').controller('buyAmazonController', - function($rootScope, $scope, $ionicModal, $log, $timeout, $state, lodash, profileService, bwcError, gettext, configService, walletService, fingerprintService, amazonService, ongoingProcess) { + function($rootScope, $scope, $ionicModal, $log, $timeout, $state, $ionicPopup, lodash, profileService, bwcError, gettext, configService, walletService, fingerprintService, amazonService, ongoingProcess, platformInfo, nodeWebkit) { var self = this; - var client; + var wallet; - var handleEncryptedWallet = function(client, cb) { - if (!walletService.isEncrypted(client)) return cb(); - $rootScope.$emit('Local/NeedsPassword', false, function(err, password) { - if (err) return cb(err); - return cb(walletService.unlock(client, password)); - }); + $scope.openExternalLink = function(url, target) { + if (platformInfo.isNW) { + nodeWebkit.openExternalLink(url); + } else { + target = target || '_blank'; + var ref = window.open(url, target, 'location=no'); + } }; this.init = function() { @@ -24,11 +25,11 @@ angular.module('copayApp.controllers').controller('buyAmazonController', if (lodash.isEmpty(self.allWallets)) return; - client = self.allWallets[0]; + wallet = self.allWallets[0]; $timeout(function() { - self.selectedWalletId = client.credentials.walletId; - self.selectedWalletName = client.credentials.walletName; + self.selectedWalletId = wallet.credentials.walletId; + self.selectedWalletName = wallet.credentials.walletName; $scope.$apply(); }, 100); }; @@ -50,9 +51,9 @@ angular.module('copayApp.controllers').controller('buyAmazonController', $scope.$on('walletSelected', function(ev, walletId) { $timeout(function() { - client = profileService.getClient(walletId); + wallet = profileService.getClient(walletId); self.selectedWalletId = walletId; - self.selectedWalletName = client.credentials.walletName; + self.selectedWalletName = wallet.credentials.walletName; $scope.$apply(); }, 100); $scope.walletsModal.hide(); @@ -63,6 +64,12 @@ angular.module('copayApp.controllers').controller('buyAmazonController', self.error = null; self.errorInfo = null; + if (!wallet.canSign() && !wallet.isPrivKeyExternal()) { + $log.info('No signing proposal: No private key'); + self.error = bwcError.msg('MISSING_PRIVATE_KEY'); + return; + } + var dataSrc = { currency: 'USD', amount: $scope.fiat, @@ -98,7 +105,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController', $log.debug('Fetch PayPro Request...', invoice.paymentUrls.BIP73); - client.fetchPayPro({ + wallet.fetchPayPro({ payProUrl: invoice.paymentUrls.BIP73, }, function(err, paypro) { @@ -149,7 +156,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController', feeLevel: walletSettings.feeLevel || 'normal' }; - walletService.createTx(client, txp, function(err, createdTxp) { + walletService.createTx(wallet, txp, function(err, createdTxp) { ongoingProcess.set('Processing Transaction...', false); if (err) { self.error = bwcError.msg(err); @@ -240,42 +247,41 @@ angular.module('copayApp.controllers').controller('buyAmazonController', }); }); }); - } + }; this.confirmTx = function(txp, cb) { - - fingerprintService.check(client, function(err) { + fingerprintService.check(wallet, function(err) { if (err) { $log.debug(err); return cb(err); } - handleEncryptedWallet(client, function(err) { + walletService.handleEncryptedWallet(wallet, function(err) { if (err) { $log.debug(err); return bwcError.cb(err, null, cb); } ongoingProcess.set('Processing Transaction...', true); - walletService.publishTx(client, txp, function(err, publishedTxp) { + walletService.publishTx(wallet, txp, function(err, publishedTxp) { if (err) { $log.debug(err); return bwcError.cb(err, null, cb); } - walletService.signTx(client, publishedTxp, function(err, signedTxp) { - walletService.lock(client); + walletService.signTx(wallet, publishedTxp, function(err, signedTxp) { + walletService.lock(wallet); if (err) { $log.debug(err); - walletService.removeTx(client, signedTxp, function(err) { + walletService.removeTx(wallet, signedTxp, function(err) { if (err) $log.debug(err); }); return bwcError.cb(err, null, cb); } - walletService.broadcastTx(client, signedTxp, function(err, broadcastedTxp) { + walletService.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) { if (err) { $log.debug(err); - walletService.removeTx(client, broadcastedTxp, function(err) { + walletService.removeTx(wallet, broadcastedTxp, function(err) { if (err) $log.debug(err); }); return bwcError.cb(err, null, cb); diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index ab9e3be9f..66c0f0de0 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -214,7 +214,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController', return; } - handleEncryptedWallet(wallet, function(err) { + walletService.handleEncryptedWallet(wallet, function(err) { if (err) { self.error = err.message ||  bwcError.msg(err); return; diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js index 3c925b8d7..fafb18238 100644 --- a/src/js/controllers/tab-home.js +++ b/src/js/controllers/tab-home.js @@ -2,7 +2,6 @@ angular.module('copayApp.controllers').controller('tabHomeController', function($rootScope, $timeout, $scope, $state, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo) { - var self = this; var setNotifications = function(notifications) { @@ -18,48 +17,51 @@ angular.module('copayApp.controllers').controller('tabHomeController', - self.updateAllWallets = function() { - $scope.wallets = profileService.getWallets(); + $scope.updateAllWallets = function() { + $timeout(function() { + $scope.wallets = profileService.getWallets(); - var i = $scope.wallets.length, j =0; -// var timeSpan = 60 * 60 * 24 * 7; - var timeSpan = 60 * 60 * 24 * 1; - var notifications = []; + var i = $scope.wallets.length, j =0; + // var timeSpan = 60 * 60 * 24 * 7; + var timeSpan = 60 * 60 * 24 * 1; + var notifications = []; - $scope.fetchingNotifications = true; + $scope.fetchingNotifications = true; - lodash.each($scope.wallets, function(wallet) { + lodash.each($scope.wallets, function(wallet) { + + walletService.getStatus(wallet, {}, function(err, status) { + if (err) { + console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO + return; + } + wallet.status = status; + }); + + walletService.getNotifications(wallet, { + timeSpan: timeSpan + }, function(err, n) { + if (err) { + console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO + return; + } + notifications.push(n); + if (++j == i) { + $scope.fetchingNotifications = false; + setNotifications(lodash.compact(lodash.flatten(notifications))); + }; + }); - walletService.getStatus(wallet, {}, function(err, status) { - if (err) { - console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO - return; - } - wallet.status = status; }); + $scope.$digest(); + }, 100); + }; - walletService.getNotifications(wallet, { - timeSpan: timeSpan - }, function(err, n) { - if (err) { - console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO - return; - } - notifications.push(n); - if (++j == i) { - $scope.fetchingNotifications = false; - setNotifications(lodash.compact(lodash.flatten(notifications))); - }; - }); - - }); - } - - self.updateWallet = function(wallet) { + $scope.updateWallet = function(wallet) { $log.debug('Updating wallet:' + wallet.name) walletService.getStatus(wallet, {}, function(err, status) { if (err) { - console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO + $log.error(err); //TODO return; } wallet.status = status; @@ -71,17 +73,16 @@ angular.module('copayApp.controllers').controller('tabHomeController', - self.updateAllWallets(); $scope.bitpayCardEnabled = true; // TODO var listeners = [ $rootScope.$on('bwsEvent', function(e, walletId, type, n) { var wallet = profileService.getWallet(walletId); - self.updateWallet(wallet); + $scope.updateWallet(wallet); }), $rootScope.$on('Local/TxAction', function(e, walletId) { var wallet = profileService.getWallet(walletId); - self.updateWallet(wallet); + $scope.updateWallet(wallet); }), ]; diff --git a/src/js/directives/copyToClipboard.js b/src/js/directives/copyToClipboard.js index 50165b70a..1e9cbfe92 100644 --- a/src/js/directives/copyToClipboard.js +++ b/src/js/directives/copyToClipboard.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.directives') - .directive('copyToClipboard', function(platformInfo, gettextCatalog, ionicToast, clipboard) { + .directive('copyToClipboard', function(platformInfo, nodeWebkit, gettextCatalog, ionicToast, clipboard) { return { restrict: 'A', scope: { diff --git a/src/sass/main.scss b/src/sass/main.scss index af6c7ab3e..e798b077c 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -380,36 +380,14 @@ ul.wallet-selection.wallets { bottom: 0; } -.popup-txsent { - position: absolute; - width: 100%; - height: 100%; - background: rgba(24, 44, 58, 0.9); - i { - font-size: 5rem; - color: #4A90E2; - border-radius: 100%; - border-color: #4A90E2; - border: 2px solid; - width: 150px; - height: 150px; - display: block; - text-align: center; - padding-top: 1rem; - } +.popup-txsent i { + font-size: 5rem; + color: #4A90E2; } .popup-txsigned i, .popup-txrejected i { font-size: 5rem; color: #4A90E2; - border-radius: 100%; - border-color: #4A90E2; - border: 2px solid; - width: 150px; - height: 150px; - display: block; - text-align: center; - padding-top: 1rem; } .payment-proposal-head {