Skip to content

Commit 75bebc7

Browse files
committed
misc
1 parent 1e02522 commit 75bebc7

9 files changed

+14
-28
lines changed

assets_js_bitrequest_config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,7 @@ const glob_multi_wallets = {
21592159
},
21602160
{
21612161
"name": "mymonero api",
2162-
"base_url": "https://api.mymonero.com:8443/",
2162+
"base_url": "https://api.mymonero.com/",
21632163
"key_param": null,
21642164
"api_key": "no_key",
21652165
"sign_up": null

assets_js_bitrequest_core.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3334,6 +3334,7 @@ function submit_erc20() {
33343334

33353335
// Validates the address and view key (if applicable) for the selected currency
33363336
function validate_address_vk(addr_data) {
3337+
console.log(addr_data);
33373338
const label_field = $("#addressform .addresslabel"),
33383339
label_input = label_field.val();
33393340
if (inj(label_input)) return
@@ -3386,9 +3387,6 @@ function validate_address_vk(addr_data) {
33863387
api_proxy({
33873388
"api": "mymonero api",
33883389
"search": "login",
3389-
"cachetime": 25,
3390-
"cachefolder": "1h",
3391-
"proxy": true,
33923390
"params": {
33933391
"method": "POST",
33943392
"data": api_payload,

assets_js_bitrequest_fetchblocks.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -923,9 +923,6 @@ function initialize_monero_scan(rd, api_data, rdo) {
923923
api_proxy({
924924
"api": "mymonero api",
925925
"search": "login",
926-
"cachetime": 25,
927-
"cachefolder": "1h",
928-
"proxy": true,
929926
"params": {
930927
"method": "POST",
931928
"data": login_data,
@@ -969,9 +966,6 @@ function scan_monero_transactions(rd, api_data, rdo, viewkey) {
969966
api_proxy({
970967
"api": "mymonero api",
971968
"search": "get_address_txs",
972-
"cachetime": 25,
973-
"cachefolder": "1h",
974-
"proxy": true,
975969
"params": {
976970
"method": "POST",
977971
"data": request_payload,

assets_js_bitrequest_monitors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ function process_scan_results(rd, api_data, rdo, tx_details, l2) {
397397
return
398398
}
399399
if (src === "tx_polling" || src === "l2_polling") {
400-
if (block_overflow("polling")) return // prevent overflow
400+
if (block_overflow("polling" && src !== "addr_polling")) return // prevent overflow
401401
route_transaction_monitor(tx_details, api_data);
402402
}
403403
return

assets_js_bitrequest_polling.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,6 @@ function connect_monero_node(cachetime, address, vk) {
167167
api_proxy({
168168
"api": "mymonero api",
169169
"search": "login",
170-
"cachetime": 25,
171-
"cachefolder": "1h",
172-
"proxy": true,
173170
"params": {
174171
"method": "POST",
175172
"data": payload,
@@ -244,9 +241,6 @@ function check_monero_transactions(cachetime, address, vk, request_ts) {
244241
api_proxy({
245242
"api": api_name,
246243
"search": "get_address_txs",
247-
"cachetime": cachetime,
248-
"cachefolder": "1h",
249-
"proxy": true,
250244
"params": {
251245
"method": "POST",
252246
"data": payload,

assets_js_bitrequest_rpcs.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,11 @@ function fetch_electrum_nodes(currency, node_url, predefined_nodes, custom_nodes
201201
fetch_timeout = setTimeout(function() {
202202
api_proxy({
203203
"api": currency,
204-
"cachetime": 25,
205-
"cachefolder": "1h",
206204
"custom": "electrum",
207205
"api_url": rpc_url2,
208206
"proxy": true,
209207
"params": {
210208
"method": "POST",
211-
"cache": true,
212209
"data": {
213210
"id": sha_sub(rpc_url2, 6),
214211
"method": "blockchain.transaction.get",
@@ -943,4 +940,4 @@ function get_node_icon(node_name) {
943940
(node_name.includes("infura")) ? "infura" :
944941
(node_name.includes("blockcypher")) ? "blockcypher" :
945942
(node_name === "nano") ? "nano" : "node";
946-
}
943+
}

assets_js_bitrequest_sockets.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ function init_socket(socket_node, wallet_address, retry) {
140140
return
141141
}
142142
if (payment_type === "bitcoin-cash") {
143+
start_address_monitor(null, null, true);
144+
return
143145
if (node_name === "mempool.space websocket" || socket_node.default === false) {
144146
mempoolspace_btc_socket(socket_node, wallet_address);
145147
return
@@ -233,10 +235,12 @@ function socket_info(socket_node, is_connected, is_polling) {
233235
if (glob_const.paymentdialogbox.hasClass("transacting")) return
234236
if (!is_openrequest()) return
235237
payment_address.removeClass("live");
236-
helper.l1_status = false;
237-
if (helper.l2_status === false) {
238-
glob_const.paymentpopup.removeClass("live");
239-
notify(tl("websocketoffline"), 500000, "yes");
238+
if (helper) {
239+
helper.l1_status = false;
240+
if (helper.l2_status === false) {
241+
glob_const.paymentpopup.removeClass("live");
242+
notify(tl("websocketoffline"), 500000, "yes");
243+
}
240244
}
241245
}
242246

assets_styles_settings.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ ul.conf_options li .conf_emoji {
169169
cursor: pointer;
170170
}
171171

172-
.selectarrows:before {
172+
.selectarrows:before,
173+
.inputwrap .qrscanner .icon-qrcode:before {
173174
margin-right: 0.25em;
174175
vertical-align: top!important;
175176
}

assets_styles_styles.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2634,8 +2634,6 @@ html.inframe.hide_app #closeoptions {
26342634

26352635
/* qr scanner */
26362636

2637-
.qrscanner {}
2638-
26392637
#scanner {
26402638
position: fixed;
26412639
top: 0px;

0 commit comments

Comments
 (0)