From f8c836bcc40ddedfde35404cf1f7261590d74d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Fri, 30 Jun 2017 14:15:53 -0300 Subject: [PATCH 1/2] remove auto capitalize and correct some strings --- src/js/services/onGoingProcess.js | 20 ++++++++++---------- src/sass/views/bitpayCard.scss | 4 ---- src/sass/views/includes/clickToAccept.scss | 1 - src/sass/views/includes/slideToAccept.scss | 1 - src/sass/views/includes/txp-details.scss | 4 ---- src/sass/views/integrations/amazon.scss | 8 ++------ src/sass/views/integrations/coinbase.scss | 4 ---- src/sass/views/integrations/glidera.scss | 4 ---- www/views/confirm.html | 10 +++++----- 9 files changed, 17 insertions(+), 39 deletions(-) diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index 0e7db5bfd..d3127db7b 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -15,22 +15,22 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'connectingledger': gettext('Waiting for Ledger...'), 'connectingtrezor': gettext('Waiting for Trezor...'), 'creatingTx': gettext('Creating transaction'), - 'creatingWallet': gettext('Creating Wallet...'), - 'deletingWallet': gettext('Deleting Wallet...'), - 'extractingWalletInfo': gettext('Extracting Wallet Information...'), - 'fetchingPayPro': gettext('Fetching Payment Information'), + 'creatingWallet': gettext('Creating wallet...'), + 'deletingWallet': gettext('Deleting wallet...'), + 'extractingWalletInfo': gettext('Extracting wallet information...'), + 'fetchingPayPro': gettext('Fetching payment information'), 'generatingCSV': gettext('Generating .csv file...'), 'gettingFeeLevels': gettext('Getting fee levels...'), - 'importingWallet': gettext('Importing Wallet...'), - 'joiningWallet': gettext('Joining Wallet...'), - 'recreating': gettext('Recreating Wallet...'), + 'importingWallet': gettext('Importing wallet...'), + 'joiningWallet': gettext('Joining wallet...'), + 'recreating': gettext('Recreating wallet...'), 'rejectTx': gettext('Rejecting payment proposal'), 'removeTx': gettext('Deleting payment proposal'), 'retrievingInputs': gettext('Retrieving inputs information'), - 'scanning': gettext('Scanning Wallet funds...'), + 'scanning': gettext('Scanning wallet funds...'), 'sendingTx': gettext('Sending transaction'), 'signingTx': gettext('Signing transaction'), - 'sweepingWallet': gettext('Sweeping Wallet...'), + 'sweepingWallet': gettext('Sweeping wallet...'), 'validatingWords': gettext('Validating recovery phrase...'), 'loadingTxInfo': gettext('Loading transaction info...'), 'sendingFeedback': gettext('Sending feedback...'), @@ -39,7 +39,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'sending2faCode': gettext('Sending 2FA code...'), 'buyingBitcoin': gettext('Buying Bitcoin...'), 'sellingBitcoin': gettext('Selling Bitcoin...'), - 'fetchingBitPayAccount': gettext('Fetching BitPay Account...'), + 'fetchingBitPayAccount': gettext('Fetching BitPay account...'), 'updatingGiftCards': 'Updating Gift Cards...', 'updatingGiftCard': 'Updating Gift Card...', 'cancelingGiftCard': 'Canceling Gift Card...', diff --git a/src/sass/views/bitpayCard.scss b/src/sass/views/bitpayCard.scss index 5c2df4425..c05bd8497 100644 --- a/src/sass/views/bitpayCard.scss +++ b/src/sass/views/bitpayCard.scss @@ -52,10 +52,6 @@ width: 35px; } - span { - text-transform: capitalize; - } - .big-icon-svg { padding: 0 12px 0 0; } diff --git a/src/sass/views/includes/clickToAccept.scss b/src/sass/views/includes/clickToAccept.scss index 3d8b96ada..a38455ac3 100644 --- a/src/sass/views/includes/clickToAccept.scss +++ b/src/sass/views/includes/clickToAccept.scss @@ -24,7 +24,6 @@ click-to-accept { height: 100%; width: 100%; z-index: 4; - text-transform: capitalize; -webkit-transform: translateY(2rem); transform: translateY(2rem); opacity: 0; diff --git a/src/sass/views/includes/slideToAccept.scss b/src/sass/views/includes/slideToAccept.scss index 97c307931..75502c6a8 100644 --- a/src/sass/views/includes/slideToAccept.scss +++ b/src/sass/views/includes/slideToAccept.scss @@ -95,7 +95,6 @@ slide-to-accept { width: 100%; font-size: 17px; letter-spacing: 0.02rem; - text-transform: capitalize; -webkit-transform: translateY(2rem); transform: translateY(2rem); opacity: 0; diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 7303c1f82..8d21570f4 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -32,10 +32,6 @@ height: 35px; width: 35px; } - - span { - text-transform: capitalize; - } } .amount-label{ line-height: 30px; diff --git a/src/sass/views/integrations/amazon.scss b/src/sass/views/integrations/amazon.scss index e56535c77..0139f8784 100644 --- a/src/sass/views/integrations/amazon.scss +++ b/src/sass/views/integrations/amazon.scss @@ -11,7 +11,7 @@ stroke: black; fill: black; } - + .add-bottom-for-cta { bottom: 92px; } @@ -31,10 +31,6 @@ width: 35px; } - span { - text-transform: capitalize; - } - .big-icon-svg { margin-right: 0.6rem; } @@ -80,7 +76,7 @@ color: $item-label-color; margin-bottom: 8px; } - + .capitalized { text-transform: capitalize; } diff --git a/src/sass/views/integrations/coinbase.scss b/src/sass/views/integrations/coinbase.scss index d002aef37..e8ddfde2d 100644 --- a/src/sass/views/integrations/coinbase.scss +++ b/src/sass/views/integrations/coinbase.scss @@ -28,10 +28,6 @@ height: 35px; width: 35px; } - - span { - text-transform: capitalize; - } } .amount-label{ line-height: 30px; diff --git a/src/sass/views/integrations/glidera.scss b/src/sass/views/integrations/glidera.scss index d73c8fc62..c771e3099 100644 --- a/src/sass/views/integrations/glidera.scss +++ b/src/sass/views/integrations/glidera.scss @@ -28,10 +28,6 @@ height: 35px; width: 35px; } - - span { - text-transform: capitalize; - } } .amount-label{ line-height: 30px; diff --git a/www/views/confirm.html b/www/views/confirm.html index 8f146912f..d638f57bf 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -82,14 +82,14 @@ {{tx.txp[wallet.id].feeStr || '...'}} {{tx.txp[wallet.id].alternativeFeeStr || '...'}}  - · -   + · +   {{tx.txp[wallet.id].feeRatePerStr}} of the sending amount - + - + @@ -125,7 +125,7 @@ slide-success-hide-on-confirm="true"> Payment Sent Proposal Created - Transaction created + Transaction Created Date: Fri, 30 Jun 2017 14:17:58 -0300 Subject: [PATCH 2/2] fixes --- src/js/services/onGoingProcess.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index d3127db7b..e0f82fc40 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -15,22 +15,22 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'connectingledger': gettext('Waiting for Ledger...'), 'connectingtrezor': gettext('Waiting for Trezor...'), 'creatingTx': gettext('Creating transaction'), - 'creatingWallet': gettext('Creating wallet...'), - 'deletingWallet': gettext('Deleting wallet...'), - 'extractingWalletInfo': gettext('Extracting wallet information...'), + 'creatingWallet': gettext('Creating Wallet...'), + 'deletingWallet': gettext('Deleting Wallet...'), + 'extractingWalletInfo': gettext('Extracting Wallet information...'), 'fetchingPayPro': gettext('Fetching payment information'), 'generatingCSV': gettext('Generating .csv file...'), 'gettingFeeLevels': gettext('Getting fee levels...'), - 'importingWallet': gettext('Importing wallet...'), - 'joiningWallet': gettext('Joining wallet...'), - 'recreating': gettext('Recreating wallet...'), + 'importingWallet': gettext('Importing Wallet...'), + 'joiningWallet': gettext('Joining Wallet...'), + 'recreating': gettext('Recreating Wallet...'), 'rejectTx': gettext('Rejecting payment proposal'), 'removeTx': gettext('Deleting payment proposal'), 'retrievingInputs': gettext('Retrieving inputs information'), - 'scanning': gettext('Scanning wallet funds...'), + 'scanning': gettext('Scanning Wallet funds...'), 'sendingTx': gettext('Sending transaction'), 'signingTx': gettext('Signing transaction'), - 'sweepingWallet': gettext('Sweeping wallet...'), + 'sweepingWallet': gettext('Sweeping Wallet...'), 'validatingWords': gettext('Validating recovery phrase...'), 'loadingTxInfo': gettext('Loading transaction info...'), 'sendingFeedback': gettext('Sending feedback...'), @@ -39,7 +39,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'sending2faCode': gettext('Sending 2FA code...'), 'buyingBitcoin': gettext('Buying Bitcoin...'), 'sellingBitcoin': gettext('Selling Bitcoin...'), - 'fetchingBitPayAccount': gettext('Fetching BitPay account...'), + 'fetchingBitPayAccount': gettext('Fetching BitPay Account...'), 'updatingGiftCards': 'Updating Gift Cards...', 'updatingGiftCard': 'Updating Gift Card...', 'cancelingGiftCard': 'Canceling Gift Card...',