From ebfddc1a68671a4b446fb30057399a14ca79b361 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 1 Feb 2023 23:04:02 +0400
Subject: [PATCH] Fix return to saved history state with translate bar.

---
 Telegram/SourceFiles/history/history_widget.cpp        | 10 +++++-----
 .../history/view/history_view_translate_bar.cpp        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index d72cc06ad..3fde93a29 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2647,6 +2647,11 @@ void HistoryWidget::updateControlsVisibility() {
 		return;
 	}
 
+	if (_firstLoadRequest && !_scroll->isHidden()) {
+		_scroll->hide();
+	} else if (!_firstLoadRequest && _scroll->isHidden()) {
+		_scroll->show();
+	}
 	if (_pinnedBar) {
 		_pinnedBar->show();
 	}
@@ -2659,11 +2664,6 @@ void HistoryWidget::updateControlsVisibility() {
 	if (_requestsBar) {
 		_requestsBar->show();
 	}
-	if (_firstLoadRequest && !_scroll->isHidden()) {
-		_scroll->hide();
-	} else if (!_firstLoadRequest && _scroll->isHidden()) {
-		_scroll->show();
-	}
 	if (_contactStatus) {
 		_contactStatus->show();
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
index d1a303724..620a0b892 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
@@ -597,7 +597,7 @@ int TranslateBar::height() const {
 	return !_forceHidden
 		? _wrap.height()
 		: _shouldBeShown
-		? st::historyReplyHeight
+		? st::historyComposeButton.height
 		: 0;
 }