Merge pull request #316 from blockchain/send

Send fixes
blockchain · Feb 20, 2016 · 562d0bd · 562d0bd
2 parents efd1467 + f3677ee
commit 562d0bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/assets/js/controllers/send.controller.js b/assets/js/controllers/send.controller.js
@@ -172,11 +172,10 @@ function SendCtrl($scope, $log, Wallet, Alerts, currency, $uibModalInstance, $ti
     const transactionFailed = (message) => {
       $scope.sending = false;
       $scope.payment = new Wallet.payment(paymentCheckpoint).build();
-      if (message) {
-        $translate(message).then(t => {
-          Alerts.displayError(t, false, $scope.alerts);
-        });
-      }
+      let msgText = 'string' === typeof message ? message : 'SEND_FAILED';
+      $translate(msgText).then(t => {
+        Alerts.displayError(t, false, $scope.alerts);
+      });
     };
 
     const transactionSucceeded = (tx) => {
@@ -399,7 +398,7 @@ function SendCtrl($scope, $log, Wallet, Alerts, currency, $uibModalInstance, $ti
     let txFrom = $scope.transaction.from;
     if (!txFrom) return;
     let origin = (txFrom.index == null) ? txFrom.address : txFrom.index;
-    $scope.payment.from(origin);
+    $scope.payment.from(origin).sideEffect($scope.handleTxUpdate);
     $scope.buildTx();
   };
 

diff --git a/locales/en-human.json b/locales/en-human.json
@@ -351,6 +351,7 @@
   "AUTHORIZED" : "Authorized!",
   "AUTHORIZED_MESSAGE" : "You have authorized this login attempt.",
   "ADVANCED_SEND" : "Advanced Send",
+  "SEND_FAILED": "Send failed, please come back later to try again",
   "RESET_FORM" : "Reset Form",
   "REGULAR_SEND" : "Regular Send",
   "MINERS_FEE" : "Miner's Fee",