From 29e4198d44bb336d6fcf8b6e094f616c1a9c3d27 Mon Sep 17 00:00:00 2001
From: TeamAbronDev <teamabron@gmail.com>
Date: Mon, 20 Jan 2025 16:26:35 +0330
Subject: [PATCH 1/2] changed if

---
 src/pages/channels/Channel.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/channels/Channel.tsx b/src/pages/channels/Channel.tsx
index 4d575f9e..bc2d96b7 100644
--- a/src/pages/channels/Channel.tsx
+++ b/src/pages/channels/Channel.tsx
@@ -98,10 +98,9 @@ export const Channel = observer(
     ({ id, server_id }: { id: string; server_id: string }) => {
         const client = useClient();
         const state = useApplicationState();
-
-        if (!client.channels.exists(id)) {
-            if (server_id && !client.channels.exists(id)) {
-                const server = client.servers.get(server_id);
+        if (!client.channels.get(id)) {      
+            if (server_id) {
+                  const server = client.servers.get(server_id);
                 if (server && server.channel_ids.length > 0) {
                     let target_id = server.channel_ids[0];
                     const last_id = state.layout.getLastOpened(server_id);

From 31f0c282de0cfedc563d84a97ba5a674b198750e Mon Sep 17 00:00:00 2001
From: ramin <ramin@romina.tech>
Date: Mon, 20 Jan 2025 21:39:02 +0330
Subject: [PATCH 2/2] Changed to back

---
 src/controllers/modals/components/CreateInvite.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/controllers/modals/components/CreateInvite.tsx b/src/controllers/modals/components/CreateInvite.tsx
index 4fb7abe0..d9901a84 100644
--- a/src/controllers/modals/components/CreateInvite.tsx
+++ b/src/controllers/modals/components/CreateInvite.tsx
@@ -7,10 +7,10 @@ import { ModalForm } from "@revoltchat/ui";
 
 import { noopAsync } from "../../../lib/js";
 
-import { IS_REVOLT } from "../../../version";
 import { takeError } from "../../client/jsx/error";
 import { modalController } from "../ModalController";
 import { ModalProps } from "../types";
+import { IS_REVOLT } from "../../../version";
 
 /**
  * Code block which displays invite
@@ -44,9 +44,7 @@ export default function CreateInvite({
 
         target
             .createInvite()
-            .then((res) => {
-                setCode(res._id || "default_code");
-            })
+            .then(({ _id }) => setCode(_id))
             .catch((err) =>
                 modalController.push({ type: "error", error: takeError(err) }),
             )
@@ -81,10 +79,11 @@ export default function CreateInvite({
                     children: <Text id="app.context_menu.copy_link" />,
                     onClick: () =>
                         modalController.writeText(
-                            `https://${window.location.host}/invite/${code}`,
+                            `https://${window.location.host}/invite/${code}`
                         ),
                 },
             ]}
         />
     );
 }
+