update lines and cols

README.md

@@ -33,7 +33,6 @@ By navigating to Settings -> App Settings, you may customize your UI's icons, co
 - `CTRL` + `p` = Hide/show a log of raw received packets.
 - `CTRL` + `t` = With the Node List highlighted, send a traceroute to the selected node 
 - `CTRL` + `d` = With the Channel List hightlighted, archive a chat to reduce UI clutter. Messages will be saved in the db and repopulate if you send or receive a DM from this user.
-- `CTRL` + `d` = With the Note List highlghted, remove a node from your nodedb.
 - `ESC` = Exit out of the Settings Dialogue, or Quit the application if settings are not displayed.
 
 ### Search
@@ -68,11 +67,3 @@ To quickly connect to localhost, use:
 ```sh
 contact -t
 ```
-## Install in development (editable) mode:
-```bash
-git clone https://github.com/pdxlocations/contact.git
-cd contact
-python3 -m venv .venv
-source .venv/bin/activate
-pip install -e .
-```

contact/ui/contact_ui.py

@@ -13,7 +13,7 @@ from contact.utilities.input_handlers import get_list_input
 import contact.ui.default_config as config
 import contact.ui.dialog
 from contact.ui.nav_utils import move_main_highlight, draw_main_arrows, get_msg_window_lines, wrap_text
-from contact.utilities.singleton import ui_state, interface_state, menu_state
+from contact.utilities.singleton import ui_state, interface_state
 
 
 def handle_resize(stdscr: curses.window, firstrun: bool) -> None:
@@ -341,6 +341,7 @@ def handle_ctrl_t(stdscr: curses.window) -> None:
     send_traceroute()
     curses.curs_set(0)  # Hide cursor
     contact.ui.dialog.dialog(
+        stdscr,
         f"Traceroute Sent To: {get_name_from_database(ui_state.node_list[ui_state.selected_node])}",
         "Results will appear in messages window.\nNote: Traceroute is limited to once every 30 seconds.",
     )
@@ -363,10 +364,7 @@ def handle_backspace(entry_win: curses.window, input_text: str) -> str:
 def handle_backtick(stdscr: curses.window) -> None:
     """Handle backtick key events to open the settings menu."""
     curses.curs_set(0)
-    previous_window = ui_state.current_window
-    ui_state.current_window = 4
     settings_menu(stdscr, interface_state.interface)
-    ui_state.current_window = previous_window
     curses.curs_set(1)
     refresh_node_list()
     handle_resize(stdscr, False)
@@ -601,8 +599,6 @@ def draw_messages_window(scroll_to_bottom: bool = False) -> None:
     refresh_pad(1)
 
     draw_packetlog_win()
-    if ui_state.current_window == 4:
-        menu_state.need_redraw = True
 
 
 def draw_node_list() -> None:
@@ -653,9 +649,6 @@ def draw_node_list() -> None:
     curses.curs_set(1)
     entry_win.refresh()
 
-    if ui_state.current_window == 4:
-        menu_state.need_redraw = True
-
 
 def select_channel(idx: int) -> None:
     """Select a channel by index and update the UI state accordingly."""

contact/ui/control_ui.py

@@ -6,7 +6,6 @@ import sys
 from typing import List
 
 from contact.utilities.save_to_radio import save_changes
-import contact.ui.default_config as config
 from contact.utilities.config_io import config_export, config_import
 from contact.utilities.control_utils import parse_ini_file, transform_menu_path
 from contact.utilities.input_handlers import (
@@ -21,7 +20,9 @@ from contact.ui.dialog import dialog
 from contact.ui.menus import generate_menu_from_protobuf
 from contact.ui.nav_utils import move_highlight, draw_arrows, update_help_window
 from contact.ui.user_config import json_editor
-from contact.utilities.singleton import menu_state
+from contact.ui.ui_state import MenuState
+
+menu_state = MenuState()
 
 # Constants
 width = 80
@@ -35,17 +36,16 @@ script_dir = os.path.dirname(os.path.abspath(__file__))
 parent_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
 
 # Paths
-# locals_dir = os.path.dirname(os.path.abspath(sys.argv[0]))  # Current script directory
+locals_dir = os.path.dirname(os.path.abspath(sys.argv[0]))  # Current script directory
 translation_file = os.path.join(parent_dir, "localisations", "en.ini")
 
-# config_folder = os.path.join(locals_dir, "node-configs")
-config_folder = os.path.abspath(config.node_configs_file_path)
+config_folder = os.path.join(locals_dir, "node-configs")
 
 # Load translations
 field_mapping, help_text = parse_ini_file(translation_file)
 
 
-def display_menu() -> tuple[object, object]:  # curses.window or pad types
+def display_menu(menu_state: MenuState) -> tuple[object, object]:  # curses.window or pad types
 
     min_help_window_height = 6
     num_items = len(menu_state.current_menu) + (1 if menu_state.show_save_option else 0)
@@ -106,7 +106,7 @@ def display_menu() -> tuple[object, object]:  # curses.window or pad types
         )
 
     # Draw help window with dynamically updated max_help_lines
-    draw_help_window(start_y, start_x, menu_height, max_help_lines, transformed_path)
+    draw_help_window(start_y, start_x, menu_height, max_help_lines, transformed_path, menu_state)
 
     menu_win.refresh()
     menu_pad.refresh(
@@ -117,7 +117,6 @@ def display_menu() -> tuple[object, object]:  # curses.window or pad types
         menu_win.getbegyx()[0] + 3 + menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0),
         menu_win.getbegyx()[1] + menu_win.getmaxyx()[1] - 4,
     )
-    curses.curs_set(0)
 
     max_index = num_items + (1 if menu_state.show_save_option else 0) - 1
     visible_height = menu_win.getmaxyx()[0] - 5 - (2 if menu_state.show_save_option else 0)
@@ -133,6 +132,7 @@ def draw_help_window(
     menu_height: int,
     max_help_lines: int,
     transformed_path: List[str],
+    menu_state: MenuState,
 ) -> None:
 
     global help_win
@@ -168,32 +168,29 @@ def settings_menu(stdscr: object, interface: object) -> None:
 
     modified_settings = {}
 
-    menu_state.need_redraw = True
+    need_redraw = True
     menu_state.show_save_option = False
 
     while True:
-        if menu_state.need_redraw:
-            menu_state.need_redraw = False
+        if need_redraw:
             options = list(menu_state.current_menu.keys())
 
-            # Determine if save option should be shown
-            path = menu_state.menu_path
             menu_state.show_save_option = (
-                (len(path) > 2 and ("Radio Settings" in path or "Module Settings" in path))
-                or (len(path) == 2 and "User Settings" in path)
-                or (len(path) == 3 and "Channels" in path)
+                (
+                    len(menu_state.menu_path) > 2
+                    and ("Radio Settings" in menu_state.menu_path or "Module Settings" in menu_state.menu_path)
+                )
+                or (len(menu_state.menu_path) == 2 and "User Settings" in menu_state.menu_path)
+                or (len(menu_state.menu_path) == 3 and "Channels" in menu_state.menu_path)
             )
 
             # Display the menu
-            menu_win, menu_pad = display_menu()
+            menu_win, menu_pad = display_menu(menu_state)
 
-        if menu_win is None:
-            continue  # Skip if menu_win is not initialized
+            need_redraw = False
 
-        menu_win.timeout(200)  # wait up to 200 ms for a keypress (or less if key is pressed)
+        # Capture user input
         key = menu_win.getch()
-        if key == -1:
-            continue
 
         max_index = len(options) + (1 if menu_state.show_save_option else 0) - 1
         # max_help_lines = 4
@@ -227,7 +224,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
             )
 
         elif key == curses.KEY_RESIZE:
-            menu_state.need_redraw = True
+            need_redraw = True
             curses.update_lines_cols()
 
             menu_win.erase()
@@ -251,7 +248,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
             )
 
         elif key == curses.KEY_RIGHT or key == ord("\n"):
-            menu_state.need_redraw = True
+            need_redraw = True
             menu_state.start_index.append(0)
             menu_win.erase()
             help_win.erase()
@@ -304,7 +301,6 @@ def settings_menu(stdscr: object, interface: object) -> None:
                         file.write(config_text)
                     logging.info(f"Config file saved to {yaml_file_path}")
                     dialog("Config File Saved:", yaml_file_path)
-                    menu_state.need_redraw = True
                     menu_state.start_index.pop()
                     continue
                 except PermissionError:
@@ -321,7 +317,6 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 # Check if folder exists and is not empty
                 if not os.path.exists(config_folder) or not any(os.listdir(config_folder)):
                     dialog("", " No config files found. Export a config first.")
-                    menu_state.need_redraw = True
                     continue  # Return to menu
 
                 file_list = [f for f in os.listdir(config_folder) if os.path.isfile(os.path.join(config_folder, f))]
@@ -329,7 +324,6 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 # Ensure file_list is not empty before proceeding
                 if not file_list:
                     dialog("", " No config files found. Export a config first.")
-                    menu_state.need_redraw = True
                     continue
 
                 filename = get_list_input("Choose a config file", None, file_list)
@@ -396,6 +390,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 menu_state.start_index.pop()
                 menu_state.selected_index = 4
                 continue
+                # need_redraw = True
 
             field_info = menu_state.current_menu.get(selected_option)
             if isinstance(field_info, tuple):
@@ -514,28 +509,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 menu_state.selected_index = 0
 
         elif key == curses.KEY_LEFT:
-
-            # If we are at the main menu and there are unsaved changes, prompt to save
-            if len(menu_state.menu_path) == 3 and modified_settings:
-
-                current_section = menu_state.menu_path[-1]
-                save_prompt = get_list_input(
-                    f"You have unsaved changes in {current_section}. Save before exiting?",
-                    None,
-                    ["Yes", "No", "Cancel"],
-                    mandatory=True,
-                )
-                if save_prompt == "Cancel":
-                    continue  # Stay in the menu without doing anything
-                elif save_prompt == "Yes":
-                    save_changes(interface, modified_settings, menu_state)
-                    logging.info("Changes Saved")
-
-                modified_settings.clear()
-                menu = rebuild_menu_at_current_path(interface, menu_state)
-                pass
-
-            menu_state.need_redraw = True
+            need_redraw = True
 
             menu_win.erase()
             help_win.erase()
@@ -546,8 +520,8 @@ def settings_menu(stdscr: object, interface: object) -> None:
             menu_win.refresh()
             help_win.refresh()
 
-            # if len(menu_state.menu_path) < 2:
-            #     modified_settings.clear()
+            if len(menu_state.menu_path) < 2:
+                modified_settings.clear()
 
             # Navigate back to the previous menu
             if len(menu_state.menu_path) > 1:
@@ -564,16 +538,6 @@ def settings_menu(stdscr: object, interface: object) -> None:
             break
 
 
-def rebuild_menu_at_current_path(interface, menu_state):
-    """Rebuild menus from the device and re-point current_menu to the same path."""
-    new_menu = generate_menu_from_protobuf(interface)
-    cur = new_menu["Main Menu"]
-    for step in menu_state.menu_path[1:]:
-        cur = cur.get(step, {})
-    menu_state.current_menu = cur
-    return new_menu
-
-
 def set_region(interface: object) -> None:
     node = interface.getNode("^local")
     device_config = node.localConfig

contact/ui/default_config.py

@@ -2,7 +2,6 @@ import json
 import logging
 import os
 from typing import Dict
-from contact.ui.colors import setup_colors
 
 # Get the parent directory of the script
 script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -14,12 +13,6 @@ parent_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
 # parent_dir = "/tmp/test_nonwritable"
 
 
-def reload_config() -> None:
-    loaded_config = initialize_config()
-    assign_config_variables(loaded_config)
-    setup_colors(reinit=True)
-
-
 def _is_writable_dir(path: str) -> bool:
     """
     Return True if we can create & delete a temp file in `path`.
@@ -64,7 +57,6 @@ config_root = _get_config_root(parent_dir)
 json_file_path = os.path.join(config_root, "config.json")
 log_file_path = os.path.join(config_root, "client.log")
 db_file_path = os.path.join(config_root, "client.db")
-node_configs_file_path = os.path.join(config_root, "node-configs/")
 
 
 def format_json_single_line_arrays(data: Dict[str, object], indent: int = 4) -> str:
@@ -185,7 +177,6 @@ def initialize_config() -> Dict[str, object]:
         "node_list_16ths": "5",
         "db_file_path": db_file_path,
         "log_file_path": log_file_path,
-        "node_configs_file_path": node_configs_file_path,
         "message_prefix": ">>",
         "sent_message_prefix": ">> Sent",
         "notification_symbol": "*",
@@ -226,7 +217,7 @@ def initialize_config() -> Dict[str, object]:
 def assign_config_variables(loaded_config: Dict[str, object]) -> None:
     # Assign values to local variables
 
-    global db_file_path, log_file_path, node_configs_file_path, message_prefix, sent_message_prefix
+    global db_file_path, log_file_path, message_prefix, sent_message_prefix
     global notification_symbol, ack_implicit_str, ack_str, nak_str, ack_unknown_str
     global node_list_16ths, channel_list_16ths
     global theme, COLOR_CONFIG
@@ -236,7 +227,6 @@ def assign_config_variables(loaded_config: Dict[str, object]) -> None:
     node_list_16ths = loaded_config["node_list_16ths"]
     db_file_path = loaded_config["db_file_path"]
     log_file_path = loaded_config["log_file_path"]
-    node_configs_file_path = loaded_config.get("node_configs_file_path")
     message_prefix = loaded_config["message_prefix"]
     sent_message_prefix = loaded_config["sent_message_prefix"]
     notification_symbol = loaded_config["notification_symbol"]
@@ -268,7 +258,6 @@ if __name__ == "__main__":
     print("\nLoaded Configuration:")
     print(f"Database File Path: {db_file_path}")
     print(f"Log File Path: {log_file_path}")
-    print(f"Configs File Path: {node_configs_file_path}")
     print(f"Message Prefix: {message_prefix}")
     print(f"Sent Message Prefix: {sent_message_prefix}")
     print(f"Notification Symbol: {notification_symbol}")

contact/ui/dialog.py

@@ -1,18 +1,14 @@
 import curses
 from contact.ui.colors import get_color
-from contact.utilities.singleton import menu_state, ui_state
 
 
 def dialog(title: str, message: str) -> None:
     """Display a dialog with a title and message."""
 
-    previous_window = ui_state.current_window
-    ui_state.current_window = 4
-
     curses.update_lines_cols()
     height, width = curses.LINES, curses.COLS
 
-    # Parse message into lines and calculate dimensions
+    # Calculate dialog dimensions
     message_lines = message.splitlines()
     max_line_length = max(len(l) for l in message_lines)
     dialog_width = max(len(title) + 4, max_line_length + 4)
@@ -20,44 +16,36 @@ def dialog(title: str, message: str) -> None:
     x = (width - dialog_width) // 2
     y = (height - dialog_height) // 2
 
-    def draw_window():
-        win.erase()
-        win.bkgd(get_color("background"))
-        win.attrset(get_color("window_frame"))
-        win.border(0)
-
-        win.addstr(0, 2, title, get_color("settings_default"))
-
-        for i, line in enumerate(message_lines):
-            msg_x = (dialog_width - len(line)) // 2
-            win.addstr(2 + i, msg_x, line, get_color("settings_default"))
-
-        ok_text = " Ok "
-        win.addstr(
-            dialog_height - 2,
-            (dialog_width - len(ok_text)) // 2,
-            ok_text,
-            get_color("settings_default", reverse=True),
-        )
-
-        win.refresh()
-
+    # Create dialog window
     win = curses.newwin(dialog_height, dialog_width, y, x)
-    draw_window()
+    win.bkgd(get_color("background"))
+    win.attrset(get_color("window_frame"))
+    win.border(0)
 
+    # Add title
+    win.addstr(0, 2, title, get_color("settings_default"))
+
+    # Add message (centered)
+    for i, line in enumerate(message_lines):
+        msg_x = (dialog_width - len(line)) // 2
+        win.addstr(2 + i, msg_x, line, get_color("settings_default"))
+
+    # Add centered OK button
+    ok_text = " Ok "
+    win.addstr(
+        dialog_height - 2,
+        (dialog_width - len(ok_text)) // 2,
+        ok_text,
+        get_color("settings_default", reverse=True),
+    )
+
+    # Refresh dialog window
+    win.refresh()
+
+    # Get user input
     while True:
-        win.timeout(200)
         char = win.getch()
-
-        if menu_state.need_redraw:
-            menu_state.need_redraw = False
-            draw_window()
-
-        if char in (curses.KEY_ENTER, 10, 13, 32, 27):  # Enter, space, Esc
+        if char in (curses.KEY_ENTER, 10, 13, 32, 27):  # Enter, space, or Esc
             win.erase()
             win.refresh()
-            ui_state.current_window = previous_window
             return
-
-        if char == -1:
-            continue

contact/ui/ui_state.py

@@ -10,7 +10,6 @@ class MenuState:
     current_menu: Union[Dict[str, Any], List[Any], str, int] = field(default_factory=dict)
     menu_path: List[str] = field(default_factory=list)
     show_save_option: bool = False
-    need_redraw: bool = False
 
 
 @dataclass

contact/ui/user_config.py

@@ -4,10 +4,9 @@ import curses
 from typing import Any, List, Dict
 
 from contact.ui.colors import get_color, setup_colors, COLOR_MAP
-import contact.ui.default_config as config
+from contact.ui.default_config import format_json_single_line_arrays, loaded_config
 from contact.ui.nav_utils import move_highlight, draw_arrows
 from contact.utilities.input_handlers import get_list_input
-from contact.utilities.singleton import menu_state
 
 
 width = 80
@@ -54,9 +53,7 @@ def edit_value(key: str, current_value: str) -> str:
     # Handle theme selection dynamically
     if key == "theme":
         # Load theme names dynamically from the JSON
-        theme_options = [
-            k.split("_", 2)[2].lower() for k in config.loaded_config.keys() if k.startswith("COLOR_CONFIG")
-        ]
+        theme_options = [k.split("_", 2)[2].lower() for k in loaded_config.keys() if k.startswith("COLOR_CONFIG")]
         return get_list_input("Select Theme", current_value, theme_options)
 
     elif key == "node_sort":
@@ -75,64 +72,41 @@ def edit_value(key: str, current_value: str) -> str:
     user_input = ""
     input_position = (7, 13)  # Tuple for row and column
     row, col = input_position  # Unpack tuple
-
     while True:
-        if menu_state.need_redraw:
-            curses.update_lines_cols()
-            menu_state.need_redraw = False
-
-            # Re-create the window to fully reset state
-            edit_win = curses.newwin(height, width, start_y, start_x)
-            edit_win.timeout(200)
-            edit_win.bkgd(get_color("background"))
-            edit_win.attrset(get_color("window_frame"))
-            edit_win.border()
-
-            # Redraw static content
-            edit_win.addstr(1, 2, f"Editing {key}", get_color("settings_default", bold=True))
-            edit_win.addstr(3, 2, "Current Value:", get_color("settings_default"))
-            for i, line in enumerate(wrapped_lines[:4]):
-                edit_win.addstr(4 + i, 2, line, get_color("settings_default"))
-            edit_win.addstr(7, 2, "New Value: ", get_color("settings_default"))
-
-        visible_text = user_input[scroll_offset : scroll_offset + input_width]
-        edit_win.addstr(row, col, " " * input_width, get_color("settings_default"))
-        edit_win.addstr(row, col, visible_text, get_color("settings_default"))
+        visible_text = user_input[scroll_offset : scroll_offset + input_width]  # Only show what fits
+        edit_win.addstr(row, col, " " * input_width, get_color("settings_default"))  # Clear previous text
+        edit_win.addstr(row, col, visible_text, get_color("settings_default"))  # Display text
         edit_win.refresh()
 
-        edit_win.move(row, col + min(len(user_input) - scroll_offset, input_width))
+        edit_win.move(row, col + min(len(user_input) - scroll_offset, input_width))  # Adjust cursor position
+        key = edit_win.get_wch()
 
-        try:
-            key = edit_win.get_wch()
-        except curses.error:
-            continue  # window not ready — skip this loop
-
-        if key in (chr(27), curses.KEY_LEFT):
+        if key in (chr(27), curses.KEY_LEFT):  # ESC or Left Arrow
             curses.curs_set(0)
-            return current_value
+            return current_value  # Exit without returning a value
 
         elif key in (chr(curses.KEY_ENTER), chr(10), chr(13)):
             break
 
-        elif key in (curses.KEY_BACKSPACE, chr(127)):
-            if user_input:
+        elif key in (curses.KEY_BACKSPACE, chr(127)):  # Backspace
+            if user_input:  # Only process if there's something to delete
                 user_input = user_input[:-1]
                 if scroll_offset > 0 and len(user_input) < scroll_offset + input_width:
-                    scroll_offset -= 1
+                    scroll_offset -= 1  # Move back if text is shorter than scrolled area
         else:
             if isinstance(key, str):
                 user_input += key
             else:
                 user_input += chr(key)
 
-            if len(user_input) > input_width:
+            if len(user_input) > input_width:  # Scroll if input exceeds visible area
                 scroll_offset += 1
 
     curses.curs_set(0)
     return user_input if user_input else current_value
 
 
-def display_menu() -> tuple[Any, Any, List[str]]:
+def display_menu(menu_state: Any) -> tuple[Any, Any, List[str]]:
     """
     Render the configuration menu with a Save button directly added to the window.
     """
@@ -215,7 +189,6 @@ def display_menu() -> tuple[Any, Any, List[str]]:
 def json_editor(stdscr: curses.window, menu_state: Any) -> None:
 
     menu_state.selected_index = 0  # Track the selected option
-    made_changes = False  # Track if any changes were made
 
     script_dir = os.path.dirname(os.path.abspath(__file__))
     parent_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
@@ -238,18 +211,16 @@ def json_editor(stdscr: curses.window, menu_state: Any) -> None:
     menu_state.current_menu = data  # Track the current level of the menu
 
     # Render the menu
-    menu_win, menu_pad, options = display_menu()
-    menu_state.need_redraw = True
+    menu_win, menu_pad, options = display_menu(menu_state)
+    need_redraw = True
 
     while True:
-        if menu_state.need_redraw:
-            menu_state.need_redraw = False
-            menu_win, menu_pad, options = display_menu()
+        if need_redraw:
+            menu_win, menu_pad, options = display_menu(menu_state)
             menu_win.refresh()
+            need_redraw = False
 
         max_index = len(options) + (1 if menu_state.show_save_option else 0) - 1
-
-        menu_win.timeout(200)
         key = menu_win.getch()
 
         if key == curses.KEY_UP:
@@ -277,7 +248,7 @@ def json_editor(stdscr: curses.window, menu_state: Any) -> None:
 
         elif key in (curses.KEY_RIGHT, 10, 13):  # 10 = \n, 13 = carriage return
 
-            menu_state.need_redraw = True
+            need_redraw = True
             menu_win.erase()
             menu_win.refresh()
 
@@ -298,14 +269,11 @@ def json_editor(stdscr: curses.window, menu_state: Any) -> None:
 
                 if isinstance(selected_data, list) and len(selected_data) == 2:
                     # Edit color pair
-                    old = selected_data
                     new_value = edit_color_pair(selected_key, selected_data)
                     menu_state.menu_path.pop()
                     menu_state.start_index.pop()
                     menu_state.menu_index.pop()
                     menu_state.current_menu[selected_key] = new_value
-                    if new_value != old:
-                        made_changes = True
 
                 elif isinstance(selected_data, (dict, list)):
                     # Navigate into nested data
@@ -314,26 +282,22 @@ def json_editor(stdscr: curses.window, menu_state: Any) -> None:
 
                 else:
                     # General value editing
-                    old = selected_data
                     new_value = edit_value(selected_key, selected_data)
                     menu_state.menu_path.pop()
                     menu_state.menu_index.pop()
                     menu_state.start_index.pop()
                     menu_state.current_menu[selected_key] = new_value
-                    menu_state.need_redraw = True
-                    if new_value != old:
-                        made_changes = True
+                    need_redraw = True
 
             else:
                 # Save button selected
                 save_json(file_path, data)
                 stdscr.refresh()
-                # config.reload()  # This isn't refreshing the file paths as expected
                 continue
 
         elif key in (27, curses.KEY_LEFT):  # Escape or Left Arrow
 
-            menu_state.need_redraw = True
+            need_redraw = True
             menu_win.erase()
             menu_win.refresh()
 
@@ -354,19 +318,6 @@ def json_editor(stdscr: curses.window, menu_state: Any) -> None:
 
             else:
                 # Exit the editor
-                if made_changes:
-                    save_prompt = get_list_input(
-                        "You have unsaved changes. Save before exiting?",
-                        None,
-                        ["Yes", "No", "Cancel"],
-                        mandatory=True,
-                    )
-                    if save_prompt == "Cancel":
-                        continue  # Stay in the menu without doing anything
-                    elif save_prompt == "Yes":
-                        save_json(file_path, data)
-                        made_changes = False
-
                 menu_win.clear()
                 menu_win.refresh()
 
@@ -374,7 +325,7 @@ def json_editor(stdscr: curses.window, menu_state: Any) -> None:
 
 
 def save_json(file_path: str, data: Dict[str, Any]) -> None:
-    formatted_json = config.format_json_single_line_arrays(data)
+    formatted_json = format_json_single_line_arrays(data)
     with open(file_path, "w", encoding="utf-8") as f:
         f.write(formatted_json)
     setup_colors(reinit=True)
@@ -383,6 +334,7 @@ def save_json(file_path: str, data: Dict[str, Any]) -> None:
 def main(stdscr: curses.window) -> None:
     from contact.ui.ui_state import MenuState
 
+    menu_state = MenuState()
     if len(menu_state.menu_path) == 0:
         menu_state.menu_path = ["App Settings"]  # Initialize if not set
 

contact/utilities/input_handlers.py

@@ -8,7 +8,6 @@ from contact.ui.colors import get_color
 from contact.ui.nav_utils import move_highlight, draw_arrows, wrap_text
 from contact.ui.dialog import dialog
 from contact.utilities.validation_rules import get_validation_for
-from contact.utilities.singleton import menu_state
 
 
 def invalid_input(window: curses.window, message: str, redraw_func: Optional[callable] = None) -> None:
@@ -54,7 +53,6 @@ def get_text_input(prompt: str, selected_config: str, input_type: str) -> Option
     start_x = (curses.COLS - width) // 2
 
     input_win = curses.newwin(height, width, start_y, start_x)
-    input_win.timeout(200)
     input_win.bkgd(get_color("background"))
     input_win.attrset(get_color("window_frame"))
     input_win.border()
@@ -92,25 +90,15 @@ def get_text_input(prompt: str, selected_config: str, input_type: str) -> Option
     first_line_width = input_width - len(prompt_text)
 
     while True:
-        if menu_state.need_redraw:
-            menu_state.need_redraw = False
-            redraw_input_win()
-
-        try:
-            key = input_win.get_wch()
-        except curses.error:
-            continue
+        key = input_win.get_wch()
 
         if key == chr(27) or key == curses.KEY_LEFT:
             input_win.erase()
             input_win.refresh()
             curses.curs_set(0)
-            menu_state.need_redraw = True
             return None
 
         elif key in (chr(curses.KEY_ENTER), chr(10), chr(13)):
-            menu_state.need_redraw = True
-
             if not user_input.strip():
                 invalid_input(input_win, "Value cannot be empty.", redraw_func=redraw_input_win)
                 continue
@@ -248,11 +236,10 @@ def get_admin_key_input(current_value: List[bytes]) -> Optional[List[str]]:
     start_y = (curses.LINES - height) // 2
     start_x = (curses.COLS - width) // 2
 
-    admin_key_win = curses.newwin(height, width, start_y, start_x)
-    admin_key_win.timeout(200)
-    admin_key_win.bkgd(get_color("background"))
-    admin_key_win.attrset(get_color("window_frame"))
-    admin_key_win.keypad(True)  # Enable keypad for special keys
+    repeated_win = curses.newwin(height, width, start_y, start_x)
+    repeated_win.bkgd(get_color("background"))
+    repeated_win.attrset(get_color("window_frame"))
+    repeated_win.keypad(True)  # Enable keypad for special keys
 
     curses.echo()
     curses.curs_set(1)
@@ -263,39 +250,37 @@ def get_admin_key_input(current_value: List[bytes]) -> Optional[List[str]]:
     invalid_input = ""
 
     while True:
-        admin_key_win.erase()
-        admin_key_win.border()
-        admin_key_win.addstr(1, 2, "Edit up to 3 Admin Keys:", get_color("settings_default", bold=True))
+        repeated_win.erase()
+        repeated_win.border()
+        repeated_win.addstr(1, 2, "Edit up to 3 Admin Keys:", get_color("settings_default", bold=True))
 
         # Display current values, allowing editing
         for i, line in enumerate(user_values):
             prefix = "→ " if i == cursor_pos else "  "  # Highlight the current line
-            admin_key_win.addstr(
+            repeated_win.addstr(
                 3 + i, 2, f"{prefix}Admin Key {i + 1}: ", get_color("settings_default", bold=(i == cursor_pos))
             )
-            admin_key_win.addstr(3 + i, 18, line)  # Align text for easier editing
+            repeated_win.addstr(3 + i, 18, line)  # Align text for easier editing
 
         # Move cursor to the correct position inside the field
         curses.curs_set(1)
-        admin_key_win.move(3 + cursor_pos, 18 + len(user_values[cursor_pos]))  # Position cursor at end of text
+        repeated_win.move(3 + cursor_pos, 18 + len(user_values[cursor_pos]))  # Position cursor at end of text
 
         # Show error message if needed
         if invalid_input:
-            admin_key_win.addstr(7, 2, invalid_input, get_color("settings_default", bold=True))
+            repeated_win.addstr(7, 2, invalid_input, get_color("settings_default", bold=True))
 
-        admin_key_win.refresh()
-        key = admin_key_win.getch()
+        repeated_win.refresh()
+        key = repeated_win.getch()
 
         if key == 27 or key == curses.KEY_LEFT:  # Escape or Left Arrow -> Cancel and return original
-            admin_key_win.erase()
-            admin_key_win.refresh()
+            repeated_win.erase()
+            repeated_win.refresh()
             curses.noecho()
             curses.curs_set(0)
-            menu_state.need_redraw = True
             return None
 
         elif key == ord("\n"):  # Enter key to save and return
-            menu_state.need_redraw = True
             if all(is_valid_base64(val) for val in user_values):  # Ensure all values are valid Base64 and 32 bytes
                 curses.noecho()
                 curses.curs_set(0)
@@ -317,9 +302,6 @@ def get_admin_key_input(current_value: List[bytes]) -> Optional[List[str]]:
                 pass  # Ignore invalid character inputs
 
 
-from contact.utilities.singleton import menu_state  # Required if not already imported
-
-
 def get_repeated_input(current_value: List[str]) -> Optional[str]:
     height = 9
     width = 80
@@ -327,82 +309,71 @@ def get_repeated_input(current_value: List[str]) -> Optional[str]:
     start_x = (curses.COLS - width) // 2
 
     repeated_win = curses.newwin(height, width, start_y, start_x)
-    repeated_win.timeout(200)
     repeated_win.bkgd(get_color("background"))
     repeated_win.attrset(get_color("window_frame"))
-    repeated_win.keypad(True)
+    repeated_win.keypad(True)  # Enable keypad for special keys
 
     curses.echo()
-    curses.curs_set(1)
+    curses.curs_set(1)  #  Show the cursor
 
-    user_values = current_value[:3] + [""] * (3 - len(current_value))  # Always 3 fields
-    cursor_pos = 0
+    # Editable list of values (max 3 values)
+    user_values = current_value[:3]
+    cursor_pos = 0  # Track which value is being edited
     invalid_input = ""
 
-    def redraw():
+    while True:
         repeated_win.erase()
         repeated_win.border()
         repeated_win.addstr(1, 2, "Edit up to 3 Values:", get_color("settings_default", bold=True))
 
+        # Display current values, allowing editing
         for i, line in enumerate(user_values):
-            prefix = "→ " if i == cursor_pos else "  "
+            prefix = "→ " if i == cursor_pos else "  "  # Highlight the current line
             repeated_win.addstr(
                 3 + i, 2, f"{prefix}Value{i + 1}: ", get_color("settings_default", bold=(i == cursor_pos))
             )
-            repeated_win.addstr(3 + i, 18, line[: width - 20])  # Prevent overflow
+            repeated_win.addstr(3 + i, 18, line)
 
+        # Move cursor to the correct position inside the field
+        curses.curs_set(1)
+        repeated_win.move(3 + cursor_pos, 18 + len(user_values[cursor_pos]))  #  Position cursor at end of text
+
+        # Show error message if needed
         if invalid_input:
-            repeated_win.addstr(7, 2, invalid_input[: width - 4], get_color("settings_default", bold=True))
+            repeated_win.addstr(7, 2, invalid_input, get_color("settings_default", bold=True))
 
-        repeated_win.move(3 + cursor_pos, 18 + len(user_values[cursor_pos]))
         repeated_win.refresh()
+        key = repeated_win.getch()
 
-    while True:
-        if menu_state.need_redraw:
-            menu_state.need_redraw = False
-            redraw()
-
-        redraw()
-
-        try:
-            key = repeated_win.get_wch()
-        except curses.error:
-            continue  # ignore timeout or input issues
-
-        if key in (27, curses.KEY_LEFT):  # ESC or Left Arrow
+        if key == 27 or key == curses.KEY_LEFT:  # Escape or Left Arrow -> Cancel and return original
             repeated_win.erase()
             repeated_win.refresh()
             curses.noecho()
             curses.curs_set(0)
-            menu_state.need_redraw = True
             return None
-        elif key in ("\n", curses.KEY_ENTER):
+
+        elif key == ord("\n"):  # Enter key to save and return
             curses.noecho()
             curses.curs_set(0)
-            menu_state.need_redraw = True
-            return ", ".join(user_values).strip()
-        elif key == curses.KEY_UP:
-            cursor_pos = (cursor_pos - 1) % 3
-        elif key == curses.KEY_DOWN:
-            cursor_pos = (cursor_pos + 1) % 3
-        elif key in (curses.KEY_BACKSPACE, 127):
-            user_values[cursor_pos] = user_values[cursor_pos][:-1]
+            return ", ".join(user_values)
+        elif key == curses.KEY_UP:  # Move cursor up
+            cursor_pos = (cursor_pos - 1) % len(user_values)
+        elif key == curses.KEY_DOWN:  # Move cursor down
+            cursor_pos = (cursor_pos + 1) % len(user_values)
+        elif key == curses.KEY_BACKSPACE or key == 127:  # Backspace key
+            if len(user_values[cursor_pos]) > 0:
+                user_values[cursor_pos] = user_values[cursor_pos][:-1]  # Remove last character
         else:
             try:
-                ch = chr(key) if isinstance(key, int) else key
-                if ch.isprintable():
-                    user_values[cursor_pos] += ch
-                    invalid_input = ""
-            except Exception:
-                pass
-
-
-from contact.utilities.singleton import menu_state  # Ensure this is imported
+                user_values[cursor_pos] += chr(key)  # Append valid character input to the selected field
+                invalid_input = ""  # Clear error if user starts fixing input
+            except ValueError:
+                pass  # Ignore invalid character inputs
 
 
 def get_fixed32_input(current_value: int) -> int:
-    original_value = current_value
-    ip_string = str(ipaddress.IPv4Address(current_value))
+    cvalue = current_value
+    current_value = str(ipaddress.IPv4Address(current_value))
     height = 10
     width = 80
     start_y = (curses.LINES - height) // 2
@@ -412,73 +383,54 @@ def get_fixed32_input(current_value: int) -> int:
     fixed32_win.bkgd(get_color("background"))
     fixed32_win.attrset(get_color("window_frame"))
     fixed32_win.keypad(True)
-    fixed32_win.timeout(200)
 
     curses.echo()
     curses.curs_set(1)
     user_input = ""
 
-    def redraw():
+    while True:
         fixed32_win.erase()
         fixed32_win.border()
-        fixed32_win.addstr(1, 2, "Enter an IP address (xxx.xxx.xxx.xxx):", get_color("settings_default", bold=True))
-        fixed32_win.addstr(3, 2, f"Current: {ip_string}", get_color("settings_default"))
-        fixed32_win.addstr(5, 2, f"New value: {user_input}", get_color("settings_default"))
+        fixed32_win.addstr(1, 2, "Enter an IP address (xxx.xxx.xxx.xxx):", curses.A_BOLD)
+        fixed32_win.addstr(3, 2, f"Current: {current_value}")
+        fixed32_win.addstr(5, 2, f"New value: {user_input}")
         fixed32_win.refresh()
 
-    while True:
-        if menu_state.need_redraw:
-            menu_state.need_redraw = False
-            redraw()
+        key = fixed32_win.getch()
 
-        redraw()
-
-        try:
-            key = fixed32_win.get_wch()
-        except curses.error:
-            continue  # ignore timeout
-
-        if key in (27, curses.KEY_LEFT):  # ESC or Left Arrow to cancel
+        if key == 27 or key == curses.KEY_LEFT:  # Escape or Left Arrow to cancel
             fixed32_win.erase()
             fixed32_win.refresh()
             curses.noecho()
             curses.curs_set(0)
-            menu_state.need_redraw = True
-            return original_value
-
-        elif key in ("\n", curses.KEY_ENTER):
+            return cvalue  # Return the current value unchanged
+        elif key == ord("\n"):  # Enter key to validate and save
+            # Validate IP address
             octets = user_input.split(".")
-            menu_state.need_redraw = True
             if len(octets) == 4 and all(octet.isdigit() and 0 <= int(octet) <= 255 for octet in octets):
                 curses.noecho()
                 curses.curs_set(0)
-                return int(ipaddress.ip_address(user_input))
+                fixed32_address = ipaddress.ip_address(user_input)
+                return int(fixed32_address)  # Return the valid IP address
             else:
-                fixed32_win.addstr(7, 2, "Invalid IP address. Try again.", get_color("settings_default", bold=True))
+                fixed32_win.addstr(7, 2, "Invalid IP address. Try again.", curses.A_BOLD | curses.color_pair(5))
                 fixed32_win.refresh()
-                curses.napms(1500)
-                user_input = ""
-
-        elif key in (curses.KEY_BACKSPACE, 127):
+                curses.napms(1500)  # Wait for 1.5 seconds before refreshing
+                user_input = ""  # Clear invalid input
+        elif key == curses.KEY_BACKSPACE or key == 127:  # Backspace key
             user_input = user_input[:-1]
-
         else:
             try:
-                ch = chr(key) if isinstance(key, int) else key
-                if ch.isdigit() or ch == ".":
-                    user_input += ch
-            except Exception:
-                pass  # Ignore unprintable inputs
+                char = chr(key)
+                if char.isdigit() or char == ".":
+                    user_input += char  # Append only valid characters (digits or dots)
+            except ValueError:
+                pass  # Ignore invalid inputs
 
 
-from typing import List, Optional  # ensure Optional is imported
-
-
-def get_list_input(
-    prompt: str, current_option: Optional[str], list_options: List[str], mandatory: bool = False
-) -> Optional[str]:
+def get_list_input(prompt: str, current_option: Optional[str], list_options: List[str]) -> Optional[str]:
     """
-    List selector.
+    Displays a scrollable list of list_options for the user to choose from.
     """
     selected_index = list_options.index(current_option) if current_option in list_options else 0
 
@@ -488,7 +440,6 @@ def get_list_input(
     start_x = (curses.COLS - width) // 2
 
     list_win = curses.newwin(height, width, start_y, start_x)
-    list_win.timeout(200)
     list_win.bkgd(get_color("background"))
     list_win.attrset(get_color("window_frame"))
     list_win.keypad(True)
@@ -496,62 +447,50 @@ def get_list_input(
     list_pad = curses.newpad(len(list_options) + 1, width - 8)
     list_pad.bkgd(get_color("background"))
 
+    # Render header
+    list_win.erase()
+    list_win.border()
+    list_win.addstr(1, 2, prompt, get_color("settings_default", bold=True))
+
+    # Render options on the pad
+    for idx, color in enumerate(list_options):
+        if idx == selected_index:
+            list_pad.addstr(idx, 0, color.ljust(width - 8), get_color("settings_default", reverse=True))
+        else:
+            list_pad.addstr(idx, 0, color.ljust(width - 8), get_color("settings_default"))
+
+    # Initial refresh
+    list_win.refresh()
+    list_pad.refresh(
+        0,
+        0,
+        list_win.getbegyx()[0] + 3,
+        list_win.getbegyx()[1] + 4,
+        list_win.getbegyx()[0] + list_win.getmaxyx()[0] - 2,
+        list_win.getbegyx()[1] + list_win.getmaxyx()[1] - 4,
+    )
+
     max_index = len(list_options) - 1
     visible_height = list_win.getmaxyx()[0] - 5
 
-    def redraw_list_ui():
-        list_win.erase()
-        list_win.border()
-        list_win.addstr(1, 2, prompt, get_color("settings_default", bold=True))
-
-        for idx, item in enumerate(list_options):
-            color = get_color("settings_default", reverse=(idx == selected_index))
-            list_pad.addstr(idx, 0, item.ljust(width - 8), color)
-
-        list_win.refresh()
-        list_pad.refresh(
-            0,
-            0,
-            list_win.getbegyx()[0] + 3,
-            list_win.getbegyx()[1] + 4,
-            list_win.getbegyx()[0] + list_win.getmaxyx()[0] - 2,
-            list_win.getbegyx()[1] + list_win.getmaxyx()[1] - 4,
-        )
-        draw_arrows(list_win, visible_height, max_index, [0], show_save_option=False)
-
-    # Initial draw
-    redraw_list_ui()
+    draw_arrows(list_win, visible_height, max_index, [0], show_save_option=False)  # Initial call to draw arrows
 
     while True:
-        if menu_state.need_redraw:
-            menu_state.need_redraw = False
-            redraw_list_ui()
-
-        try:
-            key = list_win.getch()
-        except curses.error:
-            continue
+        key = list_win.getch()
 
         if key == curses.KEY_UP:
             old_selected_index = selected_index
             selected_index = max(0, selected_index - 1)
             move_highlight(old_selected_index, list_options, list_win, list_pad, selected_index=selected_index)
-
         elif key == curses.KEY_DOWN:
             old_selected_index = selected_index
             selected_index = min(len(list_options) - 1, selected_index + 1)
             move_highlight(old_selected_index, list_options, list_win, list_pad, selected_index=selected_index)
-
-        elif key == ord("\n"):  # Enter
+        elif key == ord("\n"):  # Enter key
             list_win.clear()
             list_win.refresh()
-            menu_state.need_redraw = True
             return list_options[selected_index]
-
-        elif key == 27 or key == curses.KEY_LEFT:  # ESC or Left
-            if mandatory:
-                continue
+        elif key == 27 or key == curses.KEY_LEFT:  # ESC or Left Arrow
             list_win.clear()
             list_win.refresh()
-            menu_state.need_redraw = True
             return current_option

contact/utilities/singleton.py

@@ -1,6 +1,5 @@
-from contact.ui.ui_state import ChatUIState, InterfaceState, AppState, MenuState
+from contact.ui.ui_state import ChatUIState, InterfaceState, AppState
 
 ui_state = ChatUIState()
 interface_state = InterfaceState()
 app_state = AppState()
-menu_state = MenuState()

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.3.17"
+version = "1.3.16"
 description = "This Python curses client for Meshtastic is a terminal-based client designed to manage device settings, enable mesh chat communication, and handle configuration backups and restores."
 authors = [
     {name = "Ben Lipsey",email = "ben@pdxlocations.com"}