diff --git a/tg_bot/screens/creative_editor_ui.go b/tg_bot/screens/creative_editor_ui.go index 424275b..15c33a5 100644 --- a/tg_bot/screens/creative_editor_ui.go +++ b/tg_bot/screens/creative_editor_ui.go @@ -89,9 +89,9 @@ func (e *CreativeEditorFields) ShowTagPanel(b *bot.Bot) { func (e *CreativeEditorFields) GetTagLabel() string { if e.Tag != nil && *e.Tag == "production" { - return "🏷 Π Π°Π±ΠΎΡ‡ΠΈΠΉ" + return "β—‰ Π Π°Π±ΠΎΡ‡ΠΈΠΉ" } - return "🏷 ВСстовый" + return "β—‰ ВСстовый" } func (e *CreativeEditorFields) ShowAddButtonPanel(b *bot.Bot) { diff --git a/tg_bot/screens/creative_view.go b/tg_bot/screens/creative_view.go index dcf8e24..8a909ef 100644 --- a/tg_bot/screens/creative_view.go +++ b/tg_bot/screens/creative_view.go @@ -187,35 +187,18 @@ func (s *CreativeView) Exit() {} // showActionPanel ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°Π΅Ρ‚ панСль дСйствий с ΠΊΠ½ΠΎΠΏΠΊΠ°ΠΌΠΈ func (s *CreativeView) showActionPanel(b *bot.Bot) { tagLabel := s.GetTagLabel() - purchaseLabel := "πŸ›’ Π—Π°ΠΊΡƒΠΏΠΈΡ‚ΡŒ Π½Π° ΠΊΡ€Π΅Π°Ρ‚ΠΈΠ²" - // Если ΠΊΡ€Π΅Π°Ρ‚ΠΈΠ² Π°Ρ€Ρ…ΠΈΠ²ΠΈΡ€ΠΎΠ²Π°Π½ (Π² Π±ΡƒΠ΄ΡƒΡ‰Π΅ΠΌ), ΠΌΠΎΠΆΠ½ΠΎ ΠΈΠ·ΠΌΠ΅Π½ΠΈΡ‚ΡŒ ΠΊΠ½ΠΎΠΏΠΊΠΈ - var buttons [][]echotron.InlineKeyboardButton - - // Кнопка пСрСимСнования - buttons = append(buttons, Row( - Button("✏️ ΠŸΠ΅Ρ€Π΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Ρ‚ΡŒ", "rename"), - )) - - // Кнопка рСдактирования - buttons = append(buttons, Row( - Button("πŸ–Š Π Π΅Π΄Π°ΠΊΡ‚ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ", "edit"), - )) - - // Кнопка Ρ‚Π΅Π³Π° - buttons = append(buttons, Row( - Button(tagLabel, "toggle_tag"), - )) - - // Кнопка Π·Π°ΠΊΡƒΠΏΠ° - buttons = append(buttons, Row( - Button(purchaseLabel, "purchase_creative"), - )) - - // Кнопка Π½Π°Π·Π°Π΄ - buttons = append(buttons, Row( - Button("← Назад", "back"), - )) + buttons := [][]echotron.InlineKeyboardButton{ + Row( + Button("✎ ΠŸΠ΅Ρ€Π΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Ρ‚ΡŒ", "rename"), + Button("✎ Π Π΅Π΄Π°ΠΊΡ‚ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ", "edit"), + ), + Row(Button("οΌ‹ Π—Π°ΠΊΡƒΠΏΠΈΡ‚ΡŒ", "purchase_creative")), + Row( + Button("← Назад", "back"), + Button(tagLabel, "toggle_tag"), + ), + } s.ShowControlPanel(b, msgCreativeView, buttons) } diff --git a/tg_bot/screens/purchase_optional_details.go b/tg_bot/screens/purchase_optional_details.go index 299d4af..2c40955 100644 --- a/tg_bot/screens/purchase_optional_details.go +++ b/tg_bot/screens/purchase_optional_details.go @@ -1130,10 +1130,8 @@ func (s *PurchaseOptionalDetails) renderParamChannels(b *bot.Bot, mode bot.Rende } start, end := ui2.GetPageBounds(s.ParamPage, perPage, total) - // УстанавливаСм Ρ€Π΅ΠΆΠΈΠΌ ΠΏΠΎ ΡƒΠΌΠΎΠ»Ρ‡Π°Π½ΠΈΡŽ - if s.ChannelEditMode == "" { - s.ChannelEditMode = "edit" - } + // ВсСгда сбрасываСм Π½Π° Ρ€Π΅Π΄Π°ΠΊΡ‚ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ ΠΏΡ€ΠΈ Π²Ρ…ΠΎΠ΄Π΅ + s.ChannelEditMode = "edit" var rows [][]echotron.InlineKeyboardButton