Skip to content

Commit bb517d3

Browse files
committed
team invite
1 parent 2576e20 commit bb517d3

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

assets_js_bitrequest_coin_settings.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,17 +382,16 @@ function display_xpub_details(currency, xpub_key) {
382382
}).join(""),
383383
currency_symbol = coin_data.ccsymbol,
384384
currency_icon = getcc_icon(coin_data.cmcid, currency_symbol + "-" + currency, coin_data.erc20),
385-
dialog_content = $("<div id='ad_info_wrap'><h2>" + currency_icon + " <span>" + currency + " " + tl("Key derivations") + "</span></h2><ul>\
386-
<li id='xpub_box' class='clearfix noline'>\
385+
xpub_box = br_is_cashier ? "" : "<li id='xpub_box' class='clearfix noline'>\
387386
<div class='xpub_ib clearfix pd_" + currency + "' data-xpub='" + xpub_key + "'>\
388387
<div class='show_xpub'><strong>Xpub: </strong><span class='xpref ref'>" + tl("show") + "</span></div>\
389388
<div class='xp_span drawer'>\
390389
<div class='qrwrap flex'><div class='qrcode'></div>" + currency_icon + "</div>\
391390
<p class='adbox adboxl select' data-type='Xpub'>" + xpub_key + "</p>\
392391
</div>\
393392
</div>\
394-
<li>\
395-
<div id='d_paths'></div>\
393+
<li>",
394+
dialog_content = $("<div id='ad_info_wrap'><h2>" + currency_icon + " <span>" + currency + " " + tl("Key derivations") + "</span></h2><ul>" + xpub_box + "<div id='d_paths'></div>\
396395
</li>\
397396
</ul>\
398397
</div>").data(root_config);
@@ -536,6 +535,10 @@ function validate_xpub(form_container) {
536535
xpub_fail(currency);
537536
return false;
538537
}
538+
const label_field = form_container.find(".addresslabel"),
539+
label_input = label_field.val();
540+
if (inj(label_input)) return
541+
label_field.slideUp("500").val("");
539542
address_list.html(derived_addresses);
540543
details_panel.slideDown("500");
541544
const key_confirm = form_container.find("#pk_confirmwrap"),

assets_js_bitrequest_core.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3313,7 +3313,6 @@ function init_addressform(token_data) {
33133313
const form_container = $("#erc20formbox"),
33143314
input_section = form_container.find("#erc20_inputs"),
33153315
addr_input = form_container.find("input.address"),
3316-
label_input = form_container.find("input.addresslabel"),
33173316
token = token_data.currency;
33183317
form_container.data(token_data);
33193318
addr_input.attr("placeholder", tl("entercoinaddress", {

assets_js_bitrequest_settings.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3717,8 +3717,8 @@ function check_teaminvite(ro) {
37173717
cd = countdown(expires_in * 1000),
37183718
cd_format = countdown_format(cd),
37193719
bpdat_seedid = q_obj(br_dat, "bitrequest_cashier.seedid"),
3720-
update = bpdat_seedid == glob_let.cashier_seedid,
3721-
master_account = bpdat_seedid == glob_let.bipid,
3720+
update = (bpdat_seedid == glob_let.cashier_seedid) && (bpdat_seedid !== false),
3721+
master_account = (bpdat_seedid == glob_let.bipid) && (bpdat_seedid !== false),
37223722
teamid = br_get_local("teamid", true),
37233723
teamid_arr = get_default_object(teamid),
37243724
is_installed = teamid_arr.includes(ro),

0 commit comments

Comments
 (0)