Browse Source

Basilisk Send error handling and bug fixed

master
Satinder Grewal 8 years ago
parent
commit
74a09a7257
  1. BIN
      assets/images/cryptologo/PANGEA.png
  2. BIN
      assets/images/native/pangea_header_title_logo.png
  3. 23
      assets/scripts/iguana_api/IguanaEDEX.js
  4. 1
      assets/scripts/lang/en.js
  5. 2
      assets/scripts/sidebar.js

BIN
assets/images/cryptologo/PANGEA.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
assets/images/native/pangea_header_title_logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

23
assets/scripts/iguana_api/IguanaEDEX.js

@ -220,10 +220,9 @@ function EDEXSendutxoRawTx(data) {
console.log(result);
if (result.result == 'success') {
if (result.result == 'success' && result.completed == true) {
console.log(send_data);
toastr.success(_lang[defaultLang].TOASTR.SIGNED_TX_GENERATED + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION);
}
if (send_data.sendsig == 1) {
console.log(send_data);
toastr.info(_lang[defaultLang].TOASTR.SENDING_TX + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION);
@ -440,6 +439,26 @@ function EDEXSendutxoRawTx(data) {
toastr.info(_lang[defaultLang].TOASTR.REFRESHING_FUNDS, _lang[defaultLang].TOASTR.WALLET_NOTIFICATION);
});
}
} else if (result.result == 'success' && result.completed == false) {
console.log(result);
toastr.error(_lang[defaultLang].TOASTR.SIGNED_TX_GENERATED_FAIL + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION);
edexcoin_sendto_result_tbl += '<tr class="">' +
'<td>result</td>' +
'<td>' +
'<span class="label label-success">' + result.result + '</span>' +
'</td>' +
'</tr>' +
'<tr class="">' +
'<td>completed</td>' +
'<td>' +
'<span class="label label-primary">' + result.completed + '</span>' +
'</td>' +
'</tr>';
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
$('#edexcoin_send_coins_anothertx_btn').show();
$('#edexcoin-send-txdetails-screen').data('panel-api').done();
}
});
});
}

1
assets/scripts/lang/en.js

@ -277,6 +277,7 @@ const _lang = {
'IGUANA_CONN_ERR_ALT': 'Unable to connect with iguana service. 127.0.0.1:7778',
'IGUANA_ARE_YOU_SURE': 'Are you sure Iguana is running?',
'SIGNED_TX_GENERATED': 'Signed transaction generated',
'SIGNED_TX_GENERATED_FAIL': 'Signed transaction Failed to generate',
'SENDING_TX': 'Sending Transaction to Network',
'SIGNED_TX_SENT': 'Signed transaction sent successfully',
'GETTING_TXID_INFO': 'Getting txid info for updating funds data',

2
assets/scripts/sidebar.js

@ -447,7 +447,7 @@ function assetchain_pax_menu_actions(coin) {
renderAssetGFX('wireless', 'wireless', coin);
break;
case 'PANGEA':
renderAssetGFX('supernet', 'jumblr', coin);
renderAssetGFX('pangea', 'jumblr', coin);
break;
case 'DEX':
renderAssetGFX('supernet', 'jumblr', coin);

Loading…
Cancel
Save