From 40f2c0e29c58f4a42b8ce325abde1c418f1a819b Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 16 Dec 2023 02:21:59 +0300
Subject: [PATCH] upd picopass

---
 base_pack/picopass/application.fam                  |  2 +-
 .../picopass/scenes/picopass_scene_card_menu.c      |  3 ++-
 .../scenes/picopass_scene_read_card_success.c       | 13 +++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/base_pack/picopass/application.fam b/base_pack/picopass/application.fam
index 3c68128e17b..94b8dccb60c 100644
--- a/base_pack/picopass/application.fam
+++ b/base_pack/picopass/application.fam
@@ -10,7 +10,7 @@ App(
     ],
     stack_size=4 * 1024,
     fap_description="App to communicate with NFC tags using the PicoPass(iClass) format",
-    fap_version="1.9",
+    fap_version="1.10",
     fap_icon="125_10px.png",
     fap_category="NFC",
     fap_libs=["mbedtls"],
diff --git a/base_pack/picopass/scenes/picopass_scene_card_menu.c b/base_pack/picopass/scenes/picopass_scene_card_menu.c
index 9d4521e9423..ce9e48f28d4 100644
--- a/base_pack/picopass/scenes/picopass_scene_card_menu.c
+++ b/base_pack/picopass/scenes/picopass_scene_card_menu.c
@@ -23,8 +23,9 @@ void picopass_scene_card_menu_on_enter(void* context) {
     PicopassBlock* AA1 = picopass->dev->dev_data.AA1;
 
     bool sio = 0x30 == AA1[PICOPASS_ICLASS_PACS_CFG_BLOCK_INDEX].data[0];
+    bool no_key = picopass_is_memset(pacs->key, 0x00, PICOPASS_BLOCK_LEN);
 
-    if(pacs->se_enabled) {
+    if(no_key) {
         if(sio) {
             submenu_add_item(
                 submenu,
diff --git a/base_pack/picopass/scenes/picopass_scene_read_card_success.c b/base_pack/picopass/scenes/picopass_scene_read_card_success.c
index 0b9179d7e25..88f42eb1322 100644
--- a/base_pack/picopass/scenes/picopass_scene_read_card_success.c
+++ b/base_pack/picopass/scenes/picopass_scene_read_card_success.c
@@ -52,12 +52,6 @@ void picopass_scene_read_card_success_on_enter(void* context) {
         if(pacs->se_enabled) {
             furi_string_cat_printf(credential_str, "SE enabled");
 
-            widget_add_button_element(
-                widget,
-                GuiButtonTypeRight,
-                "More",
-                picopass_scene_read_card_success_widget_callback,
-                picopass);
         } else if(!hid_csn) {
             furi_string_cat_printf(credential_str, "Non-HID CSN");
         }
@@ -68,6 +62,13 @@ void picopass_scene_read_card_success_on_enter(void* context) {
             "Menu",
             picopass_scene_read_card_success_widget_callback,
             picopass);
+        widget_add_button_element(
+            widget,
+            GuiButtonTypeRight,
+            "More",
+            picopass_scene_read_card_success_widget_callback,
+            picopass);
+
     } else if(empty) {
         furi_string_cat_printf(wiegand_str, "Empty");
         widget_add_button_element(