Merge branch 'master' into bot

open-chat-labs · Jan 10, 2025 · e6350d4 · e6350d4
2 parents 563529b + 2e2c527
commit e6350d4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/frontend/app/src/components/home/Home.svelte b/frontend/app/src/components/home/Home.svelte
@@ -102,7 +102,7 @@
     } from "../../theme/themes";
     import SuspendedModal from "../SuspendedModal.svelte";
     import NoAccess from "./NoAccess.svelte";
-    import NewGroup from "./addgroup/NewGroup.svelte";
+    import CreateOrUpdateGroup from "./createOrUpdateGroup/CreateOrUpdateGroup.svelte";
     import AccountsModal from "./profile/AccountsModal.svelte";
     import { querystring } from "../../routes";
     import { eventListScrollTop } from "../../stores/scrollPos";
@@ -1353,7 +1353,7 @@
                 on:close={closeModal}
                 on:success={accessGatesEvaluated} />
         {:else if modal.kind === "new_group"}
-            <NewGroup
+            <CreateOrUpdateGroup
                 embeddedContent={modal.embeddedContent}
                 candidateGroup={modal.candidate}
                 on:upgrade={upgrade}

diff --git a/frontend/app/src/components/home/InitialGroupMessage.svelte b/frontend/app/src/components/home/InitialGroupMessage.svelte
@@ -24,7 +24,7 @@
     </h4>
     {#if group.description.length > 0}
         <div>
-            <Markdown text={group.description} />
+            <Markdown inline={false} text={group.description} />
         </div>
     {/if}
     <div class="pop">

diff --git a/frontend/app/src/components/home/VisibilityControl.svelte b/frontend/app/src/components/home/VisibilityControl.svelte
@@ -167,7 +167,7 @@
     </div>
 {/if}
 
-{#if candidate.public && candidate.kind === "candidate_group_chat" && candidate.level === "channel"}
+{#if candidate.public && candidate.kind === "candidate_group_chat"}
     <div class="section">
         <Checkbox
             id="visible_to_non_members"

diff --git a/.../components/home/addgroup/NewGroup.svelte → ...eOrUpdateGroup/CreateOrUpdateGroup.svelte b/.../components/home/addgroup/NewGroup.svelte → ...eOrUpdateGroup/CreateOrUpdateGroup.svelte
diff --git a/...ponents/home/addgroup/GroupDetails.svelte → ...e/createOrUpdateGroup/GroupDetails.svelte b/...ponents/home/addgroup/GroupDetails.svelte → ...e/createOrUpdateGroup/GroupDetails.svelte