chore(app): Review changes

Author: vrockz747

src/card_operations/card_fetch_data.h

@@ -53,18 +53,6 @@ typedef struct {
  * GLOBAL FUNCTION PROTOTYPES
  *****************************************************************************/
 
-/**
- * @brief Fetches wallet list from card after applet initialization.
- *
- * @param card_data card_operation_data_t used for applet init.
- *
- * @return The card error type indicating the result of the operation.
- */
-card_error_type_e card_get_wallet_list(
-    card_operation_data_t card_data,
-    const card_fetch_wallet_list_config_t *configuration,
-    card_fetch_wallet_list_response_t *response);
-
 /**
  * @brief Fetches and encrypts data for a given wallet ID.
  *

src/card_operations/card_fetch_decrypt_data.c

@@ -124,48 +124,7 @@ card_error_type_e card_fetch_decrypt_data(const uint8_t *wallet_id,
 #if USE_SIMULATOR == 0
     memcpy(card_data.nfc_data.family_id, get_family_id(), FAMILY_ID_SIZE);
     result = card_initialize_applet(&card_data);
-#endif
-    // Fetch wallet list from card
-    wallet_list_t wallets_in_card = {0};
-    card_fetch_wallet_list_config_t configuration = {
-        .operation = {.acceptable_cards = ACCEPTABLE_CARDS_ALL,
-                      .skip_card_removal = true,
-                      .expected_family_id = card_data.nfc_data.family_id,
-                      .buzzer_on_success = false},
-        .frontend = {.heading = ui_text_tap_1_2_cards,
-                     .msg = ui_text_place_card_below}};
-
-    card_fetch_wallet_list_response_t response = {
-        .wallet_list = &wallets_in_card, .card_info = {0}};
-#if USE_SIMULATOR == 0
-    card_error_type_e status =
-        card_get_wallet_list(card_data, &configuration, &response);
-    // If the tapped card is not paired, it is a terminal case in the flow
-    if (true == response.card_info.pairing_error) {
-      return CARD_OPERATION_DEFAULT_INVALID;
-    }
-
-    // At this stage, either there is no core error message set, or it is set
-    // but we want to overwrite the error message using user facing messages in
-    // this flow
-    uint32_t card_fault_status = 0;
-    if (1 == response.card_info.recovery_mode) {
-      card_fault_status = NFC_NULL_PTR_ERROR;
-    } else if (CARD_OPERATION_SUCCESS != status) {
-      card_fault_status = response.card_info.status;
-    }
-
-    for (uint8_t i = 0; i < wallets_in_card.count; i++) {
-      if (memcmp(wallet_id, wallets_in_card.wallet[i].id, WALLET_ID_SIZE) ==
-          0) {
-        memcpy(wallet_name,
-               (const char *)wallets_in_card.wallet[i].name,
-               NAME_SIZE);
-        break;
-      }
-    }
-    if (0 == strlen(wallet_name)) {
-      delay_scr_init(ui_text_wallet_doesnt_exists_on_this_card, DELAY_TIME);
+    if (!card_fetch_wallet_name(card_data, wallet_id, wallet_name)) {
       return CARD_OPERATION_DEFAULT_INVALID;
     }
 #endif

src/card_operations/card_fetch_encrypt_data.c

@@ -59,6 +59,8 @@
  * INCLUDES
  *****************************************************************************/
 
+#include <stdbool.h>
+
 #include "buzzer.h"
 #include "card_fetch_data.h"
 #include "card_fetch_wallet_list.h"
@@ -88,38 +90,7 @@
 /*****************************************************************************
  * STATIC VARIABLES
  *****************************************************************************/
-card_error_type_e card_get_wallet_list(
-    card_operation_data_t card_data,
-    const card_fetch_wallet_list_config_t *configuration,
-    card_fetch_wallet_list_response_t *response) {
-  if (NULL == configuration || NULL == response ||
-      NULL == response->wallet_list) {
-    return CARD_OPERATION_DEFAULT_INVALID;
-  }
-  if (CARD_OPERATION_SUCCESS == card_data.error_type) {
-    card_data.nfc_data.status = nfc_list_all_wallet(response->wallet_list);
 
-    if (card_data.nfc_data.status == SW_NO_ERROR ||
-        card_data.nfc_data.status == SW_RECORD_NOT_FOUND) {
-      if (card_data.nfc_data.status == SW_RECORD_NOT_FOUND ||
-          configuration->operation.buzzer_on_success) {
-        buzzer_start(BUZZER_DURATION);
-      }
-      if (!configuration->operation.skip_card_removal) {
-        wait_for_card_removal();
-      }
-      // break;
-    } else {
-      card_handle_errors(&card_data);
-    }
-  }
-
-  response->card_info.pairing_error = card_data.nfc_data.pairing_error;
-  response->card_info.tapped_card = card_data.nfc_data.tapped_card;
-  response->card_info.recovery_mode = card_data.nfc_data.recovery_mode;
-  response->card_info.status = card_data.nfc_data.status;
-  return card_data.error_type;
-}
 /*****************************************************************************
  * GLOBAL VARIABLES
  *****************************************************************************/
@@ -156,48 +127,7 @@ card_error_type_e card_fetch_encrypt_data(const uint8_t *wallet_id,
 #if USE_SIMULATOR == 0
     memcpy(card_data.nfc_data.family_id, get_family_id(), FAMILY_ID_SIZE);
     result = card_initialize_applet(&card_data);
-#endif
-    // Fetch wallet list from card
-    wallet_list_t wallets_in_card = {0};
-    card_fetch_wallet_list_config_t configuration = {
-        .operation = {.acceptable_cards = ACCEPTABLE_CARDS_ALL,
-                      .skip_card_removal = true,
-                      .expected_family_id = card_data.nfc_data.family_id,
-                      .buzzer_on_success = false},
-        .frontend = {.heading = ui_text_tap_1_2_cards,
-                     .msg = ui_text_place_card_below}};
-
-    card_fetch_wallet_list_response_t response = {
-        .wallet_list = &wallets_in_card, .card_info = {0}};
-#if USE_SIMULATOR == 0
-    card_error_type_e status =
-        card_get_wallet_list(card_data, &configuration, &response);
-    // If the tapped card is not paired, it is a terminal case in the flow
-    if (true == response.card_info.pairing_error) {
-      return CARD_OPERATION_DEFAULT_INVALID;
-    }
-
-    // At this stage, either there is no core error message set, or it is set
-    // but we want to overwrite the error message using user facing messages in
-    // this flow
-    uint32_t card_fault_status = 0;
-    if (1 == response.card_info.recovery_mode) {
-      card_fault_status = NFC_NULL_PTR_ERROR;
-    } else if (CARD_OPERATION_SUCCESS != status) {
-      card_fault_status = response.card_info.status;
-    }
-
-    for (uint8_t i = 0; i < wallets_in_card.count; i++) {
-      if (memcmp(wallet_id, wallets_in_card.wallet[i].id, WALLET_ID_SIZE) ==
-          0) {
-        memcpy(wallet_name,
-               (const char *)wallets_in_card.wallet[i].name,
-               NAME_SIZE);
-        break;
-      }
-    }
-    if (0 == strlen(wallet_name)) {
-      delay_scr_init(ui_text_wallet_doesnt_exists_on_this_card, DELAY_TIME);
+    if (!card_fetch_wallet_name(card_data, wallet_id, wallet_name)) {
       return CARD_OPERATION_DEFAULT_INVALID;
     }
 #endif

src/card_operations/card_fetch_wallet_list.c

@@ -184,42 +184,64 @@ card_error_type_e card_fetch_wallet_list(
   return card_data.error_type;
 }
 
-bool card_fetch_wallet_name(const uint8_t *wallet_id, char *wallet_name) {
+bool card_fetch_wallet_name(card_operation_data_t card_data,
+                            const uint8_t *wallet_id,
+                            char *wallet_name) {
   wallet_list_t wallets_in_card = {0};
 
-  card_fetch_wallet_list_config_t configuration = {
-      .operation = {.acceptable_cards = ACCEPTABLE_CARDS_ALL,
-                    .skip_card_removal = true,
-                    .expected_family_id = get_family_id(),
-                    .buzzer_on_success = false},
-      .frontend = {.heading = ui_text_tap_1_2_cards,
-                   .msg = ui_text_place_card_below}};
-
-  card_fetch_wallet_list_response_t response = {.wallet_list = &wallets_in_card,
-                                                .card_info = {0}};
-
   // P0 abort is the only condition we want to exit the flow
   // Card abort error will be explicitly shown here as error codes
-  card_error_type_e status = card_fetch_wallet_list(&configuration, &response);
+  while (1) {
+    card_data.nfc_data.acceptable_cards = ACCEPTABLE_CARDS_ALL;
+    card_initialize_applet(&card_data);
+
+    if (CARD_OPERATION_SUCCESS == card_data.error_type) {
+      card_data.nfc_data.status = nfc_list_all_wallet(&wallets_in_card);
+
+      if (card_data.nfc_data.status == SW_NO_ERROR ||
+          card_data.nfc_data.status == SW_RECORD_NOT_FOUND) {
+        break;
+      } else {
+        card_handle_errors(&card_data);
+      }
+    }
+    if (CARD_OPERATION_CARD_REMOVED == card_data.error_type ||
+        CARD_OPERATION_RETAP_BY_USER_REQUIRED == card_data.error_type) {
+      const char *error_msg = card_data.error_message;
+      /**
+       * In case the same card as before is tapped, the user should be told to
+       * tap a different card instead of the default message "Wrong card
+       * sequence"
+       */
+      if (SW_CONDITIONS_NOT_SATISFIED == card_data.nfc_data.status) {
+        error_msg = ui_text_tap_another_card;
+      }
+      if (CARD_OPERATION_SUCCESS == indicate_card_error(error_msg)) {
+        // Re-render the instruction screen
+        instruction_scr_init(ui_text_place_card_below, ui_text_tap_1_2_cards);
+        continue;
+      }
+    }
+    // If control reached here, it is an unrecoverable error, so break
+    break;
+  }
+
+  card_error_type_e status = card_data.error_type;
   if (CARD_OPERATION_P0_OCCURED == status) {
     return false;
   }
 
   // If the tapped card is not paired, it is a terminal case in the flow
-  if (true == response.card_info.pairing_error) {
+  if (card_data.nfc_data.pairing_error) {
+    delay_scr_init(ui_text_device_and_card_not_paired, DELAY_TIME);
     return false;
   }
 
-  // At this stage, either there is no core error message set, or it is set but
-  // we want to overwrite the error message using user facing messages in this
-  // flow
-  clear_core_error_screen();
-
   uint32_t card_fault_status = 0;
-  if (1 == response.card_info.recovery_mode) {
+  if (1 == card_data.nfc_data.recovery_mode) {
     card_fault_status = NFC_NULL_PTR_ERROR;
   } else if (CARD_OPERATION_SUCCESS != status) {
-    card_fault_status = response.card_info.status;
+    card_fault_status = card_data.nfc_data.status;
   }
 
   for (uint8_t i = 0; i < wallets_in_card.count; i++) {
@@ -231,6 +253,7 @@ bool card_fetch_wallet_name(const uint8_t *wallet_id, char *wallet_name) {
   }
 
   if (0 == strlen(wallet_name)) {
+    delay_scr_init(ui_text_wallet_doesnt_exists_on_this_card, DELAY_TIME);
     return false;
   }
 

src/card_operations/card_fetch_wallet_list.h

@@ -15,6 +15,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "card_internal.h"
 #include "card_operation_typedefs.h"
 #include "wallet_list.h"
 
@@ -69,6 +70,7 @@ card_error_type_e card_fetch_wallet_list(
  * copied.
  * @return true if the wallet name is successfully fetched, false otherwise.
  */
-bool card_fetch_wallet_name(const uint8_t *wallet_id, char *wallet_name);
-
+bool card_fetch_wallet_name(card_operation_data_t card_data,
+                            const uint8_t *wallet_id,
+                            char *wallet_name);
 #endif /* CARD_FETCH_WALLET_LIST_H */