From f18df25a9669816f5e8a516b5edb82b8bbcd61ff Mon Sep 17 00:00:00 2001
From: gid9798 <30450294+gid9798@users.noreply.github.com>
Date: Mon, 14 Aug 2023 15:33:03 +0300
Subject: [PATCH] NFC app: MF Custom UID, fix SAK & ATQA save

---
 applications/main/nfc/scenes/nfc_scene_save_name.c | 3 ++-
 applications/main/nfc/scenes/nfc_scene_set_type.c  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/applications/main/nfc/scenes/nfc_scene_save_name.c b/applications/main/nfc/scenes/nfc_scene_save_name.c
index a7b97aac0..a432e69f7 100644
--- a/applications/main/nfc/scenes/nfc_scene_save_name.c
+++ b/applications/main/nfc/scenes/nfc_scene_save_name.c
@@ -58,7 +58,8 @@ bool nfc_scene_save_name_on_event(void* context, SceneManagerEvent event) {
             if(strcmp(nfc->dev->dev_name, "") != 0) {
                 nfc_device_delete(nfc->dev, true);
             }
-            if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetUid)) {
+            if(scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetUid) &&
+               (!scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetTypeMfUid))) {
                 nfc->dev->dev_data.nfc_data = nfc->dev_edit_data;
             }
             strlcpy(nfc->dev->dev_name, nfc->text_store, strlen(nfc->text_store) + 1);
diff --git a/applications/main/nfc/scenes/nfc_scene_set_type.c b/applications/main/nfc/scenes/nfc_scene_set_type.c
index b6f8d3bce..0da633c63 100644
--- a/applications/main/nfc/scenes/nfc_scene_set_type.c
+++ b/applications/main/nfc/scenes/nfc_scene_set_type.c
@@ -57,7 +57,7 @@ bool nfc_scene_set_type_on_event(void* context, SceneManagerEvent event) {
             scene_manager_next_scene(nfc->scene_manager, NfcSceneSetSak);
             consumed = true;
         } else if(event.event == SubmenuIndexMFClassicCustomUID) {
-            nfc->dev->format = NfcDeviceSaveFormatMifareClassic;
+            nfc_device_clear(nfc->dev);
             scene_manager_next_scene(nfc->scene_manager, NfcSceneSetTypeMfUid);
             consumed = true;
         } else {