Merge pull request #230 from blockchain/bug-fixes

Bug fixes
blockchain · Dec 17, 2015 · 076a1ec · 076a1ec
2 parents fe071d8 + 08c7590
commit 076a1ec
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/app/partials/recover-funds.jade b/app/partials/recover-funds.jade
@@ -54,29 +54,27 @@
           p {{ errors.confirmation }}
     .flex-center.flex-end.mvl
       img(ng-show="working" src="img/spinner.gif")
-      button.button-muted.mrm(
-        type="button"
-        ng-switch-when="1"
-        ng-disabled="working"
-        ui-sref="public.help"
-        translate="GO_BACK")
-      button.button-primary(
-        type="submit"
-        ng-switch-when="1"
-        ng-click="nextStep()"
-        ng-disabled="!recoveryForm.$valid"
-        translate="CONTINUE")
-      button.button-muted.mrm(
-        type="button"
-        ng-switch-when="2"
-        ng-click="goBack()"
-        translate="GO_BACK")
-      button.button-success(
-        type="submit"
-        ng-switch-when="2"
-        ng-click="performImport()"
-        ng-disabled="!recoveryForm.$valid || working"
-        translate="RECOVER_FUNDS")
+      div(ng-switch-when="1")
+        button.button-muted.mrm(
+          type="button"
+          ng-disabled="working"
+          ui-sref="public.help"
+          translate="GO_BACK")
+        button.button-primary(
+          type="submit"
+          ng-click="nextStep()"
+          ng-disabled="!recoveryForm.$valid"
+          translate="CONTINUE")
+      div(ng-switch-when="2")
+        button.button-muted.mrm(
+          type="button"
+          ng-click="goBack()"
+          translate="GO_BACK")
+        button.button-success(
+          type="submit"
+          ng-click="performImport()"
+          ng-disabled="!recoveryForm.$valid || working"
+          translate="RECOVER_FUNDS")
   .flex-center.flex-justify.flex-column(ng-switch-when="3")
     .level-complete.flex-center.flex-justify
       i.ti-check.bright-green

diff --git a/app/partials/send.jade b/app/partials/send.jade
@@ -135,7 +135,7 @@
         .total-amounts.aaa.mbm
           .flex-center.pbl
             label.mbn(translate="OVERVIEW")
-            helper-button(content="DYK3")
+            helper-button(content="DYK_TX_FEES")
           table.width-100
             tr
               td(translate="AMOUNT")

diff --git a/assets/js/controllers/send.controller.js b/assets/js/controllers/send.controller.js
@@ -292,8 +292,9 @@ function SendCtrl($scope, $log, Wallet, Alerts, currency, $uibModalInstance, $ti
     let tx = $scope.transaction;
     if (!tx.from) return 0;
     let availableBal = tx.from.balance - tx.fee;
-    let maxAvailable = $scope.advanced ? availableBal : tx.sweepAmount;
-    return maxAvailable || availableBal;
+    let maxAvailable = ($scope.advanced ? availableBal : tx.sweepAmount) || availableBal;
+    if (maxAvailable < 0) maxAvailable = 0;
+    return maxAvailable;
   };
 
   $scope.$watch("transaction.destinations", (destinations) => {

diff --git a/assets/js/services/wallet.service.js b/assets/js/services/wallet.service.js
@@ -1200,7 +1200,7 @@ function Wallet($http, $window, $timeout, Alerts, MyWallet, MyBlockchainApi, MyB
       successCallback();
     };
     let error = () => {
-      Alerts.displayError('Second password cannot be unset. Contact support.');
+      $translate('SECOND_PASSWORD_REMOVE_ERR').then(Alerts.displayError);
       errorCallback();
     };
     let cancel = errorCallback;

diff --git a/locales/en-human.json b/locales/en-human.json
@@ -198,6 +198,7 @@
   "SECOND_PASSWORD_EXPLAIN" : "For Additional security, you can choose a second password that is required whenever you want to spend bitcoins. This is different from your standard wallet password. If you set your second wallet password, don’t forget it!",
   "SECOND_PASSWORD_WARNING" : "This is different from your standard wallet password. If you set your second wallet password, don’t forget it!",
   "SECOND_PASSWORD_CANCEL": "Your second password is required to send bitcoin. Please try again",
+  "SECOND_PASSWORD_REMOVE_ERR": "Second password cannot be removed. Please contact support.",
   "REMEMBER_2FA" : "Remember 2-step Verification",
   "REMEMBER_2FA_EXPLAIN" : "Your browser will be remembered for a short period of time, allowing you to login again without having to re-authenticate. Disable this to require full authentication every time you login. This will not affect your current browser until you delete all cookies.",
   "BLOCK_TOR" : "Wallet access via Tor",