diff --git a/js/coinbin.js b/js/coinbin.js index acbed03..ddde353 100644 --- a/js/coinbin.js +++ b/js/coinbin.js @@ -888,11 +888,13 @@ $(document).ready(function() { redeem.addr+'" target="_blank">'+redeem.addr+''); for(var i in data.data.txs){ var o = data.data.txs[i]; - var tx = ((o.txid).match(/.{1,2}/g).reverse()).join("")+''; - var n = o.output_no; - var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : o.script_hex; - var amount = o.value; - addOutput(tx, n, script, amount); + var tx = ((""+o.txid).match(/.{1,2}/g).reverse()).join("")+''; + if(tx.match(/^[a-f0-9]+$/)){ + var n = o.output_no; + var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : o.script_hex; + var amount = o.value; + addOutput(tx, n, script, amount); + } } } else { $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs.'); @@ -1121,8 +1123,7 @@ $(document).ready(function() { error: function(data) { var obj = $.parseJSON(data.responseText); var r = ' '; - r += (obj.data) ? obj.data : ''; - r += (obj.message) ? ' '+obj.message : ''; + r += (obj.data.tx_hex) ? ' '+obj.data.tx_hex : ''; r = (r!='') ? r : ' Failed to broadcast'; // build response $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(r).prepend(''); // console.error(JSON.stringify(data, null, 4)); @@ -1132,8 +1133,7 @@ $(document).ready(function() { if((data.status && data.data) && data.status=='success'){ $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger').removeClass("hidden").html(' Txid: ' + data.data.txid); } else { - $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html( - ' Unexpected error, please try again').prepend(''); + $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(' Unexpected error, please try again').prepend(''); } }, complete: function(data, status) {