From ec71a5c9d8b2b6e31a532a7e675a02c610a5a943 Mon Sep 17 00:00:00 2001
From: Dmitry Pavlov <di-smash007@mail.ru>
Date: Fri, 22 Apr 2022 22:01:21 +0300
Subject: [PATCH] [FL-2455] LFRFID, iButton: more-menu fix (#1151)

* Items order changed
* iButton,Rfid: correct order in enums

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
---
 .../ibutton/scene/ibutton_scene_read_key_menu.cpp      | 10 +++++-----
 .../lfrfid/scene/lfrfid_app_scene_read_menu.cpp        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp b/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp
index b7757224..215eb76f 100644
--- a/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp
+++ b/applications/ibutton/scene/ibutton_scene_read_key_menu.cpp
@@ -2,9 +2,9 @@
 #include "../ibutton_app.h"
 
 typedef enum {
-    SubmenuIndexWrite,
-    SubmenuIndexEmulate,
     SubmenuIndexSave,
+    SubmenuIndexEmulate,
+    SubmenuIndexWrite,
 } SubmenuIndex;
 
 static void submenu_callback(void* context, uint32_t index) {
@@ -22,11 +22,11 @@ void iButtonSceneReadKeyMenu::on_enter(iButtonApp* app) {
     iButtonAppViewManager* view_manager = app->get_view_manager();
     Submenu* submenu = view_manager->get_submenu();
 
+    submenu_add_item(submenu, "Save", SubmenuIndexSave, submenu_callback, app);
+    submenu_add_item(submenu, "Emulate", SubmenuIndexEmulate, submenu_callback, app);
     if(ibutton_key_get_type(app->get_key()) == iButtonKeyDS1990) {
         submenu_add_item(submenu, "Write", SubmenuIndexWrite, submenu_callback, app);
     }
-    submenu_add_item(submenu, "Save", SubmenuIndexSave, submenu_callback, app);
-    submenu_add_item(submenu, "Emulate", SubmenuIndexEmulate, submenu_callback, app);
     submenu_set_selected_item(submenu, submenu_item_selected);
 
     view_manager->switch_to(iButtonAppViewManager::Type::iButtonAppViewSubmenu);
@@ -62,4 +62,4 @@ void iButtonSceneReadKeyMenu::on_exit(iButtonApp* app) {
     Submenu* submenu = view->get_submenu();
 
     submenu_reset(submenu);
-}
\ No newline at end of file
+}
diff --git a/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp b/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp
index ce0461f9..76c91230 100644
--- a/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp
+++ b/applications/lfrfid/scene/lfrfid_app_scene_read_menu.cpp
@@ -1,17 +1,17 @@
 #include "lfrfid_app_scene_read_menu.h"
 
 typedef enum {
-    SubmenuWrite,
     SubmenuSave,
     SubmenuEmulate,
+    SubmenuWrite,
 } SubmenuIndex;
 
 void LfRfidAppSceneReadKeyMenu::on_enter(LfRfidApp* app, bool need_restore) {
     auto submenu = app->view_controller.get<SubmenuVM>();
 
-    submenu->add_item("Write", SubmenuWrite, submenu_callback, app);
     submenu->add_item("Save", SubmenuSave, submenu_callback, app);
     submenu->add_item("Emulate", SubmenuEmulate, submenu_callback, app);
+    submenu->add_item("Write", SubmenuWrite, submenu_callback, app);
 
     if(need_restore) {
         submenu->set_selected_item(submenu_item_selected);