Merge branch 'develop' into feature-voice-chat-indicator

front/src/Components/EmbedScreens/CoWebsiteThumbnailSlot.svelte

@@ -5,6 +5,7 @@
     import { coWebsitesNotAsleep, mainCoWebsite } from "../../Stores/CoWebsiteStore";
     import { highlightedEmbedScreen } from "../../Stores/EmbedScreensStore";
     import type { CoWebsite } from "../../WebRtc/CoWebsiteManager";
+    import { iframeStates } from "../../WebRtc/CoWebsiteManager";
     import { coWebsiteManager } from "../../WebRtc/CoWebsiteManager";
 
     export let index: number;
@@ -35,8 +36,12 @@
             if ($mainCoWebsite.iframe.id === coWebsite.iframe.id) {
                 const coWebsites = $coWebsitesNotAsleep;
                 const newMain = $highlightedEmbedScreen ?? coWebsites.length > 1 ? coWebsites[1] : undefined;
-                if (newMain) {
+                if (newMain && newMain.iframe.id !== $mainCoWebsite.iframe.id) {
                     coWebsiteManager.goToMain(newMain);
+                } else if (coWebsiteManager.getMainState() === iframeStates.closed) {
+                    coWebsiteManager.displayMain();
+                } else {
+                    coWebsiteManager.hideMain();
                 }
             } else {
                 highlightedEmbedScreen.toggleHighlight({

front/src/Components/Login/LoginScene.svelte

@@ -53,7 +53,7 @@
         <section class="terms-and-conditions">
             <a style="display: none;" href="traduction">Need for traduction</a>
             <p>
-                {$LL.login.terms()}
+                {@html $LL.login.terms()}
             </p>
         </section>
     {/if}

front/src/Components/Menu/Menu.svelte

@@ -69,6 +69,7 @@
         } else {
             const customMenu = customMenuIframe.get(menu.label);
             if (customMenu !== undefined) {
+                activeSubMenu = menu;
                 props = { url: customMenu.url, allowApi: customMenu.allowApi };
                 activeComponent = CustomSubMenu;
             } else {