Merge pull request #571 from Cypherock/fix/inheritance/bug-fix

Cypherock · Oct 7, 2024 · 82eeb8b · 82eeb8b
2 parents ad25877 + 7c04614
commit 82eeb8b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/apps/inheritance_app/inheritance_auth_wallet.c b/apps/inheritance_app/inheritance_auth_wallet.c
@@ -287,7 +287,7 @@ static bool auth_wallet_get_seed_entropy() {
 
 static bool auth_wallet_pair_card() {
   card_error_type_e status = single_card_pair_operation(
-      (char *)ui_text_tap_the_card, ui_text_place_card_below);
+      (char *)ui_text_tap_a_card, ui_text_place_card_below);
   if (status != CARD_OPERATION_SUCCESS) {
     SET_ERROR_TYPE(AUTH_WALLET_PAIRING_ERROR);
     return false;

diff --git a/apps/inheritance_app/inheritance_decrypt_data.c b/apps/inheritance_app/inheritance_decrypt_data.c
@@ -493,10 +493,14 @@ static bool deserialize_packet(void) {
 }
 
 static bool decrypt_message_data(void) {
-  return card_fetch_decrypt_data(decryption_context->wallet_id,
-                                 decryption_context->data,
-                                 decryption_context->data_count) ==
-         CARD_OPERATION_SUCCESS;
+  if (card_fetch_decrypt_data(decryption_context->wallet_id,
+                              decryption_context->data,
+                              decryption_context->data_count) !=
+      CARD_OPERATION_SUCCESS) {
+    return false;
+  }
+  set_app_flow_status(INHERITANCE_DECRYPT_DATA_STATUS_MESSAGE_DECRYPTED);
+  return true;
 }
 
 static bool decrypt_data(void) {
@@ -521,7 +525,6 @@ static bool decrypt_data(void) {
     }
 
   } while (0);
-  set_app_flow_status(INHERITANCE_DECRYPT_DATA_STATUS_MESSAGE_DECRYPTED);
   delay_scr_init(ui_text_processing, DELAY_TIME);
   return status;
 }

diff --git a/src/card_operations/card_fetch_wallet_list.c b/src/card_operations/card_fetch_wallet_list.c
@@ -226,15 +226,7 @@ bool card_fetch_wallet_name(const uint8_t *wallet_id, char *wallet_name) {
   }
   nfc_deselect_card();
 
-  // P0 abort is the only condition we want to exit the flow
-  // Card abort error will be explicitly shown here as error codes
-  if (card_data.error_type == CARD_OPERATION_P0_OCCURED) {
-    return false;
-  }
-
-  // If the tapped card is not paired, it is a terminal case in the flow
-  if (card_data.nfc_data.pairing_error) {
-    delay_scr_init(ui_text_device_and_card_not_paired, DELAY_TIME);
+  if (result != CARD_OPERATION_SUCCESS) {
     return false;
   }
 

diff --git a/src/card_operations/card_internal.c b/src/card_operations/card_internal.c
@@ -228,7 +228,7 @@ static card_error_type_e handle_wait_for_card_selection(
   evt_status = get_events(EVENT_CONFIG_NFC, MAX_INACTIVITY_TIMEOUT);
 
   if (true == evt_status.p0_event.flag) {
-    return CARD_OPERATION_P0_OCCURED;
+    NFC_RETURN_ERROR_TYPE(card_data, CARD_OPERATION_P0_OCCURED);
   }
 
   /* This API call is required to select the detected card as `get_events` calls

diff --git a/src/constant_texts.c b/src/constant_texts.c
@@ -540,7 +540,6 @@ const char *ui_text_inheritance_wallet_auth_success =
     "Wallet\nauthenticated\nsuccessfully";
 const char *ui_text_inheritance_wallet_auth_fail =
     "Wallet\nauthentication\nfailed";
-const char *ui_text_tap_the_card = "Tap the card";
 
 const char *ui_text_inheritance_encryption_flow_confirmation =
     "Proceed to encrypt data for %s?";

diff --git a/src/constant_texts.h b/src/constant_texts.h
@@ -379,7 +379,6 @@ 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;
-extern const char *ui_text_tap_the_card;
 
 extern const char *ui_text_inheritance_encryption_flow_confirmation;
 extern const char *ui_text_inheritance_encryption_flow_success;