From 03b490c181fff5659f78545a739a4bd7a6dbcf36 Mon Sep 17 00:00:00 2001
From: Artem Tsyrulnikov <a.tsyrulnikov@legres.ru>
Date: Mon, 19 Jan 2026 14:21:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=BA=D0=B8=D0=B4?=
 =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D0=BC=20=D0=B2=20=D0=B3=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tg_bot/bot/bot.go       | 14 +++++++++++++-
 tg_bot/screens/login.go | 14 ++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/tg_bot/bot/bot.go b/tg_bot/bot/bot.go
index 8788038..3f447c1 100644
--- a/tg_bot/bot/bot.go
+++ b/tg_bot/bot/bot.go
@@ -338,7 +338,19 @@ func (b *Bot) Update(u *echotron.Update) {
 		return
 	}
 
-	// 4. Fallback - сброс в начальное состояние
+	// 4. Fallback - ререндер текущего экрана, чтобы не терять прогресс
+	if b.CurrentState != nil {
+		mode := NewMessage
+		if u.CallbackQuery != nil {
+			mode = EditMessage
+		}
+		b.CurrentState.Enter(b, mode)
+		if exec.handled || exec.transitioned {
+			return
+		}
+	}
+
+	// 5. Крайний fallback - сброс в начальное состояние
 	b.SetState(b.commandRouter("/start"), NewMessage)
 }
 
diff --git a/tg_bot/screens/login.go b/tg_bot/screens/login.go
index 94895aa..1638f46 100644
--- a/tg_bot/screens/login.go
+++ b/tg_bot/screens/login.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/NicoNex/echotron/v3"
 	"github.com/TelegramExchange/tgex-backend/tg_bot/bot"
+	"github.com/rs/zerolog/log"
 )
 
 type Login struct{}
@@ -31,12 +32,21 @@ func (s *Login) Enter(b *bot.Bot, mode bot.RenderMode) {
 
 	kb := Keyboard(Row(URLButton("Войти на сайт", loginURL)))
 
-	b.SendNew(fmt.Sprintf(msgHelloLogin, usernameDisplay), kb)
+	_, err = b.SendMessage(fmt.Sprintf(msgHelloLogin, usernameDisplay), b.ChatID, &echotron.MessageOptions{
+		ReplyMarkup: kb,
+		ParseMode:   echotron.HTML,
+	})
+	if err != nil {
+		log.Err(err)
+		return
+	}
+
+	b.SetState(&MainMenu{}, bot.NewMessage)
 }
 func (s *Login) HandleCallback(b *bot.Bot, u *echotron.Update) {}
 
 func (s *Login) HandleMessage(b *bot.Bot, u *echotron.Update) {}
 
-func (s *Login) Handle(b *bot.Bot, u *echotron.Update) { b.SetState(&MainMenu{}, bot.NewMessage) }
+func (s *Login) Handle(b *bot.Bot, u *echotron.Update) {}
 
 func (s *Login) Exit() {}