fix: Minor updates as per PR review

Author: pro-utkarshM

apps/btc_family/btc_pub_key.c

@@ -161,7 +161,9 @@ static void send_public_key(const uint8_t *public_key);
 /*****************************************************************************
  * STATIC VARIABLES
  *****************************************************************************/
-static bool sign_address = false;
+#ifndef BTC_ONLY_BUILD
+ static bool sign_address = false;
+#endif // BTC_ONLY_BUILD
 
 static bool check_which_request(const btc_query_t *query,
                                 pb_size_t which_request) {
@@ -184,13 +186,13 @@ static bool validate_request_data(btc_get_public_key_request_t *request) {
     status = false;
   }
 
+  #ifndef BTC_ONLY_BUILD
   caq_node_data_t data = {.applet_id = get_btc_app_desc()->id};
 
   memzero(data.params, sizeof(data.params));
   memcpy(data.params,
          request->initiate.wallet_id,
          sizeof(request->initiate.wallet_id));
-#ifndef BTC_ONLY_BUILD
   data.params[32] = EXCHANGE_FLOW_TAG_RECEIVE;
   sign_address = exchange_app_validate_caq(data);
 #endif // BTC_ONLY_BUILD
@@ -305,12 +307,12 @@ void btc_get_pub_key(btc_query_t *query) {
   delay_scr_init(ui_text_processing, DELAY_SHORT);
   size_t length = btc_get_address(seed, path, path_length, public_key, msg);
   memzero(seed, sizeof(seed));
-
+  
+  #ifndef BTC_ONLY_BUILD
   if (sign_address) {
-    #ifndef BTC_ONLY_BUILD
     exchange_sign_address(msg, sizeof(msg));
-    #endif // BTC_ONLY_BUILD
   }
+  #endif // BTC_ONLY_BUILD
 
   if (0 < length &&
       true == core_scroll_page(ui_text_receive_on, msg, btc_send_error)) {

apps/btc_family/btc_txn.c

@@ -281,7 +281,6 @@ static bool send_script_sig(btc_query_t *query, const scrip_sig_t *sigs);
 /*****************************************************************************
  * STATIC VARIABLES
  *****************************************************************************/
-static bool use_signature_verification = false;
 static btc_txn_context_t *btc_txn_context = NULL;
 
 /*****************************************************************************
@@ -313,6 +312,7 @@ static bool validate_request_data(const btc_sign_txn_request_t *request) {
     status = false;
   }
 #ifndef BTC_ONLY_BUILD
+  bool use_signature_verification = false; // Declare and initialize here
   caq_node_data_t data = {.applet_id = get_btc_app_desc()->id};
   memzero(data.params, sizeof(data.params));
   memcpy(data.params,
@@ -572,6 +572,14 @@ static bool get_user_verification() {
   char value[100] = "";
   char address[100] = "";
 
+#ifndef BTC_ONLY_BUILD
+  bool use_signature_verification = false;
+  // This needs to be re-evaluated as validate_request_data will be called first and will set this variable.
+  // The query is not accessible directly in get_user_verification.
+  // For now, removing this re-evaluation part.
+  // Keeping the if condition as is for the exchange_validate_stored_signature function call.
+#endif // BTC_ONLY_BUILD
+
   for (int idx = 0; idx < btc_txn_context->metadata.output_count; idx++) {
     btc_sign_txn_output_t *output = &btc_txn_context->outputs[idx];
     btc_sign_txn_output_script_pub_key_t *script = &output->script_pub_key;
@@ -590,14 +598,14 @@ static bool get_user_verification() {
       return false;
     }
 
+#ifndef BTC_ONLY_BUILD
     if (use_signature_verification) {
-      #ifndef BTC_ONLY_BUILD
       if (!exchange_validate_stored_signature(address, sizeof(address))) {
         btc_send_error(ERROR_COMMON_ERROR_UNKNOWN_ERROR_TAG, status);
         return false;
       }
-      #endif // BTC_ONLY_BUILD
     }
+#endif // BTC_ONLY_BUILD
 
     if (!core_scroll_page(title, address, btc_send_error) ||
         !core_scroll_page(title, value, btc_send_error)) {
@@ -749,4 +757,4 @@ void btc_sign_transaction(btc_query_t *query) {
     free(btc_txn_context);
     btc_txn_context = NULL;
   }
-}
+}

common/core/core_flow_init.c

@@ -187,7 +187,6 @@ void core_init_app_registry() {
   registry_add_app(get_ltc_app_desc());
   registry_add_app(get_doge_app_desc());
   registry_add_app(get_dash_app_desc());
-  registry_add_app(get_inheritance_app_desc());
 
   registry_add_app(get_eth_app_desc());
   registry_add_app(get_near_app_desc());