From cb0a7330b623c00b77ab537f2a1ca543082aa907 Mon Sep 17 00:00:00 2001
From: hippoz <10706925-hippoz@users.noreply.gitlab.com>
Date: Tue, 20 Sep 2022 18:19:11 +0300
Subject: [PATCH] make sure responsive handlers are initialized before gateway
 settlement

---
 frontend/src/components/Main.svelte | 30 +++++++++--------------------
 frontend/src/main.js                |  3 +--
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/Main.svelte b/frontend/src/components/Main.svelte
index 808d566..edd6cd3 100644
--- a/frontend/src/components/Main.svelte
+++ b/frontend/src/components/Main.svelte
@@ -28,26 +28,14 @@
     {/if}
 </svelte:head>
 
-<style>
-    .flex-container {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: row;
-        overflow: hidden;
-    }
-</style>
-
 <OverlayProvider />
 
-<div class="flex-container">
-    {#if !($smallViewport && $showPresenceSidebar) && $showSidebar || $selectedChannel.id === -1}
-        <Sidebar />
-    {/if}
-    {#if !($smallViewport && $showSidebar) && !($smallViewport && $showPresenceSidebar) && $showChannelView && $selectedChannel.id !== -1}
-        <ChannelView channel={$selectedChannel} />
-    {/if}
-    {#if $showPresenceSidebar}
-        <PresenceSidebar />
-    {/if}
-</div>
+{#if !($smallViewport && $showPresenceSidebar) && $showSidebar || $selectedChannel.id === -1}
+    <Sidebar />
+{/if}
+{#if !($smallViewport && $showSidebar) && !($smallViewport && $showPresenceSidebar) && $showChannelView && $selectedChannel.id !== -1}
+    <ChannelView channel={$selectedChannel} />
+{/if}
+{#if $showPresenceSidebar}
+    <PresenceSidebar />
+{/if}
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 83e2500..a79b13e 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -8,8 +8,6 @@ import gateway, { GatewayEventType } from './gateway';
 import "@material-design-icons/font";
 
 function handleGatewaySettlement() {
-    initResponsiveHandlers();
-
     const loadingElement = document.getElementById("pre--loading-screen");
     if (loadingElement) {
         loadingElement.parentElement.removeChild(loadingElement);
@@ -27,6 +25,7 @@ function handleGatewaySettlement() {
 function main() {
     useDebuggingApi();
     useAuthHandlers();
+    initResponsiveHandlers();
     
     gateway.subscribe(GatewayEventType.Ready, handleGatewaySettlement);
     gateway.subscribe(GatewayEventType.Close, handleGatewaySettlement);