From 3cffc69cb55a180f45820317f0431f1ea9e8f518 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Thu, 20 Mar 2025 04:23:33 +0000
Subject: [PATCH] Fix some message strings

---
 .../protocol_support/type_4_tag/type_4_tag_render.c       | 6 +++---
 lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag_render.c b/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag_render.c
index ac1f5bdbc..492bbb457 100644
--- a/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag_render.c
+++ b/applications/main/nfc/helpers/protocol_support/type_4_tag/type_4_tag_render.c
@@ -15,18 +15,18 @@ void nfc_render_type_4_tag_info(
         furi_string_cat(str, "\n::::::::::::::::::[Tag Specs]::::::::::::::::::\n");
         furi_string_cat_printf(
             str, "T4T Mapping Version: %u.%u\n", data->t4t_version.major, data->t4t_version.minor);
-        furi_string_cat_printf(str, "NDEF File ID: 0x%04X\n", data->ndef_file_id);
+        furi_string_cat_printf(str, "NDEF File ID: %04X\n", data->ndef_file_id);
         furi_string_cat_printf(str, "Max NDEF Size: %u\n", data->ndef_max_len);
         furi_string_cat_printf(
             str, "APDU Sizes: R:%u W:%u\n", data->chunk_max_read, data->chunk_max_write);
         furi_string_cat_printf(
             str,
-            "Read Lock: 0x%02X%s\n",
+            "Read Lock: %02X%s\n",
             data->ndef_read_lock,
             data->ndef_read_lock == 0 ? " (unlocked)" : "");
         furi_string_cat_printf(
             str,
-            "Write Lock: 0x%02X%s",
+            "Write Lock: %02X%s",
             data->ndef_write_lock,
             data->ndef_write_lock == 0 ? " (unlocked)" : "");
     }
diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c b/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
index 0a33cbbf8..ee5183ac4 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
@@ -38,7 +38,7 @@ Type4TagError type_4_tag_apdu_trx(Type4TagPoller* instance, BitBuffer* tx_buf, B
     if(memcmp(status, success, sizeof(status)) == 0) {
         return Type4TagErrorNone;
     } else {
-        FURI_LOG_E(TAG, "APDU failed: 0x%02X%02X", status[0], status[1]);
+        FURI_LOG_E(TAG, "APDU failed: %02X%02X", status[0], status[1]);
         return Type4TagErrorApduFailed;
     }
 }
@@ -263,7 +263,7 @@ Type4TagError type_4_tag_poller_read_cc(Type4TagPoller* instance) {
         if(error != Type4TagErrorNone) break;
         instance->data->is_tag_specific = true;
 
-        FURI_LOG_D(TAG, "Detected NDEF file ID 0x%04X", instance->data->ndef_file_id);
+        FURI_LOG_D(TAG, "Detected NDEF file ID %04X", instance->data->ndef_file_id);
     } while(false);
 
     return error;
@@ -298,7 +298,7 @@ Type4TagError type_4_tag_poller_read_ndef(Type4TagPoller* instance) {
         if(error != Type4TagErrorNone) break;
 
         FURI_LOG_D(
-            TAG, "Read %hu bytes from NDEF file 0x%04X", ndef_len, instance->data->ndef_file_id);
+            TAG, "Read %hu bytes from NDEF file %04X", ndef_len, instance->data->ndef_file_id);
     } while(false);
 
     return error;
@@ -396,7 +396,7 @@ Type4TagError type_4_tag_poller_write_ndef(Type4TagPoller* instance) {
         if(error != Type4TagErrorNone) break;
 
         FURI_LOG_D(
-            TAG, "Wrote %hu bytes from NDEF file 0x%04X", ndef_len, instance->data->ndef_file_id);
+            TAG, "Wrote %hu bytes to NDEF file %04X", ndef_len, instance->data->ndef_file_id);
     } while(false);
 
     return error;