From 46acbfdaf1983e7e78e80efd41d115984f23ce60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Thu, 19 Nov 2020 20:34:26 -0500
Subject: [PATCH] fix: show messages after app load

---
 public/src/app.js     | 14 +++++++-------
 public/src/sockets.js |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index 25dd05a24c..68ec9adf6f 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -114,16 +114,16 @@ app.cacheBuster = null;
 			if (app.user.uid > 0) {
 				unread.initUnreadTopics();
 			}
-
+			function finishLoad() {
+				$(window).trigger('action:app.load');
+				app.showMessages();
+				appLoaded = true;
+			}
 			overrides.overrideTimeago();
 			if (app.user.timeagoCode && app.user.timeagoCode !== 'en') {
-				require(['timeago/locales/jquery.timeago.' + app.user.timeagoCode], function () {
-					$(window).trigger('action:app.load');
-					appLoaded = true;
-				});
+				require(['timeago/locales/jquery.timeago.' + app.user.timeagoCode], finishLoad);
 			} else {
-				$(window).trigger('action:app.load');
-				appLoaded = true;
+				finishLoad();
 			}
 		});
 	};
diff --git a/public/src/sockets.js b/public/src/sockets.js
index a5b087222c..4c8e1bc5f3 100644
--- a/public/src/sockets.js
+++ b/public/src/sockets.js
@@ -101,7 +101,6 @@ socket = window.socket;
 
 	function onConnect() {
 		if (!reconnecting) {
-			app.showMessages();
 			$(window).trigger('action:connected');
 		}