fix(tui): improve timelock input handling

- Separate mode toggle (M key) from field navigation (Tab key)
- Fix field indices for TimelockRelative (use 0-based)
- Update render to show correct navigation hints
- Ensure both Blocks and Time modes have proper input fields

Author: cheng-chun-yuan

src/tui/mod.rs

@@ -1417,24 +1417,28 @@ fn handle_send_keys(app: &mut App, key: KeyEvent) {
                 use crate::tui::screens::{ScriptType, TimelockMode};
                 let config = &mut app.send_form.script_config;
 
-                // For TimelockRelative with mode toggle
-                if config.script_type == ScriptType::TimelockRelative && config.focused_field == 0 {
-                    // Toggle mode when Tab pressed on mode field
-                    config.timelock_mode = config.timelock_mode.toggle();
-                } else {
-                    let max_fields = match &config.script_type {
-                        ScriptType::None => 0,
-                        ScriptType::TimelockAbsolute => 1,
-                        ScriptType::TimelockRelative => match config.timelock_mode {
-                            TimelockMode::Blocks => 2, // mode + blocks
-                            TimelockMode::Time => 3,   // mode + days + hours
-                        },
-                        ScriptType::Recovery => 2,
-                        ScriptType::HTLC => 3,
-                    };
-                    if max_fields > 0 {
-                        config.focused_field = (config.focused_field + 1) % max_fields;
-                    }
+                let max_fields = match &config.script_type {
+                    ScriptType::None => 0,
+                    ScriptType::TimelockAbsolute => 1,
+                    ScriptType::TimelockRelative => match config.timelock_mode {
+                        TimelockMode::Blocks => 1, // blocks only
+                        TimelockMode::Time => 2,   // days + hours
+                    },
+                    ScriptType::Recovery => 2,
+                    ScriptType::HTLC => 3,
+                };
+                if max_fields > 0 {
+                    config.focused_field = (config.focused_field + 1) % max_fields;
+                }
+            }
+            KeyCode::Char('m') | KeyCode::Char('M') => {
+                // Toggle timelock mode (blocks vs time)
+                use crate::tui::screens::ScriptType;
+                if app.send_form.script_config.script_type == ScriptType::TimelockRelative {
+                    app.send_form.script_config.timelock_mode =
+                        app.send_form.script_config.timelock_mode.toggle();
+                    // Reset to first input field after mode change
+                    app.send_form.script_config.focused_field = 0;
                 }
             }
             KeyCode::Char(_) | KeyCode::Backspace => {
@@ -1449,15 +1453,15 @@ fn handle_send_keys(app: &mut App, key: KeyEvent) {
                     }
                     ScriptType::TimelockRelative => match config.timelock_mode {
                         TimelockMode::Blocks => {
-                            if config.focused_field == 1 {
+                            if config.focused_field == 0 {
                                 config.timelock_blocks.handle_key(key);
                             }
                         }
                         TimelockMode::Time => match config.focused_field {
-                            1 => {
+                            0 => {
                                 config.timelock_days.handle_key(key);
                             }
-                            2 => {
+                            1 => {
                                 config.timelock_hours.handle_key(key);
                             }
                             _ => {}

src/tui/screens/send.rs

@@ -1152,33 +1152,25 @@ fn render_configure_script(frame: &mut Frame, form: &SendFormData, area: Rect) {
         }
         ScriptType::TimelockRelative => {
             let mode = &form.script_config.timelock_mode;
-            let mode_focused = form.script_config.focused_field == 0;
 
             let mut lines = vec![
-                // Mode toggle
+                // Mode indicator
                 Line::from(vec![
-                    Span::styled(
-                        if mode_focused { "▶ " } else { "  " },
-                        Style::default().fg(Color::Yellow),
-                    ),
                     Span::styled("Mode: ", Style::default().fg(Color::Gray)),
                     Span::styled(
                         format!("[{}]", mode.label()),
-                        if mode_focused {
-                            Style::default()
-                                .fg(Color::Yellow)
-                                .add_modifier(Modifier::BOLD)
-                        } else {
-                            Style::default().fg(Color::Cyan)
-                        },
+                        Style::default()
+                            .fg(Color::Cyan)
+                            .add_modifier(Modifier::BOLD),
                     ),
-                    Span::styled("  (Tab to toggle)", Style::default().fg(Color::DarkGray)),
+                    Span::styled("  (M to toggle)", Style::default().fg(Color::DarkGray)),
                 ]),
+                Line::from(""),
             ];
 
             match mode {
                 TimelockMode::Blocks => {
-                    let blocks_focused = form.script_config.focused_field == 1;
+                    let blocks_focused = form.script_config.focused_field == 0;
                     lines.push(Line::from(vec![
                         Span::styled(
                             if blocks_focused { "▶ " } else { "  " },
@@ -1201,8 +1193,8 @@ fn render_configure_script(frame: &mut Frame, form: &SendFormData, area: Rect) {
                     )]));
                 }
                 TimelockMode::Time => {
-                    let days_focused = form.script_config.focused_field == 1;
-                    let hours_focused = form.script_config.focused_field == 2;
+                    let days_focused = form.script_config.focused_field == 0;
+                    let hours_focused = form.script_config.focused_field == 1;
                     lines.push(Line::from(vec![
                         Span::styled(
                             if days_focused { "▶ " } else { "  " },
@@ -1217,7 +1209,8 @@ fn render_configure_script(frame: &mut Frame, form: &SendFormData, area: Rect) {
                                 Style::default().fg(Color::White)
                             },
                         ),
-                        Span::raw("    "),
+                    ]));
+                    lines.push(Line::from(vec![
                         Span::styled(
                             if hours_focused { "▶ " } else { "  " },
                             Style::default().fg(Color::Yellow),