From ce53ed2a7c0aad68415f12f4a1f03df7d1c4b4ae Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 10 Sep 2024 06:03:54 +0300
Subject: [PATCH 1/2] fix wrong menu order [ci skip]

---
 .../desktop_settings/scenes/desktop_settings_scene_start.c      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
index 0629daffb..04cb0182b 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_start.c
@@ -11,8 +11,8 @@ typedef enum {
     DesktopSettingsAutoLockDelay,
     DesktopSettingsBatteryDisplay,
     DesktopSettingsClockDisplay,
-    DesktopSettingsHappyMode,
     DesktopSettingsChangeName,
+    DesktopSettingsHappyMode,
     DesktopSettingsFavoriteLeftShort,
     DesktopSettingsFavoriteLeftLong,
     DesktopSettingsFavoriteRightShort,

From c1d31edda150f3e2357d2020d6a6d21dc9abb1a4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Tue, 10 Sep 2024 06:12:13 +0300
Subject: [PATCH 2/2] upd changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7755c53b7..5a7c51ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,11 @@
 - 125kHz RFID: 
     - OFW: Fix detection of GProx II cards and false detection of other cards (by @Astrrra)
     - OFW: Fix Guard GProxII False Positive and 36-bit Parsing (by @zinongli)
+    - OFW: GProxII Fix Writing and Rendering Conflict 
 - NFC:
     - Saflok parser improvements (by @zinongli & @xtruan & @zacharyweiss & @evilmog & @Arkwin)
     - OFW: Fix crash on Ultralight unlock (by @Astrrra) 
+    - OFW: FeliCa anti-collision fix
 * OFW: Rename 'Detect Reader' to 'Extract MF Keys' 
 * OFW: Happy mode
 * OFW: Infrared: Universal AC - Add Airwell AW-HKD012-N91