From 4c19652175120fc171480284a4de209e00d54504 Mon Sep 17 00:00:00 2001 From: plondon Date: Mon, 9 May 2016 10:37:26 -0400 Subject: [PATCH 01/11] fix(Upgrade): fix font size alignment in upgrade modal --- app/partials/upgrade.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/partials/upgrade.jade b/app/partials/upgrade.jade index a4e89a4fe1..b8273bb9d7 100644 --- a/app/partials/upgrade.jade +++ b/app/partials/upgrade.jade @@ -26,7 +26,7 @@ span(translate="UPGRADE_LIMITATIONS").type-sm |   span - b(translate="UPGRADE_DISABLES_API_ACCESS", ng-show="settings.apiAccess") + span.type-sm.bold(translate="UPGRADE_DISABLES_API_ACCESS", ng-show="settings.apiAccess") | span(translate="NO_GOING_BACK").type-sm.bold .modal-footer.pal.flex-end From 8823e80ffb0bbe53bcb42564e238aa4299c95482 Mon Sep 17 00:00:00 2001 From: plondon Date: Tue, 10 May 2016 11:36:48 -0400 Subject: [PATCH 02/11] fix(QRScan): better wording for qr helper text --- locales/en-human.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-human.json b/locales/en-human.json index 2012885db4..14f494ff50 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -681,7 +681,7 @@ "OK": "OK", "DESCRIPTION:": "Description:", "COPY_HELPER": "Copy this address and share it with your sender via email, text, or carrier pigeon.", - "QR_HELPER": "Share this QR code with your sender.", + "QR_HELPER": "Ask your sender to scan this QR code.", "CUSTOMIZE_HELPER": "Specify an amount and a description for this transaction.", "SAVE_HELPER": "You’ll find this in Settings -> Addresses -> {{ label }} -> Manage Addresses.", "THANKS_FOR_ACCEPTING": "Thanks for accepting bitcoin!", From 5627a6147b2279e7e508793f79269d3283e81baa Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 16:32:31 -0400 Subject: [PATCH 03/11] fix(DynamicFeeHelper): Lower To [AMT] mBTC or BTC instead of MBTC --- app/partials/dynamic-fee.jade | 2 +- assets/css/elements/_buttons.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/partials/dynamic-fee.jade b/app/partials/dynamic-fee.jade index 16a68a6e55..0dd5016d4a 100644 --- a/app/partials/dynamic-fee.jade +++ b/app/partials/dynamic-fee.jade @@ -9,5 +9,5 @@ translate="GO_BACK" ng-click="cancel()") button.button-muted.mrm( translate="CONTINUE_CURRENT_FEE" ng-hide="surge" ng-click="useCurrent()") - button.button-primary( + button.button-primary.initial-text( translate="{{:: btnTranslation }}" translate-values="{ suggested: suggestedFee }" ng-click="useSuggested()") diff --git a/assets/css/elements/_buttons.scss b/assets/css/elements/_buttons.scss index 08e46a5e16..2cc9c2ff5f 100644 --- a/assets/css/elements/_buttons.scss +++ b/assets/css/elements/_buttons.scss @@ -19,6 +19,9 @@ button[disabled] { outline: none; text-decoration: none; } + &.initial-text { + text-transform: none; + } } @mixin button($name, $background:white, $color:white, $max-width:none) { From 9cd446edf90299489ec66eeb7ce06c034df2c6be Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 16:53:36 -0400 Subject: [PATCH 04/11] fix(Transfer): append transfer tooltip to body --- app/partials/settings/transfer.jade | 1 + 1 file changed, 1 insertion(+) diff --git a/app/partials/settings/transfer.jade b/app/partials/settings/transfer.jade index 8dcdea16aa..ade6f7517c 100644 --- a/app/partials/settings/transfer.jade +++ b/app/partials/settings/transfer.jade @@ -13,6 +13,7 @@ uib-progressbar.modal-progress( span.security-red.mrs.ti-alert( ng-show="combinedBalance > totalAmount + totalFees && !status.loading" uib-tooltip="{{::'SWEEP_LOW_BALANCE_WARN'|translate}}" + tooltip-append-to-body="true" tooltip-placement="left") span(translate="FROM") .col-sm-5(ng-show="addresses.length === 1") From 13080057ef8fc70c79bbd2b54b8cf0c173c5770c Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 17:28:28 -0400 Subject: [PATCH 05/11] fix(MobileUI): message beacon contextual message visibility --- assets/css/components/_notifications.scss | 5 +++++ assets/css/modules/_layout.scss | 4 +++- assets/css/modules/_left-nav.scss | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/assets/css/components/_notifications.scss b/assets/css/components/_notifications.scss index 4d56f7892d..50c4edb354 100644 --- a/assets/css/components/_notifications.scss +++ b/assets/css/components/_notifications.scss @@ -42,6 +42,11 @@ @media (max-width: 768px) { right: 5px; } + @media (max-height: 550px) { + top: -1px; + left: -15px; + right: initial; + } } .message-beacon { diff --git a/assets/css/modules/_layout.scss b/assets/css/modules/_layout.scss index 53b8ffb2e7..997fa8a056 100644 --- a/assets/css/modules/_layout.scss +++ b/assets/css/modules/_layout.scss @@ -7,10 +7,12 @@ position: absolute; width: 270px; padding: 15px; - overflow: auto; background: $light-blue; height: calc(100% - 60px); border-right: 1px solid $border-grey; + @media (max-height: 550px) { + overflow: auto; + } .active-accounts{ margin-bottom: 30px; } diff --git a/assets/css/modules/_left-nav.scss b/assets/css/modules/_left-nav.scss index d6d88c1ec5..2f36006bbd 100644 --- a/assets/css/modules/_left-nav.scss +++ b/assets/css/modules/_left-nav.scss @@ -104,10 +104,6 @@ ul.aside { } } -@media (max-height: 550px) { - display: none; -} - .scroll-parent{ .scroll-accounts{ max-height: 150px; From 941cd70f6ac37a9272c6404e756556622c194d0b Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 17:34:40 -0400 Subject: [PATCH 06/11] fix(Accounts): 'All' active state and amount --- app/partials/wallet-navigation.jade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/partials/wallet-navigation.jade b/app/partials/wallet-navigation.jade index c85c84755c..0295811b62 100644 --- a/app/partials/wallet-navigation.jade +++ b/app/partials/wallet-navigation.jade @@ -9,8 +9,9 @@ i.ti-layout-list-post span(translate="MY_TRANSACTIONS") ul.scroll-accounts.aside-list.pas(ng-show="showOrHide('transactions')", ng-click="hideMenu()") - li.mvs(ng-class="selectedAccountIndex == '' ? 'active' : ''", ui-sref="wallet.common.transactions({accountIndex: ''})", ng-hide="!status.didUpgradeToHd || (numberOfActiveAccounts() <= 1 && numberOfActiveLegacyAddresses() == 0) ") - a.pas(translate="ALL") + li(ng-class="selectedAccountIndex == '' ? 'active' : ''", ui-sref="wallet.common.transactions({accountIndex: ''})", ng-hide="!status.didUpgradeToHd || (numberOfActiveAccounts() <= 1 && numberOfActiveLegacyAddresses() == 0) ") + a.flex-between.pas + span(translate="ALL") span fiat-or-btc(btc="total()") li(ng-repeat="account in accounts()" ng-class="selectedAccountIndex != '' && $index == selectedAccountIndex ? 'active' : ''" ui-sref="wallet.common.transactions({accountIndex: account.index.toString()})") From 0aa22f436a5d750ace0cf9d133db7862bedb159a Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 17:43:03 -0400 Subject: [PATCH 07/11] fix(ImportedAddresses): imported addresses color --- app/partials/home.jade | 2 +- assets/css/modules/_left-nav.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/partials/home.jade b/app/partials/home.jade index 57dc3a3401..9f98ed1052 100644 --- a/app/partials/home.jade +++ b/app/partials/home.jade @@ -9,7 +9,7 @@ blocket-loading li.flex-between.border-bottom-light(ng-repeat="account in activeAccounts()") span.em-500 {{::account.label}} fiat-or-btc(btc="account.balance") - li.flex-between.border-bottom-thick.transfer(ng-show="hasLegacyAddresses()") + li.flex-between.border-bottom-thick.mid-grey(ng-show="hasLegacyAddresses()") span.em-400 Imported Addresses fiat-or-btc(btc="getLegacyTotal()") li.flex-between.border-bottom-light.basic-grey.em-500 diff --git a/assets/css/modules/_left-nav.scss b/assets/css/modules/_left-nav.scss index 2f36006bbd..160394b5a1 100644 --- a/assets/css/modules/_left-nav.scss +++ b/assets/css/modules/_left-nav.scss @@ -50,9 +50,9 @@ ul.aside { span { color: $basic-grey; } - &.imported-addresses{ - > span { - color: $mid-grey; + &.imported-addresses { + span { + color: $mid-grey !important; } } } From a4978f36ba5946eafa6d986466c4ebed597c8be7 Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 17:46:21 -0400 Subject: [PATCH 08/11] fix(Security): fix api access copy --- app/partials/settings/security.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/partials/settings/security.jade b/app/partials/settings/security.jade index 203f811fa1..53a62c1d47 100644 --- a/app/partials/settings/security.jade +++ b/app/partials/settings/security.jade @@ -128,5 +128,5 @@ form.form-horizontal(role="form",name="form",novalidate, ng-show="display.advanc .col-sm-12.col-md-6 .flex-center.flex-between-mobile.mbm label.type-h5.em-400.mbn(translate="API_ACCESS") - p.em-300.text.line-height.hidden-xs.hidden-sm(translate="API_ACCESS_SUPPORT") + p.em-300.text.line-height(translate="API_ACCESS_SUPPORT") .col-sm-12.col-md-6 From bde41cd154f6c4ff2bb3656f371eafa380af784e Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 18:06:52 -0400 Subject: [PATCH 09/11] feat(Feedback): add information regarding feedback form and its purpose --- app/partials/feedback.jade | 1 + locales/en-human.json | 1 + 2 files changed, 2 insertions(+) diff --git a/app/partials/feedback.jade b/app/partials/feedback.jade index a586dc4ae5..a25b25cd8f 100644 --- a/app/partials/feedback.jade +++ b/app/partials/feedback.jade @@ -8,6 +8,7 @@ a(href="https://www.surveygizmo.com/s3/2271145/c67c5c2b6b11" target="_blank") SurveyGizmo span . div(ng-hide="formStage >= 2") + .well(ng-click="supportModal()" translate="FEEDBACK_WARN") form.bc-form.pal(ng-submit="setFormSubmitted()" name="feedbackForm" autocomplete="off") .bc-form-header h2.mtn.em-400.type-h5(translate="FEEDBACK_TELL_US") diff --git a/locales/en-human.json b/locales/en-human.json index 14f494ff50..a73c5503cb 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -524,6 +524,7 @@ "FEEDBACK_DISLIKES": "What can we improve on?", "FEEDBACK_TELL_US": "Tell us what you think!", "FEEDBACK_OVERALL": "What's your overall impression of the wallet?", + "FEEDBACK_WARN": "If you are having an issue with your wallet please Contact Support. This form is for general feedback of the wallet.", "WALLET_RECOVERY": "Wallet Recovery", "LOGGING" : "Activity Logging", "LOG" : "Log", From e130f33f10e3acbabd588e6d05f9f72d014cf866 Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 18:19:37 -0400 Subject: [PATCH 10/11] fix(SendReceive): extend scrollable address css hack to send and receive --- app/partials/request.jade | 3 ++- assets/css/modules/_send-receive.scss | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/partials/request.jade b/app/partials/request.jade index 0a20d16ca1..a9a2c1dfac 100644 --- a/app/partials/request.jade +++ b/app/partials/request.jade @@ -17,7 +17,8 @@ ui-select-match(placeholder="{{'SEARCH' | translate}}...") label-origin(origin="$select.selected") ui-select-choices(repeat="destination in destinations | filter: getFilter($select.search)" group-by="'type'") - label-origin(origin="destination" highlight="$select.search") + span + label-origin(origin="destination" highlight="$select.search") span.help-block(ng-show="fields.to.isWatchOnly" translate="WATCH_ONLY_REQUEST_WARN") .form-group.row(ng-show="paymentRequest && paymentRequest.paid > 0 && paymentRequest.paid != fields.amount") diff --git a/assets/css/modules/_send-receive.scss b/assets/css/modules/_send-receive.scss index d32fd9c83e..6999378bb2 100644 --- a/assets/css/modules/_send-receive.scss +++ b/assets/css/modules/_send-receive.scss @@ -30,8 +30,8 @@ > div, textarea, .bitcoin-address { @extend .mlm; @media (min-width: 769px) { - max-width: 420px; - min-width: 420px; + max-width: 440px; + min-width: 440px; } &.auto { width: auto; From ab5887482f06bbf869ad1e57c309a8391ed95285 Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 12 May 2016 18:21:09 -0400 Subject: [PATCH 11/11] fix(AutoLogout): trailing space in logout warn --- locales/en-human.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-human.json b/locales/en-human.json index a73c5503cb..3c44e0773c 100644 --- a/locales/en-human.json +++ b/locales/en-human.json @@ -33,7 +33,7 @@ "LOGGED_OUT_AUTOMATICALLY" : "Logged out automatically", "AUTO_LOGOUT" : "Auto Logout", "AUTO_LOGOUT_EXPLAIN" : "After a certain period of inactivity, you will be automatically logged out of your wallet.", - "AUTO_LOGOUT_WARN" : "Are you still there? You've been inactive for {{::minutes}} minutes. Click \"Cancel\" if you don't want to be logged out automatically .", + "AUTO_LOGOUT_WARN" : "Are you still there? You've been inactive for {{::minutes}} minutes. Click \"Cancel\" if you don't want to be logged out automatically.", "LOG_ME_OUT": "Log me out", "CHANGES_BEING_SAVED": "There are changes still being saved. Are you sure you wish to logout?", "CLOSE": "Close",