Accept broadcaster feedback.

darkwallet · Jan 4, 2015 · 86af84a · 86af84a
1 parent 5e2c9db
commit 86af84a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/js/backend/services/wallet.js b/src/js/backend/services/wallet.js
@@ -478,17 +478,17 @@ function(IdentityKeyRing, Port, CurrencyFormatting, TransactionTasks, Bitcoin, B
              var hash = newTx.getId();
              core.getCurrentIdentity().txdb.setLabel(hash, task.label);
          }
-         var notifyTx = function(error, count) {
+         var notifyTx = function(error, count, type) {
              if (error) {
-                 console.log("Error sending tx: " + error);
+                 console.log("Error sending tx: " + error, count, type);
                  callback({data: error, text: "Error sending tx"});
              } else {
                  TransactionTasks.processRadar(task, count);
 
                  // notify gui about radar updates
-                 Port.post('gui', {type: 'radar', count: count});
+                 Port.post('gui', {type: type, count: count});
 
-                 callback(null, {radar: count, type: 'radar'});
+                 callback(null, {radar: count, type: type});
                  console.log("tx radar: " + count);
              }
          };

diff --git a/src/js/frontend/controllers/history.js b/src/js/frontend/controllers/history.js
@@ -273,7 +273,7 @@ function (controllers, DarkWallet, Port) {
   $scope.rowBroadcast = function(row) {
       var done = false;
       var client = DarkWallet.getClient();
-      client.broadcast_transaction(row.tx.toHex(), function(error, count) {
+      client.broadcast_transaction(row.tx.toHex(), function(error, count, type) {
           if (error) {
               notify.error("Error broadcasting");
           } else if (!done && count) {

diff --git a/src/js/frontend/controllers/send.js b/src/js/frontend/controllers/send.js
@@ -235,6 +235,8 @@ function (controllers, Port, DarkWallet, BtcUtils, CurrencyFormat, Bitcoin) {
               enableSending();
               $tabs.updateTabs($history.pocket.type, $history.pocket.tasks);
 
+          } else if (task && task.type == 'brc') {
+              console.log("broadcaster feedback!", task);
           } else if (task && task.type == 'radar') {
               if (onUpdateRadar(task.radar || 0, radarCache) && timeoutId) {
                   enableSending(true);