fix: Handle cases for decryption and auth wallet for nominee

Author: TejasvOnly

apps/inheritance_app/inheritance_auth_wallet.c

@@ -166,18 +166,23 @@ STATIC bool auth_wallet_handle_inititate_query(inheritance_query_t *query) {
   char msg[100] = "";
 
   if (!check_which_request(query,
-                           INHERITANCE_AUTH_WALLET_REQUEST_INITIATE_TAG) ||
-      !get_wallet_name_by_id(query->auth_wallet.initiate.wallet_id,
-                             (uint8_t *)wallet_name,
-                             inheritance_send_error)) {
-    // TODO: update this for nominee
+                           INHERITANCE_AUTH_WALLET_REQUEST_INITIATE_TAG)) {
     return false;
   }
-
-  snprintf(msg,
-           sizeof(msg),
-           ui_text_inheritance_wallet_auth_flow_confirmation,
-           wallet_name);
+  if (get_wallet_name_by_id(query->auth_wallet.initiate.wallet_id,
+                            (uint8_t *)wallet_name,
+                            NULL)) {
+    snprintf(msg,
+             sizeof(msg),
+             ui_text_inheritance_wallet_auth_flow_confirmation,
+             wallet_name);
+
+  } else {
+    snprintf(msg,
+             sizeof(msg),
+             "%s",
+             ui_text_inheritance_wallet_auth_flow_confirmation_generic);
+  }
 
   if (!core_confirmation(msg, inheritance_send_error)) {
     return false;

apps/inheritance_app/inheritance_decrypt_data.c

@@ -209,17 +209,23 @@ STATIC bool inheritance_handle_initiate_query(inheritance_query_t *query) {
 
   if (!check_which_request(
           query, INHERITANCE_DECRYPT_DATA_WITH_PIN_REQUEST_INITIATE_TAG) ||
-      !validate_request_data(&query->decrypt) ||
-      !get_wallet_name_by_id(query->decrypt.initiate.wallet_id,
-                             (uint8_t *)wallet_name,
-                             inheritance_send_error)) {
+      !validate_request_data(&query->decrypt)) {
     return false;
   }
 
-  snprintf(msg,
-           sizeof(msg),
-           ui_text_inheritance_decryption_flow_confirmation,
-           wallet_name);
+  if (get_wallet_name_by_id(
+          query->decrypt.initiate.wallet_id, (uint8_t *)wallet_name, NULL)) {
+    snprintf(msg,
+             sizeof(msg),
+             ui_text_inheritance_decryption_flow_confirmation,
+             wallet_name);
+
+  } else {
+    snprintf(msg,
+             sizeof(msg),
+             "%s",
+             ui_text_inheritance_decryption_flow_confirmation_generic);
+  }
 
   if (!core_confirmation(msg, inheritance_send_error)) {
     return false;

src/card_operations/card_fetch_encrypt_data.c

@@ -61,6 +61,7 @@
 
 #include "buzzer.h"
 #include "card_fetch_data.h"
+#include "card_fetch_wallet_list.h"
 #include "card_internal.h"
 #include "card_utils.h"
 #include "nfc.h"
@@ -107,8 +108,7 @@ card_error_type_e card_fetch_encrypt_data(const uint8_t *wallet_id,
 
   char wallet_name[NAME_SIZE] = "";
 #if USE_SIMULATOR == 0
-  // Confirm NULL use for rejection_cb
-  ASSERT(get_wallet_name_by_id(wallet_id, (uint8_t *)wallet_name, NULL));
+  card_fetch_wallet_name(wallet_id, wallet_name);
 #endif
 
   instruction_scr_init(ui_text_place_card_below, ui_text_tap_1_2_cards);

src/card_operations/card_fetch_wallet_list.c

@@ -63,6 +63,7 @@
 
 #include <stdint.h>
 
+#include "app_error.h"
 #include "card_internal.h"
 #include "card_operation_typedefs.h"
 #include "card_utils.h"
@@ -132,7 +133,10 @@ card_error_type_e card_fetch_wallet_list(
 
       if (card_data.nfc_data.status == SW_NO_ERROR ||
           card_data.nfc_data.status == SW_RECORD_NOT_FOUND) {
-        buzzer_start(BUZZER_DURATION);
+        if (card_data.nfc_data.status == SW_RECORD_NOT_FOUND ||
+            config->operation.buzzer_on_success) {
+          buzzer_start(BUZZER_DURATION);
+        }
         if (!config->operation.skip_card_removal) {
           wait_for_card_removal();
         }
@@ -186,7 +190,8 @@ bool card_fetch_wallet_name(const uint8_t *wallet_id, char *wallet_name) {
   card_fetch_wallet_list_config_t configuration = {
       .operation = {.acceptable_cards = ACCEPTABLE_CARDS_ALL,
                     .skip_card_removal = true,
-                    .expected_family_id = get_family_id()},
+                    .expected_family_id = get_family_id(),
+                    .buzzer_on_success = false},
       .frontend = {.heading = ui_text_tap_1_2_cards,
                    .msg = ui_text_place_card_below}};
 

src/card_operations/card_pair.c

@@ -514,7 +514,6 @@ card_error_type_e single_card_pair_operation(char *heading,
       }
 
       buzzer_start(BUZZER_DURATION);
-      wait_for_card_removal();
 
       break;
     }
@@ -534,4 +533,4 @@ card_error_type_e single_card_pair_operation(char *heading,
 
   nfc_deselect_card();
   return card_data.error_type;
-}
+}

src/constant_texts.c

@@ -532,6 +532,8 @@ const char *ui_critical_card_health_migrate_data =
 // Inheritance
 const char *ui_text_inheritance_wallet_auth_flow_confirmation =
     "Start %s wallet authentication?";
+const char *ui_text_inheritance_wallet_auth_flow_confirmation_generic =
+    "Start wallet authentication?";
 const char *ui_text_inheritance_wallet_authenticating =
     "Wallet\nauthenticating...";
 const char *ui_text_inheritance_wallet_auth_success =
@@ -547,6 +549,8 @@ const char *ui_text_inheritance_encryption_flow_failure = "Encryption Failed";
 
 const char *ui_text_inheritance_decryption_flow_confirmation =
     "Proceed to decrypt data for %s?";
+const char *ui_text_inheritance_decryption_flow_confirmation_generic =
+    "Proceed to decrypt data?";
 const char *ui_text_inheritance_decryption_flow_success = "Decryption Success";
 const char *ui_text_inheritance_decryption_flow_failure = "Decryption Failed";
 

src/constant_texts.h

@@ -375,6 +375,7 @@ extern const char *ui_critical_card_health_migrate_data;
 
 // Inheritance
 extern const char *ui_text_inheritance_wallet_auth_flow_confirmation;
+extern const char *ui_text_inheritance_wallet_auth_flow_confirmation_generic;
 extern const char *ui_text_inheritance_wallet_authenticating;
 extern const char *ui_text_inheritance_wallet_auth_success;
 extern const char *ui_text_inheritance_wallet_auth_fail;
@@ -385,6 +386,7 @@ extern const char *ui_text_inheritance_encryption_flow_success;
 extern const char *ui_text_inheritance_encryption_flow_failure;
 
 extern const char *ui_text_inheritance_decryption_flow_confirmation;
+extern const char *ui_text_inheritance_decryption_flow_confirmation_generic;
 extern const char *ui_text_inheritance_decryption_flow_success;
 extern const char *ui_text_inheritance_decryption_flow_failure;
 

src/settings/card_health_check.c

@@ -107,6 +107,7 @@ void card_health_check(void) {
   configuration.operation.acceptable_cards = ACCEPTABLE_CARDS_ALL;
   configuration.operation.skip_card_removal = true;
   configuration.operation.expected_family_id = get_family_id();
+  configuration.operation.buzzer_on_success = true;
   configuration.frontend.heading = NULL;
   configuration.frontend.msg = ui_text_card_health_check_start;
 
@@ -201,4 +202,4 @@ void card_health_check(void) {
   }
 
   return;
-}
+}

src/settings/factory_reset.c

@@ -217,6 +217,7 @@ static bool get_wallet_list_from_two_cards(wallet_list_t *wallet_list) {
   configuration.operation.acceptable_cards = ACCEPTABLE_CARDS_ALL;
   configuration.operation.skip_card_removal = false;
   configuration.operation.expected_family_id = get_family_id();
+  configuration.operation.buzzer_on_success = true;
   configuration.frontend.heading = ui_text_tap_1_2_cards;
   configuration.frontend.msg = ui_text_place_card_below;
 
@@ -365,4 +366,4 @@ void clear_device_data(void) {
 
   // Reset device to apply new settings
   BSP_reset();
-}
+}

src/settings/sync_with_cards.c

@@ -140,6 +140,7 @@ static bool get_wallets_from_card(wallet_list_t *wallet_list,
   configuration.operation.acceptable_cards = ACCEPTABLE_CARDS_ALL;
   configuration.operation.skip_card_removal = false;
   configuration.operation.expected_family_id = get_family_id();
+  configuration.operation.buzzer_on_success = true;
 
   configuration.frontend.heading = ui_text_tap_1_2_cards;
   configuration.frontend.msg = ui_text_place_card_below;
@@ -328,4 +329,4 @@ void sync_with_cards(void) {
   delay_scr_init(msg, DELAY_TIME);
 
   return;
-}
+}