Merge pull request #437 from blockchain/bugs

Bugs

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()")

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")

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

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")

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

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")

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

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()})")

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 {

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) {

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;
   }

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;
         }
       }
     }
@@ -104,10 +104,6 @@ ul.aside {
   }
 }
 
-@media (max-height: 550px) {
-  display: none;
-}
-
 .scroll-parent{
   .scroll-accounts{
     max-height: 150px;

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;

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",
@@ -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 <span class='blue pointer underline'><i class='ti-headphone mhs'></i> Contact Support</span>. This form is for general feedback of the wallet.",
   "WALLET_RECOVERY": "Wallet Recovery",
   "LOGGING" : "Activity Logging",
   "LOG" : "Log",
@@ -681,7 +682,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!",