diff --git a/assets/images/cryptologo/PANGEA.png b/assets/images/cryptologo/PANGEA.png index d42bfb8..153fa6a 100644 Binary files a/assets/images/cryptologo/PANGEA.png and b/assets/images/cryptologo/PANGEA.png differ diff --git a/assets/images/native/pangea_header_title_logo.png b/assets/images/native/pangea_header_title_logo.png new file mode 100644 index 0000000..39160bb Binary files /dev/null and b/assets/images/native/pangea_header_title_logo.png differ diff --git a/assets/scripts/iguana_api/IguanaEDEX.js b/assets/scripts/iguana_api/IguanaEDEX.js index a2e4851..62e9f7a 100644 --- a/assets/scripts/iguana_api/IguanaEDEX.js +++ b/assets/scripts/iguana_api/IguanaEDEX.js @@ -220,225 +220,244 @@ 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); - ajax_data_dexrawtx = { - 'signedtx': result.signedtx, - 'coin': send_data.coin - }; - Iguana_DEXsendrawtx(ajax_data_dexrawtx).then(function(dexrwatx_result) { - console.log(dexrwatx_result); - if (dexrwatx_result.error == undefined) { - var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); - - toastr.success(_lang[defaultLang].TOASTR.SIGNED_TX_SENT, _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); - edexcoin_sendto_result_tbl += '' + - 'result' + - '' + - '' + result.result + '' + - '' + - '' + - '' + - 'completed' + - '' + - '' + result.completed + '' + - '' + - '' + - '' + - 'rawtx' + - '' + - '' + result.rawtx + '' + - '' + - '' + - '' + - 'txid' + - '' + - '' + dexrwatx_result + '' + - '' + - '' + - '' + - 'signedtx' + - '' + - '' + result.signedtx + '' + - '' + - ''; - $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); - $('#edexcoin_send_coins_anothertx_btn').show(); - $('#edexcoin-send-txdetails-screen').data('panel-api').done(); - - var gettxiddata = function() { - return new Promise(function(resolve, reject) { - toastr.info(_lang[defaultLang].TOASTR.GETTING_TXID_INFO + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); - - EDEXgettransaction(ajax_data_dexrawtx.coin,dexrwatx_result).then(function(result) { - console.log(result); - resolve(result); + if (send_data.sendsig == 1) { + console.log(send_data); + toastr.info(_lang[defaultLang].TOASTR.SENDING_TX + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); + ajax_data_dexrawtx = { + 'signedtx': result.signedtx, + 'coin': send_data.coin + }; + Iguana_DEXsendrawtx(ajax_data_dexrawtx).then(function(dexrwatx_result) { + console.log(dexrwatx_result); + if (dexrwatx_result.error == undefined) { + var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); + + toastr.success(_lang[defaultLang].TOASTR.SIGNED_TX_SENT, _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); + edexcoin_sendto_result_tbl += '' + + 'result' + + '' + + '' + result.result + '' + + '' + + '' + + '' + + 'completed' + + '' + + '' + result.completed + '' + + '' + + '' + + '' + + 'rawtx' + + '' + + '' + result.rawtx + '' + + '' + + '' + + '' + + 'txid' + + '' + + '' + dexrwatx_result + '' + + '' + + '' + + '' + + 'signedtx' + + '' + + '' + result.signedtx + '' + + '' + + ''; + $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); + $('#edexcoin_send_coins_anothertx_btn').show(); + $('#edexcoin-send-txdetails-screen').data('panel-api').done(); + + var gettxiddata = function() { + return new Promise(function(resolve, reject) { + toastr.info(_lang[defaultLang].TOASTR.GETTING_TXID_INFO + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); + + EDEXgettransaction(ajax_data_dexrawtx.coin,dexrwatx_result).then(function(result) { + console.log(result); + resolve(result); + }); }); - }); - } + } - var process_refresh_utxos = function(gettxdata) { - return new Promise(function(resolve, reject) { - console.log(gettxdata) - console.log(utxos_set) - EDEX_GetTxIDList(gettxdata).then(function(get_txid_list) { - console.log(get_txid_list) - resolve(get_txid_list); - }); - /*EDEX_ProcessRefreshData(gettxdata,utxos_set).then(function(new_utxos_set) { - console.log(new_utxos_set); - resolve(new_utxos_set); - });*/ - }); - } + var process_refresh_utxos = function(gettxdata) { + return new Promise(function(resolve, reject) { + console.log(gettxdata) + console.log(utxos_set) + EDEX_GetTxIDList(gettxdata).then(function(get_txid_list) { + console.log(get_txid_list) + resolve(get_txid_list); + }); + /*EDEX_ProcessRefreshData(gettxdata,utxos_set).then(function(new_utxos_set) { + console.log(new_utxos_set); + resolve(new_utxos_set); + });*/ + }); + } - var get_data_cache_contents = function(get_txid_list) { - return new Promise(function(resolve, reject) { - console.log(get_txid_list); - console.log(send_data) - console.log(send_data.sendfrom) - Shepherd_GroomData_Get().then(function(result) { - console.log(result); - /*console.log(result.basilisk.KMD[send_data.sendfrom].refresh); - delete result.basilisk.KMD[send_data.sendfrom].refresh.data; - console.log(result.basilisk.KMD[send_data.sendfrom].refresh); - result.basilisk.KMD[send_data.sendfrom].refresh.data = new_utxos_set; - console.log(result.basilisk.KMD[send_data.sendfrom].refresh); - var save_this_data = result;*/ - var save_this_data = EDEX_RemoveTXID(result, get_txid_list); - console.log(save_this_data); - //resolve(result); - resolve(save_this_data); + var get_data_cache_contents = function(get_txid_list) { + return new Promise(function(resolve, reject) { + console.log(get_txid_list); + console.log(send_data) + console.log(send_data.sendfrom) + Shepherd_GroomData_Get().then(function(result) { + console.log(result); + /*console.log(result.basilisk.KMD[send_data.sendfrom].refresh); + delete result.basilisk.KMD[send_data.sendfrom].refresh.data; + console.log(result.basilisk.KMD[send_data.sendfrom].refresh); + result.basilisk.KMD[send_data.sendfrom].refresh.data = new_utxos_set; + console.log(result.basilisk.KMD[send_data.sendfrom].refresh); + var save_this_data = result;*/ + var save_this_data = EDEX_RemoveTXID(result, get_txid_list); + console.log(save_this_data); + //resolve(result); + resolve(save_this_data); + }); }); - }); - } + } - var save_new_cache_data = function(save_this_data) { - return new Promise(function(resolve, reject) { - console.log(save_this_data); + var save_new_cache_data = function(save_this_data) { + return new Promise(function(resolve, reject) { + console.log(save_this_data); - Shepherd_GroomData_Post(save_this_data).then(function(result) { - console.log(result); - resolve(result); + Shepherd_GroomData_Post(save_this_data).then(function(result) { + console.log(result); + resolve(result); + }); }); + } + + gettxiddata() + .then(function(gettxdata) { + return process_refresh_utxos(gettxdata); + }) + .then(function(new_utxos_set) { + return get_data_cache_contents(new_utxos_set); + }) + .then(function(save_this_data) { + return save_new_cache_data(save_this_data); + }); + + //var call_data = {"allcoins": false,"coin":ajax_data_dexrawtx.coin,"calls":"refresh"} + //console.log(call_data) + /*Shepherd_FetchBasiliskData(call_data).then(function(result){ + console.log(result) + toastr.info('Refreshing Wallet Funds.', 'Wallet Notification'); + })*/ + } else { + var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); + + toastr.success(_lang[defaultLang].TOASTR.SIGNED_TX_SENT, _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); + edexcoin_sendto_result_tbl += '' + + 'result' + + '' + + '' + dexrwatx_result.result + '' + + '' + + '' + + '' + + 'error' + + '' + + '' + dexrwatx_result.error + '' + + '' + + '' + + '' + + 'signedtx' + + '' + + '' + ajax_data_dexrawtx.signedtx + '' + + '' + + ''; + $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); + $('#edexcoin_send_coins_anothertx_btn').show(); + $('#edexcoin-send-txdetails-screen').data('panel-api').done(); + + var call_data = { + 'allcoins': false, + 'coin': 'KMD', + 'calls': 'refresh' + }; + console.log(call_data); + + Shepherd_FetchBasiliskData(call_data) + .then(function(result) { + console.log(result); + toastr.info(_lang[defaultLang].TOASTR.REFRESHING_FUNDS + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); }); } + }); + } + if (send_data.sendsig == 0) { + var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); + + console.log(send_data); + + //toastr.success('Signed Transaction Generated.', 'Wallet Notification'); + edexcoin_sendto_result_tbl += '' + + 'result' + + '' + + '' + result.result + '' + + '' + + '' + + '' + + 'completed' + + '' + + '' + result.completed + '' + + '' + + '' + + '' + + 'rawtx' + + '' + + '' + result.rawtx + '' + + '' + + '' + + '' + + 'txid' + + '' + + '' + result.txid + '' + + '' + + '' + + '' + + 'signedtx' + + '' + + '' + result.signedtx + '' + + '' + + ''; + $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); + $('#edexcoin_send_coins_anothertx_btn').show(); + $('#edexcoin-send-txdetails-screen').data('panel-api').done(); + + var call_data = { + 'allcoins': false, + 'coin': 'KMD', + 'calls': 'refresh' + }; + console.log(call_data); + + Shepherd_FetchBasiliskData(call_data) + .then(function(result) { + console.log(result); + 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); - gettxiddata() - .then(function(gettxdata) { - return process_refresh_utxos(gettxdata); - }) - .then(function(new_utxos_set) { - return get_data_cache_contents(new_utxos_set); - }) - .then(function(save_this_data) { - return save_new_cache_data(save_this_data); - }); - - //var call_data = {"allcoins": false,"coin":ajax_data_dexrawtx.coin,"calls":"refresh"} - //console.log(call_data) - /*Shepherd_FetchBasiliskData(call_data).then(function(result){ - console.log(result) - toastr.info('Refreshing Wallet Funds.', 'Wallet Notification'); - })*/ - } else { - var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); - - toastr.success(_lang[defaultLang].TOASTR.SIGNED_TX_SENT, _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); - edexcoin_sendto_result_tbl += '' + - 'result' + - '' + - '' + dexrwatx_result.result + '' + - '' + - '' + - '' + - 'error' + - '' + - '' + dexrwatx_result.error + '' + - '' + - '' + - '' + - 'signedtx' + - '' + - '' + ajax_data_dexrawtx.signedtx + '' + - '' + - ''; - $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); - $('#edexcoin_send_coins_anothertx_btn').show(); - $('#edexcoin-send-txdetails-screen').data('panel-api').done(); - - var call_data = { - 'allcoins': false, - 'coin': 'KMD', - 'calls': 'refresh' - }; - console.log(call_data); - - Shepherd_FetchBasiliskData(call_data) - .then(function(result) { - console.log(result); - toastr.info(_lang[defaultLang].TOASTR.REFRESHING_FUNDS + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); - }); - } - }); - } - if (send_data.sendsig == 0) { - var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); - - console.log(send_data); - - //toastr.success('Signed Transaction Generated.', 'Wallet Notification'); edexcoin_sendto_result_tbl += '' + - 'result' + - '' + - '' + result.result + '' + - '' + - '' + - '' + - 'completed' + - '' + - '' + result.completed + '' + - '' + - '' + - '' + - 'rawtx' + - '' + - '' + result.rawtx + '' + - '' + - '' + - '' + - 'txid' + - '' + - '' + result.txid + '' + - '' + - '' + - '' + - 'signedtx' + - '' + - '' + result.signedtx + '' + - '' + - ''; - $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); - $('#edexcoin_send_coins_anothertx_btn').show(); - $('#edexcoin-send-txdetails-screen').data('panel-api').done(); - - var call_data = { - 'allcoins': false, - 'coin': 'KMD', - 'calls': 'refresh' - }; - console.log(call_data); - - Shepherd_FetchBasiliskData(call_data) - .then(function(result) { - console.log(result); - toastr.info(_lang[defaultLang].TOASTR.REFRESHING_FUNDS, _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); - }); + 'result' + + '' + + '' + result.result + '' + + '' + + '' + + '' + + 'completed' + + '' + + '' + result.completed + '' + + '' + + ''; + $('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl); + $('#edexcoin_send_coins_anothertx_btn').show(); + $('#edexcoin-send-txdetails-screen').data('panel-api').done(); } }); }); diff --git a/assets/scripts/lang/en.js b/assets/scripts/lang/en.js index 07143a8..58ee1ec 100644 --- a/assets/scripts/lang/en.js +++ b/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', diff --git a/assets/scripts/login.js b/assets/scripts/login.js index 4ee164d..ea34b6f 100644 --- a/assets/scripts/login.js +++ b/assets/scripts/login.js @@ -782,7 +782,7 @@ var Login = function() { $('#addcoin_mdl_basilisk_mode_login') .prop('disabled', false) .prop('checked', true); - $('#addcoin_mdl_full_mode_login').prop('disabled', false); + $('#addcoin_mdl_full_mode_login').prop('disabled', true); } if (tmp_coin_val == 'SUPERNET' || tmp_coin_val == 'REVS' || diff --git a/assets/scripts/sidebar.js b/assets/scripts/sidebar.js index 43eff82..d93441b 100644 --- a/assets/scripts/sidebar.js +++ b/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); diff --git a/assets/scripts/templates/addCoinOptions.js b/assets/scripts/templates/addCoinOptions.js index f4b75f1..de40cf3 100644 --- a/assets/scripts/templates/addCoinOptions.js +++ b/assets/scripts/templates/addCoinOptions.js @@ -1,69 +1,73 @@ templates.addCoinOptions = ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `; \ No newline at end of file