From a4d23768c1767906a58baa4a77a246718c864654 Mon Sep 17 00:00:00 2001
From: jLynx <admin@jlynx.net>
Date: Sat, 8 Nov 2025 10:13:35 +1300
Subject: [PATCH 1/2] Update version.txt (#2858)

---
 .github/workflows/version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/version.txt b/.github/workflows/version.txt
index b1d18bc43..aaf7425f4 100644
--- a/.github/workflows/version.txt
+++ b/.github/workflows/version.txt
@@ -1 +1 @@
-v2.3.0
+v2.3.1

From c46cc431c9000a5ac2c49d24ffaa3429f819545a Mon Sep 17 00:00:00 2001
From: jLynx <admin@jlynx.net>
Date: Sat, 8 Nov 2025 10:21:33 +1300
Subject: [PATCH 2/2] Revert "resolve conflicts merge" (#2860)

This reverts commit 344aa0c74154ec6166983f433b6a9f8e6176ca46.
---
 firmware/application/apps/ble_rx_app.cpp           | 13 -------------
 firmware/application/apps/ble_rx_app.hpp           |  7 -------
 firmware/application/apps/ble_tx_app.hpp           |  2 +-
 firmware/application/external/tetris/ui_tetris.hpp |  2 +-
 firmware/common/ui_widget.hpp                      |  4 ----
 5 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/firmware/application/apps/ble_rx_app.cpp b/firmware/application/apps/ble_rx_app.cpp
index 8c85af7a7..b16cf913b 100644
--- a/firmware/application/apps/ble_rx_app.cpp
+++ b/firmware/application/apps/ble_rx_app.cpp
@@ -200,14 +200,6 @@ void RecentEntriesTable<BleRecentEntries>::draw(
         hitsStr = to_string_dec_int(entry.numHits);
     }
 
-    std::string hitsStr;
-
-    if (!entry.informationString.empty()) {
-        hitsStr = entry.informationString;
-    } else {
-        hitsStr = to_string_dec_int(entry.numHits);
-    }
-
     // Pushing single digit values down right justified.
     int hitsDigits = hitsStr.length();
     uint8_t hits_spacing = 8 - hitsDigits;
@@ -1049,11 +1041,6 @@ bool BLERxView::updateEntry(const BlePacketData* packet, BleRecentEntry& entry,
         if (!success && !uniqueParsing) {
             success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
         }
-
-        if (!success && !uniqueParsing) {
-            success = parse_beacon_data(packet->data, packet->dataLen, entry.nameString, entry.informationString);
-        }
-
     } else if (pdu_type == ADV_DIRECT_IND || pdu_type == SCAN_REQ) {
         if (!uniqueParsing) {
             ADV_PDU_PAYLOAD_TYPE_1_3* directed_mac_data = (ADV_PDU_PAYLOAD_TYPE_1_3*)packet->data;
diff --git a/firmware/application/apps/ble_rx_app.hpp b/firmware/application/apps/ble_rx_app.hpp
index 8ac260117..99b4abd21 100644
--- a/firmware/application/apps/ble_rx_app.hpp
+++ b/firmware/application/apps/ble_rx_app.hpp
@@ -175,13 +175,6 @@ class BleRecentEntryDetailView : public View {
         {7 * 8, UI_POS_Y(2), 23 * 8, UI_POS_HEIGHT(1)},
         "-"};
 
-    Labels label_vendor{
-        {{0 * 8, 2 * 16}, "Vendor:", Theme::getInstance()->fg_light->foreground}};
-
-    Text text_vendor{
-        {7 * 8, 2 * 16, 23 * 8, 16},
-        "-"};
-
     Labels labels{
         {{UI_POS_X(0), UI_POS_Y(3)}, "Len", Theme::getInstance()->fg_light->foreground},
         {{5 * 8, UI_POS_Y(3)}, "Type", Theme::getInstance()->fg_light->foreground},
diff --git a/firmware/application/apps/ble_tx_app.hpp b/firmware/application/apps/ble_tx_app.hpp
index 4bed8e712..7ef4f3b5d 100644
--- a/firmware/application/apps/ble_tx_app.hpp
+++ b/firmware/application/apps/ble_tx_app.hpp
@@ -293,7 +293,7 @@ class BLETxView : public View {
         {{UI_POS_X(0), 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};
 
     TextViewer dataEditView{
-        {0, 9 * 18, screen_width, screen_height - 80}};
+        {0, 9 * 18, 240, 240}};
 
     Button button_clear_marked{
         {UI_POS_X(1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(13), UI_POS_HEIGHT(1.5)},
diff --git a/firmware/application/external/tetris/ui_tetris.hpp b/firmware/application/external/tetris/ui_tetris.hpp
index 4a8f07fbc..46a0b159e 100644
--- a/firmware/application/external/tetris/ui_tetris.hpp
+++ b/firmware/application/external/tetris/ui_tetris.hpp
@@ -154,7 +154,7 @@ class TetrisView : public View {
     NavigationView& nav_;
 
     Button dummy{
-        {screen_width, 0, 0, 0},
+        {240, 0, 0, 0},
         ""};
 
     MessageHandlerRegistration message_handler_frame_sync{
diff --git a/firmware/common/ui_widget.hpp b/firmware/common/ui_widget.hpp
index 2ad757ffd..452d1b2cc 100644
--- a/firmware/common/ui_widget.hpp
+++ b/firmware/common/ui_widget.hpp
@@ -994,10 +994,6 @@ class Waveform : public Widget {
     void set_paused(bool paused);
     bool is_clickable() const;
 
-    bool is_paused() const;
-    void set_paused(bool paused);
-    bool is_clickable() const;
-
     void paint(Painter& painter) override;
     bool on_key(const KeyEvent key) override;
     bool on_touch(const TouchEvent event) override;