team invite

Author: bitrequest

assets_js_bitrequest_coin_settings.js

@@ -382,17 +382,16 @@ function display_xpub_details(currency, xpub_key) {
         }).join(""),
         currency_symbol = coin_data.ccsymbol,
         currency_icon = getcc_icon(coin_data.cmcid, currency_symbol + "-" + currency, coin_data.erc20),
-        dialog_content = $("<div id='ad_info_wrap'><h2>" + currency_icon + " <span>" + currency + " " + tl("Key derivations") + "</span></h2><ul>\
-        <li id='xpub_box' class='clearfix noline'>\
+        xpub_box = br_is_cashier ? "" : "<li id='xpub_box' class='clearfix noline'>\
             <div class='xpub_ib clearfix pd_" + currency + "' data-xpub='" + xpub_key + "'>\
                 <div class='show_xpub'><strong>Xpub: </strong><span class='xpref ref'>" + tl("show") + "</span></div>\
                     <div class='xp_span drawer'>\
                         <div class='qrwrap flex'><div class='qrcode'></div>" + currency_icon + "</div>\
                         <p class='adbox adboxl select' data-type='Xpub'>" + xpub_key + "</p>\
                     </div>\
                 </div>\
-        <li>\
-            <div id='d_paths'></div>\
+        <li>",
+        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>\
         </li>\
     </ul>\
     </div>").data(root_config);
@@ -536,6 +535,10 @@ function validate_xpub(form_container) {
         xpub_fail(currency);
         return false;
     }
+    const label_field = form_container.find(".addresslabel"),
+        label_input = label_field.val();
+    if (inj(label_input)) return
+    label_field.slideUp("500").val("");
     address_list.html(derived_addresses);
     details_panel.slideDown("500");
     const key_confirm = form_container.find("#pk_confirmwrap"),

assets_js_bitrequest_core.js

@@ -3313,7 +3313,6 @@ function init_addressform(token_data) {
     const form_container = $("#erc20formbox"),
         input_section = form_container.find("#erc20_inputs"),
         addr_input = form_container.find("input.address"),
-        label_input = form_container.find("input.addresslabel"),
         token = token_data.currency;
     form_container.data(token_data);
     addr_input.attr("placeholder", tl("entercoinaddress", {

assets_js_bitrequest_settings.js

@@ -3717,8 +3717,8 @@ function check_teaminvite(ro) {
                     cd = countdown(expires_in * 1000),
                     cd_format = countdown_format(cd),
                     bpdat_seedid = q_obj(br_dat, "bitrequest_cashier.seedid"),
-                    update = bpdat_seedid == glob_let.cashier_seedid,
-                    master_account = bpdat_seedid == glob_let.bipid,
+                    update = (bpdat_seedid == glob_let.cashier_seedid) && (bpdat_seedid !== false),
+                    master_account = (bpdat_seedid == glob_let.bipid) && (bpdat_seedid !== false),
                     teamid = br_get_local("teamid", true),
                     teamid_arr = get_default_object(teamid),
                     is_installed = teamid_arr.includes(ro),