diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..abf9486
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Telegram-Final-Project
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6a467ed..c9b0080 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 17f2a0d..f2488fb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="23" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/build.gradle b/build.gradle
index 7c4e380..f3bf6b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ tasks.withType(JavaCompile) {
 
 application {
   mainModule = 'org.to.telegramfinalproject'
-  mainClass = 'org.to.telegramfinalproject.HelloApplication'
+  mainClass = 'org.to.telegramfinalproject.Server.MainServer'
 }
 
 javafx {
@@ -40,13 +40,20 @@ dependencies {
     implementation('com.dlsc.formsfx:formsfx-core:11.6.0') {
         exclude group: 'org.openjfx'
     }
+    implementation 'org.postgresql:postgresql:42.7.3'
     implementation('net.synedra:validatorfx:0.5.0') {
         exclude group: 'org.openjfx'
     }
+    //For upload files
+    implementation 'org.slf4j:slf4j-simple:2.0.13'
+    implementation 'com.sparkjava:spark-core:2.9.4'
+    implementation 'com.mpatric:mp3agic:0.9.1'        //for mp3
+    implementation 'org.json:json:20231013'
     implementation 'org.kordamp.ikonli:ikonli-javafx:12.3.1'
     implementation 'org.kordamp.bootstrapfx:bootstrapfx-core:0.4.0'
     implementation('eu.hansolo:tilesfx:21.0.3') {
         exclude group: 'org.openjfx'
+
     }
 
     test {
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 4d8e706..eedc2c7 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,14 +1,32 @@
 module org.to.telegramfinalproject {
     requires javafx.controls;
     requires javafx.fxml;
+    requires javafx.graphics;   // بهتره اضافه باشه
+    requires javafx.media;
     requires javafx.web;
 
+    requires org.json;
+    requires java.sql;
+    requires java.desktop;
+
+    // لایبرری‌های جانبی — اگر واقعاً در مسیر ماژول هستند
     requires org.controlsfx.controls;
     requires com.dlsc.formsfx;
     requires net.synedra.validatorfx;
     requires org.kordamp.ikonli.javafx;
     requires org.kordamp.bootstrapfx.core;
     requires eu.hansolo.tilesfx;
-    opens org.to.telegramfinalproject to javafx.fxml;
-    exports org.to.telegramfinalproject;
-}
\ No newline at end of file
+    requires mp3agic;
+    requires spark.core;          // فقط اگر واقعاً استفاده می‌کنی
+    requires javax.servlet.api;   // فقط اگر واقعاً استفاده می‌کنی
+
+    // کنترلرها/کلاس‌هایی که FXML به آن‌ها دسترسی بازتابی دارد
+    opens org.to.telegramfinalproject.UI to javafx.fxml;
+    opens org.to.telegramfinalproject.Client to javafx.fxml;
+    opens org.to.telegramfinalproject.Models to javafx.fxml; // اگر مدل‌ها داخل FXML مصرف می‌شوند
+
+    // اگر پکیج‌هایی را می‌خواهی خارج از ماژول در دسترس قرار دهی
+    exports org.to.telegramfinalproject.UI;
+    exports org.to.telegramfinalproject.Client;
+    exports org.to.telegramfinalproject.Models;
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java b/src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
new file mode 100644
index 0000000..7a84301
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
@@ -0,0 +1,4730 @@
+package org.to.telegramfinalproject.Client;
+
+import javafx.application.Platform;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Database.PrivateChatDatabase;
+import org.to.telegramfinalproject.Database.ContactDatabase;
+import org.to.telegramfinalproject.Models.ChatEntry;
+import org.to.telegramfinalproject.Models.ContactEntry;
+import org.to.telegramfinalproject.Models.SearchRequestModel;
+import org.to.telegramfinalproject.Models.SearchResultModel;
+import org.to.telegramfinalproject.UI.ChatPageController;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+
+public class ActionHandler {
+    private final PrintWriter out;
+    private final BufferedReader in;
+    private final Scanner scanner;
+    public static volatile boolean forceExitChat = false;
+    public static ActionHandler instance;
+    private final DataOutputStream outBin; // NEW
+
+
+    //use for UI
+    private volatile String lastStatus = "error";   // success | error
+    private volatile String lastMessage = "";
+    // ===== UI hook for search results =====
+
+
+
+
+
+    public String getLastStatus()  { return lastStatus; }
+    public String getLastMessage() { return lastMessage; }
+    public boolean wasSuccess()    { return "success".equalsIgnoreCase(lastStatus); }
+
+
+
+//    private void handleRealTime(JSONObject json) throws IOException {
+//        IncomingMessageListener listener = new IncomingMessageListener(this.in);
+//        listener.handleRealTimeEvent (json);
+//    }
+
+    // ActionHandler.java
+    private void handleRealTime(JSONObject json) throws IOException {
+        IncomingMessageListener listener = TelegramClient.getInstance().getListener();
+        if (listener != null) {
+            listener.handleRealTimeEvent(json);
+        } else {
+            System.err.println("[RT] Listener not ready; dropping RT event: " + json);
+        }
+    }
+
+
+    public static ActionHandler getInstance() {
+        return instance;
+    }
+
+    public ActionHandler(PrintWriter out, BufferedReader in, DataOutputStream outBin, Scanner scanner) {
+        this.out = out;
+        this.in  = in;
+        this.outBin = outBin;      // NEW
+        this.scanner = scanner;
+        ActionHandler.instance = this;
+    }
+
+//    public ActionHandler(PrintWriter out, BufferedReader in, Scanner scanner) {
+//        this.out = out;
+//        this.in = in;
+//        this.scanner = scanner;
+//        ActionHandler.instance = this;
+//
+//    }
+
+    public void login(String username , String password){
+        JSONObject request = new JSONObject();
+        request.put("action", "login");
+        request.put("user_id", JSONObject.NULL);
+        request.put("username", username);
+        request.put("password", password);
+        request.put("profile_name", JSONObject.NULL);
+
+        this.send(request);
+
+    }
+    public void loginHandler() {
+        System.out.println("Login form: \n");
+        System.out.print("Username: ");
+        String username = this.scanner.nextLine();
+        System.out.print("Password: ");
+        String password = this.scanner.nextLine();
+
+        JSONObject request = new JSONObject();
+        request.put("action", "login");
+        request.put("user_id", JSONObject.NULL);
+        request.put("username", username);
+        request.put("password", password);
+        request.put("profile_name", JSONObject.NULL);
+
+        this.send(request);
+
+    }
+
+    public void register() {
+        System.out.println("Register form: \n");
+
+        String username, user_id, password, profile_name;
+
+        while (true) {
+            System.out.print("Username: ");
+            username = scanner.nextLine().trim();
+            if (username.isEmpty()) {
+                System.out.println("❌ Username cannot be empty.");
+                continue;
+            }
+
+            System.out.print("User id: ");
+            user_id = scanner.nextLine().trim();
+            if (user_id.isEmpty()) {
+                System.out.println("❌ User ID cannot be empty.");
+                continue;
+            }
+
+            System.out.print("Password: ");
+            password = scanner.nextLine();
+            if (password.isEmpty()) {
+                System.out.println("❌ Password cannot be empty.");
+                continue;
+            }
+
+            System.out.print("Profile name: ");
+            profile_name = scanner.nextLine().trim();
+            if (profile_name.isEmpty()) {
+                System.out.println("❌ Profile name cannot be empty.");
+                continue;
+            }
+
+            break;
+        }
+
+
+        JSONObject request = new JSONObject();
+        request.put("action", "register");
+        request.put("user_id", user_id);
+        request.put("username", username);
+        request.put("password", password);
+        request.put("profile_name", profile_name);
+
+        this.send(request);
+    }
+
+    public void search() {
+        System.out.print("Enter keyword to search: ");
+        String keyword = scanner.nextLine();
+
+        if (Session.currentUser == null || !Session.currentUser.has("user_id")) {
+            System.out.println("You must be logged in to search.");
+            return;
+        }
+
+        String userId = Session.currentUser.getString("user_id");
+        SearchRequestModel model = new SearchRequestModel("search", keyword, userId);
+        send(model.toJson());
+    }
+
+    public void searchUI(String keyword) {
+
+        if (Session.currentUser == null || !Session.currentUser.has("user_id")) {
+            System.out.println("You must be logged in to search.");
+            return;
+        }
+
+        String userId = Session.currentUser.getString("user_id");
+        SearchRequestModel model = new SearchRequestModel("search", keyword, userId);
+        send(model.toJson());
+    }
+
+
+    public void searchInUsers(){
+        System.out.println("Enter keyword to search: ");
+        String keyword = scanner.nextLine();
+        if (Session.currentUser == null || !Session.currentUser.has("user_id")) {
+            System.out.println("You must be logged in to search.");
+            return;
+        }
+        String userId = Session.currentUser.getString("user_id");
+        SearchRequestModel model = new SearchRequestModel("searchInUsers", keyword, userId);
+        send(model.toJson());
+
+    }
+
+
+    public void searchEligibleUsers(String entityType, UUID entityId) {
+        System.out.print("Enter keyword to search: ");
+        String keyword = scanner.nextLine().trim();
+
+        if (Session.currentUser == null || !Session.currentUser.has("user_id")) {
+            System.out.println("You must be logged in to search.");
+            return;
+        }
+
+        JSONObject req = new JSONObject();
+        req.put("action", "searchEligibleUsers");
+        req.put("keyword", keyword);
+        req.put("user_id", Session.currentUser.getString("user_id"));
+        req.put("entity_id", entityId.toString());
+        req.put("entity_type", entityType);  // group or channel
+
+        JSONObject res = sendWithResponse(req);
+
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ " + (res != null ? res.getString("message") : "No response received."));
+            return;
+        }
+
+        JSONArray results = res.getJSONObject("data").getJSONArray("results");
+        if (results.isEmpty()) {
+            System.out.println("⚠️ No eligible users found.");
+            return;
+        }
+
+        System.out.println("\nEligible Users:");
+        for (int i = 0; i < results.length(); i++) {
+            JSONObject user = results.getJSONObject(i);
+            System.out.println((i + 1) + ". " + user.getString("name") + " (ID: " + user.getString("id") + ")");
+        }
+
+        System.out.print("Select a user to add (or 0 to cancel): ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine()) - 1;
+        } catch (Exception e) {
+            System.out.println("❌ Invalid input.");
+            return;
+        }
+
+        if (choice < 0 || choice >= results.length()) {
+            System.out.println("Cancelled.");
+            return;
+        }
+
+        JSONObject selected = results.getJSONObject(choice);
+        UUID targetUUID = UUID.fromString(selected.getString("uuid"));
+
+        if (entityType.equals("group")) {
+            addMemberToGroup(entityId, targetUUID);
+        } else if (entityType.equals("channel")) {
+            addSubscriberToChannel(entityId, targetUUID);
+        }
+    }
+
+
+    public void addContact(UUID contactId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "add_contact");
+        req.put("user_id", Session.currentUser.getString("user_id"));
+        req.put("contact_id", contactId.toString());
+        send(req);
+    }
+
+
+    public void joinGroupOrChannel(String type, String uuid) {
+        JSONObject req = new JSONObject();
+        req.put("action", "join_" + type);
+        req.put("user_id", Session.getUserUUID());
+        req.put("id", uuid);
+        send(req);
+    }
+
+
+
+    public ChatEntry fetchChatInfo(String receiverId, String receiverType) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_info");
+        req.put("receiver_id", receiverId);
+        req.put("receiver_type", receiverType);
+        out.println(req.toString());
+
+        try {
+            JSONObject response = TelegramClient.responseQueue.take();
+            if (response != null && response.getString("status").equals("success")) {
+                JSONObject data = response.getJSONObject("data");
+
+                return new ChatEntry(
+                        UUID.fromString(data.getString("internal_id")),
+                        receiverId,
+                        data.getString("name"),
+                        data.optString("image_url", ""),
+                        receiverType,
+                        null,
+                        data.optBoolean("is_owner", false),
+                        data.optBoolean("is_admin", false)
+                );
+
+            }
+        } catch (Exception e) {
+            System.err.println("Error fetching chat info: " + e.getMessage());
+        }
+
+        //if invalid make unknown modle
+        return new ChatEntry(
+                UUID.randomUUID(),
+                receiverId,
+                "[Unknown " + receiverType + "]",
+                "",
+                receiverType,
+                null
+        );
+    }
+
+
+    public void refreshChatList() {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_list");
+        req.put("user_id", Session.currentUser.getString("user_id"));
+        out.println(req.toString());
+
+        try {
+            JSONObject response = TelegramClient.responseQueue.take();
+
+            if (response != null && response.getString("status").equals("success")) {
+                if (response.has("data") && !response.isNull("data")) {
+                    JSONObject data = response.getJSONObject("data");
+
+                    if ((!data.has("active_chat_list") || data.isNull("active_chat_list")) &&
+                            (!data.has("archived_chat_list") || data.isNull("archived_chat_list"))) {
+                        System.out.println("❌ No chat list found in response data.");
+                        return;
+                    }
+
+                    List<ChatEntry> activeChats = new ArrayList<>();
+                    List<ChatEntry> archivedChats = new ArrayList<>();
+
+                    // 📁 Parse active chat list
+                    if (data.has("active_chat_list") && !data.isNull("active_chat_list")) {
+                        JSONArray activeJson = data.getJSONArray("active_chat_list");
+                        for (Object obj : activeJson) {
+                            JSONObject chat = (JSONObject) obj;
+                            ChatEntry entry = parseChatEntry(chat);
+                            activeChats.add(entry);
+                        }
+                    }
+
+                    // 📁 Parse archived chat list
+                    if (data.has("archived_chat_list") && !data.isNull("archived_chat_list")) {
+                        JSONArray archivedJson = data.getJSONArray("archived_chat_list");
+                        for (Object obj : archivedJson) {
+                            JSONObject chat = (JSONObject) obj;
+                            ChatEntry entry = parseChatEntry(chat);
+                            archivedChats.add(entry);
+                        }
+                    }
+
+                    Session.chatList = new ArrayList<>();
+                    Session.chatList.addAll(activeChats);
+                    Session.chatList.addAll(archivedChats);
+
+                    Session.activeChats = activeChats;
+                    Session.archivedChats = archivedChats;
+
+                    System.out.println("✅ Chat list updated.");
+                    System.out.println("📂 Active Chats: " + activeChats.size());
+                    System.out.println("📁 Archived Chats: " + archivedChats.size());
+                } else {
+                    System.out.println("⚠️ Response has no data object.");
+                }
+            } else {
+                if (response.has("message") && !response.isNull("message")) {
+                    System.out.println("❌ Failed to refresh chat list: " + response.getString("message"));
+                } else {
+                    System.out.println("❌ Failed to refresh chat list.");
+                }
+            }
+        } catch (Exception e) {
+            System.err.println("❌ Error during refreshChatList: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    private ChatEntry parseChatEntry(JSONObject chat) {
+        UUID internalId = null;
+        try { internalId = UUID.fromString(chat.getString("internal_id")); } catch (Exception ignored) {}
+
+        String id        = chat.optString("id", "");
+        String name      = chat.optString("name", "");
+        String imageUrl  = chat.optString("image_url", "");
+        String type      = chat.optString("type", "");
+        boolean isOwner  = chat.optBoolean("is_owner", false);
+        boolean isAdmin  = chat.optBoolean("is_admin", false);
+
+        LocalDateTime lastTime = null;
+        String lts = chat.optString("last_message_time", null);
+        if (lts != null && !"null".equalsIgnoreCase(lts)) {
+            try { lastTime = LocalDateTime.parse(lts); } catch (Exception ignored) {}
+        }
+
+        ChatEntry entry = new ChatEntry(internalId, id, name, imageUrl, type, lastTime, isOwner, isAdmin);
+
+        entry.setUnreadCount(chat.optInt("unread_count", 0));
+        String preview = chat.optString("last_message_preview", null);
+        if (preview != null && !"null".equalsIgnoreCase(preview)) {
+            entry.setLastMessagePreview(preview);
+        }
+
+        String other = chat.optString("other_user_id", null);
+        if (other != null && !"null".equalsIgnoreCase(other)) {
+            try { entry.setOtherUserId(UUID.fromString(other)); } catch (Exception ignored) {}
+        }
+
+        if (chat.has("is_saved_messages")) {
+            entry.setSavedMessages(chat.optBoolean("is_saved_messages", false));
+        }
+
+        return entry;
+    }
+
+
+
+    public void createGroup() {
+        String groupId = null;
+
+        while (groupId == null){
+            System.out.print("Enter group ID: ");
+            String input = scanner.nextLine();
+            if (!input.trim().isEmpty()) {
+                groupId = input;
+            } else {
+                System.out.println("Group ID can't be empty.");
+            }
+
+        }
+
+        String groupName = null;
+        while (groupName == null) {
+            System.out.print("Enter group name: ");
+            String input = scanner.nextLine();
+            if (!input.trim().isEmpty()) {
+                groupName = input;
+            } else {
+                System.out.println("Group name can't be empty.");
+            }
+        }
+        System.out.print("Enter image URL (optional): ");
+        String imageUrl = scanner.nextLine();
+
+        JSONObject req = new JSONObject();
+        req.put("action", "create_group");
+        req.put("user_id", Session.getUserUUID());
+        req.put("group_id", groupId);
+        req.put("group_name", groupName);
+        req.put("image_url", imageUrl.isBlank() ? JSONObject.NULL : imageUrl);
+
+        send(req);
+    }
+
+    public void createGroupUI(String id, String name, String url, String user ){
+        JSONObject req = new JSONObject();
+        req.put("action", "create_group");
+        req.put("user_id", user);
+        req.put("group_id", id);
+        req.put("group_name", name);
+        req.put("image_url", url.isBlank() ? JSONObject.NULL : url);
+
+        send(req);
+
+    }
+
+
+    public void createChannelUI(String id, String name, String url , String user){
+
+        JSONObject req = new JSONObject();
+        req.put("action", "create_channel");
+        req.put("user_id", user);
+        req.put("channel_id", id);
+        req.put("channel_name", name);
+        req.put("image_url", url.isBlank() ? JSONObject.NULL : url);
+
+        send(req);
+
+    }
+
+    public void createChannel() {
+        String channelId = null;
+
+        while (channelId == null){
+            System.out.print("Enter channel ID: ");
+            String input = scanner.nextLine();
+            if (!input.trim().isEmpty()) {
+                channelId = input;
+            } else {
+                System.out.println("Channel ID can't be empty.");
+            }
+
+        }
+        String channelName = null;
+        while (channelName == null) {
+            System.out.print("Enter channel name: ");
+            String input = scanner.nextLine();
+            if (!input.trim().isEmpty()) {
+                channelName = input;
+            } else {
+                System.out.println("Channel name can't be empty.");
+            }
+        }
+        System.out.print("Enter image URL (optional): ");
+        String imageUrl = scanner.nextLine();
+
+        JSONObject req = new JSONObject();
+        req.put("action", "create_channel");
+        req.put("user_id", Session.getUserUUID());
+        req.put("channel_id", channelId);
+        req.put("channel_name", channelName);
+        req.put("image_url", imageUrl.isBlank() ? JSONObject.NULL : imageUrl);
+
+        send(req);
+    }
+
+    public void addMember(UUID memberId){
+        JSONObject req = new JSONObject();
+        req.put("action", "add_member");
+        req.put("user_id", Session.currentUser.getString("user_id"));
+        //req.put("group/channel",)
+        req.put("member_id", memberId.toString());
+        send(req);
+    }
+
+
+
+
+    public void send(JSONObject request) {
+        try {
+            if (!request.has("action") || request.isNull("action")) {
+                System.err.println("❌ Invalid request: missing action.");
+                return;
+            }
+
+            String action = request.getString("action");
+            this.out.println(request.toString());
+
+            JSONObject response = null;
+
+            while (true) {
+                JSONObject incoming = TelegramClient.responseQueue.take();
+
+                if (incoming.has("status")) {
+                    response = incoming;
+                    break;
+                } else {
+                    //real time
+                    handleRealTime(incoming);
+                }
+            }
+
+            if (response == null) {
+                System.out.println("⚠️ No usable response received.");
+                return;
+            }
+
+            if (response.has("message") && !response.isNull("message")) {
+                System.out.println("✅ Server Response: " + response.getString("message"));
+            }
+
+            String status = response.optString("status", "error");
+            if (!"success".equals(status) || !response.has("data") || response.isNull("data"))
+                return;
+
+
+            status  = response.optString("status","error");
+            String message = response.optString("message","");
+            this.lastStatus  = status;
+            this.lastMessage = message;
+
+
+            switch (action) {
+                case "login":
+                case "register":
+                    Session.currentUser = response.getJSONObject("data");
+
+                    JSONArray chatListJson = Session.currentUser.getJSONArray("chat_list");
+                    JSONArray Archived = Session.currentUser.getJSONArray("archived_chat_list");
+                    JSONArray Active = Session.currentUser.getJSONArray("active_chat_list");
+                    JSONArray contactList = Session.currentUser.getJSONArray("contact_list");
+//                    List<ChatEntry> chatList = new ArrayList<>();
+//
+//
+//                    for (Object obj : chatListJson) {
+//                        JSONObject chat = (JSONObject) obj;
+//
+//                        ChatEntry entry = new ChatEntry(
+//                                UUID.fromString(chat.getString("internal_id")),
+//                                chat.getString("id"),
+//                                chat.getString("name"),
+//                                chat.optString("image_url", ""),
+//                                chat.getString("type"),
+//                                chat.isNull("last_message_time") ? null : LocalDateTime.parse(chat.getString("last_message_time")),
+//                                chat.optBoolean("is_owner", false),
+//                                chat.optBoolean("is_admin", false)
+//
+//
+//                        );
+//
+//                        if (chat.has("other_user_id")) {
+//                            entry.setOtherUserId(UUID.fromString(chat.getString("other_user_id")));
+//                        }
+//
+//                        if (chat.has("is_saved_messages")) {
+//                            entry.setSavedMessages(chat.getBoolean("is_saved_messages"));
+//                        }
+//
+//                        chatList.add(entry);
+//
+//                    }
+//
+//                    List<ChatEntry> archivedChats = new ArrayList<>();
+//                    for (Object obj : Archived){
+//                        JSONObject chat = (JSONObject)  obj;
+//
+//                        ChatEntry entry = new ChatEntry(
+//                                UUID.fromString(chat.getString("internal_id")),
+//                                chat.getString("id"),
+//                                chat.getString("name"),
+//                                chat.optString("image_url", ""),
+//                                chat.getString("type"),
+//                                chat.isNull("last_message_time") ? null : LocalDateTime.parse(chat.getString("last_message_time")),
+//                                chat.optBoolean("is_owner", false),
+//                                chat.optBoolean("is_admin", false)
+//                        );
+//                        if (chat.has("other_user_id")) {
+//                            entry.setOtherUserId(UUID.fromString(chat.getString("other_user_id")));
+//                        }
+//                        archivedChats.add(entry);
+//
+//                    }
+//
+//                    List<ChatEntry> activeChats = new ArrayList<>();
+//                    for (Object obj : Active){
+//                        JSONObject chat = (JSONObject)  obj;
+//
+//                        ChatEntry entry = new ChatEntry(
+//                                UUID.fromString(chat.getString("internal_id")),
+//                                chat.getString("id"),
+//                                chat.getString("name"),
+//                                chat.optString("image_url", ""),
+//                                chat.getString("type"),
+//                                chat.isNull("last_message_time") ? null : LocalDateTime.parse(chat.getString("last_message_time")),
+//                                chat.optBoolean("is_owner", false),
+//                                chat.optBoolean("is_admin", false)
+//                        );
+//                        if (chat.has("other_user_id")) {
+//                            entry.setOtherUserId(UUID.fromString(chat.getString("other_user_id")));
+//                        }
+//
+//                        activeChats.add(entry);
+//
+//                    }
+
+                    List<ChatEntry> chatList = new ArrayList<>();
+                    for (Object obj : chatListJson) {
+                        chatList.add(parseChatEntry((JSONObject) obj));
+                    }
+
+                    List<ChatEntry> archivedChats = new ArrayList<>();
+                    for (Object obj : Archived) {
+                        archivedChats.add(parseChatEntry((JSONObject) obj));
+                    }
+
+                    List<ChatEntry> activeChats = new ArrayList<>();
+                    for (Object obj : Active) {
+                        activeChats.add(parseChatEntry((JSONObject) obj));
+                    }
+
+
+                    Session.contactEntries.clear();
+                    for (Object obj : contactList) {
+                        JSONObject c = (JSONObject) obj;
+
+                        ContactEntry entry = new ContactEntry(
+                                UUID.fromString(c.getString("contact_id")),
+                                c.getString("user_id"),
+                                c.getString("contact_displayId"),
+                                c.getString("profile_name"),
+                                c.optString("image_url", ""),
+                                c.optBoolean("is_blocked", false),
+                                c.isNull("last_seen")
+                                        ? null
+                                        : LocalDateTime.parse(c.getString("last_seen"))
+                        );
+                        Session.contactEntries.add(entry);
+                    }
+
+
+
+
+                    Session.activeChats = activeChats;
+                    Session.archivedChats = archivedChats;
+                    Session.chatList = chatList;
+                    break;
+
+                case "searchInUsers":
+                    JSONArray result = response.getJSONObject("data").getJSONArray("results");
+                    if (result.isEmpty()){
+                        System.out.println("No results found.");
+                    }
+                    else{
+                        System.out.println("Search Results:");
+                        for (int i = 0 ; i < result.length(); i++){
+                            JSONObject item = result.getJSONObject(i);
+                            String type = item.getString("type");
+                            if(type.equals("user")){
+                                System.out.println((i + 1) + ". [" + type + "] "
+                                        + item.getString("name") + " (ID: " + item.getString("id") + ")");
+                            }
+                        }
+                        System.out.print("Select a result number to interact(0 for return): ");
+                        int index = Integer.parseInt(scanner.nextLine()) - 1;
+                        if (index < 0 || index >= result.length()) return;
+                        JSONObject selected = result.getJSONObject(index);
+                        String userId = selected.getString("id");
+                        String uuid = selected.getString("uuid");
+                        UUID memberId = UUID.fromString(uuid);
+                        addMember(memberId);
+                    }
+                    break;
+                case "search" :
+
+
+                    JSONArray results = response.getJSONObject("data").getJSONArray("results");
+
+                    if (results.isEmpty()) {
+                        System.out.println("No results found.");
+                    } else {
+                        System.out.println("\nSearch Results:");
+                        for (int i = 0; i < results.length(); i++) {
+                            JSONObject item = results.getJSONObject(i);
+                            String type = item.getString("type");
+
+                            if (type.equals("message")) {
+                                String senderName = item.optString("sender_name", item.optString("sender", "Unknown"));
+                                String time = item.optString("time", "Unknown time");
+                                String content = item.optString("content", "[No content]");
+                                String context = "";
+
+                                if (item.has("group_name")) {
+                                    context = " in group: " + item.getString("group_name");
+                                } else if (item.has("channel_name")) {
+                                    context = " in channel: " + item.getString("channel_name");
+                                }
+
+                                System.out.println((i + 1) + ". [message] \"" + content + "\""
+                                        + " (from: " + senderName + context + ", at: " + time + ")");
+                            } else {
+                                System.out.println((i + 1) + ". [" + type + "] "
+                                        + item.getString("name") + " (ID: " + item.getString("id") + ")");
+                            }
+
+                        }
+
+                        System.out.print("Select a result number to interact (or 0 to exit): ");
+                        int index = Integer.parseInt(scanner.nextLine()) - 1;
+                        if (index == -1) {
+                            System.out.println("Exit...");
+                            return;
+                        }
+                        if (index < -1 || index >= results.length()) return;
+
+                        JSONObject selected = results.getJSONObject(index);
+                        String type = selected.getString("type");
+
+                        switch (type) {
+                            case "user" -> {
+                                String uuidStr = selected.getString("uuid");
+                                UUID uuid = UUID.fromString(uuidStr);
+
+                                System.out.println("🔍 Looking for chat with internal_id='" + uuid + "' type='private'");
+
+                                ChatEntry existing = Session.chatList.stream()
+                                        .filter(c -> c.getId().equals(uuid) && c.getType().equals("private"))
+                                        .findFirst()
+                                        .orElse(null);
+
+                                if (existing != null) {
+                                    openChat(existing);
+                                } else {
+                                    ChatEntry preview = new ChatEntry();
+                                    preview.setId(String.valueOf(uuid));
+                                    preview.setDisplayId(selected.getString("id"));
+                                    preview.setName(selected.getString("name"));
+                                    preview.setType("private");
+
+                                    openForeignChat(preview);
+                                }
+//                                else {
+//                                    System.out.println("ℹ Trying to add contact...");
+//                                    addContact(uuid);
+//
+//                                    refreshChatList();
+//                                    System.out.println("🔄 Rechecking chat list...");
+//
+//                                    existing = Session.chatList.stream()
+//                                            .filter(c -> c.getId().equals(uuid) && c.getType().equals("private"))
+//                                            .findFirst()
+//                                            .orElse(null);
+//
+//                                    if (existing != null) {
+//                                        openChat(existing);
+//                                    } else {
+//                                        System.out.println("❌ Failed to open chat. Try again later.");
+//                                    }
+//                                }
+                            }
+
+                            case "group", "channel" -> {
+                                String uuidStr = selected.getString("uuid");
+                                UUID uuid = UUID.fromString(uuidStr);
+
+                                System.out.println("🔍 Looking for chat with internal_id='" + uuid + "' type='" + type + "'");
+
+                                ChatEntry existing = Session.chatList.stream()
+                                        .filter(c -> c.getId().equals(uuid) && c.getType().equals(type))
+                                        .findFirst()
+                                        .orElse(null);
+
+                                if (existing != null) {
+                                    openChat(existing);
+                                }else {
+                                    ChatEntry preview = new ChatEntry();
+                                    preview.setId(String.valueOf(uuid));
+                                    preview.setDisplayId(selected.getString("id"));
+                                    preview.setName(selected.getString("name"));
+                                    preview.setType(type);
+
+                                    openForeignChat(preview);
+                                }
+//                                else {
+//                                    System.out.println("ℹ Trying to join " + type + "...");
+//                                    joinGroupOrChannel(type, uuidStr);
+//
+//                                    refreshChatList();
+//                                    System.out.println("🔄 Rechecking chat list...");
+//
+//                                    existing = Session.chatList.stream()
+//                                            .filter(c -> c.getId().equals(uuid) && c.getType().equals(type))
+//                                            .findFirst()
+//                                            .orElse(null);
+//
+//                                    if (existing != null) {
+//                                        openChat(existing);
+//                                    } else {
+//                                        System.out.println("❌ Failed to open " + type + ". Try again later.");
+//                                    }
+//                                }
+                            }
+
+                            case "message" -> {
+                                String receiverId = selected.getString("receiver_id");
+                                String receiverType = selected.getString("receiver_type");
+                                String senderName = selected.optString("sender_name", "Unknown");
+                                String content = selected.optString("content", "[No content]");
+                                String time = selected.optString("time", "Unknown time");
+
+                                String context = "";
+                                if (receiverType.equals("group")) {
+                                    context = "in group: " + selected.optString("group_name", "Unknown group");
+                                } else if (receiverType.equals("channel")) {
+                                    context = "in channel: " + selected.optString("channel_name", "Unknown channel");
+                                }
+
+                                System.out.println("📩 Message preview:");
+                                System.out.println("From: " + senderName);
+                                if (!context.isEmpty()) System.out.println(context);
+                                System.out.println("Time: " + time);
+                                System.out.println("Content: \"" + content + "\"");
+
+                                System.out.println("🔍 Looking for chat with displayId='" + receiverId + "' type='" + receiverType + "'");
+
+                                ChatEntry chat = Session.chatList.stream()
+                                        .filter(c -> c.getDisplayId().equals(receiverId) && c.getType().equals(receiverType))
+                                        .findFirst()
+                                        .orElseGet(() -> fetchChatInfo(receiverId, receiverType));
+
+                                openChat(chat);
+                            }
+
+
+                            default -> System.out.println("No interaction available for type: " + type);
+                        }
+                    }
+
+
+
+
+                    break;
+
+
+                case "create_group":
+                case "create_channel":
+                    if (response.has("data")) {
+                        JSONObject chatJson = response.getJSONObject("data");
+
+                        ChatEntry chat = new ChatEntry(
+                                UUID.fromString(chatJson.getString("internal_id")),
+                                chatJson.getString("id"),
+                                chatJson.getString("name"),
+                                chatJson.optString("image_url", ""),
+                                chatJson.getString("type"),
+                                null,
+                                chatJson.optBoolean("is_owner", false),
+                                chatJson.optBoolean("is_admin", false)
+                        );
+
+
+                        refreshChatList();
+                        System.out.println("✅ Created and opening chat...");
+                        refreshChatList();
+                        openChat(chat);
+                    }
+
+                    break;
+
+                case "get_messages":
+                    JSONArray messages = response.getJSONObject("data").getJSONArray("messages");
+                    System.out.println("\n🔓 Messages fetched:");
+                    System.out.println("─────────────────────────────────────────────");
+                    for (int i = 0; i < messages.length(); i++) {
+
+                        JSONObject m = messages.getJSONObject(i);
+                        String senderId = m.getString("sender_id");
+                        String senderName = m.optString("sender_name", "Other");
+                        String content = m.getString("content");
+                        String time = m.getString("send_at");
+
+                        String label = senderId.equals(Session.currentUser.getString("internal_uuid")) ? "You" : senderName;
+                        System.out.println("[" + time + "] " + label + ": " + content);
+                    }
+                    System.out.println("─────────────────────────────────────────────");
+                    break;
+
+
+                case "logout":
+                    Session.currentUser = null;
+                    Session.chatList = null;
+                    break;
+            }
+
+        } catch (Exception e) {
+            System.err.println("❌ Error during send(): " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+
+
+
+    public void userMenu(UUID internal_uuid) throws IOException {
+        while (true) {
+
+
+            if (Session.backToChatList) {
+                Session.backToChatList = false;
+                return;
+            }
+
+
+
+
+            System.out.println("\nUser Menu:");
+            System.out.println("1. Show chat list");
+            System.out.println("2. Search");
+            System.out.println("3. Create Channel");
+            System.out.println("4. Create group");
+            System.out.println("5. View contacts");
+            System.out.println("6. Show sidebar menu");
+            System.out.println("7. Logout");
+            System.out.print("Choose an option: ");
+            String choice = scanner.nextLine();
+
+            switch (choice) {
+                case "1" -> {
+                    Session.inChatListMenu = true;
+                    showChatListAndSelect();
+                    Session.inChatListMenu = false;
+                }
+                case "2" -> search();
+                case "3" -> createChannel();
+                case "4" -> createGroup();
+                case "5" -> showContactList();
+                case "6" -> showSidebarMenu();
+                case "7" -> {
+                    logout();
+                    return;
+                }
+                default -> System.out.println("Invalid choice.");
+            }
+        }
+    }
+
+//    public void showContactList() {
+//        List<ContactEntry> contacts = Session.contactEntries;
+//        if (contacts.isEmpty()) {
+//            System.out.println("📭 You have no contacts.");
+//            return;
+//        }
+//
+//        System.out.println("👥 Your Contacts:");
+//        for (int i = 0; i < contacts.size(); i++) {
+//            System.out.println((i + 1) + ". " + contacts.get(i));
+//        }
+//
+//        System.out.print("Select a contact (0 to go back): ");
+//        int choice = scanner.nextInt();
+//        scanner.nextLine();
+//
+//        if (choice == 0) return;
+//        if (choice < 1 || choice > contacts.size()) {
+//            System.out.println("❌ Invalid choice.");
+//            return;
+//        }
+//
+//        ContactEntry selected = contacts.get(choice - 1);
+//        System.out.println("\n📇 What do you want to do with " + selected.getProfileName() + "?");
+//        System.out.println("1. View Profile");
+//        System.out.println("2. Send Message");
+//        System.out.print("Enter your choice: ");
+//        int action = scanner.nextInt();
+//        scanner.nextLine();
+//
+//        switch (action) {
+//            case 1 -> viewProfile(selected.getContactId());
+//            case 2 -> startPrivateChat(selected);
+//            default -> System.out.println("❌ Invalid option.");
+//        }
+//    }
+
+    public void showContactList() {
+        System.out.println("1. View All Contacts");
+        System.out.println("2. Search Contacts");
+        System.out.println("Choose an option: (0 to go back)");
+        int option = scanner.nextInt();
+        scanner.nextLine();
+
+        // Handle invalid input
+        while (option < 0 || option > 2) {
+            System.out.println("Invalid choice. Try again: ");
+            option = scanner.nextInt();
+            scanner.nextLine();
+        }
+
+        List<ContactEntry> contacts;
+
+        if (option == 0) {
+            return;
+        }
+        else if (option == 1) {
+            contacts = Session.contactEntries;
+
+        } else if (option == 2) {
+            contacts = new ArrayList<>();
+
+            System.out.print("Enter name or user ID to search: ");
+            String searchTerm = scanner.nextLine();
+
+            // Handle invalid input
+            while (searchTerm.isEmpty()) {
+                System.out.print("Search key can not be empty. Try again: ");
+                searchTerm = scanner.nextLine();
+            }
+
+            // Send a request to server
+            JSONObject request = new JSONObject();
+            request.put("action", "search_contacts");
+            request.put("user_id", Session.getUserUUID());
+            request.put("search_term", searchTerm);
+
+            JSONObject response = ActionHandler.sendWithResponse(request);
+
+            if (!response.optString("status", "fail").equals("success")) {
+                System.out.println("Failed to search contacts: " + response.optString("message", "Unknown error"));
+                return;
+            }
+
+            JSONObject data = response.getJSONObject("data");
+            JSONArray contactsJson = data.getJSONArray("contacts");
+
+            for (int i = 0; i < contactsJson.length(); i++) {
+                JSONObject contact = contactsJson.getJSONObject(i);
+
+                UUID contactId = UUID.fromString(contact.getString("contact_id"));
+                String userId = contact.getString("user_id");
+                String contact_displayId = contact.getString("contact_display_id");
+                String profileName = contact.getString("profile_name");
+                String imageUrl = contact.optString("image_url", "");
+                boolean isBlocked = contact.getBoolean("is_blocked");
+                String lastSeenString = contact.getString("last_seen");
+                LocalDateTime lastSeen = null;
+                if (lastSeenString != null) {
+                    lastSeen = LocalDateTime.parse(lastSeenString);
+                }
+
+                contacts.add(new ContactEntry(contactId, userId, contact_displayId, profileName, imageUrl, isBlocked, lastSeen));
+            }
+
+        } else {
+            System.out.println("❌ Invalid choice.");
+            return;
+        }
+
+        if (contacts.isEmpty()) {
+            System.out.println("📭 No contacts found.");
+            return;
+        }
+
+        System.out.println("👥 Your Contacts:");
+        for (int i = 0; i < contacts.size(); i++) {
+            System.out.println((i + 1) + ". " + contacts.get(i));
+        }
+
+        System.out.print("Select a contact (0 to go back): ");
+        int choice = scanner.nextInt();
+        scanner.nextLine();
+
+        if (choice == 0) return;
+        if (choice < 1 || choice > contacts.size()) {
+            System.out.println("❌ Invalid choice.");
+            return;
+        }
+
+        ContactEntry selected = contacts.get(choice - 1);
+        System.out.println("\n📇 What do you want to do with " + selected.getProfileName() + "?");
+        System.out.println("1. View Profile");
+        System.out.println("2. Send Message");
+        System.out.println("3. Remove Contact");
+        System.out.print("Enter your choice: ");
+        int action = scanner.nextInt();
+        scanner.nextLine();
+
+        switch (action) {
+            case 1 -> viewProfile(selected.getContactId());
+            case 2 -> startPrivateChat(selected);
+            case 3 -> {
+                // Send a request to server
+                JSONObject request = new JSONObject();
+                request.put("action", "remove_contact");
+                request.put("user_id", Session.getUserUUID()); // Current user
+                request.put("contact_id", selected.getContactId().toString()); // Contact to remove
+
+                JSONObject response = ActionHandler.sendWithResponse(request);
+
+                if ("success".equals(response.optString("status"))) {
+                    System.out.println("✅ Contact removed successfully.");
+                    Session.contactEntries.remove(selected); // Remove from local session list
+                } else {
+                    System.out.println("❌ Failed to remove contact: " +
+                            response.optString("message", "Unknown error"));
+                }
+            }
+
+            default -> System.out.println("❌ Invalid option.");
+        }
+    }
+
+
+    public void viewProfile(UUID targetId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_profile");
+        req.put("target_id", targetId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch profile.");
+            return;
+        }
+
+        JSONObject data = res.getJSONObject("data");
+        String profileName = data.getString("profile_name");
+        String userId = data.getString("user_id");
+        String bio = data.optString("bio", "(no bio)");
+        String imageUrl = data.optString("image_url", "(no image)");
+        boolean isOnline = data.getBoolean("is_online");
+        String lastSeen = data.getString("last_seen");
+
+        System.out.println("\n📄 Profile Info:");
+        System.out.println("Name: " + profileName);
+        System.out.println("User ID: " + userId);
+        System.out.println("Bio: " + bio);
+        System.out.println("Image: " + imageUrl);
+        System.out.println("Status: " + (isOnline ? "🟢 Online" : "🔘 Last seen at " + lastSeen));
+    }
+
+
+    public void startPrivateChat(ContactEntry contact) {
+        UUID myId = UUID.fromString(Session.currentUser.getString("internal_uuid"));
+        UUID contactId = contact.getContactId();
+
+        JSONObject req = new JSONObject();
+        req.put("action", "get_or_create_private_chat");
+        req.put("user1", myId.toString());
+        req.put("user2", contactId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to create or fetch private chat.");
+            return;
+        }
+
+        JSONObject data = res.getJSONObject("data");
+        UUID chatId = UUID.fromString(data.getString("chat_id"));
+
+        ChatEntry entry = new ChatEntry(
+                chatId,
+                contact.getUserId(),
+                contact.getProfileName(),
+                contact.getImageUrl(),
+                "private",
+                null,
+                false,
+                false
+        );
+        entry.setOtherUserId(contactId);
+
+        Session.chatList.add(0, entry);
+        System.out.println("✅ Chat with " + contact.getProfileName() + " started.");
+
+        openChat(entry);
+    }
+
+
+
+//    public void showChatListAndSelect() {
+//
+//
+//        List<ChatEntry> chatList = Session.getChatList();
+//        if (chatList.isEmpty()) {
+//            System.out.println("📭 You have no chats.");
+//            return;
+//        }
+//
+//        System.out.println("\nYour Chats:");
+//        for (int i = 0; i < chatList.size(); i++) {
+//            ChatEntry entry = chatList.get(i);
+//            String last = entry.getLastMessageTime() == null ? "No messages yet" : entry.getLastMessageTime().toString();
+//            System.out.printf("%d. [%s] %s - Last: %s\n", i + 1, entry.getType(), entry.getName(), last);
+//        }
+//
+//        System.out.print("Select a chat by number: ");
+//        int choice = Integer.parseInt(scanner.nextLine());
+//        if (choice < 1 || choice > chatList.size()) {
+//            System.out.println("❌ Invalid choice.");
+//            return;
+//        }
+//
+//        openChat(chatList.get(choice - 1));
+//    }
+
+
+//    public void showChatListAndSelect() {
+//        if (Session.activeChats == null || Session.activeChats.isEmpty()) {
+//            System.out.println("No active chats.");
+//            return;
+//        }
+//
+//        System.out.println("\nYour Chats:");
+//        System.out.println("0. 📦 Archived Chats");
+//
+//        // Track index dynamically
+//        int index = 1;
+//
+//        // Check if Saved Messages exists in the list
+//        int savedMessagesIndex = -1;
+//        for (int i = 0; i < Session.activeChats.size(); i++) {
+//            ChatEntry entry = Session.activeChats.get(i);
+//
+//            if (entry.isSavedMessages()) {
+//                savedMessagesIndex = index;
+//                System.out.println(index + ". 📦 Saved Messages Chat");
+//                index++;
+//                break;
+//            }
+//        }
+//
+//        // Print the rest of the chats
+//        for (int i = 0; i < Session.activeChats.size(); i++) {
+//            ChatEntry entry = Session.activeChats.get(i);
+//            if (entry.isSavedMessages()) {
+//                continue; // Already printed above
+//            }
+//
+//            String time = (entry.getLastMessageTime() == null)
+//                    ? "No messages yet"
+//                    : entry.getLastMessageTime().toString();
+//            System.out.println(index + ". [" + entry.getType() + "] " +
+//                    entry.getName() + " - Last: " + time);
+//            index++;
+//        }
+//
+//        System.out.print("Select a chat by number: ");
+//        int choice = Integer.parseInt(scanner.nextLine());
+//
+//        if (choice == 0) {
+//            showArchivedChats();
+//            return;
+//        }
+//
+//        if (choice == savedMessagesIndex) {
+//            new SidebarHandler(scanner, this).getSavedMessagesData(Session.getUserUUID());
+//            return;
+//        }
+//
+//        // Adjust for Saved Messages if it was in the list
+//        int baseIndex = (savedMessagesIndex != -1 && choice > savedMessagesIndex) ? 1 : 0;
+//        int chatIndex = choice - 1 - baseIndex;
+//
+//        if (chatIndex < 0 || chatIndex >= Session.activeChats.size()) {
+//            System.out.println("Invalid selection.");
+//            return;
+//        }
+//
+//        // Find the actual index of the chat, skipping the saved_messages entry
+//        int actualIndex = 0;
+//        for (int i = 0; i < Session.activeChats.size(); i++) {
+//            if (Session.activeChats.get(i).getType().equalsIgnoreCase("saved_messages")) {
+//                continue; // Skip saved_messages
+//            }
+//            if (actualIndex == chatIndex) {
+//                break;
+//            }
+//            actualIndex++;
+//        }
+//
+//        ChatEntry selected = Session.activeChats.get(actualIndex);
+//        openChat(selected);
+//    }
+
+
+
+    public void showChatListAndSelect() {
+        if (Session.activeChats == null || Session.activeChats.isEmpty()) {
+            System.out.println("📭 You have no chats.");
+            return;
+        }
+
+        System.out.println("\nYour Chats:");
+        System.out.println("0. 📦 Archived Chats");
+
+        //find save messages chat
+        Integer savedIdxInActive = null;
+        for (int i = 0; i < Session.activeChats.size(); i++) {
+            if (Session.activeChats.get(i).isSavedMessages()) {
+                savedIdxInActive = i;
+                break;
+            }
+        }
+
+        Map<Integer, Integer> displayToActive = new HashMap<>();
+
+        int displayIndex = 1;
+
+        if (savedIdxInActive != null) {
+            ChatEntry saved = Session.activeChats.get(savedIdxInActive);
+            String last = (saved.getLastMessageTime() == null) ? "No messages yet" : saved.getLastMessageTime().toString();
+            System.out.println(displayIndex + ". 💾 Saved Messages - Last: " + last);
+
+            displayToActive.put(displayIndex, savedIdxInActive);
+            displayIndex++;
+        }
+
+        for (int i = 0; i < Session.activeChats.size(); i++) {
+            if (savedIdxInActive != null && i == savedIdxInActive) continue;
+
+            ChatEntry e = Session.activeChats.get(i);
+            String last = (e.getLastMessageTime() == null) ? "No messages yet" : e.getLastMessageTime().toString();
+            System.out.println(displayIndex + ". [" + e.getType() + "] " + e.getName() + " - Last: " + last);
+
+            displayToActive.put(displayIndex, i);
+            displayIndex++;
+        }
+
+        System.out.print("Select a chat by number: ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine().trim());
+        } catch (Exception e) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        if (choice == 0) {
+            showArchivedChats();
+            return;
+        }
+
+        Integer activeIdx = displayToActive.get(choice);
+        if (activeIdx == null) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        ChatEntry selected = Session.activeChats.get(activeIdx);
+        openChat(selected);
+    }
+
+
+    public void showArchivedChats() {
+        if (Session.archivedChats == null || Session.archivedChats.isEmpty()) {
+            System.out.println("📭 No archived chats.");
+            return;
+        }
+
+        System.out.println("\n📦 Archived Chats:");
+        for (int i = 0; i < Session.archivedChats.size(); i++) {
+            ChatEntry entry = Session.archivedChats.get(i);
+            String time = (entry.getLastMessageTime() == null)
+                    ? "No messages yet"
+                    : entry.getLastMessageTime().toString();
+            System.out.println((i + 1) + ". [" + entry.getType() + "] " +
+                    entry.getName() + " - Last: " + time);
+        }
+
+        System.out.print("Select a chat by number (or 0 to return): ");
+        int choice = Integer.parseInt(scanner.nextLine());
+
+        if (choice == 0) {
+            System.out.println("🔙 Returning to main chat list...");
+            return;
+        }
+
+        int index = choice - 1;
+
+        if (index < 0 || index >= Session.archivedChats.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        ChatEntry selected = Session.archivedChats.get(index);
+        openChat(selected);
+    }
+
+
+
+
+    public void openChat(ChatEntry chat) {
+
+        //for private chats only
+        if (chat.getType().equalsIgnoreCase("private")) {
+            JSONObject reqTarget = new JSONObject();
+            reqTarget.put("action", "get_private_chat_target");
+            reqTarget.put("chat_id", chat.getId());
+
+            JSONObject resTarget = sendWithResponse(reqTarget);
+            if (resTarget == null || !resTarget.getString("status").equals("success")) {
+                System.out.println("❌ Failed to fetch target user for private chat.");
+                return;
+            }
+            String otherUserId = resTarget.getJSONObject("data").getString("target_id");
+            chat.setOtherUserId(UUID.fromString(otherUserId));
+        }
+
+
+
+        JSONObject req = new JSONObject();
+        req.put("action", "get_messages");
+        req.put("receiver_id",chat.getId());
+        req.put("receiver_type", chat.getType());
+//        String type = chat.getType();
+//        UUID chatId = chat.getId();
+//        if (type.equals("private")) {
+//            UUID myId = UUID.fromString(Session.currentUser.getString("internal_uuid"));
+//            UUID otherUserId = chat.getId();
+//
+//            JSONObject getChatIdReq = new JSONObject();
+//            getChatIdReq.put("action", "get_or_create_private_chat");
+//            getChatIdReq.put("user1", myId.toString());
+//            getChatIdReq.put("user2", otherUserId.toString());
+//
+//            JSONObject chatIdRes = sendWithResponse(getChatIdReq);
+//            if (chatIdRes == null || !chatIdRes.getString("status").equals("success")) {
+//                System.out.println("❌ Failed to fetch private chat ID.");
+//                return;
+//            }
+//
+//            Session.currentPrivateChatUserId = otherUserId;
+//            chatId = UUID.fromString(chatIdRes.getJSONObject("data").getString("chat_id"));
+//            chat.setId(String.valueOf(chatId));
+//
+//        }
+
+
+
+
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch messages.");
+            return;
+        }
+
+        JSONArray messages = res.getJSONObject("data").getJSONArray("messages");
+        System.out.println("\n🔓 Messages fetched:");
+        System.out.println("─────────────────────────────────────────────");
+        for (int i = 0; i < messages.length(); i++) {
+            JSONObject m = messages.getJSONObject(i);
+            String senderId = m.getString("sender_id");
+            String senderName = m.optString("sender_name", "Other");
+            String content = m.getString("content");
+            String time = m.getString("send_at");
+
+            String label = senderId.equals(Session.currentUser.getString("internal_uuid")) ? "You" : senderName;
+            System.out.println("[" + time + "] " + label + ": " + content);
+        }
+        System.out.println("─────────────────────────────────────────────");
+
+        if (chat.getType().equals("private") && chat.getOtherUserId() == null) {
+            for (ContactEntry contact : Session.contactEntries) {
+                if (contact.getContactId().equals(chat.getId())) {
+                    chat.setOtherUserId(contact.getContactId());
+                    break;
+                }
+            }
+        }
+
+        boolean stayInChat = true;
+
+
+        Session.currentChatId = chat.getId().toString();
+        Session.currentChatEntry = chat;
+        Session.currentChatType = chat.getType().toLowerCase();
+        Session.inChatMenu = true;
+        startMenuRefresherThread();
+
+
+        while (stayInChat) {
+            if (forceExitChat) {
+                System.out.println("⚠️ You have been removed from this chat or chat was deleted. Returning to chat list...");
+                forceExitChat = false;
+                break;
+            }
+
+            System.out.println("\n📍 Entered Chat:");
+            System.out.println("🔷 Name: " + chat.getName());
+            System.out.println("────────────────────────────────────────────");
+
+            switch (chat.getType().trim().toLowerCase()) {
+                case "private" -> stayInChat = showPrivateChatMenu(chat);
+                case "group" -> stayInChat = showGroupChatMenu(chat);
+                case "channel" -> stayInChat = showChannelChatMenu(chat);
+                default -> {
+                    System.out.println("❗ Unknown chat type: " + chat.getType());
+                    stayInChat = false;
+                }
+            }
+        }
+
+        Session.inChatMenu = false;
+        Session.currentChatId = null;
+        Session.currentChatEntry = null;
+        Session.currentChatType = null;
+
+    }
+
+
+
+
+//
+//    private boolean showPrivateChatMenu(ChatEntry chat) {
+//
+//        if (forceExitChat) {
+//            forceExitChat = false;
+//            System.out.println("🚪 Exiting chat due to real-time update.");
+//            return false;
+//        }
+//
+//
+//            JSONObject reqTarget = new JSONObject();
+//            reqTarget.put("action", "get_private_chat_target");
+//            reqTarget.put("chat_id", chat.getId());
+//
+//            JSONObject resTarget = sendWithResponse(reqTarget);
+//            if (resTarget == null || !resTarget.getString("status").equals("success")) {
+//                System.out.println("❌ Failed to fetch target user for private chat.");
+//                return false;
+//            }
+//
+//            String otherUserId = resTarget.getJSONObject("data").getString("target_id");
+//            chat.setOtherUserId(UUID.fromString(otherUserId));
+//
+//
+//        JSONObject req = new JSONObject();
+//        req.put("action", "view_profile");
+//        req.put("target_id", chat.getOtherUserId());  // internal UUID
+//
+//        JSONObject res = sendWithResponse(req);
+//
+//        if (res.getString("status").equals("success")) {
+//            JSONObject data = res.getJSONObject("data");
+//
+//            System.out.println("\n💬 Private Chat with: " + data.getString("profile_name"));
+//
+//            if (data.getBoolean("is_online")) {
+//                System.out.println("✅ Status: Online");
+//            } else {
+//                System.out.println("📅 Last seen: " + data.getString("last_seen"));
+//            }
+//
+//            System.out.println("────────────────────────────────────────────");
+//        }
+//
+//
+//        System.out.println("1. Send message");
+//        System.out.println("2. Block/Unblock");
+//        System.out.println("3. Delete chat (one-sided)");
+//        System.out.println("4. Delete chat (both sides)");
+//        System.out.println("5. View profile");
+//        System.out.println("6. Archive/Unarchived");
+//        System.out.println("7. View messages");
+//        System.out.println("8. Back");
+//
+//
+//        String input = scanner.nextLine();
+//        switch (input) {
+//            case "1" -> sendMessage(chat.getId(), "private");
+//            case "2" -> toggleBlock(chat.getOtherUserId());
+//            case "3" -> {
+//                deleteChat(chat.getId(), false);
+//                return true;
+//            }
+//            case "4" -> {
+//                deleteChat(chat.getId(), true);
+//                return true;
+//            }
+//            case "5" -> {
+//                JSONObject reqProfile = new JSONObject();
+//                reqProfile.put("action", "view_profile");
+//                reqProfile.put("target_id", chat.getOtherUserId());
+//
+//                JSONObject resProfile = sendWithResponse(reqProfile);
+//
+//                if (resProfile.getString("status").equals("success")) {
+//                    JSONObject profile = resProfile.getJSONObject("data");
+//                    System.out.println("\n👤 Profile Info:");
+//                    System.out.println("🔷 Name: " + profile.optString("profile_name", "Unknown"));
+//                    System.out.println("📄 Bio: " + profile.optString("bio", "No bio set"));
+//                    System.out.println("🖼️ Image URL: " + profile.optString("image_url", "N/A"));
+//
+//                    if (profile.getBoolean("is_online")) {
+//                        System.out.println("✅ Status: Online");
+//                    } else {
+//                        System.out.println("📅 Last seen: " + profile.optString("last_seen", "Unknown"));
+//                    }
+//                    System.out.println("────────────────────────────────────────────");
+//                } else {
+//                    System.out.println("❌ Could not load profile.");
+//                }
+//                return true;
+//            }
+//
+//            case "6" ->{
+//                toggleArchive(chat.getId() , "private");
+//
+//                return true;
+//            }
+//            case "7" ->{
+//                viewMessagesInChat(chat);
+//            }
+//
+//            case "8" -> {
+//                return false;
+//            }
+//            default -> System.out.println("Invalid choice.");
+//        }
+//        return true;
+//    }
+
+
+    public boolean showPrivateChatMenu(ChatEntry chat) {
+
+        if (forceExitChat) {
+            forceExitChat = false;
+            System.out.println("🚪 Exiting chat due to real-time update.");
+            return false;
+        }
+
+        UUID chatId = chat.getId();
+
+        if (chat.getOtherUserId() == null) {
+            JSONObject reqTarget = new JSONObject()
+                    .put("action", "get_private_chat_target")
+                    .put("chat_id", chatId.toString());
+
+            JSONObject resTarget = sendWithResponse(reqTarget);
+            if (resTarget == null || !"success".equals(resTarget.optString("status"))) {
+                System.out.println("❌ Failed to fetch target user for private chat.");
+                return false;
+            }
+            chat.setOtherUserId(UUID.fromString(resTarget.getJSONObject("data").getString("target_id")));
+        }
+
+        UUID me = UUID.fromString(Session.currentUser.getString("internal_uuid"));
+        boolean isSaved = chat.isSavedMessages() || me.equals(chat.getOtherUserId());
+
+        System.out.println();
+        if (isSaved) {
+            System.out.println("💬 Private Chat with: Saved Messages");
+            System.out.println("────────────────────────────────────────────");
+        } else {
+            JSONObject req = new JSONObject()
+                    .put("action", "view_profile")
+                    .put("target_id", chat.getOtherUserId());
+
+            JSONObject res = sendWithResponse(req);
+            if (res != null && "success".equals(res.optString("status"))) {
+                JSONObject data = res.getJSONObject("data");
+                System.out.println("\n💬 Private Chat with: " + data.optString("profile_name", chat.getName()));
+                if (data.optBoolean("is_online", false)) System.out.println("✅ Status: Online");
+                else System.out.println("📅 Last seen: " + data.optString("last_seen", "Unknown"));
+                System.out.println("────────────────────────────────────────────");
+            }
+        }
+
+        if (isSaved) {
+            System.out.println("1. Send message");
+            System.out.println("2. View messages");
+            System.out.println("3. Back");
+
+            String input = scanner.nextLine().trim();
+            switch (input) {
+                case "1" -> sendMessage(chatId, "private");
+                case "2" -> { viewMessagesInChat(chat); }
+                case "3" -> { return false; }
+                default -> System.out.println("Invalid choice.");
+            }
+            return true;
+        }
+
+        System.out.println("1. Send message");
+        System.out.println("2. Block/Unblock");
+        System.out.println("3. Delete chat (one-sided)");
+        System.out.println("4. Delete chat (both sides)");
+        System.out.println("5. View profile");
+        System.out.println("6. Archive/Unarchived");
+        System.out.println("7. View messages");
+        System.out.println("8. Back");
+
+        String input = scanner.nextLine().trim();
+        switch (input) {
+            case "1" -> sendMessage(chatId, "private");
+            case "2" -> toggleBlock(chat.getOtherUserId());
+            case "3" -> { deleteChat(chatId, false); return true; }
+            case "4" -> { deleteChat(chatId, true);  return true; }
+            case "5" -> {
+                JSONObject reqProfile = new JSONObject()
+                        .put("action", "view_profile")
+                        .put("target_id", chat.getOtherUserId());
+
+                JSONObject resProfile = sendWithResponse(reqProfile);
+                if (resProfile != null && "success".equals(resProfile.optString("status"))) {
+                    JSONObject profile = resProfile.getJSONObject("data");
+                    System.out.println("\n👤 Profile Info:");
+                    System.out.println("🔷 Name: " + profile.optString("profile_name", "Unknown"));
+                    System.out.println("📄 Bio: " + profile.optString("bio", "No bio set"));
+                    System.out.println("🖼️ Image URL: " + profile.optString("image_url", "N/A"));
+                    if (profile.optBoolean("is_online", false)) System.out.println("✅ Status: Online");
+                    else System.out.println("📅 Last seen: " + profile.optString("last_seen", "Unknown"));
+                    System.out.println("────────────────────────────────────────────");
+                } else {
+                    System.out.println("❌ Could not load profile.");
+                }
+                return true;
+            }
+            case "6" -> { toggleArchive(chatId, "private"); return true; }
+            case "7" -> { viewMessagesInChat(chat); break; }
+            case "8" -> { return false; }
+            default -> System.out.println("Invalid choice.");
+        }
+        return true;
+    }
+
+
+    public JSONObject getGroupPermissions(UUID groupId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_group_permissions");
+        req.put("group_id", groupId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            return new JSONObject();
+        }
+        return res.getJSONObject("data");
+    }
+
+
+
+    public boolean showGroupChatMenu(ChatEntry chat) {
+        if (forceExitChat) {
+            forceExitChat = false;
+            System.out.println("🚪 Exiting chat due to real-time update.");
+            return false;
+        }
+
+        boolean isAdmin = chat.isAdmin();
+        boolean isOwner = chat.isOwner();
+        JSONObject perms = getGroupPermissions(chat.getId());
+
+        System.out.println("\n--- Group Chat Menu ---");
+        System.out.println("1. Send Message");
+        System.out.println("2. View Members");
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_members", false))) {
+            System.out.println("3. Add Member");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_edit_group", false))) {
+            System.out.println("4. Edit Group Info");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_admins", false))) {
+            System.out.println("5. Add Admin");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_admins", false))) {
+            System.out.println("6. Remove Admin");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_members", false))) {
+            System.out.println("7. Remove member");
+        }
+        if (isOwner) {
+            System.out.println("8. Delete Group");
+            System.out.println("9. Leave Group (Transfer ownership required)");
+        } else {
+            System.out.println("9. Leave Group");
+        }
+        System.out.println("10. View Profile");
+
+        if (isOwner) {
+            System.out.println("11. Edit Admin Permissions");
+        }
+
+        System.out.println("12. Archive/Unarchived");
+        System.out.println("13. View messages");
+
+        System.out.println("0. Back to Chat List");
+
+        String input = scanner.nextLine();
+        switch (input) {
+            case "1" -> sendMessage(chat.getId(), "group");
+            case "2" -> viewGroupMembers(chat.getId());
+            case "3" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_add_members", false)))
+                    searchEligibleUsers("group", chat.getId());
+                else System.out.println("❌ You don't have permission.");
+            }
+            case "4" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_edit_group", false))) editGroupInfo(chat.getId());
+                else System.out.println("❌ You don't have permission.");
+            }
+            case "5" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_add_admins", false))) addAdminToGroup(chat.getId());
+                else System.out.println("❌ You don't have permission.");
+            }
+            case "6" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_remove_admins", false))) removeAdminFromGroup(chat.getId());
+                else System.out.println("❌ You don't have permission.");
+            }
+            case "7" ->{
+                if(isOwner || (isAdmin && perms.optBoolean("can_remove_members",false))) removeMemberFromGroup(chat.getId());
+            }
+            case "8" -> {
+                if (isOwner) deleteGroup(chat.getId());
+                else System.out.println("❌ You don't have permission.");
+                return false;
+            }
+            case "9" -> {
+                if (isOwner) {
+                    transferOwnershipAndLeave(chat.getId());
+                } else {
+                    leaveChat(chat.getId(), "group");
+                    //refreshChatList();
+                }
+                return false;
+            }
+            case "10" ->{
+                GroupInfo(chat.getId());
+            }
+            case "11" -> {
+                if (isOwner) {
+                    editAdminPermissions(chat.getId(), "group");
+                }
+            }
+
+            case "12"->{
+                toggleArchive(chat.getId() , "group");
+            }
+
+            case "13" ->{
+                viewMessagesInChat(chat);
+            }
+
+            case "0" -> {
+                return false;
+            }
+            default -> System.out.println("Invalid choice.");
+        }
+        return true;
+    }
+
+
+
+
+    public boolean showChannelChatMenu(ChatEntry chat) {
+        if (forceExitChat) {
+            forceExitChat = false;
+            System.out.println("🚪 Exiting chat due to real-time update.");
+            return false;
+        }
+
+        chat = fetchChatInfo(chat.getId().toString(), chat.getType());
+        boolean isAdmin = chat.isAdmin();
+        boolean isOwner = chat.isOwner();
+
+        JSONObject perms = getChannelPermissions(chat.getId());
+
+        System.out.println("\n--- Channel Menu ---");
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_post", false))) {
+            System.out.println("1. Send Post");
+        }
+
+        if (isOwner || isAdmin) {
+            System.out.println("2. View Subscribers");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_members", false))) {
+            System.out.println("3. Add Subscriber");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_members", false))) {
+            System.out.println("4. Remove Subscriber");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_edit_channel", false))) {
+            System.out.println("5. Edit Channel Info");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_admins", false))) {
+            System.out.println("6. Add Admin");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_admins", false))) {
+            System.out.println("7. Remove Admin");
+        }
+
+        if (isOwner) {
+            System.out.println("8. Delete Channel");
+            System.out.println("9. Leave Channel (Transfer ownership required)");
+        } else {
+            System.out.println("8. Leave Channel");
+        }
+
+        System.out.println("10. View Profile");
+        if (isOwner) {
+            System.out.println("11. Edit Admin Permissions");
+        }
+
+        System.out.println("12. Archive/Unarchived");
+        System.out.println("13. View messages");
+        System.out.println("0. Back to Chat List");
+
+        String input = scanner.nextLine();
+        switch (input) {
+            case "1" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_post", false))) {
+                    sendMessage(chat.getId(), "channel");
+                } else {
+                    System.out.println("❌ You don't have permission to post.");
+                }
+            }
+            case "2" -> {
+                if (isOwner || isAdmin) {
+                    viewChannelSubscribers(chat.getId());
+                } else {
+                    System.out.println("❌ You don't have permission to view subscribers.");
+                }
+            }
+            case "3" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_add_members", false))) {
+                    searchEligibleUsers("channel", chat.getId());
+                } else {
+                    System.out.println("❌ You don't have permission to add subscribers.");
+                }
+            }
+            case "4" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_remove_members", false))) {
+                    removeSubscriberFromChannel(chat.getId());
+                } else {
+                    System.out.println("❌ You don't have permission to remove subscribers.");
+                }
+            }
+            case "5" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_edit_channel", false))) {
+                    editChannelInfo(chat.getId());
+                } else {
+                    System.out.println("❌ You don't have permission to edit channel info.");
+                }
+            }
+            case "6" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_add_admins", false))) {
+                    addAdminToChannel(chat.getId());
+                } else {
+                    System.out.println("❌ You don't have permission to add admins.");
+                }
+            }
+            case "7" -> {
+                if (isOwner || (isAdmin && perms.optBoolean("can_remove_admins", false))) {
+                    removeAdminFromChannel(chat.getId());
+                } else {
+                    System.out.println("❌ You don't have permission to remove admins.");
+                }
+            }
+            case "8" -> {
+                if (isOwner) {
+                    deleteChannel(chat.getId());
+                    return false;
+                } else {
+                    leaveChat(chat.getId(), "channel");
+                    return false;
+                }
+            }
+            case "9" -> {
+                if (isOwner) {
+                    transferChannelOwnershipAndLeave(chat.getId());
+                    return false;
+                } else {
+                    System.out.println("❌ You don't have permission.");
+                }
+            }
+            case "10"->{
+                ChannelInfo(chat.getId());
+            }
+            case "11" -> {
+                if (isOwner) {
+                    editAdminPermissions(chat.getId(), "channel");
+                }
+            }
+
+            case "12"->{
+                toggleArchive(chat.getId() , "channel");
+            }
+            case "13" ->{
+                viewMessagesInChat(chat);
+            }
+
+            case "0" -> {
+                return false;
+            }
+            default -> System.out.println("Invalid choice.");
+        }
+        return true;
+    }
+
+
+
+
+
+
+
+
+    public void transferOwnershipAndLeave(UUID groupId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_group_admins");
+        req.put("group_id", groupId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch admins.");
+            return;
+        }
+
+        JSONArray admins = res.getJSONObject("data").getJSONArray("admins");
+
+        if (admins.length() == 0) {
+            System.out.println("⚠️ No other admins available. You cannot leave without promoting someone to owner.");
+            return;
+        }
+
+        UUID currentUserId = UUID.fromString(Session.getUserUUID());
+        boolean success = false;
+
+        while (!success) {
+            System.out.println("\n--- Admins List ---");
+            for (int i = 0; i < admins.length(); i++) {
+                JSONObject admin = admins.getJSONObject(i);
+                System.out.printf("%d. %s (%s)%s\n", i + 1,
+                        admin.getString("profile_name"),
+                        admin.getString("user_id"),
+                        admin.getString("user_id").equals(currentUserId.toString()) ? " 👑 (You)" : "");
+            }
+            System.out.println("0. Cancel");
+
+            System.out.print("Select a new owner by number: ");
+            String input = scanner.nextLine().trim();
+
+            if (input.equals("0")) {
+                System.out.println("❌ Ownership transfer canceled.");
+                return;
+            }
+
+            int choice;
+            try {
+                choice = Integer.parseInt(input) - 1;
+            } catch (NumberFormatException e) {
+                System.out.println("❗ Invalid input. Please enter a number.");
+                continue;
+            }
+
+            if (choice < 0 || choice >= admins.length()) {
+                System.out.println("❗ Invalid selection. Please try again.");
+                continue;
+            }
+
+            JSONObject selected = admins.getJSONObject(choice);
+            String newOwnerId = selected.getString("user_id");
+
+            if (newOwnerId.equals(currentUserId.toString())) {
+                System.out.println("⚠️ You cannot transfer ownership to yourself. Please select a different admin.");
+                continue;
+            }
+
+            JSONObject promoteReq = new JSONObject();
+            promoteReq.put("action", "transfer_group_ownership");
+            promoteReq.put("group_id", groupId.toString());
+            promoteReq.put("new_owner_user_id", newOwnerId);
+
+            JSONObject promoteRes = sendWithResponse(promoteReq);
+            if (promoteRes == null || !promoteRes.getString("status").equals("success")) {
+                System.out.println("❌ Failed to transfer ownership.");
+                return;
+            }
+
+            System.out.println("✅ Ownership transferred successfully.");
+            success = true;
+        }
+
+        leaveChat(groupId, "group");
+    }
+
+
+    public void removeMemberFromGroup(UUID groupId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_group_members");
+        req.put("group_id", groupId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch members.");
+            return;
+        }
+
+        JSONArray members = res.getJSONObject("data").getJSONArray("members");
+        List<JSONObject> eligible = new ArrayList<>();
+
+        System.out.println("\n--- Members List ---");
+        for (int i = 0; i < members.length(); i++) {
+            JSONObject m = members.getJSONObject(i);
+            String role = m.getString("role");
+            String profileName = m.getString("profile_name");
+            String userId = m.getString("user_id");
+
+            if (role.equals("owner")) continue;
+
+            eligible.add(m);
+            System.out.println((eligible.size()) + ". " + profileName + " (" + userId + ") [" + role + "]");
+        }
+
+        if (eligible.isEmpty()) {
+            System.out.println("⚠️ No removable members.");
+            return;
+        }
+
+        System.out.print("Select a member to remove: ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine()) - 1;
+        } catch (Exception e) {
+            System.out.println("❌ Invalid input.");
+            return;
+        }
+
+        if (choice < 0 || choice >= eligible.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        JSONObject selected = eligible.get(choice);
+        String targetInternalUUID = selected.getString("internal_uuid");
+
+        JSONObject removeReq = new JSONObject();
+        removeReq.put("action", "remove_member_from_group");
+        removeReq.put("group_id", groupId.toString());
+        removeReq.put("user_id", targetInternalUUID);
+
+        JSONObject removeRes = sendWithResponse(removeReq);
+        if (removeRes != null)
+            System.out.println(removeRes.getString("message"));
+    }
+
+
+
+    public void addAdminToChannel(UUID channelId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_channel_subscribers");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch subscribers.");
+            return;
+        }
+
+        JSONArray subscribers = res.getJSONObject("data").getJSONArray("subscribers");
+        List<JSONObject> eligible = new ArrayList<>();
+
+        System.out.println("\n--- Subscribers List ---");
+        for (int i = 0; i < subscribers.length(); i++) {
+            JSONObject s = subscribers.getJSONObject(i);
+            String role = s.getString("role");
+            String profileName = s.getString("profile_name");
+            String userId = s.getString("user_id");
+
+            if (role.equals("subscriber")) {
+                eligible.add(s);
+                System.out.printf("%d. %s (%s)\n", eligible.size(), profileName, userId);
+            }
+        }
+
+        if (eligible.isEmpty()) {
+            System.out.println("⚠️ No eligible subscribers to promote.");
+            return;
+        }
+
+        System.out.print("Select a subscriber to promote to admin: ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine()) - 1;
+        } catch (Exception e) {
+            System.out.println("❌ Invalid input.");
+            return;
+        }
+
+        if (choice < 0 || choice >= eligible.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        JSONObject selected = eligible.get(choice);
+        String targetInternalUUID = selected.getString("internal_uuid");
+
+        JSONObject permissions = new JSONObject();
+        System.out.print("Can post? (true/false): ");
+        permissions.put("can_post", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can edit channel info? (true/false): ");
+        permissions.put("can_edit_channel", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can add members? (true/false): ");
+        permissions.put("can_add_members", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can remove members? (true/false): ");
+        permissions.put("can_remove_members", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can add admins? (true/false): ");
+        permissions.put("can_add_admins", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can remove admins? (true/false): ");
+        permissions.put("can_remove_admins", Boolean.parseBoolean(scanner.nextLine()));
+
+        JSONObject promoteReq = new JSONObject();
+        promoteReq.put("action", "add_admin_to_channel");
+        promoteReq.put("channel_id", channelId.toString());
+        promoteReq.put("target_user_id", targetInternalUUID);
+        promoteReq.put("permissions", permissions);
+
+        JSONObject promoteRes = sendWithResponse(promoteReq);
+        if (promoteRes != null)
+            System.out.println(promoteRes.getString("message"));
+    }
+
+
+
+
+    public void addAdminToGroup(UUID groupId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_group_members");
+        req.put("group_id", groupId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch members.");
+            return;
+        }
+
+        JSONArray members = res.getJSONObject("data").getJSONArray("members");
+        List<JSONObject> eligible = new ArrayList<>();
+
+        System.out.println("\n--- Members List ---");
+        for (int i = 0; i < members.length(); i++) {
+            JSONObject m = members.getJSONObject(i);
+            if (m.getString("role").equals("member")) {
+                eligible.add(m);
+                System.out.println((eligible.size()) + ". " + m.getString("profile_name") + " (" + m.getString("user_id") + ")");
+            }
+        }
+
+        if (eligible.isEmpty()) {
+            System.out.println("⚠️ No eligible members.");
+            return;
+        }
+
+        System.out.print("Select a member to promote: ");
+        int choice = Integer.parseInt(scanner.nextLine()) - 1;
+        if (choice < 0 || choice >= eligible.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        JSONObject selected = eligible.get(choice);
+        String targetInternalUUID = selected.getString("internal_uuid");
+
+        JSONObject permissions = new JSONObject();
+        System.out.print("Can add members? (true/false): ");
+        permissions.put("can_add_members", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can remove members? (true/false): ");
+        permissions.put("can_remove_members", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can add admins? (true/false): ");
+        permissions.put("can_add_admins", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can remove admins? (true/false): ");
+        permissions.put("can_remove_admins", Boolean.parseBoolean(scanner.nextLine()));
+        System.out.print("Can edit group info? (true/false): ");
+        permissions.put("can_edit_group", Boolean.parseBoolean(scanner.nextLine()));
+
+        JSONObject promoteReq = new JSONObject();
+        promoteReq.put("action", "add_admin_to_group");
+        promoteReq.put("group_id", groupId.toString());
+        promoteReq.put("user_id", targetInternalUUID);
+        promoteReq.put("permissions", permissions);
+
+        JSONObject promoteRes = sendWithResponse(promoteReq);
+        if (promoteRes != null)
+            System.out.println(promoteRes.getString("message"));
+    }
+
+
+    public void viewGroupMembers(UUID groupId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_group_members");
+        req.put("group_id", groupId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null) return;
+
+        if (res.getString("status").equals("success")) {
+            JSONArray members = res.getJSONObject("data").getJSONArray("members");
+
+            System.out.println("\n--- Group Members ---");
+            for (int i = 0; i < members.length(); i++) {
+                JSONObject m = members.getJSONObject(i);
+                String name = m.getString("profile_name");
+                String userId = m.getString("user_id");
+                String role = m.getString("role");
+                System.out.printf("- %s (ID: %s) [%s]\n", name, userId, role);
+            }
+        } else {
+            System.out.println("❌ Failed to fetch members.");
+        }
+    }
+
+
+
+
+
+    public void removeSubscriberFromChannel(UUID channelId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_channel_subscribers");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch subscribers.");
+            return;
+        }
+
+        JSONArray subscribers = res.getJSONObject("data").getJSONArray("subscribers");
+        List<JSONObject> eligible = new ArrayList<>();
+
+        System.out.println("\n--- Subscribers List ---");
+        for (int i = 0; i < subscribers.length(); i++) {
+            JSONObject s = subscribers.getJSONObject(i);
+            String role = s.getString("role");
+            String profileName = s.getString("profile_name");
+            String userId = s.getString("user_id");
+
+            if (role.equals("owner")) continue;
+
+            eligible.add(s);
+            System.out.println((eligible.size()) + ". " + profileName + " (" + userId + ") [" + role + "]");
+        }
+
+        if (eligible.isEmpty()) {
+            System.out.println("⚠️ No removable subscribers.");
+            return;
+        }
+
+        System.out.print("Select a subscriber to remove: ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine()) - 1;
+        } catch (Exception e) {
+            System.out.println("❌ Invalid input.");
+            return;
+        }
+
+        if (choice < 0 || choice >= eligible.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        JSONObject selected = eligible.get(choice);
+        String targetInternalUUID = selected.getString("internal_uuid");
+
+        JSONObject removeReq = new JSONObject();
+        removeReq.put("action", "remove_subscriber_from_channel");
+        removeReq.put("channel_id", channelId.toString());
+        removeReq.put("user_id", targetInternalUUID);
+
+        JSONObject removeRes = sendWithResponse(removeReq);
+        if (removeRes != null)
+            System.out.println(removeRes.getString("message"));
+    }
+
+
+    public void transferChannelOwnershipAndLeave(UUID channelId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_channel_admins");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch admins.");
+            return;
+        }
+
+        JSONArray admins = res.getJSONObject("data").getJSONArray("admins");
+
+        if (admins.length() == 0) {
+            System.out.println("⚠️ No admins available. You cannot leave without transferring ownership.");
+            return;
+        }
+
+        UUID currentUserId = UUID.fromString(Session.getUserUUID());
+        boolean success = false;
+
+        while (!success) {
+            System.out.println("\n--- Admins List ---");
+            for (int i = 0; i < admins.length(); i++) {
+                JSONObject admin = admins.getJSONObject(i);
+                System.out.printf("%d. %s (%s)%s\n", i + 1,
+                        admin.getString("profile_name"),
+                        admin.getString("user_id"),
+                        admin.getString("internal_uuid").equals(currentUserId.toString()) ? " 👑 (You)" : "");
+            }
+            System.out.println("0. Cancel");
+
+            System.out.print("Select a new owner by number: ");
+            String input = scanner.nextLine().trim();
+
+            if (input.equals("0")) {
+                System.out.println("❌ Ownership transfer canceled.");
+                return;
+            }
+
+            int choice;
+            try {
+                choice = Integer.parseInt(input) - 1;
+            } catch (NumberFormatException e) {
+                System.out.println("❗ Invalid input. Please enter a number.");
+                continue;
+            }
+
+            if (choice < 0 || choice >= admins.length()) {
+                System.out.println("❗ Invalid selection. Please try again.");
+                continue;
+            }
+
+            JSONObject selected = admins.getJSONObject(choice);
+            String newOwnerId = selected.getString("internal_uuid");
+
+            if (newOwnerId.equals(currentUserId.toString())) {
+                System.out.println("⚠️ You cannot transfer ownership to yourself. Please select a different admin.");
+                continue;
+            }
+
+            // Send transfer request
+            JSONObject promoteReq = new JSONObject();
+            promoteReq.put("action", "transfer_channel_ownership");
+            promoteReq.put("channel_id", channelId.toString());
+            promoteReq.put("new_owner_user_id", newOwnerId);
+
+            JSONObject promoteRes = sendWithResponse(promoteReq);
+            if (promoteRes == null || !promoteRes.getString("status").equals("success")) {
+                System.out.println("❌ Failed to transfer ownership.");
+                return;
+            }
+
+            System.out.println("✅ Ownership transferred successfully.");
+            success = true; // Break loop
+        }
+
+        // Continue execution after successful ownership transfer
+        leaveChat(channelId, "channel");
+    }
+
+
+
+    public void deleteChannel(UUID channelId) {
+        System.out.print("Are you sure you want to delete the channel? (yes/no): ");
+        String confirm = scanner.nextLine().trim().toLowerCase();
+
+        if (!confirm.equals("yes")) {
+            System.out.println("❌ Delete cancelled.");
+            return;
+        }
+
+        JSONObject req = new JSONObject();
+        req.put("action", "delete_channel");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res != null && res.getString("status").equals("success")) {
+            System.out.println("✅ Channel deleted successfully.");
+            refreshChatList();
+        } else {
+            System.out.println("❌ Failed to delete channel.");
+        }
+    }
+
+
+    public void deleteGroup(UUID groupId) {
+        System.out.print("Are you sure you want to delete the group? (yes/no): ");
+        String confirm = scanner.nextLine().trim().toLowerCase();
+
+        if (!confirm.equals("yes")) {
+            System.out.println("❌ Delete cancelled.");
+            return;
+        }
+
+        JSONObject req = new JSONObject();
+        req.put("action", "delete_group");
+        req.put("group_id", groupId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res != null && res.getString("status").equals("success")) {
+            System.out.println("✅ Group deleted successfully.");
+            refreshChatList();
+        } else {
+            System.out.println("❌ Failed to delete group.");
+        }
+    }
+
+    public void deleteChat(UUID targetId, boolean both) {
+        JSONObject req = new JSONObject();
+        req.put("action", "delete_private_chat");
+        req.put("chat_id", targetId.toString());
+        req.put("both", both);
+        send(req);
+
+        JSONObject resp = sendWithResponse(req);
+        if (resp.getString("status").equals("success")) {
+            System.out.println("✅ Chat deleted successfully.");
+        } else {
+            System.out.println("⚠️ Failed to delete chat.");
+        }
+    }
+
+
+
+    public void toggleBlock(UUID userId) {
+
+
+        JSONObject req = new JSONObject();
+        req.put("action", "toggle_block");
+        req.put("user_id", Session.getUserUUID());
+        req.put("target_id", userId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null) return;
+
+        String status = res.getString("status");
+        String message = res.getString("message");
+
+        if (status.equals("success")) {
+            System.out.println("🔒 " + message);
+        } else {
+            System.out.println("❌ " + message);
+        }
+    }
+
+
+    public void leaveChat(UUID id, String type) {
+        JSONObject req = new JSONObject();
+        req.put("action", "leave_chat");
+        req.put("user_id", Session.getUserUUID());
+        req.put("chat_id", id.toString());
+        req.put("chat_type", type);
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null) return;
+
+        String status = res.getString("status");
+        String message = res.getString("message");
+
+        if (status.equals("success")) {
+            System.out.println("✅ You left the chat.");
+        } else {
+            System.out.println("❌ " + message);
+        }
+    }
+
+
+    public void removeAdminFromGroup(UUID groupId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_group_admins");
+        req.put("group_id", groupId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch admins.");
+            return;
+        }
+
+        JSONArray admins = res.getJSONObject("data").getJSONArray("admins");
+        List<JSONObject> eligible = new ArrayList<>();
+
+        System.out.println("\n--- Admins List ---");
+        for (int i = 0; i < admins.length(); i++) {
+            JSONObject admin = admins.getJSONObject(i);
+            String role = admin.getString("role");
+            String profileName = admin.getString("profile_name");
+            String userId = admin.getString("user_id");
+
+            if (!role.equals("owner")) {
+                eligible.add(admin);
+                System.out.printf("%d. %s (%s)\n", eligible.size(), profileName, userId);
+            }
+        }
+
+        if (eligible.isEmpty()) {
+            System.out.println("⚠️ No removable admins.");
+            return;
+        }
+
+        System.out.print("Select an admin to remove: ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine()) - 1;
+        } catch (Exception e) {
+            System.out.println("❌ Invalid input.");
+            return;
+        }
+
+        if (choice < 0 || choice >= eligible.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        JSONObject selected = eligible.get(choice);
+        String targetInternalUUID = selected.getString("user_id");
+
+        JSONObject removeReq = new JSONObject();
+        removeReq.put("action", "remove_admin_from_group");
+        removeReq.put("group_id", groupId.toString());
+        removeReq.put("target_user_id", targetInternalUUID);
+
+        JSONObject removeRes = sendWithResponse(removeReq);
+        if (removeRes != null)
+            System.out.println(removeRes.getString("message"));
+    }
+
+
+    public void removeAdminFromChannel(UUID channelId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_channel_admins");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch admins.");
+            return;
+        }
+
+        JSONArray admins = res.getJSONObject("data").getJSONArray("admins");
+        List<JSONObject> eligible = new ArrayList<>();
+
+        System.out.println("\n--- Admins List ---");
+        for (int i = 0; i < admins.length(); i++) {
+            JSONObject admin = admins.getJSONObject(i);
+            String role = admin.getString("role");
+            String profileName = admin.getString("profile_name");
+            String userId = admin.getString("user_id");
+
+            if (!role.equals("owner")) {
+                eligible.add(admin);
+                System.out.printf("%d. %s (%s)\n", eligible.size(), profileName, userId);
+            }
+        }
+
+        if (eligible.isEmpty()) {
+            System.out.println("⚠️ No removable admins.");
+            return;
+        }
+
+        System.out.print("Select an admin to remove: ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine()) - 1;
+        } catch (Exception e) {
+            System.out.println("❌ Invalid input.");
+            return;
+        }
+
+        if (choice < 0 || choice >= eligible.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        JSONObject selected = eligible.get(choice);
+        String targetInternalUUID = selected.getString("internal_uuid");
+
+        JSONObject removeReq = new JSONObject();
+        removeReq.put("action", "remove_admin_from_channel");
+        removeReq.put("channel_id", channelId.toString());
+        removeReq.put("target_user_id", targetInternalUUID);
+
+        JSONObject removeRes = sendWithResponse(removeReq);
+        if (removeRes != null)
+            System.out.println(removeRes.getString("message"));
+    }
+
+
+
+
+
+
+    public void addMemberToGroup(UUID groupId, UUID userId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "add_member_to_group");
+        req.put("group_id", groupId.toString());
+        req.put("user_id", userId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res != null) {
+            System.out.println(res.getString("message"));
+        }
+    }
+
+    public void addSubscriberToChannel(UUID channelId, UUID targetUserId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "add_subscriber_to_channel");
+        req.put("channel_id", channelId.toString());
+        req.put("user_id", targetUserId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null) return;
+
+        if (res.getString("status").equals("success")) {
+            System.out.println("✅ Subscriber added successfully.");
+        } else {
+            System.out.println("❌ " + res.getString("message"));
+        }
+    }
+
+    public void GroupInfo(UUID groupId){
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_info");
+        req.put("receiver_id", groupId.toString());
+        req.put("receiver_type", "group");
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch group info.");
+            return;
+        }
+
+        JSONObject data = res.getJSONObject("data");
+
+        String currentId = data.getString("id");
+        String currentName = data.getString("name");
+        String currentDesc = data.optString("description", null);
+        String currentImage = data.optString("image_url", null);
+
+        System.out.println("\n--- Group Info ---");
+        System.out.println("1. Group ID: " + currentId);
+        System.out.println("2. Name: " + currentName);
+        System.out.println("3. Description: " + currentDesc);
+        System.out.println("4. Image URL: " + currentImage);
+        System.out.println("────────────────────────────────────────────");
+
+
+    }
+
+    public void editGroupInfo(UUID groupId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_info");
+        req.put("receiver_id", groupId.toString());
+        req.put("receiver_type", "group");
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch group info.");
+            return;
+        }
+
+        JSONObject data = res.getJSONObject("data");
+
+        String currentId = data.getString("id");
+        String currentName = data.getString("name");
+        String currentDesc = data.optString("description", null);
+        String currentImage = data.optString("image_url", null);
+
+        System.out.println("\n--- Current Group Info ---");
+        System.out.println("1. Group ID: " + currentId);
+        System.out.println("2. Name: " + currentName);
+        System.out.println("3. Description: " + currentDesc);
+        System.out.println("4. Image URL: " + currentImage);
+        System.out.println("0. Cancel");
+
+        System.out.print("Select the field you want to edit (0-4): ");
+        String choice = scanner.nextLine().trim();
+
+        String newGroupId = currentId;
+        String newName = currentName;
+        String newDesc = currentDesc;
+        String newImage = currentImage;
+
+        switch (choice) {
+            case "1" -> {
+                System.out.print("Enter new Group ID: ");
+                newGroupId = scanner.nextLine().trim();
+            }
+            case "2" -> {
+                System.out.print("Enter new Group Name: ");
+                newName = scanner.nextLine().trim();
+            }
+            case "3" -> {
+                System.out.print("Enter new Description: ");
+                newDesc = scanner.nextLine().trim();
+            }
+            case "4" -> {
+                System.out.print("Enter new Image URL: ");
+                newImage = scanner.nextLine().trim();
+            }
+            case "0" -> {
+                System.out.println("Cancelled.");
+                return;
+            }
+            default -> {
+                System.out.println("Invalid choice.");
+                return;
+            }
+        }
+
+        JSONObject editReq = new JSONObject();
+        editReq.put("action", "edit_group_info");
+        editReq.put("group_id", groupId.toString()); // internal_uuid
+        editReq.put("new_group_id", newGroupId);
+        editReq.put("name", newName);
+        editReq.put("description", newDesc);
+        editReq.put("image_url", newImage);
+
+        JSONObject editRes = sendWithResponse(editReq);
+        if (editRes != null)
+            System.out.println(editRes.getString("message"));
+    }
+
+
+
+    public void viewChannelSubscribers(UUID channelId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_channel_subscribers");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null) return;
+
+        if (res.getString("status").equals("success")) {
+            JSONObject data = res.getJSONObject("data");
+            JSONArray subs = data.getJSONArray("subscribers");
+
+            System.out.println("--- Subscribers ---");
+            for (int i = 0; i < subs.length(); i++) {
+                JSONObject s = subs.getJSONObject(i);
+                System.out.println("- " + s.getString("profile_name"));
+            }
+        } else {
+            System.out.println("❌ Failed to load subscribers.");
+        }
+    }
+
+    public void ChannelInfo(UUID channelInternalId){
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_info");
+        req.put("receiver_id", channelInternalId.toString());
+        req.put("receiver_type", "channel");
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch channel info.");
+            return;
+        }
+
+        JSONObject data = res.getJSONObject("data");
+
+        String currentId = data.getString("id");
+        String currentName = data.getString("name");
+        String currentDesc = data.optString("description", null);
+        String currentImage = data.optString("image_url", null);
+
+        System.out.println("\n--- Channel Info ---");
+        System.out.println("1. Channel ID: " + currentId);
+        System.out.println("2. Name: " + currentName);
+        System.out.println("3. Description: " + currentDesc);
+        System.out.println("4. Image URL: " + currentImage);
+        System.out.println("────────────────────────────────────────────");
+
+    }
+
+
+    public void editChannelInfo(UUID channelInternalId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_info");
+        req.put("receiver_id", channelInternalId.toString());
+        req.put("receiver_type", "channel");
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch channel info.");
+            return;
+        }
+
+        JSONObject data = res.getJSONObject("data");
+
+        String currentId = data.getString("id");
+        String currentName = data.getString("name");
+        String currentDesc = data.optString("description", null);
+        String currentImage = data.optString("image_url", null);
+
+        System.out.println("\n--- Current Channel Info ---");
+        System.out.println("1. Channel ID: " + currentId);
+        System.out.println("2. Name: " + currentName);
+        System.out.println("3. Description: " + currentDesc);
+        System.out.println("4. Image URL: " + currentImage);
+        System.out.println("0. Cancel");
+
+        System.out.print("Select the field you want to edit (0-4): ");
+        String choice = scanner.nextLine().trim();
+
+        String newChannelId = currentId;
+        String newName = currentName;
+        String newDesc = currentDesc;
+        String newImage = currentImage;
+
+        switch (choice) {
+            case "1" -> {
+                System.out.print("Enter new Channel ID: ");
+                newChannelId = scanner.nextLine().trim();
+            }
+            case "2" -> {
+                System.out.print("Enter new Channel Name: ");
+                newName = scanner.nextLine().trim();
+            }
+            case "3" -> {
+                System.out.print("Enter new Description: ");
+                newDesc = scanner.nextLine().trim();
+            }
+            case "4" -> {
+                System.out.print("Enter new Image URL: ");
+                newImage = scanner.nextLine().trim();
+            }
+            case "0" -> {
+                System.out.println("Cancelled.");
+                return;
+            }
+            default -> {
+                System.out.println("Invalid choice.");
+                return;
+            }
+        }
+
+        JSONObject editReq = new JSONObject();
+        editReq.put("action", "edit_channel_info");
+        editReq.put("channel_id", channelInternalId.toString()); // internal_uuid
+        editReq.put("new_channel_id", newChannelId);
+        editReq.put("name", newName);
+        editReq.put("description", newDesc);
+        editReq.put("image_url", newImage);
+
+        JSONObject editRes = sendWithResponse(editReq);
+        if (editRes != null)
+            System.out.println(editRes.getString("message"));
+    }
+
+
+    public JSONObject getResponse() {
+        try {
+            return TelegramClient.responseQueue.take();
+
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Failed to get server response");
+        }
+    }
+
+
+    public void logout() {
+        if (Session.currentUser != null && Session.currentUser.has("user_id")) {
+            JSONObject request = new JSONObject();
+            request.put("action", "logout");
+            request.put("user_id", Session.currentUser.getString("internal_uuid"));
+
+            send(request);
+            Session.currentUser = null;
+            Session.chatList = null;
+        } else {
+            System.out.println("Not logged in.");
+        }
+    }
+
+
+
+
+
+
+
+    public void editAdminPermissions(UUID chatId, String chatType) {
+        JSONObject req = new JSONObject();
+        req.put("action", chatType.equals("group") ? "view_group_admins" : "view_channel_admins");
+        req.put(chatType + "_id", chatId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to fetch admins.");
+            return;
+        }
+
+        JSONArray admins = res.getJSONObject("data").getJSONArray("admins");
+        List<JSONObject> editableAdmins = new ArrayList<>();
+
+        System.out.println("\n--- Admins List ---");
+        for (int i = 0; i < admins.length(); i++) {
+            JSONObject admin = admins.getJSONObject(i);
+            if (!admin.getString("role").equals("owner")) {
+                editableAdmins.add(admin);
+                System.out.printf("%d. %s (%s)\n", editableAdmins.size(),
+                        admin.getString("profile_name"),
+                        admin.getString("user_id"));
+            }
+        }
+
+        if (editableAdmins.isEmpty()) {
+            System.out.println("⚠️ No editable admins found.");
+            return;
+        }
+
+        System.out.print("Select an admin to edit permissions: ");
+        int choice;
+        try {
+            choice = Integer.parseInt(scanner.nextLine()) - 1;
+        } catch (Exception e) {
+            System.out.println("❌ Invalid input.");
+            return;
+        }
+
+        if (choice < 0 || choice >= editableAdmins.size()) {
+            System.out.println("❌ Invalid selection.");
+            return;
+        }
+
+        JSONObject selected = editableAdmins.get(choice);
+        String adminId = selected.getString("user_id");
+
+        JSONObject permissions = new JSONObject();
+
+        if (chatType.equals("channel")) {
+            System.out.print("Can post? (true/false): ");
+            permissions.put("can_post", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can edit channel info? (true/false): ");
+            permissions.put("can_edit_channel", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can add members? (true/false): ");
+            permissions.put("can_add_members", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can remove members? (true/false): ");
+            permissions.put("can_remove_members", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can add admins? (true/false): ");
+            permissions.put("can_add_admins", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can remove admins? (true/false): ");
+            permissions.put("can_remove_admins", Boolean.parseBoolean(scanner.nextLine()));
+        } else {
+            System.out.print("Can add members? (true/false): ");
+            permissions.put("can_add_members", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can remove members? (true/false): ");
+            permissions.put("can_remove_members", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can add admins? (true/false): ");
+            permissions.put("can_add_admins", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can remove admins? (true/false): ");
+            permissions.put("can_remove_admins", Boolean.parseBoolean(scanner.nextLine()));
+
+            System.out.print("Can edit group info? (true/false): ");
+            permissions.put("can_edit_group", Boolean.parseBoolean(scanner.nextLine()));
+        }
+
+        JSONObject updateReq = new JSONObject();
+        updateReq.put("action", "edit_admin_permissions");
+        updateReq.put("chat_id", chatId.toString());
+        updateReq.put("chat_type", chatType);
+        updateReq.put("admin_id", adminId);
+        updateReq.put("permissions", permissions);
+
+        JSONObject updateRes = sendWithResponse(updateReq);
+        if (updateRes != null)
+            System.out.println(updateRes.getString("message"));
+    }
+
+
+    public void viewChannelAdmins(UUID channelId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_channel_admins");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null) return;
+
+        if (res.getString("status").equals("success")) {
+            JSONArray admins = res.getJSONObject("data").getJSONArray("admins");
+
+            System.out.println("\n--- Channel Admins ---");
+            for (int i = 0; i < admins.length(); i++) {
+                JSONObject a = admins.getJSONObject(i);
+                System.out.printf("- %s (%s) [%s]\n",
+                        a.getString("profile_name"),
+                        a.getString("user_id"),
+                        a.getString("role"));
+            }
+        } else {
+            System.out.println("❌ Failed to fetch admins.");
+        }
+    }
+
+
+    public JSONObject getChannelPermissions(UUID channelId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_channel_permissions");
+        req.put("channel_id", channelId.toString());
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            return new JSONObject();
+        }
+        return res.getJSONObject("data");
+    }
+
+
+
+
+
+    public void viewAdmins(String type, UUID entityId) {
+        JSONObject req = new JSONObject();
+        req.put("action", type.equals("group") ? "view_group_admins" : "view_channel_admins");
+        req.put(type + "_id", entityId.toString());
+
+        send(req);
+        JSONObject res = getResponse();
+        if (res.getString("status").equals("success")) {
+            JSONArray admins = res.getJSONObject("data").getJSONArray("admins");
+            System.out.println("📋 Admins in this " + type + ":");
+            for (int i = 0; i < admins.length(); i++) {
+                JSONObject admin = admins.getJSONObject(i);
+                System.out.printf("- %s (%s)\n", admin.getString("name"), admin.getString("role"));
+            }
+        } else {
+            System.out.println("❌ " + res.getString("message"));
+        }
+    }
+
+
+    public static JSONObject sendWithResponse(JSONObject request) {
+        try {
+            if (!request.has("action") || request.isNull("action")) {
+                System.err.println("❌ Invalid request: missing action.");
+                return null;
+            }
+            System.out.println("📤 Sending request to server: " + request.toString(2));
+            System.out.println("📤 [sendWithResponse] Action: " + request.optString("action", "unknown") + ", Full: " + request.toString(2));
+
+
+            String requestId = UUID.randomUUID().toString();
+            request.put("request_id", requestId);
+
+            BlockingQueue<JSONObject> queue = new LinkedBlockingQueue<>();
+            TelegramClient.pendingResponses.put(requestId, queue);
+
+            TelegramClient.getInstance().getOut().println(request.toString());
+
+            // Wait for response
+            JSONObject response = queue.take();
+
+            TelegramClient.pendingResponses.remove(requestId);
+
+            if (response == null) {
+                System.out.println("⚠️ No response received.");
+                return null;
+            }
+
+            System.out.println("✅ Server Response: " + response.getString("message"));
+            return response;
+
+        } catch (Exception e) {
+            System.err.println("❌ Error during sendWithResponse(): " + e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static void requestChatList() {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_list");
+        req.put("user_id", Session.getUserUUID());
+
+        JSONObject res = sendWithResponse(req);
+        if (res.getString("status").equals("success")) {
+            JSONArray chats = res.getJSONObject("data").getJSONArray("chat_list");
+            Session.updateChatList(chats);
+            System.out.println("✅ Chat list updated.");
+        } else {
+            System.out.println("❌ Failed to update chat list.");
+        }
+    }
+
+
+    public static void requestChatInfo(String chatId, String chatType) throws IOException {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_info");
+        req.put("receiver_id", chatId);
+        req.put("receiver_type", chatType);
+        TelegramClient.send(req);
+    }
+
+
+
+
+    public static void displayChatList() {
+        if (Session.chatList == null || Session.chatList.isEmpty()) {
+            System.out.println("\n📭 No chats available.");
+            return;
+        }
+
+
+        System.out.println("\n💬 Your Chats:");
+        System.out.println("0. 📦 Archived chats");
+
+        int index = 1;
+        for (ChatEntry chat : Session.activeChats) {
+            String time = (chat.getLastMessageTime() == null)
+                    ? "No messages yet"
+                    : chat.getLastMessageTime().toString();
+
+            System.out.printf("%d. [%s] %s (%s) - Last: %s\n",
+                    index++, chat.getType(), chat.getName(), chat.getDisplayId(), time);
+        }
+    }
+
+
+    public static class ChatStateMonitor implements Runnable {
+        private final PrintWriter out;
+
+        public ChatStateMonitor(PrintWriter out) {
+            this.out = out;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                try {
+                    if (forceExitChat) {
+                        System.out.println("🚪 You were removed from the chat. Returning to chat list...");
+                        forceExitChat = false;
+                        Session.backToChatList = true;
+                    }
+
+                    if (Session.forceRefreshChatList) {
+                        Session.forceRefreshChatList = false;
+                        System.out.println("🔁 Refresh triggered by real-time event.");
+                        ActionHandler.requestChatList();
+                        if (Session.inChatListMenu) {
+                            System.out.println("\n📬 Updated Chat List:");
+                            ActionHandler.displayChatList();  //Show chats
+                            System.out.print("Select a chat by number: ");
+                        }
+                    }
+
+                    Thread.sleep(300);
+                } catch (Exception e) {
+                    System.out.println("❌ ChatStateMonitor crashed: " + e.getMessage());
+                }
+            }
+        }
+    }
+
+
+    public static class CurrentChatMenuRefresher implements Runnable {
+        private final ActionHandler handler;
+
+        public CurrentChatMenuRefresher(ActionHandler handler) {
+            this.handler = handler;
+        }
+
+        @Override
+        public void run() {
+            System.out.println("🔁 Menu refresher thread running...");
+
+            while (true) {
+                try {
+                    if (Session.refreshCurrentChatMenu && Session.inChatMenu && Session.currentChatId != null) {
+                        System.out.println("🔁 [Refresher] Refresh requested. Searching for chat...");
+
+
+                        ChatEntry chat = Session.chatList.stream()
+                                .filter(e -> e.getId().toString().equals(Session.currentChatId))
+                                .findFirst()
+                                .orElse(null);
+
+                        if (chat != null) {
+                            Session.currentChatEntry = chat;
+                            Session.refreshCurrentChatMenu = false;
+
+                            String type = chat.getType().toLowerCase();
+                            System.out.println("\n🔁 Your permissions have changed. Menu updated:");
+
+                            if (type.equals("group")) {
+                                handler.printGroupMenuOnly(chat);
+                            } else if (type.equals("channel")) {
+                                handler.printChannelMenuOnly(chat);
+                            }
+
+                            System.out.print("Select an option: ");
+                        } else {
+                            System.out.println("⚠️ No matching chat found for ID: " + Session.currentChatId);
+                        }
+                    }
+
+                    Thread.sleep(200);
+                } catch (Exception e) {
+                    System.out.println("❌ CurrentChatMenuRefresher crashed: " + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+
+
+
+    public void printGroupMenuOnly(ChatEntry chat) {
+        boolean isAdmin = chat.isAdmin();
+        boolean isOwner = chat.isOwner();
+        JSONObject perms = getGroupPermissions(chat.getId());
+
+        System.out.println("\n--- Group Chat Menu (Auto-refreshed) ---");
+        System.out.println("1. Send Message");
+        System.out.println("2. View Members");
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_members", false))) {
+            System.out.println("3. Add Member");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_edit_group", false))) {
+            System.out.println("4. Edit Group Info");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_admins", false))) {
+            System.out.println("5. Add Admin");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_admins", false))) {
+            System.out.println("6. Remove Admin");
+        }
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_members", false))) {
+            System.out.println("7. Remove member");
+        }
+        if (isOwner) {
+            System.out.println("8. Delete Group");
+            System.out.println("9. Leave Group (Transfer ownership required)");
+        } else {
+            System.out.println("9. Leave Group");
+        }
+
+        System.out.println("0. Back to Chat List");
+    }
+
+
+    public void printChannelMenuOnly(ChatEntry chat) {
+        boolean isAdmin = chat.isAdmin();
+        boolean isOwner = chat.isOwner();
+        JSONObject perms = getChannelPermissions(chat.getId());
+
+        System.out.println("\n--- Channel Menu (Auto-refreshed) ---");
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_post", false))) {
+            System.out.println("1. Send Post");
+        }
+
+        if (isOwner || isAdmin) {
+            System.out.println("2. View Subscribers");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_members", false))) {
+            System.out.println("3. Add Subscriber");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_members", false))) {
+            System.out.println("4. Remove Subscriber");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_edit_channel", false))) {
+            System.out.println("5. Edit Channel Info");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_add_admins", false))) {
+            System.out.println("6. Add Admin");
+        }
+
+        if (isOwner || (isAdmin && perms.optBoolean("can_remove_admins", false))) {
+            System.out.println("7. Remove Admin");
+        }
+
+        if (isOwner) {
+            System.out.println("8. Delete Channel");
+            System.out.println("9. Leave Channel (Transfer ownership required)");
+        } else {
+            System.out.println("8. Leave Channel");
+        }
+
+        System.out.println("0. Back to Chat List");
+    }
+
+
+
+
+
+
+    public void startMenuRefresherThread() {
+        Thread refresher = new Thread(() -> {
+            System.out.println("🟡 Refresher tick. refreshCurrentChatMenu = " + Session.refreshCurrentChatMenu);
+
+            while (true) {
+                try {
+                    Thread.sleep(500);
+                    if (Session.refreshCurrentChatMenu) {
+                        Session.refreshCurrentChatMenu = false;
+                        if (Session.currentChatEntry == null) {
+                            System.out.println("⚠️ currentChatEntry is null. Skipping...");
+                            continue;
+                        }
+
+
+                        switch (Session.currentChatEntry.getType()) {
+                            case "group" -> showGroupChatMenu(Session.currentChatEntry);
+                            case "channel" -> showChannelChatMenu(Session.currentChatEntry);
+                        }
+                    }
+                } catch (Exception ignored) {}
+            }
+        });
+        refresher.setDaemon(true);
+        refresher.start();
+    }
+
+
+
+    public void openForeignChat(ChatEntry chat) {
+        System.out.println("🔍 Opening " + chat.getType() + " chat (not in your chat list)");
+
+        JSONObject req = new JSONObject();
+        req.put("action", "get_messages");
+        req.put("receiver_id", chat.getId().toString());
+        req.put("receiver_type", chat.getType());
+        send(req);
+
+        switch (chat.getType().toLowerCase()) {
+            case "private" -> {
+                System.out.println("\n--- Private Chat ---");
+                System.out.println("1. View Profile");
+                System.out.println("2. Add to Contact");
+                System.out.println("0. Back");
+                String input = scanner.nextLine();
+                switch (input) {
+                    case "1" ->{
+                        viewUserProfile(chat.getId());
+                        openForeignChat(chat);
+
+                    }
+                    case "2" -> {
+                        addContact(chat.getId());
+                        refreshContactList();
+                    }
+                    default -> System.out.println("Back...");
+                }
+            }
+
+            case "group", "channel" -> {
+                System.out.println("\n--- " + chat.getType().substring(0, 1).toUpperCase() + chat.getType().substring(1) + " Preview ---");
+                System.out.println("1. View Info");
+                System.out.println("2. Join " + chat.getType());
+                System.out.println("0. Back");
+                String input = scanner.nextLine();
+                switch (input) {
+                    case "1" -> {
+                        viewGroupOrChannelInfo(chat.getId(), chat.getType());
+                        openForeignChat(chat);
+                    }
+
+                    case "2" -> {
+                        joinGroupOrChannel(chat.getType(), chat.getId().toString());
+                        refreshChatList();
+                        ChatEntry joined = Session.chatList.stream()
+                                .filter(c -> c.getId().equals(chat.getId()) && c.getType().equals(chat.getType()))
+                                .findFirst().orElse(null);
+                        if (joined != null) {
+                            openChat(joined);
+                        } else {
+                            System.out.println("❌ Failed to join.");
+                        }
+                    }
+                    default -> System.out.println("Back...");
+                }
+            }
+        }
+    }
+
+
+
+
+
+    public void viewUserProfile(UUID userId) {
+        JSONObject req = new JSONObject();
+        req.put("action", "view_profile");
+        req.put("target_id", userId.toString());
+
+        JSONObject response = sendWithResponse(req);
+
+        if (response.getString("status").equals("success")) {
+            JSONObject profile = response.getJSONObject("data");
+            System.out.println("\n👤 Profile Info:");
+            System.out.println("🔷 Name: " + profile.getString("profile_name"));
+            System.out.println("🔷User ID: "+profile.getString("user_id"));
+            System.out.println("📄 Bio: " + profile.optString("bio", "N/A"));
+            System.out.println("🖼️ Image URL: " + profile.optString("image_url", "N/A"));
+            if (profile.getBoolean("is_online")) {
+                System.out.println("✅ Status: Online");
+            } else {
+                System.out.println("📅 Last seen: " + profile.optString("last_seen", "Unknown"));
+            }
+            System.out.println("────────────────────────────────────────────");
+        } else {
+            System.out.println("❌ Could not load profile.");
+        }
+    }
+
+    public void viewGroupOrChannelInfo(UUID id, String type) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_chat_info");
+        req.put("receiver_id", id.toString());
+        req.put("receiver_type", type);
+
+        JSONObject response = sendWithResponse(req);
+
+        if (response.getString("status").equals("success")) {
+            JSONObject data = response.getJSONObject("data");
+            System.out.println("\n📢 " + type.substring(0, 1).toUpperCase() + type.substring(1) + " Info:");
+            System.out.println("🔷 Name: " + data.optString("name", "N/A"));
+            System.out.println("🆔 ID: " + data.optString("id", "N/A"));
+            System.out.println("📄 Description: " + data.optString("description", "N/A"));
+            System.out.println("🖼️ Image: " + data.optString("image_url", "N/A"));
+            System.out.println("────────────────────────────────────────────");
+        } else {
+            System.out.println("❌ Failed to fetch " + type + " info.");
+            System.out.println("✅ Server Response: " + response.getString("message"));
+        }
+    }
+
+
+
+    public void toggleArchive(UUID chatId, String chatType) {
+
+        Optional<ChatEntry> optional = Session.chatList.stream()
+                .filter(c -> c.getId().equals(chatId))
+                .findFirst();
+
+        if (optional.isEmpty()) {
+            System.out.println("❌ Chat not found.");
+            return;
+        }
+
+        ChatEntry chat = optional.get();
+
+        if (chat.isArchived()) {
+            unarchiveChat(chatId, chatType);
+            chat.setArchived(false);
+            System.out.println("✅ Chat unarchived.");
+        } else {
+            archiveChat(chatId, chatType);
+            chat.setArchived(true);
+            System.out.println("✅ Chat archived.");
+        }
+
+        Session.refreshChatLists();
+    }
+
+
+    public void archiveChat(UUID chatId, String chatType) {
+        JSONObject req = new JSONObject();
+        req.put("action", "archive_chat");
+        req.put("chat_id", chatId.toString());
+        req.put("chat_type", chatType);
+        JSONObject res = sendWithResponse(req);
+        if (res != null) System.out.println(res.getString("message"));
+    }
+
+    public void unarchiveChat(UUID chatId, String chatType) {
+        JSONObject req = new JSONObject();
+        req.put("action", "unarchive_chat");
+        req.put("chat_id", chatId.toString());
+        req.put("chat_type", chatType);
+        JSONObject res = sendWithResponse(req);
+        if (res != null) System.out.println(res.getString("message"));
+    }
+
+
+//    public void sendMessage(UUID receiverId, String receiverType) {
+//        Scanner scanner = new Scanner(System.in);
+//
+//        System.out.print("Enter your message: ");
+//        String content = scanner.nextLine();
+//
+//        System.out.print("Enter message type (TEXT / IMAGE / VIDEO / FILE): ");
+//        String messageType = scanner.nextLine();
+//        Set<String> allowedTypes = Set.of("TEXT", "IMAGE", "VIDEO", "FILE");
+//        while (!allowedTypes.contains(messageType.toUpperCase())) {
+//            System.out.println("❌ Invalid message type. Try again (TEXT / IMAGE / VIDEO / FILE): ");
+//            messageType = scanner.nextLine();
+//        }
+//        messageType = messageType.toUpperCase();
+//
+//        JSONArray attachmentsArray = new JSONArray();
+//
+//        System.out.print("Do you want to attach files? (yes/no): ");
+//        if (scanner.nextLine().equalsIgnoreCase("yes")) {
+//            while (true) {
+//                System.out.print("File URL: ");
+//                String fileUrl = scanner.nextLine();
+//
+//                System.out.print("File Type (IMAGE / VIDEO / FILE): ");
+//                String fileType = scanner.nextLine();
+//
+//                JSONObject fileJson = new JSONObject();
+//                fileJson.put("file_url", fileUrl);
+//                fileJson.put("file_type", fileType);
+//                attachmentsArray.put(fileJson);
+//
+//                System.out.print("Add another file? (yes/no): ");
+//                if (!scanner.nextLine().equalsIgnoreCase("yes")) {
+//                    break;
+//                }
+//            }
+//        }
+//
+//
+//
+//        JSONObject messageJson = new JSONObject();
+//        messageJson.put("action", "send_message");
+//        messageJson.put("receiver_type", receiverType);
+//        messageJson.put("content", content);
+//        messageJson.put("message_type", messageType);
+//        if (receiverType.equals("private")) {
+//            messageJson.put("receiver_user_id", receiverId.toString());
+//        } else {
+//            messageJson.put("receiver_id", receiverId.toString());
+//        }
+//
+//        if (!attachmentsArray.isEmpty()) {
+//            messageJson.put("attachments", attachmentsArray);
+//        }
+//
+//        JSONObject response = sendWithResponse(messageJson);
+//        if (response != null && response.getString("status").equals("success")) {
+//            System.out.println("✅ Message sent successfully! ID: " + response.getJSONObject("data").getString("message_id"));
+//        } else {
+//            System.out.println("❌ Failed to send message: " + (response != null ? response.getString("message") : "no response"));
+//        }
+//
+//    }
+
+
+
+    public void sendMessage(UUID chatId, String receiverType) {
+        Scanner scanner = new Scanner(System.in);
+
+        System.out.print("Enter your message: ");
+        String content = scanner.nextLine();
+
+        System.out.print("Enter message type (TEXT / IMAGE / VIDEO / FILE / AUDIO): ");
+        String messageType = scanner.nextLine().toUpperCase();
+        Set<String> allowedTypes = Set.of("TEXT", "IMAGE", "VIDEO", "FILE");
+        while (!allowedTypes.contains(messageType)) {
+            System.out.print("❌ Invalid type. Try again (TEXT / IMAGE / VIDEO / FILE / AUDIO): ");
+            messageType = scanner.nextLine().toUpperCase();
+        }
+
+        JSONArray attachmentsArray = new JSONArray();
+        System.out.print("Do you want to attach files? (yes/no): ");
+        if (scanner.nextLine().equalsIgnoreCase("yes")) {
+            while (true) {
+                System.out.print("File URL: ");
+                String fileUrl = scanner.nextLine();
+
+                // URL validation
+                if (fileUrl.isEmpty()) {
+                    System.out.print("URL can not be empty. Try again.");
+                    continue;
+                }
+
+                if (fileUrl.contains(" ")) {
+                    System.out.println("URL cannot contain spaces. Try again.");
+                    continue;
+                }
+
+                if (!fileUrl.isEmpty() && !fileUrl.matches("^(http|https)://.*$")) {
+                    System.out.println("Invalid URL format. Please enter a valid HTTP/HTTPS link.");
+                    continue;
+                }
+
+                System.out.print("File Type (IMAGE / VIDEO / FILE / AUDIO): ");
+                String fileType = scanner.nextLine().toUpperCase();
+
+                Set<String> allowedFileTypes = Set.of("TEXT", "IMAGE", "VIDEO", "FILE");
+                while (!allowedFileTypes.contains(fileType)) {
+                    System.out.print("❌ Invalid type. Try again (IMAGE / VIDEO / FILE / AUDIO): ");
+                    fileType = scanner.nextLine().toUpperCase();
+                }
+
+                JSONObject fileJson = new JSONObject();
+                fileJson.put("file_url", fileUrl);
+                fileJson.put("file_type", fileType);
+                attachmentsArray.put(fileJson);
+
+                System.out.print("Add another file? (yes/no): ");
+                if (!scanner.nextLine().equalsIgnoreCase("yes")) break;
+            }
+        }
+
+        JSONObject messageJson = new JSONObject();
+        messageJson.put("action", "send_message");
+        messageJson.put("receiver_type", receiverType);
+        messageJson.put("receiver_id", chatId.toString());
+        messageJson.put("content", content);
+        messageJson.put("message_type", messageType);
+
+        if (!attachmentsArray.isEmpty()) {
+            messageJson.put("attachments", attachmentsArray);
+        }
+
+        JSONObject response = sendWithResponse(messageJson);
+        if (response != null && response.getString("status").equals("success")) {
+            System.out.println("✅ Message sent! ID: " + response.getJSONObject("data").getString("message_id"));
+        } else {
+            System.out.println("❌ Failed to send message: " + (response != null ? response.getString("message") : "No response"));
+        }
+    }
+
+    public void refreshContactList() {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_contact_list");
+        req.put("user_id", Session.currentUser.getString("user_id"));
+        out.println(req.toString());
+
+        try {
+            JSONObject response = TelegramClient.responseQueue.take();
+
+            if (response != null && response.getString("status").equals("success")) {
+                if (response.has("data") && !response.isNull("data")) {
+                    JSONObject data = response.getJSONObject("data");
+
+                    if (!data.has("contact_list") || data.isNull("contact_list")) {
+                        System.out.println("❌ contact_list not found in response data.");
+                        return;
+                    }
+
+                    JSONArray contactListJson = data.getJSONArray("contact_list");
+                    List<ContactEntry> contactList = new ArrayList<>();
+
+                    for (Object obj : contactListJson) {
+                        JSONObject c = (JSONObject) obj;
+
+                        ContactEntry entry = new ContactEntry(
+                                UUID.fromString(c.getString("contact_id")),
+                                c.getString("user_id"),
+                                c.getString("contact_displayId"),
+                                c.getString("profile_name"),
+                                c.optString("image_url", ""),
+                                c.optBoolean("is_blocked", false),
+                                c.isNull("last_seen")
+                                        ? null
+                                        : LocalDateTime.parse(c.getString("last_seen"))
+                        );
+
+                        contactList.add(entry);
+                    }
+
+                    Session.contactEntries = contactList;
+                    System.out.println("✅ Contact list updated. Total: " + contactList.size());
+
+                } else {
+                    System.out.println("⚠️ Response has no data object.");
+                }
+            } else {
+                if (response.has("message") && !response.isNull("message")) {
+                    System.out.println("❌ Failed to refresh contact list: " + response.getString("message"));
+                } else {
+                    System.out.println("❌ Failed to refresh contact list.");
+                }
+            }
+        } catch (Exception e) {
+            System.err.println("❌ Error during refreshContactList: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    public void viewMessagesInChat(ChatEntry chat) {
+        int offset = 0;
+        int limit = 10;
+
+        while (true) {
+            JSONObject req = new JSONObject();
+            req.put("action", "get_chat_messages");
+            req.put("chat_id", chat.getId());
+            req.put("chat_type", chat.getType());
+            req.put("offset", offset);
+            req.put("limit", limit);
+
+            JSONObject res = sendWithResponse(req);
+            if (res == null || !res.getString("status").equals("success")) {
+                System.out.println("❌ Failed to fetch messages.");
+                return;
+            }
+
+            JSONArray messages = res.getJSONObject("data").getJSONArray("get_chat_messages");
+
+            if (messages.isEmpty()) {
+                if (offset == 0)
+                    System.out.println("📭 No messages in this chat.");
+                else
+                    System.out.println("📭 No more messages.");
+                return;
+            }
+
+            System.out.println("\n📥 Messages:");
+            System.out.println("─────────────────────────────────────────────");
+            for (int i = 0; i < messages.length(); i++) {
+                JSONObject msg = messages.getJSONObject(i);
+                String senderName = msg.optString("sender_name", "Unknown");
+                String content = msg.optString("content", "(no content)");
+                String time = msg.optString("time", "");
+                boolean isEdited = msg.optBoolean("is_edited", false);
+                String editedAt = msg.optString("edited_at", "");
+                String label = isEdited ? "🖊️ (edited at: " + editedAt + ")" : "";
+
+                // ✅ Forwarded info
+                String forwardLabel = "";
+                if (msg.optBoolean("is_forwarded", false)) {
+                    String forwardFrom = msg.optString("forwarded_from_name", "Unknown");
+                    forwardLabel = "🔁 Forwarded from " + forwardFrom;
+                }
+
+                //for reply
+                String replyLabel = "";
+                if (msg.has("reply_to_id")) {
+                    String repliedSender = msg.optString("reply_to_sender", "Unknown");
+                    String repliedContent = msg.optString("reply_to_content", "...");
+                    replyLabel = "↪️ Reply to " + repliedSender + ": \"" + repliedContent + "\"";
+                }
+
+                JSONArray reactions = msg.optJSONArray("reactions");
+                if (reactions != null && !reactions.isEmpty()) {
+                    System.out.print(" 💬 Reactions: ");
+                    for (int j = 0; j < reactions.length(); j++) {
+                        System.out.print(reactions.getString(j) + " ");
+                    }
+                    System.out.println();
+                }
+
+
+                System.out.printf("[%d] [%s] %s: \n", i + 1, time, senderName);
+                if (!forwardLabel.isEmpty()) System.out.println(forwardLabel);
+                if (!replyLabel.isEmpty()) System.out.println(replyLabel);
+                System.out.printf("%s %s\n", content, label);
+                System.out.println("─────────────────────────────────────────────");
+            }
+
+            System.out.print("""
+            💬 Options:
+            [number] - Interact with message
+            N - Next page (older messages)
+            0 - Back to chat menu
+            S - Send message
+            ➤ Choice: """);
+
+            String input = scanner.nextLine().trim();
+
+            if (input.equals("0")) return;
+            if (input.equalsIgnoreCase("N")) {
+                offset += limit;
+                continue;
+            }
+
+            if(input.equalsIgnoreCase("S")){
+                sendMessage(chat.getId(), chat.getType());
+            }
+            try {
+                int index = Integer.parseInt(input);
+                if (index < 1 || index > messages.length()) {
+                    System.out.println("❌ Invalid message number.");
+                    continue;
+                }
+
+                JSONObject selected = messages.getJSONObject(index - 1);
+                UUID messageId = UUID.fromString(selected.getString("message_id"));
+                UUID senderId = UUID.fromString(selected.getString("sender_id"));
+                boolean isSender = senderId.toString().equals(Session.currentUser.getString("internal_uuid"));
+                boolean isChannel = chat.getType().equals("channel");
+                boolean isOwnerOrAdmin = chat.isOwner() || chat.isAdmin();
+
+                System.out.println("\n🎯 Selected message by " + selected.getString("sender_name"));
+
+                // ✔ Show interaction menu based on access
+                System.out.println("2. Forward");
+
+                if (isChannel) {
+                    if (isOwnerOrAdmin) {
+                        System.out.println("1. Reply");
+                        System.out.println("3. React");
+                        if (isSender) {
+                            System.out.println("4. Edit");
+                        }
+                        System.out.println("5. Delete");
+                    }
+                } else {
+                    System.out.println("1. Reply");
+                    System.out.println("3. React");
+                    if (isSender) {
+                        System.out.println("4. Edit");
+                    }
+                    if (isSender || isOwnerOrAdmin) {
+                        System.out.println("5. Delete");
+                    }
+                }
+
+                System.out.println("0. Back to message list");
+                System.out.print("➤ Select an action: ");
+                String choice = scanner.nextLine().trim();
+
+                switch (choice) {
+                    case "1" -> {
+                        if (!isChannel || isOwnerOrAdmin)
+                            replyToMessage(messageId);
+                        else
+                            System.out.println("❌ You are not allowed to reply.");
+                    }
+                    case "2" -> forwardMessage(messageId);
+                    case "3" -> {
+                        if (!isChannel || isOwnerOrAdmin)
+                            reactToMessage(messageId);
+                        else
+                            System.out.println("❌ You are not allowed to react.");
+                    }
+                    case "4" -> {
+                        if (isSender)
+                            editMessage(messageId);
+                        else
+                            System.out.println("❌ You can only edit your own messages.");
+                    }
+                    case "5" -> {
+                        if (!isChannel || isOwnerOrAdmin || isSender)
+                            deleteMessage(messageId);
+                        else
+                            System.out.println("❌ You are not allowed to delete this message.");
+                    }
+                    case "0" -> {}
+                    default -> System.out.println("❌ Invalid option.");
+                }
+
+            } catch (NumberFormatException e) {
+                System.out.println("❌ Please enter a valid number or command.");
+            }
+        }
+    }
+
+    public void editMessage(UUID messageId) {
+        System.out.print("📝 Enter new content: ");
+        String newContent = scanner.nextLine().trim();
+
+        if (newContent.isEmpty()) {
+            System.out.println("❌ Content cannot be empty.");
+            return;
+        }
+
+        JSONObject req = new JSONObject();
+        req.put("action", "edit_message");
+        req.put("message_id", messageId.toString());
+        req.put("new_content", newContent);
+
+        JSONObject res = sendWithResponse(req);
+        if (res == null || !res.getString("status").equals("success")) {
+            System.out.println("❌ Failed to edit message.");
+            return;
+        }
+
+        System.out.println("✅ Message updated successfully.");
+    }
+
+
+    public void reactToMessage(UUID messageId) {
+        System.out.print("😊 Enter your reaction (e.g., ❤️, 👍, 😂): ");
+        String reaction = scanner.nextLine().trim();
+
+        if (reaction.isEmpty()) {
+            System.out.println("⚠️ Empty reaction discarded.");
+            return;
+        }
+
+        JSONObject req = new JSONObject();
+        req.put("action", "react_to_message");
+        req.put("message_id", messageId.toString());
+        req.put("reaction", reaction);
+
+        JSONObject res = sendWithResponse(req);
+        if (res != null && res.getString("status").equals("success")) {
+            System.out.println("✅ Reaction sent.");
+        } else {
+            System.out.println("❌ Failed to react to message.");
+        }
+    }
+
+
+    public void forwardMessage(UUID originalMessageId) {
+        System.out.println("\n📤 Select a chat to forward this message to:");
+
+        List<ChatEntry> chatList = Session.chatList;
+        for (int i = 0; i < chatList.size(); i++) {
+            ChatEntry c = chatList.get(i);
+            System.out.printf("%d. [%s] %s\n", i + 1, c.getType(), c.getName());
+        }
+        System.out.println("0. Cancel");
+
+        System.out.print("➤ Enter chat number: ");
+        String input = scanner.nextLine().trim();
+
+        if (input.equals("0")) return;
+
+        try {
+            int choice = Integer.parseInt(input);
+            if (choice < 1 || choice > chatList.size()) {
+                System.out.println("❌ Invalid choice.");
+                return;
+            }
+
+            ChatEntry target = chatList.get(choice - 1);
+
+            JSONObject req = new JSONObject();
+            req.put("action", "forward_message");
+            req.put("target_chat_id", target.getId());
+            req.put("target_chat_type", target.getType());
+            req.put("original_message_id", originalMessageId.toString());
+            req.put("forwarded_by", Session.currentUser.getString("internal_uuid"));
+
+            JSONObject res = sendWithResponse(req);
+            if (res != null && res.getString("status").equals("success")) {
+                System.out.println("✅ Message forwarded successfully.");
+            } else {
+                System.out.println("❌ Failed to forward the message.");
+            }
+
+        } catch (NumberFormatException e) {
+            System.out.println("❌ Invalid input.");
+        }
+    }
+
+
+    public void replyToMessage(UUID messageId) {
+        System.out.print("💬 Enter your reply: ");
+        String content = scanner.nextLine().trim();
+
+        if (content.isEmpty()) {
+            System.out.println("⚠️ Empty reply discarded.");
+            return;
+        }
+
+        UUID chatId = UUID.fromString(Session.currentChatId);
+        String chatType = Session.currentChatType;
+
+        JSONObject req = new JSONObject();
+        req.put("action", "send_reply_message");
+        req.put("receiver_type", chatType);
+        req.put("receiver_id", chatId.toString());
+        req.put("content", content);
+        req.put("reply_to_id", messageId.toString());
+
+        JSONObject res = sendWithResponse(req);
+
+        if (res != null && res.getString("status").equals("success")) {
+            System.out.println("✅ Reply sent.");
+        } else {
+            System.out.println("❌ Failed to send reply.");
+        }
+    }
+
+
+    public void deleteMessage(UUID messageId) {
+        System.out.println("\n🗑️ Delete Message Options:");
+        System.out.println("1. Delete for yourself (one-sided)");
+        System.out.println("2. Delete for everyone (global) [only if allowed]");
+        System.out.println("0. Cancel");
+
+        String choice = scanner.nextLine().trim();
+
+        switch (choice) {
+            case "1" -> {
+                JSONObject req = new JSONObject();
+                req.put("action", "delete_message");
+                req.put("message_id", messageId.toString());
+                req.put("delete_type", "one-sided");
+
+                JSONObject res = sendWithResponse(req);
+                if (res != null && res.getString("status").equals("success")) {
+                    System.out.println("✅ Message deleted for you.");
+                } else {
+                    System.out.println("❌ Failed to delete message.");
+                }
+            }
+
+            case "2" -> {
+                JSONObject req = new JSONObject();
+                req.put("action", "delete_message");
+                req.put("message_id", messageId.toString());
+                req.put("delete_type", "global");
+
+                JSONObject res = sendWithResponse(req);
+                if (res != null && res.getString("status").equals("success")) {
+                    System.out.println("✅ Message deleted for everyone.");
+                } else {
+                    System.out.println("❌ Failed to delete message globally.");
+                    if (res != null) System.out.println("⚠️ " + res.optString("message"));
+                }
+            }
+
+            case "0" -> {
+                System.out.println("❎ Delete canceled.");
+            }
+
+            default -> {
+                System.out.println("❌ Invalid option.");
+            }
+        }
+    }
+
+    public void showSidebarMenu() {
+        System.out.println("\n--- Sidebar Menu ---");
+        System.out.println("1. View Profile");
+        System.out.println("2. New Group");
+        System.out.println("3. New Channel");
+        System.out.println("4. View Contacts");
+        System.out.println("5. Saved messages");
+        System.out.println("6. Settings");
+        System.out.println("7. Telegram features");
+        System.out.println("8. Telegram Q&A");
+        System.out.println("0. Back");
+        System.out.println("Choose your action: (0 to 8)");
+
+        // Handle invalid input
+        int action;
+        while (true) {
+            if (scanner.hasNextInt()) {
+                action = scanner.nextInt();
+                scanner.nextLine(); // Clear newline
+
+                if (action >= 0 && action <= 8) {
+                    break;
+                }
+                System.out.println("Invalid input. Please enter a number between 0 and 8.");
+            } else {
+                scanner.nextLine();
+                System.out.println("Invalid input. Try again.");
+            }
+        }
+
+        SidebarHandler sidebarHandler = new SidebarHandler(scanner, this);
+        switch (action) {
+            case 0 -> {
+                return;
+            }
+            case 1 -> sidebarHandler.handleSidebarAction(SidebarAction.MY_PROFILE);
+            case 2 -> sidebarHandler.handleSidebarAction(SidebarAction.NEW_GROUP);
+            case 3 -> sidebarHandler.handleSidebarAction(SidebarAction.NEW_CHANNEL);
+            case 4 -> sidebarHandler.handleSidebarAction(SidebarAction.CONTACTS);
+            case 5 -> sidebarHandler.handleSidebarAction(SidebarAction.SAVED_MESSAGES);
+            case 6 -> sidebarHandler.handleSidebarAction(SidebarAction.SETTINGS);
+            case 7 -> sidebarHandler.handleSidebarAction(SidebarAction.FEATURES);
+            case 8 -> sidebarHandler.handleSidebarAction(SidebarAction.Q_AND_A);
+            default -> System.out.println("Invalid action.");
+        }
+    }
+
+//
+//    public void sendMessageInteractive(UUID receiverId, String receiverType) {
+//        Scanner sc = new Scanner(System.in);
+//
+//        System.out.print("Type (TEXT / IMAGE / AUDIO): ");
+//        String type = sc.nextLine().trim().toUpperCase();
+//        while (!Set.of("TEXT","IMAGE","AUDIO").contains(type)) {
+//            System.out.print("❌ Invalid. Try (TEXT / IMAGE / AUDIO): ");
+//            type = sc.nextLine().trim().toUpperCase();
+//        }
+//
+//        System.out.print("Text (optional for media; empty = no caption): ");
+//        String text = sc.nextLine();
+//
+//        if ("TEXT".equals(type)) {
+//            sendTextMessage(receiverId, receiverType, text);
+//        } else {
+//            System.out.print("File path: ");
+//            String path = sc.nextLine().trim();
+//            File f = new File(path);
+//            if (!f.isFile()) {
+//                System.out.println("❌ File not found");
+//                return;
+//            }
+//            try {
+//                sendMediaMessage(receiverId, receiverType, type, f, text);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//                System.out.println("❌ Media send failed: " + e.getMessage());
+//            }
+//        }
+//    }
+
+    private void sendTextMessage(UUID receiverId, String receiverType, String content) {
+        JSONObject req = new JSONObject()
+                .put("action", "send_message")
+                .put("receiver_type", receiverType)
+                .put("receiver_id", receiverId.toString())
+                .put("message_type", "TEXT")
+                .put("content", content == null ? "" : content);
+
+        JSONObject resp = sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            System.out.println("✅ Sent. id=" + resp.optJSONObject("data").optString("message_id",""));
+        } else {
+            System.out.println("❌ Failed: " + (resp != null ? resp.optString("message") : "no response"));
+        }
+    }
+
+//
+//    public void sendMediaMessage(UUID receiverId, String receiverType, String type /* IMAGE/AUDIO */, File file, String caption) {
+//        if (file == null) {
+//            System.out.println("❌ File is null");
+//            return;
+//        }
+//        if (!file.exists()) {
+//            System.out.println("❌ File not found: " + file.getAbsolutePath());
+//            return;
+//        }
+//        if (file.isDirectory()) {
+//            System.out.println("❌ Path is a directory, expected a file: " + file.getAbsolutePath());
+//            return;
+//        }
+//
+//        final UUID messageId = UUID.randomUUID();
+//
+//        try {
+//            String mime = detectMime(file, type.toUpperCase());
+//            if (mime == null) mime = type.equalsIgnoreCase("IMAGE") ? "image/*" : "audio/*";
+//
+//            JSONObject header = new JSONObject()
+//                    .put("message_id", messageId.toString())
+//                    .put("sender_id", Session.getUserUUID())
+//                    .put("receiver_type", receiverType)      // private|group|channel
+//                    .put("receiver_id", receiverId.toString())
+//                    .put("message_type", type.toUpperCase()) // IMAGE | AUDIO
+//                    .put("file_name", file.getName())
+//                    .put("mime_type", mime)
+//                    .put("text", caption == null ? "" : caption);
+//
+//            byte[] headerBytes = header.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+//            long contentLen = file.length();
+//
+//            BlockingQueue<JSONObject> q = new LinkedBlockingQueue<>(1);
+//            TelegramClient.pendingResponses.put(messageId.toString(), q);
+//
+//            try {
+//
+//                outBin.write("MEDIA\n".getBytes(java.nio.charset.StandardCharsets.US_ASCII));
+//                outBin.flush();
+//
+//                // 2) binary frame: magic + headerLen + header + contentLen + content
+//                outBin.writeInt(0x4D444D31);                 // "MDM1"
+//                outBin.writeInt(headerBytes.length);         // headerLen (int)
+//                outBin.write(headerBytes);                   // header
+//                outBin.writeLong(contentLen);                // contentLen (long)
+//
+//                try (InputStream fis = new BufferedInputStream(new FileInputStream(file))) {
+//                    byte[] buf = new byte[8192];
+//                    int n;
+//                    while ((n = fis.read(buf)) != -1) {
+//                        outBin.write(buf, 0, n);
+//                    }
+//                }
+//                outBin.flush();
+//
+//                JSONObject ack = q.poll(20, java.util.concurrent.TimeUnit.SECONDS);
+//                if (ack == null) {
+//                    System.out.println("❌ Media ACK timeout for " + messageId);
+//                    return;
+//                }
+//
+//                String status = ack.optString("status", "error");
+//                if ("success".equalsIgnoreCase(status)) {
+//                    System.out.println("✅ Media sent. id=" + ack.optString("message_id") +
+//                            " url=" + ack.optString("file_url"));
+//                } else {
+//                    System.out.println("❌ Media failed: " + ack.optString("message"));
+//                }
+//
+//            } finally {
+//                TelegramClient.pendingResponses.remove(messageId.toString());
+//            }
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            System.out.println("❌ sendMediaMessage error: " + e.getMessage());
+//        }
+//    }
+
+
+
+    // اورلود پیشنهادی: messageId از بیرون دریافت می‌شود
+    public void sendMediaMessage(
+            UUID messageId,            // 👈 از بیرون می‌آید (برای Pending)
+            UUID receiverId,
+            String receiverType,       // "private" | "group" | "channel"
+            String type,               // "IMAGE" | "AUDIO"
+            File file,
+            String caption
+    ) {
+        if (file == null || !file.exists() || file.isDirectory()) {
+            Platform.runLater(() -> ChatPageController.get().updatePendingStatus(
+                    messageId.toString(), "Failed (file)"));
+            return;
+        }
+
+        try {
+            String mime = detectMime(file, type.toUpperCase());
+            if (mime == null) mime = type.equalsIgnoreCase("IMAGE") ? "image/*" : "audio/*";
+
+            JSONObject header = new JSONObject()
+                    .put("message_id",   messageId.toString())
+                    .put("sender_id",    Session.getUserUUID())  // همون UUID کاربر
+                    .put("receiver_type",receiverType)
+                    .put("receiver_id",  receiverId.toString())
+                    .put("message_type", type.toUpperCase())
+                    .put("file_name",    file.getName())
+                    .put("mime_type",    mime)
+                    .put("text",         caption == null ? "" : caption);
+
+            byte[] headerBytes = header.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+            long contentLen = file.length();
+
+            BlockingQueue<JSONObject> q = new LinkedBlockingQueue<>(1);
+            TelegramClient.pendingResponses.put(messageId.toString(), q);
+
+            try {
+                outBin.write("MEDIA\n".getBytes(java.nio.charset.StandardCharsets.US_ASCII));
+                outBin.flush();
+
+                outBin.writeInt(0x4D444D31);          // "MDM1"
+                outBin.writeInt(headerBytes.length);
+                outBin.write(headerBytes);
+                outBin.writeLong(contentLen);
+
+                try (InputStream fis = new BufferedInputStream(new FileInputStream(file))) {
+                    byte[] buf = new byte[8192];
+                    int n;
+                    while ((n = fis.read(buf)) != -1) {
+                        outBin.write(buf, 0, n);
+                    }
+                }
+                outBin.flush();
+
+                JSONObject ack = q.poll(20, java.util.concurrent.TimeUnit.SECONDS);
+                if (ack == null) {
+                    System.out.println("❌ Media ACK timeout for " + messageId);
+                    Platform.runLater(() -> ChatPageController.get().updatePendingStatus(
+                            messageId.toString(), "Failed (timeout)"));
+                    return;
+                }
+
+                String status = ack.optString("status", "error");
+                if ("success".equalsIgnoreCase(status)) {
+                    // سرور شما فیلد نمایش را با نام display_path می‌فرستد (نه file_url)
+                    String url = ack.optString("display_path", ack.optString("file_url", ""));
+                    System.out.println("✅ Media sent. id=" + ack.optString("message_id") + " url=" + url);
+
+                    // بابل Pending را بردار (بلافاصله؛ پیام واقعی هم بعداً با real-time می‌آید)
+                    Platform.runLater(() -> ChatPageController.get().removePendingBubble(messageId.toString()));
+                } else {
+                    System.out.println("❌ Media failed: " + ack.optString("message"));
+                    Platform.runLater(() -> ChatPageController.get().updatePendingStatus(
+                            messageId.toString(), "Failed to send"));
+                }
+
+            } finally {
+                TelegramClient.pendingResponses.remove(messageId.toString());
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("❌ sendMediaMessage error: " + e.getMessage());
+            Platform.runLater(() -> ChatPageController.get().updatePendingStatus(
+                    messageId.toString(), "Error"));
+        }
+    }
+
+
+    public static String detectMime(File f, String typeUpper /* IMAGE or AUDIO */) {
+        try {
+            String m = java.nio.file.Files.probeContentType(f.toPath());
+            if (m != null) return m;
+        } catch (Exception ignored) {}
+        String name = f.getName().toLowerCase();
+        if (name.endsWith(".png"))  return "image/png";
+        if (name.endsWith(".jpg") || name.endsWith(".jpeg")) return "image/jpeg";
+        if (name.endsWith(".gif"))  return "image/gif";
+        if (name.endsWith(".mp3"))  return "audio/mpeg";
+        if (name.endsWith(".wav"))  return "audio/wav";
+        if (name.endsWith(".ogg"))  return "audio/ogg";
+        return typeUpper.equals("IMAGE") ? "image/*" : "audio/*";
+    }
+
+
+
+    private static String safeName(String s) {
+        if (s == null) return "unknown";
+        s = s.replace("\\", "/");
+        if (s.contains("/")) s = s.substring(s.lastIndexOf('/') + 1);
+        s = s.replaceAll("[\\\\/:*?\"<>|]", "_").trim();
+        if (s.isEmpty() || s.equals(".") || s.equals("..")) s = "unknown";
+        return s;
+    }
+
+    private static String accountFolderName() {
+        JSONObject me = Session.currentUser;
+        String acc = me.optString("username",
+                me.optString("user_id",
+                        me.optString("profile_name",
+                                me.optString("internal_uuid", "me"))));
+        return safeName(acc);
+    }
+
+    private static String chatFolderName(ChatEntry chat) {
+        String name = chat.getName();
+        if (name == null || name.isBlank()) {
+            name = chat.getDisplayId() != null && !chat.getDisplayId().isBlank()
+                    ? chat.getDisplayId()
+                    : String.valueOf(chat.getId());
+        }
+        return safeName(name);
+    }
+
+
+    public void uploadAvatar(File file) {
+        if (file == null || !file.exists() || !file.isFile()) {
+            System.out.println("❌ Invalid file");
+            return;
+        }
+
+        final UUID requestId = UUID.randomUUID();
+
+        try {
+            String mime = detectMime(file, "IMAGE");
+            if (mime == null) mime = "image/*";
+
+            // header مثل مدیا، ولی برای آواتار
+            JSONObject header = new JSONObject()
+                    .put("message_id", requestId.toString()) // برای مچ ACK
+                    .put("target_type", "user")              // یا channel/group
+                    // .put("target_id", "…")                // اگر channel/group بود
+                    .put("file_name", file.getName())
+                    .put("mime_type", mime);
+
+            byte[] headerBytes = header.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+            long contentLen = file.length();
+
+            // صف پاسخ (مثل sendMediaMessage)
+            BlockingQueue<JSONObject> q = new LinkedBlockingQueue<>(1);
+            TelegramClient.pendingResponses.put(requestId.toString(), q);
+
+            try {
+                // 🔹 سوئیچ به حالت آواتار (مثل "MEDIA\n")
+                outBin.write("AVATAR\n".getBytes(java.nio.charset.StandardCharsets.US_ASCII));
+                outBin.flush();
+
+                // 🔹 فریم باینری: مجیک + headerLen + header + contentLen + content
+                outBin.writeInt(0x41565431);              // "AVT1"
+                outBin.writeInt(headerBytes.length);
+                outBin.write(headerBytes);
+                outBin.writeLong(contentLen);
+
+                try (InputStream fis = new BufferedInputStream(new FileInputStream(file))) {
+                    byte[] buf = new byte[8192]; int n;
+                    while ((n = fis.read(buf)) != -1) outBin.write(buf, 0, n);
+                }
+                outBin.flush();
+
+                // 🔹 انتظار ACK (مثل مدیا)
+                JSONObject ack = q.poll(20, java.util.concurrent.TimeUnit.SECONDS);
+                if (ack == null) {
+                    System.out.println("❌ Avatar ACK timeout for " + requestId);
+                    return;
+                }
+
+                if ("success".equalsIgnoreCase(ack.optString("status"))) {
+                    String url = ack.optString("display_url", null);
+                    System.out.println("✅ Avatar uploaded. url=" + url);
+                    // (اختیاری) رفرش UI + شکستن کش:
+                    // MainController.getInstance().refreshMyAvatar(url + "?v=" + System.currentTimeMillis());
+                } else {
+                    System.out.println("❌ Avatar failed: " + ack.optString("message"));
+                }
+            } finally {
+                TelegramClient.pendingResponses.remove(requestId.toString());
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("❌ uploadAvatar error: " + e.getMessage());
+        }
+    }
+
+
+    private static final Path UPLOADS_ROOT =
+            Paths.get(System.getProperty("app.uploads.root", "uploads"))
+                    .toAbsolutePath().normalize();
+
+    private String prepareAvatar(String input) {
+        if (input == null || input.isBlank()) return null;
+
+        // اگر URL کامل است، دست نزن
+        if (input.startsWith("http://") || input.startsWith("https://") || input.startsWith("file:")) {
+            return input;
+        }
+
+        try {
+            Path src = Paths.get(input).toAbsolutePath().normalize();
+            if (!Files.exists(src)) {
+                System.out.println("⚠️ Image file not found: " + src);
+                return null;
+            }
+
+            String ext = getExt(src.getFileName().toString());
+            String day = LocalDate.now().toString();
+            String fileName = java.util.UUID.randomUUID() + (ext.isEmpty() ? ".jpg" : ext);
+
+            Path destDir = UPLOADS_ROOT.resolve("avatars").resolve(day);
+            Files.createDirectories(destDir);
+            Path dest = destDir.resolve(fileName);
+            Files.copy(src, dest, StandardCopyOption.REPLACE_EXISTING);
+
+            // مقدار نسبی که سرور/کلاینت‌های دیگر هم می‌فهمند
+            return "/avatars/" + day + "/" + fileName;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public void uploadAvatarFor(String targetType, UUID targetId, File file) {
+        if (file == null || !file.exists() || !file.isFile()) {
+            System.out.println("❌ Invalid file");
+            return;
+        }
+
+        final UUID reqId = UUID.randomUUID();
+
+        String lastStatus;
+        String lastMessage;
+        try {
+            String mime = detectMime(file, "IMAGE");
+            if (mime == null) mime = "image/*";
+
+            JSONObject header = new JSONObject()
+                    .put("request_id", reqId.toString()) // ← هماهنگ با pendingResponses
+                    .put("target_type", targetType.toLowerCase()); // user | group | channel
+            if (targetId != null) header.put("target_id", targetId.toString());
+            header.put("file_name", file.getName())
+                    .put("mime_type", mime);
+
+            byte[] headerBytes = header.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+            long contentLen = file.length();
+
+            BlockingQueue<JSONObject> q = new LinkedBlockingQueue<>(1);
+            // رجیستر با هر دو کلید تا هر نوع ACK روت شود
+            TelegramClient.pendingResponses.put(reqId.toString(), q);
+            TelegramClient.pendingResponses.put(header.optString("message_id", reqId.toString()), q);
+
+            try {
+                TelegramClient.mediaBusy.set(true); // ← حین باینری JSON نخونیم
+
+                // سوئیچ پروتکل
+                TelegramClient.getInstance().getOutBin()
+                        .write("AVATAR\n".getBytes(java.nio.charset.StandardCharsets.US_ASCII));
+
+                DataOutputStream outBin = TelegramClient.getInstance().getOutBin();
+                outBin.flush();
+
+                // فریم: MAGIC + headerLen + header + contentLen + content
+                outBin.writeInt(0x41565431); // "AVT1"
+                outBin.writeInt(headerBytes.length);
+                outBin.write(headerBytes);
+                outBin.writeLong(contentLen);
+
+                try (InputStream fis = new BufferedInputStream(new FileInputStream(file))) {
+                    byte[] buf = new byte[8192];
+                    int n;
+                    while ((n = fis.read(buf)) != -1) outBin.write(buf, 0, n);
+                }
+                outBin.flush();
+            } finally {
+                TelegramClient.mediaBusy.set(false);
+            }
+
+            // انتظار ACK (هر کدوم از کلیدها بیاد، Listener می‌فرسته به صف q)
+            JSONObject ack = q.poll(20, java.util.concurrent.TimeUnit.SECONDS);
+            if (ack == null) {
+                System.out.println("❌ Avatar ACK timeout for " + reqId);
+                return;
+            }
+
+
+            if ("success".equalsIgnoreCase(ack.optString("status"))) {
+                String url = ack.optString("display_url", null);
+                lastStatus = "success";
+                lastMessage = url != null ? url : "";
+
+                if (url != null && targetId != null) {
+                    String busted = url + (url.contains("?") ? "&" : "?") + "v=" + System.currentTimeMillis();
+
+                    // به‌روزرسانی State و UI: چت‌لیست + هدر
+                    Platform.runLater(() -> {
+                        var mc = org.to.telegramfinalproject.UI.MainController.getInstance();
+                    });
+                }
+            }  else {
+                System.out.println("❌ Avatar failed: " + ack.optString("message"));
+                lastStatus = "error";
+                lastMessage = ack.optString("message", "failed");
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("❌ uploadAvatarFor error: " + e.getMessage());
+            lastStatus = "error";
+            lastMessage = e.getMessage();
+        } finally {
+            TelegramClient.pendingResponses.remove(reqId.toString());
+        }
+    }
+
+    private static String getExt(String name) {
+        int i = name.lastIndexOf('.');
+        return (i >= 0) ? name.substring(i) : "";
+    }
+
+    private void updateChatAvatarLocally(String targetType, UUID chatId, String newUrl) {
+        try {
+
+            java.util.function.Consumer<java.util.List<org.to.telegramfinalproject.Models.ChatEntry>> upd =
+                    list -> list.stream()
+                            .filter(c -> c.getId().equals(chatId))
+                            .findFirst()
+                            .ifPresent(c -> c.setImageUrl(newUrl));
+
+            upd.accept(Session.chatList);
+            upd.accept(Session.activeChats);
+            upd.accept(Session.archivedChats);
+
+        } catch (Exception ignore) {}
+    }
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/AvatarLocalResolver.java b/src/main/java/org/to/telegramfinalproject/Client/AvatarLocalResolver.java
new file mode 100644
index 0000000..1d36aa9
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/AvatarLocalResolver.java
@@ -0,0 +1,74 @@
+package org.to.telegramfinalproject.Client;
+
+import javafx.scene.image.Image;
+import java.nio.file.*;
+
+public final class AvatarLocalResolver {
+    private static final Path UPLOADS_ROOT = Paths.get(
+            System.getProperty("app.uploads.root", "uploads")
+    ).toAbsolutePath().normalize();
+
+    private static boolean isHttp(String s) {
+        return s.startsWith("http://") || s.startsWith("https://");
+    }
+
+    public static String resolve(String serverValue) {
+        if (serverValue == null) return null;
+        serverValue = serverValue.trim();
+        if (serverValue.isEmpty()) return null;
+
+        // URL کامل یا file: → همون رو برگردون
+        if (isHttp(serverValue) || serverValue.startsWith("file:")) {
+            return serverValue;
+        }
+
+        // ⬅️ مهم: برای مسیرهای لوکال، هر چیزی بعد از ? یا # را حذف کن
+        serverValue = stripQueryAndHash(serverValue);
+
+        // حذف اسلش ابتدایی (اگر بود)
+        String rel = serverValue.startsWith("/") ? serverValue.substring(1) : serverValue;
+
+        // ساخت مسیر امن داخل uploads
+        Path p = UPLOADS_ROOT.resolve(rel).normalize();
+
+        // جلوگیری از خروج از دایرکتوری uploads (path traversal)
+        if (!p.startsWith(UPLOADS_ROOT)) return null;
+
+        // وجود واقعی فایل
+        if (!Files.exists(p)) {
+            System.err.println("Avatar resolve: NOT FOUND -> " + p);
+            return null;
+        }
+
+        // خروجی به صورت file:// URI که JavaFX Image می‌فهمد
+        String url = p.toUri().toString();
+        System.out.println("Avatar resolve: " + serverValue + " -> " + url);
+        return url;
+    }
+
+    private static String stripQueryAndHash(String s) {
+        int q = s.indexOf('?');
+        if (q >= 0) s = s.substring(0, q);
+        int h = s.indexOf('#');
+        if (h >= 0) s = s.substring(0, h);
+        return s;
+    }
+
+
+    public static Image load(String serverValue) {
+        String url = resolve(serverValue);
+        if (url == null) return null;
+
+        // فقط برای http/https کش‌بریکر
+        if (isHttp(url)) {
+            url += (url.contains("?") ? "&" : "?") + "v=" + System.currentTimeMillis();
+        }
+
+        Image img = new Image(url, false); // sync load تا خطا را همان‌جا بفهمیم
+        if (img.isError()) {
+            System.err.println("Avatar load failed: " + url + " -> " + img.getException());
+            return null;
+        }
+        return img;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Client/ClientConnection.java b/src/main/java/org/to/telegramfinalproject/Client/ClientConnection.java
new file mode 100644
index 0000000..870796d
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/ClientConnection.java
@@ -0,0 +1,30 @@
+package org.to.telegramfinalproject.Client;
+
+import java.io.*;
+import java.net.Socket;
+
+public class ClientConnection {
+    private Socket socket;
+    private BufferedReader in;
+    private PrintWriter out;
+
+    public ClientConnection(String host, int port) throws IOException {
+        this.socket = new Socket(host, port);
+        this.in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+        this.out = new PrintWriter(socket.getOutputStream(), true);
+    }
+
+    public void send(String request) {
+        out.println(request);
+    }
+
+    public String receive() throws IOException {
+        return in.readLine();
+    }
+
+    public void close() throws IOException {
+        socket.close();
+        in.close();
+        out.close();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/DownloadIndexRegistry.java b/src/main/java/org/to/telegramfinalproject/Client/DownloadIndexRegistry.java
new file mode 100644
index 0000000..f89bd8f
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/DownloadIndexRegistry.java
@@ -0,0 +1,30 @@
+// DownloadIndexRegistry.java
+package org.to.telegramfinalproject.Client;
+
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public final class DownloadIndexRegistry {
+    private static final ConcurrentHashMap<UUID, DownloadsIndex> INSTANCES = new ConcurrentHashMap<>();
+    private static volatile boolean HOOK_REGISTERED = false;
+
+    private DownloadIndexRegistry() {}
+
+    public static DownloadsIndex forAccount(UUID accountId) {
+        registerHookOnce();
+        return INSTANCES.computeIfAbsent(accountId, DownloadsIndex::new);
+    }
+
+    public static void closeAccount(UUID accountId) {
+        DownloadsIndex idx = INSTANCES.remove(accountId);
+        if (idx != null) idx.saveQuietly();
+    }
+
+    private static synchronized void registerHookOnce() {
+        if (HOOK_REGISTERED) return;
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            for (DownloadsIndex idx : INSTANCES.values()) idx.saveQuietly();
+        }));
+        HOOK_REGISTERED = true;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/DownloadsIndex.java b/src/main/java/org/to/telegramfinalproject/Client/DownloadsIndex.java
new file mode 100644
index 0000000..50bdc00
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/DownloadsIndex.java
@@ -0,0 +1,116 @@
+
+package org.to.telegramfinalproject.Client;
+
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public final class DownloadsIndex {
+    private final UUID accountId;
+    private final Path indexFile;
+    private final Map<UUID, Entry> map = new ConcurrentHashMap<>();
+
+    public DownloadsIndex(UUID accountId) {
+        this.accountId = accountId;
+        this.indexFile = resolveIndexPath(accountId.toString());
+        load();
+    }
+
+
+    private static Path resolveIndexPath(String accountId) {
+        String os = System.getProperty("os.name", "").toLowerCase();
+        String home = System.getProperty("user.home");
+
+        Path dir;
+        if (os.contains("win")) {
+            String appData = System.getenv("APPDATA");
+            dir = (appData != null)
+                    ? Paths.get(appData, "TeleSock")
+                    : Paths.get(home, "AppData", "Roaming", "TeleSock");
+        } else {
+            dir = Paths.get(home, ".telesock");
+        }
+        try { Files.createDirectories(dir); } catch (IOException ignored) {}
+        return dir.resolve("downloads-index-" + accountId + ".json");
+    }
+
+    private synchronized void load() {
+        map.clear();
+        try {
+            if (!Files.exists(indexFile)) return;
+            String json = Files.readString(indexFile, StandardCharsets.UTF_8);
+            if (json == null || json.isBlank()) return;
+
+            JSONObject root  = new JSONObject(json);
+            JSONObject items = root.optJSONObject("items");
+            if (items == null) return;
+
+            for (String key : items.keySet()) {
+                JSONObject e = items.getJSONObject(key);
+                map.put(UUID.fromString(key), new Entry(
+                        e.getString("path"),
+                        e.optLong("size", 0L),
+                        e.optLong("ts", System.currentTimeMillis())
+                ));
+            }
+        } catch (Exception e) {
+            System.err.println("⚠️ DownloadsIndex load failed: " + e.getMessage());
+        }
+    }
+
+    private synchronized void save() throws IOException {
+        JSONObject items = new JSONObject();
+        for (Map.Entry<UUID, Entry> it : map.entrySet()) {
+            JSONObject e = new JSONObject();
+            e.put("path", it.getValue().path);
+            e.put("size", it.getValue().size);
+            e.put("ts",   it.getValue().ts);
+            items.put(it.getKey().toString(), e);
+        }
+        byte[] data = new JSONObject().put("items", items).toString(2).getBytes(StandardCharsets.UTF_8);
+
+        Path tmp = indexFile.resolveSibling(indexFile.getFileName() + ".tmp");
+        Files.write(tmp, data);
+        try {
+            Files.move(tmp, indexFile, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
+        } catch (AtomicMoveNotSupportedException ex) {
+            Files.move(tmp, indexFile, StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+
+    public void saveQuietly() {
+        try { save(); } catch (Exception ignored) {}
+    }
+
+    public Path find(UUID mediaKey) {
+        Entry e = map.get(mediaKey);
+        if (e == null) return null;
+        Path p = Paths.get(e.path);
+        if (Files.exists(p)) return p;
+        map.remove(mediaKey);
+        saveQuietly();
+        return null;
+    }
+
+    public void put(UUID mediaKey, Path path, long size) {
+        map.put(mediaKey, new Entry(path.toString(), size, System.currentTimeMillis()));
+        saveQuietly();
+    }
+
+    public void remove(UUID mediaKey) {
+        map.remove(mediaKey);
+        saveQuietly();
+    }
+
+    private static final class Entry {
+        final String path; final long size; final long ts;
+        Entry(String path, long size, long ts) {
+            this.path = path; this.size = size; this.ts = ts;
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Client/EventProcessorThread.java b/src/main/java/org/to/telegramfinalproject/Client/EventProcessorThread.java
new file mode 100644
index 0000000..19e24bb
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/EventProcessorThread.java
@@ -0,0 +1,38 @@
+package org.to.telegramfinalproject.Client;
+
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+
+//public class EventProcessorThread extends Thread {
+//    private final ActionHandler handler;
+//    private final BufferedReader in;
+//
+//    public EventProcessorThread(ActionHandler handler, BufferedReader in) {
+//        this.handler = handler;
+//        this.in = in;
+//        setDaemon(true);
+//    }
+//
+//    @Override
+//    public void run() {
+//        try {
+//            System.out.println("👂 Real-Time Listener started.");
+//            String line;
+//            while ((line = in.readLine()) != null) {
+//                JSONObject json = new JSONObject(line);
+//                System.out.println("📥 Received raw line: " + line);
+//
+//                if (json.has("action")) {
+//                    // پیام real-time
+//                    handler.processIncomingEvent(json);
+//                } else {
+//                    // پیام پاسخ معمولی
+//                    TelegramClient.responseQueue.put(json);
+//                }
+//            }
+//        } catch (Exception e) {
+//            System.err.println("❌ Error in EventProcessorThread: " + e.getMessage());
+//        }
+//    }
+//}
diff --git a/src/main/java/org/to/telegramfinalproject/Client/IncomingMessageListener.java b/src/main/java/org/to/telegramfinalproject/Client/IncomingMessageListener.java
new file mode 100644
index 0000000..2ad0e01
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/IncomingMessageListener.java
@@ -0,0 +1,658 @@
+package org.to.telegramfinalproject.Client;
+
+import javafx.application.Platform;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Models.ChatEntry;
+import org.to.telegramfinalproject.UI.MainController;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+
+public class IncomingMessageListener implements Runnable {
+    private final BufferedReader in;
+    public enum UIMode { CONSOLE, UI }
+    private final UIMode uiMode; // runtime mode
+
+    private final java.util.Set<String> seenMessageIds =
+            java.util.Collections.newSetFromMap(new java.util.concurrent.ConcurrentHashMap<>());
+
+
+    public IncomingMessageListener(BufferedReader in, UIMode uiMode) {
+        this.in = in;
+        this.uiMode = uiMode;
+    }
+
+//    public IncomingMessageListener(BufferedReader in) {
+//        this.in = in;
+//    }
+
+    @Override
+    public void run() {
+        try {
+            System.out.println("👂 Real-Time Listener started.");
+
+            while (true) {
+
+                if (TelegramClient.mediaBusy.get()) {
+                    try { Thread.sleep(15); } catch (InterruptedException ignored) {}
+                    continue;
+                }
+
+                String line = in.readLine();
+                if (line == null) break;
+                if (line.isBlank()) continue;
+
+                final JSONObject response;
+                try {
+                    response = new JSONObject(line);
+                } catch (Exception badJson) {
+                    System.out.println("⚠️ [Listener] Non-JSON line ignored: " + line);
+                    continue;
+                }
+
+                System.out.println("📥 Received raw line: " + line);
+
+                // 1) اول message_id را روت کن (برای ACK نهایی مدیا)
+                String mid = response.optString("message_id", "");
+                if (!mid.isEmpty()) {
+                    BlockingQueue<JSONObject> q = TelegramClient.pendingResponses.get(mid);
+                    if (q != null) {
+                        q.put(response);
+                        continue; // مصرف شد
+                    }
+                }
+
+                // 2) بعد request_id را روت کن (برای INIT و بقیه درخواست‌ها)
+                if (response.has("request_id")) {
+                    String requestId = response.getString("request_id");
+                    System.out.println("📬 Response with request_id: " + requestId);
+                    System.out.println("📬 Full response: " + response.toString(2));
+
+                    BlockingQueue<JSONObject> queue = TelegramClient.pendingResponses.get(requestId);
+                    if (queue != null) {
+                        queue.put(response);
+                    } else {
+                        System.out.println("⚠️ No pending queue for request_id = " + requestId + ". Putting in responseQueue...");
+                        TelegramClient.responseQueue.put(response);
+                    }
+                    continue;
+                }
+
+                // 3) رویدادهای real-time
+                if (response.has("action")) {
+                    String action = response.getString("action");
+                    System.out.println("🎯 [Listener] Action received: " + response.toString(2));
+                    System.out.println("🎯 Received action: " + action);
+
+                    if (isRealTimeEvent(action)) {
+                        handleRealTimeEvent(response);
+                    } else {
+                        TelegramClient.responseQueue.put(response);
+                    }
+                    continue;
+                }
+
+                // 4) سایر پاسخ‌های عمومی
+                if (response.has("status") && response.has("message")) {
+                    TelegramClient.responseQueue.put(response);
+                } else {
+                    TelegramClient.responseQueue.put(response); // fallback
+                }
+            }
+
+        } catch (Exception e) {
+            System.out.println("🔴 [Listener] Crashed due to: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    private boolean isRealTimeEvent(String action) {
+        return switch (action) {
+            case "new_message",
+                 "message_edited",
+                 "message_deleted_global", "message_deleted_one_sided", "message_deleted",
+                 "message_reacted", "message_unreacted",
+                 "user_status_changed",
+                 "added_to_group", "added_to_channel",
+                 "update_group_or_channel", "chat_deleted",
+                 "blocked_by_user", "unblocked_by_user", "message_seen",
+                 "removed_from_group", "removed_from_channel",
+                 "became_admin", "removed_admin", "ownership_transferred",
+                 "admin_permissions_updated",
+                 "created_private_chat",
+                 "chat_updated" -> true;
+            default -> false;
+        };
+    }
+
+
+    void handleRealTimeEvent(JSONObject response) throws IOException {
+        String action = response.getString("action");
+        JSONObject msg = response.has("data") ? response.getJSONObject("data") : new JSONObject();
+
+        JSONObject finalMsg = msg;
+        JSONObject finalMsg1 = msg;
+        switch (action) {
+//            case "added_to_group", "added_to_channel",
+//                 "removed_from_group", "removed_from_channel",
+//                 "chat_deleted", "created_private_chat" -> {
+//                // این قسمت مستقل از UI/کنسول است
+//                System.out.println("🔄 Chat list changed. Updating...");
+//                Session.forceRefreshChatList = true;
+//
+//                String chatId = msg.getString("chat_id");
+//                String chatType = msg.getString("chat_type");
+//                ActionHandler.requestChatInfo(chatId, chatType);
+//
+//                if (action.equals("removed_from_group") || action.equals("removed_from_channel") || action.equals("chat_deleted")) {
+//                    System.out.println("🚫 You were removed from the chat or chat was deleted. Exiting...");
+//                    ActionHandler.forceExitChat = true;
+//                }
+//            }
+
+//            case "chat_updated" -> {
+//                if (uiMode == UIMode.UI) {
+//                    bumpChatListFromUpdate(msg);   // برای UI (سایدبار و سورت)
+//                } else {
+//                    updateLastMessageTime(msg);    // برای کنسول (لیست‌های Session)
+//                }
+//            }
+
+            case "added_to_group":
+            case "added_to_channel":
+            case "created_private_chat": {
+                // داده‌ها
+                UUID chatId   = UUID.fromString(msg.getString("chat_id"));
+                String type   = msg.getString("chat_type");      // "group" | "channel" | "private"
+                String name   = msg.optString("name", "");
+                String imgUrl = msg.optString("image_url", "");
+
+                // یک ChatEntry مینیمال بساز (تا UI سریع واکنش بده)
+                ChatEntry ce = new ChatEntry();
+                ce.setId(chatId.toString());
+                ce.setType(type);
+                ce.setName(name);
+                ce.setImageUrl(imgUrl);
+
+                Platform.runLater(() -> {
+                    var mc = MainController.getInstance();
+                    if (mc == null) return;
+
+                    // به لیست‌ها اضافه و UI را رفرش می‌کند (متد خودت)
+                    mc.onJoinedOrAdded(ce);
+
+                    // اگر همین چت الان بازه، مود مناسب را اعمال کن
+                    var cpc = mc.getChatPageController();
+                    if (cpc != null && cpc.isSameChat(chatId, type)) {
+                        // ❗ اگر applyMode در ChatPageController private است،
+                        // یا publicش کن یا این دو خط را حذف کن.
+                        // گروه → NORMAL ، کانال → READ_ONLY (مگر اینکه اجازه پست داشته باشی)
+                        // cpc.applyMode("group".equalsIgnoreCase(type) ? ChatViewMode.NORMAL : ChatViewMode.READ_ONLY);
+                        // cpc.fetchAndRenderHeader(ce); // اختیاری: هدر را تازه کن
+                    }
+                });
+                break;
+            }
+
+            case "removed_from_group":
+            case "removed_from_channel": {
+                UUID chatId = UUID.fromString(msg.getString("chat_id"));
+                String type = msg.getString("chat_type");
+
+                Platform.runLater(() -> {
+                    var mc = MainController.getInstance();
+                    if (mc == null) return;
+
+                    removeFromAllLists(chatId);
+                    mc.refreshChatListUI();
+
+                    // اگر همین چت باز است → به حالت نیاز به Join برگرد
+                    var cpc = mc.getChatPageController();
+                    if (cpc != null && cpc.isSameChat(chatId, type)) {
+                        // اگر applyMode private است، این خط را کامنت کن یا publicش کن
+                        // cpc.applyMode(ChatViewMode.NEEDS_JOIN);
+                    }
+                });
+                break;
+            }
+
+            case "chat_deleted": {
+                UUID chatId = UUID.fromString(msg.getString("chat_id"));
+                String type = msg.getString("chat_type");
+
+                Platform.runLater(() -> {
+                    var mc = MainController.getInstance();
+                    if (mc == null) return;
+
+                    removeFromAllLists(chatId);
+                    mc.refreshChatListUI();
+
+                    var cpc = mc.getChatPageController();
+                    if (cpc != null && cpc.isSameChat(chatId, type)) {
+                        // حداقل ورودی را ببندیم/غیرفعال کنیم
+                        // اگر applyMode private است، این خط را کامنت کن یا publicش کن
+                        // cpc.applyMode(ChatViewMode.READ_ONLY);
+                        // و یک پیام سیستمی هم نشان بده
+                        cpc.addSystemMessage("This chat was deleted.");
+                    }
+                });
+                break;
+            }
+
+
+            case "became_admin", "removed_admin", "ownership_transferred", "admin_permissions_updated" : {
+                System.out.println("🧩 Detected admin/owner role change. Calling handler...");
+                new Thread(() -> {
+                    try {
+                        handleAdminRoleChanged(finalMsg1);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }).start();
+                break;
+            }
+
+            case "new_message" :{
+                JSONObject data = response.optJSONObject("data");
+                if (data == null) break;
+
+                String mid = data.optString("id", data.optString("message_id",""));
+                if (mid.isEmpty()) break;
+                if (!seenMessageIds.add(mid)) break;
+
+                bumpChatListFromMessage(data);
+
+                JSONObject uiMsg = new JSONObject(data.toString());
+                if (!uiMsg.has("message_id") && uiMsg.has("id")) {
+                    uiMsg.put("message_id", uiMsg.getString("id"));
+                }
+
+                Platform.runLater(() -> {
+                    var mc = MainController.getInstance();
+                    var chatCtl = (mc != null) ? mc.getChatPageController() : null;
+                    if (chatCtl != null) {
+                        chatCtl.onRealTimeNewMessage(uiMsg);
+                    }
+                });
+                break;
+            }
+
+            case "message_edited": {
+                JSONObject ui = normalizeMessageId(msg);
+                // (اختیاری) اگر ایونت زمان و چت را هم می‌دهد، می‌توانی چت‌لیست را آپدیت کنی
+                Platform.runLater(() -> {
+                    var mc = MainController.getInstance();
+                    var chatCtl = (mc != null) ? mc.getChatPageController() : null;
+                    if (chatCtl != null) chatCtl.onRealTimeMessageEdited(ui);
+                });
+                break;
+            }
+
+            case "message_deleted_global", "message_deleted_one_sided", "message_deleted" : {
+                JSONObject ui = normalizeMessageId(msg);
+                Platform.runLater(() -> {
+                    var mc = MainController.getInstance();
+                    var chatCtl = (mc != null) ? mc.getChatPageController() : null;
+                    if (chatCtl != null) chatCtl.onRealTimeMessageDeleted(ui);
+                });
+                break;
+            }
+
+            case "message_reacted", "message_unreacted" : {
+                JSONObject ui = normalizeMessageId(msg);
+                Platform.runLater(() -> {
+                    var mc = MainController.getInstance();
+                    var chatCtl = (mc != null) ? mc.getChatPageController() : null;
+                    if (chatCtl != null) chatCtl.onRealTimeReaction(ui);
+                });
+                break;
+            }
+
+
+
+            case "chat_updated": {
+                var data = response.getJSONObject("data");
+                bumpChatListFromUpdate(data);
+                break;
+            }
+
+            case "user_status_changed" : {
+
+                displayRealTimeMessage(action, msg);
+                Platform.runLater(() -> {
+                    var mc = org.to.telegramfinalproject.UI.MainController.getInstance();
+                    var cp = (mc != null) ? mc.getChatPageController() : null;
+                    if (cp != null) cp.onUserStatusChanged(
+                            msg.optString("user_id",""),
+                            msg.optString("status",""),
+                            msg.optString("last_seen","")
+                    );
+                });
+                break;
+            }
+
+
+
+
+            case "blocked_by_user", "unblocked_by_user", "message_seen" : {
+                displayRealTimeMessage(action, msg);
+                break;
+            }
+
+
+
+            default :{
+                System.out.println("\n❓ Unknown real-time action: " + action);
+                System.out.println(msg.toString(2));
+            }
+        }
+
+        System.out.print(">> ");
+    }
+
+    private void updateLastMessageTime(JSONObject msg) {
+        try {
+            UUID chatUUID = UUID.fromString(msg.getString("chat_id"));
+            String newTime = msg.optString("last_message_time", null);
+
+            Session.chatList.stream()
+                    .filter(chat -> chat.getId().equals(chatUUID))
+                    .findFirst()
+                    .ifPresent(chat -> {
+                        chat.setLastMessageTime(newTime);
+                        System.out.println("✅ Updated last message time for chat: " + chat.getDisplayId());
+                    });
+
+            Session.activeChats.stream()
+                    .filter(chat -> chat.getId().equals(chatUUID))
+                    .findFirst()
+                    .ifPresent(chat -> {
+                        chat.setLastMessageTime(newTime);
+                        System.out.println("✅ Updated last message time for chat: " + chat.getDisplayId());
+                    });
+
+            Session.archivedChats.stream()
+                    .filter(chat -> chat.getId().equals(chatUUID))
+                    .findFirst()
+                    .ifPresent(chat -> {
+                        chat.setLastMessageTime(newTime);
+                        System.out.println("✅ Updated last message time for chat: " + chat.getDisplayId());
+                    });
+
+            Session.chatList.sort((c1, c2) -> {
+                if (c1.getLastMessageTime() == null && c2.getLastMessageTime() == null) return 0;
+                if (c1.getLastMessageTime() == null) return 1;
+                if (c2.getLastMessageTime() == null) return -1;
+                return c2.getLastMessageTime().compareTo(c1.getLastMessageTime()); // descending
+            });
+            Session.activeChats.sort((c1, c2) -> {
+                if (c1.getLastMessageTime() == null && c2.getLastMessageTime() == null) return 0;
+                if (c1.getLastMessageTime() == null) return 1;
+                if (c2.getLastMessageTime() == null) return -1;
+                return c2.getLastMessageTime().compareTo(c1.getLastMessageTime()); // descending
+            });
+            Session.archivedChats.sort((c1, c2) -> {
+                if (c1.getLastMessageTime() == null && c2.getLastMessageTime() == null) return 0;
+                if (c1.getLastMessageTime() == null) return 1;
+                if (c2.getLastMessageTime() == null) return -1;
+                return c2.getLastMessageTime().compareTo(c1.getLastMessageTime()); // descending
+            });
+
+
+
+
+            if (Session.inChatListMenu) {
+                ActionHandler.displayChatList();
+                System.out.print("Select a chat by number: ");
+            }
+
+        } catch (Exception e) {
+            System.out.println("❌ Failed to update last message time: " + e.getMessage());
+        }
+    }
+
+
+    private void handleAdminRoleChanged(JSONObject data) throws IOException {
+        String chatType = data.getString("chat_type");
+        String chatId = data.optString("group_id", data.optString("channel_id", data.optString("chat_id", null)));
+
+        if (chatId == null) {
+            System.out.println("⚠️ No valid ID found in real-time data: " + data.toString(2));
+            return;
+        }
+
+        System.out.println("\n🔄 Your admin status changed. Updating chat info...");
+
+        try {
+            // 1. get chat info
+            JSONObject chatInfoReq = new JSONObject();
+            chatInfoReq.put("action", "get_chat_info");
+            chatInfoReq.put("receiver_id", chatId);
+            chatInfoReq.put("receiver_type", chatType);
+            System.out.println("📤 Sending get_chat_info: " + chatInfoReq);
+            JSONObject chatInfoResp = ActionHandler.sendWithResponse(chatInfoReq);
+            JSONObject chatData = chatInfoResp.getJSONObject("data");
+
+            UUID chatUUID = UUID.fromString(chatData.getString("internal_id"));
+
+            Optional<ChatEntry> entry = Session.chatList.stream()
+                    .filter(e -> e.getId().equals(chatUUID))
+                    .findFirst();
+
+            if (entry.isEmpty()) {
+                System.out.println("❌ Chat not found in session.");
+                return;
+            }
+
+            entry.ifPresent(chat -> {
+                chat.setAdmin(chatData.optBoolean("is_admin", false));
+                chat.setOwner(chatData.optBoolean("is_owner", false));
+                chat.setName(chatData.optString("name", ""));
+                chat.setDisplayId(chatData.optString("id", ""));
+                chat.setImageUrl(chatData.optString("image_url", ""));
+                chat.setType(chatData.optString("type", ""));
+                Session.currentChatEntry = chat;
+            });
+
+            // 2. get permission
+            JSONObject permissionReq = new JSONObject();
+            if (chatType.equalsIgnoreCase("group")) {
+                permissionReq.put("action", "get_group_permissions");
+                permissionReq.put("group_id", chatId);
+            } else {
+                permissionReq.put("action", "get_channel_permissions");
+                permissionReq.put("channel_id", chatId);
+            }
+
+            JSONObject permissionResp = ActionHandler.sendWithResponse(permissionReq);
+            JSONObject perm = permissionResp.getJSONObject("data");
+            entry.ifPresent(chat -> chat.setPermissions(perm));
+
+            // 3. set currentChatId
+            Session.currentChatId = chatUUID.toString();
+
+            System.out.println("🧪 Checking refresh conditions...");
+            System.out.println("🔹 inChatMenu: " + Session.inChatMenu);
+            System.out.println("🔹 currentChatId: " + Session.currentChatId);
+            System.out.println("🔹 chatUUID: " + chatUUID);
+
+            if (Session.inChatMenu && Session.currentChatId != null && Session.currentChatId.equals(chatUUID.toString())) {
+                synchronized (Session.class) {
+                    Session.refreshCurrentChatMenu = true;
+                }
+                System.out.println("✅ Admin status updated. Refreshing menu...");
+            } else {
+                System.out.println("❌ Refresh conditions not met.");
+            }
+
+        } catch (Exception e) {
+            System.out.println("❌ Exception while handling admin role change: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+    private void displayRealTimeMessage(String action, JSONObject msg) {
+        switch (action) {
+            case "new_message" -> {
+                String senderName = msg.optString("sender_name","Unknown");
+                String content    = msg.optString("content","(empty)");
+                String sendAt     = msg.optString("send_at","-");
+                String chatId     = msg.optString("receiver_id", msg.optString("chat_id",""));
+                String kind       = msg.optString("kind","plain");
+                JSONObject meta   = msg.optJSONObject("meta");
+
+                String prefix = "";
+                if ("reply".equals(kind) && meta != null) {
+                    var rt = meta.optJSONObject("reply_to");
+                    prefix = "[reply → " + (rt!=null?rt.optString("excerpt",""):"") + "] ";
+                } else if ("forward".equals(kind) && meta != null) {
+                    var ff = meta.optJSONObject("forwarded_from");
+                    prefix = "[forwarded from " + (ff!=null?ff.optString("sender_name","unknown"):"unknown") + "] ";
+                }
+
+                boolean isInCurrentChat = Session.inChatMenu &&
+                        Session.currentChatId != null && Session.currentChatId.equals(chatId);
+
+                if (isInCurrentChat) {
+                    System.out.println(senderName + ": " + prefix + content + "   (" + sendAt + ")");
+                } else {
+                    System.out.println("💬 Message from " + senderName + ": " + prefix + content);
+                    Session.forceRefreshChatList = true;
+                }
+            }
+
+
+            case "message_edited" -> {
+                System.out.println("\n✏️ Message Edited:");
+                System.out.println("ID: " + msg.getString("message_id"));
+                System.out.println("New Content: " + msg.getString("new_content"));
+                System.out.println("Edit Time: " + msg.getString("edited_at"));
+            }
+            case "message_deleted_global" -> {
+                System.out.println("\n🗑️ Message Deleted:");
+                System.out.println("Message ID: " + msg.getString("message_id"));
+            }
+            case "message_reacted", "message_unreacted" -> {
+                String mid    = msg.getString("message_id");
+                String emoji  = msg.getString("emoji");
+                JSONObject counts = msg.optJSONObject("counts");
+                int n = msg.optInt("count_for_emoji", 0);
+                System.out.println("\n⭐ Reaction update on " + mid + " : " + emoji + " → " + n);
+            }
+
+            case "user_status_changed" -> {
+                System.out.println("\n🔄 User Status Changed:");
+                System.out.println("User: " + msg.getString("user_id"));
+                System.out.println("Status: " + msg.getString("status"));
+            }
+            case "blocked_by_user" -> {
+                System.out.println("\n⛔ You were blocked by user: " + msg.getString("blocker_id"));
+            }
+            case "unblocked_by_user" -> {
+                System.out.println("\n✅ You were unblocked by user: " + msg.getString("unblocker_id"));
+            }
+            case "message_seen" -> {
+                System.out.println("\n👁️ Your message was seen:");
+                System.out.println("Message ID: " + msg.getString("message_id"));
+                System.out.println("Seen at: " + msg.getString("seen_at"));
+            }
+            default -> {
+                System.out.println("\n❓ Unknown real-time action: " + action);
+                System.out.println(msg.toString(2));
+            }
+        }
+    }
+
+
+
+    private static LocalDateTime parseIsoFlexible(String iso) {
+        if (iso == null || iso.isBlank()) return null;
+        try { return LocalDateTime.parse(iso); } catch (Exception ignore) {}
+        try { return OffsetDateTime.parse(iso).toLocalDateTime(); } catch (Exception ignore) {}
+        return null;
+    }
+
+
+
+    private void bumpChatListFromUpdate(JSONObject data) {
+        try {
+            UUID chatId = UUID.fromString(data.optString("chat_id",""));
+            String chatType = data.optString("chat_type","");
+            LocalDateTime ts = parseIsoFlexible(data.optString("last_message_time", null));
+
+            Platform.runLater(() -> {
+                var mc = MainController.getInstance();
+                if (mc != null) mc.onChatUpdated(chatId, chatType, ts, /*isIncoming*/ false, null);
+            });
+        } catch (Exception e) { System.err.println("[RT] bumpChatListFromUpdate: " + e.getMessage()); }
+    }
+
+
+
+    private String previewOf(String type, String content) {
+        String t = type == null ? "" : type.trim().toUpperCase();
+        return switch (t) {
+            case "IMAGE" -> "[Image]";
+            case "AUDIO" -> "[Audio]";
+            case "VIDEO" -> "[Video]";
+            case "FILE"  -> "[File]";
+            default      -> (content == null ? "" : content);
+        };
+    }
+
+    private void bumpChatListFromMessage(JSONObject m) {
+        try {
+            UUID chatId = UUID.fromString(m.optString("receiver_id",""));
+            String chatType = m.optString("receiver_type","");
+            LocalDateTime ts = parseIsoFlexible(m.optString("send_at", null));
+
+            String preview = previewOf(m.optString("message_type","TEXT"),
+                    m.optString("content",""));
+
+            Platform.runLater(() -> {
+                var mc = MainController.getInstance();
+                if (mc != null) mc.onChatUpdated(chatId, chatType, ts, /*isIncoming*/ true, preview);
+            });
+        } catch (Exception e) { System.err.println("[RT] bumpChatListFromMessage: " + e.getMessage()); }
+    }
+
+    // --- add this helper ---
+    private static JSONObject normalizeMessageId(JSONObject j) {
+        if (j == null) return new JSONObject();
+        if (!j.has("message_id") && j.has("id")) {
+            JSONObject copy = new JSONObject(j.toString());
+            copy.put("message_id", copy.optString("id", ""));
+            return copy;
+        }
+        return j;
+    }
+
+
+    private void removeFromAllLists(UUID chatId) {
+        if (Session.chatList != null) {
+            Session.chatList.removeIf(c -> chatId.toString().equals(String.valueOf(c.getId())));
+        }
+        if (Session.activeChats != null) {
+            Session.activeChats.removeIf(c -> chatId.toString().equals(String.valueOf(c.getId())));
+        }
+        if (Session.archivedChats != null) {
+            Session.archivedChats.removeIf(c -> chatId.toString().equals(String.valueOf(c.getId())));
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/MediaSender.java b/src/main/java/org/to/telegramfinalproject/Client/MediaSender.java
new file mode 100644
index 0000000..112fd0d
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/MediaSender.java
@@ -0,0 +1,82 @@
+package org.to.telegramfinalproject.Client;
+
+import org.json.JSONObject;
+import java.io.*;
+import java.net.Socket;
+import java.nio.file.Files;
+import java.util.UUID;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+
+
+
+class MediaSender {
+
+    public static void sendImageOrAudio(Socket socket,
+                                        UUID senderId,
+                                        String receiverType,
+                                        UUID receiverId,
+                                        File file,
+                                        String messageType,   // "IMAGE" یا "AUDIO"
+                                        String captionOrEmpty) throws Exception {
+
+        if (!"IMAGE".equals(messageType) && !"AUDIO".equals(messageType))
+            throw new IllegalArgumentException("Only IMAGE/AUDIO");
+
+        // 1) اعلام سوییچ به باینری
+        PrintWriter textOut = new PrintWriter(new OutputStreamWriter(socket.getOutputStream(), "UTF-8"), true);
+        textOut.println("MEDIA");
+
+        // 2) متادیتا
+        String mime = Files.probeContentType(file.toPath());
+        if (mime == null) mime = "application/octet-stream";
+
+        Integer width = null, height = null;
+        if ("IMAGE".equals(messageType)) {
+            try {
+                BufferedImage img = ImageIO.read(file);
+                if (img != null) { width = img.getWidth(); height = img.getHeight(); }
+            } catch (Exception ignore) {}
+        }
+
+        UUID messageId = UUID.randomUUID();
+        JSONObject header = new JSONObject()
+                .put("message_id", messageId.toString())
+                .put("sender_id", senderId.toString())
+                .put("receiver_type", receiverType)
+                .put("receiver_id", receiverId.toString())
+                .put("message_type", messageType)
+                .put("file_name", file.getName())
+                .put("mime_type", mime)
+                .put("file_size", file.length())
+                .put("text", captionOrEmpty == null ? "" : captionOrEmpty);
+
+        if (width != null)  header.put("width", width);
+        if (height != null) header.put("height", height);
+
+        byte[] headerBytes = header.toString().getBytes("UTF-8");
+
+        // 3) ارسال فریم باینری
+        DataOutputStream dos = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream()));
+        dos.writeInt(0x4D444D31);               // MAGIC
+        dos.writeInt(headerBytes.length);       // headerLen
+        dos.write(headerBytes);                 // header
+        dos.writeLong(file.length());           // contentLen
+
+        try (InputStream fis = new BufferedInputStream(new FileInputStream(file))) {
+            byte[] buf = new byte[8192];
+            int n;
+            while ((n = fis.read(buf)) != -1) {
+                dos.write(buf, 0, n);
+            }
+        }
+        dos.flush();
+
+        // (اختیاری) Ack متنی
+        BufferedReader textIn = new BufferedReader(new InputStreamReader(socket.getInputStream(), "UTF-8"));
+        String ack = textIn.readLine();
+        if (!"OK".equalsIgnoreCase(ack)) {
+            throw new IOException("Server did not ACK: " + ack);
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Client/RealTimeBuffer.java b/src/main/java/org/to/telegramfinalproject/Client/RealTimeBuffer.java
new file mode 100644
index 0000000..0b66a4c
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/RealTimeBuffer.java
@@ -0,0 +1,12 @@
+package org.to.telegramfinalproject.Client;
+
+
+import org.json.JSONObject;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+public class RealTimeBuffer {
+    public static final BlockingQueue<JSONObject> incomingEvents = new LinkedBlockingQueue<>();
+}
+
diff --git a/src/main/java/org/to/telegramfinalproject/Client/Session.java b/src/main/java/org/to/telegramfinalproject/Client/Session.java
new file mode 100644
index 0000000..7ef40ed
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/Session.java
@@ -0,0 +1,211 @@
+package org.to.telegramfinalproject.Client;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Models.ChatEntry;
+import org.to.telegramfinalproject.Models.ContactEntry;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+
+// method for save data from server response
+public class Session {
+    public static JSONObject currentUser;
+    public static List<ChatEntry> chatList = new ArrayList<>();
+    public static List<ChatEntry> archivedChats = new ArrayList<>();
+    public static List<ChatEntry> activeChats = new ArrayList<>();
+    public static UUID currentPrivateChatUserId = null;
+    public static volatile boolean forceRefreshChatList = false;
+    public static volatile boolean backToChatList = false;
+    public static boolean inChatListMenu = false;
+    public static String currentChatType = null;
+    public static volatile boolean inChatMenu = false;
+    public static volatile boolean refreshCurrentChatMenu = false;
+    public static String currentChatId = null;
+    public static ChatEntry currentChatEntry = null;
+    public static List<ContactEntry> contactEntries = new ArrayList<>();
+    public static boolean inContactListMenu = false;
+    public static DownloadsIndex downloadsIndex = null;
+
+    public static String getUserUUID() {
+        if (currentUser.has("uuid")) return currentUser.getString("uuid");
+        if (currentUser.has("internal_uuid")) return currentUser.getString("internal_uuid");
+        if (currentUser.has("internalUUID")) return currentUser.getString("internalUUID");
+        throw new RuntimeException("❌ No UUID found in currentUser!");
+    }
+
+//    public static void updateChatList(JSONArray chatArray) {
+//        chatList.clear();
+//        for (int i = 0; i < chatArray.length(); i++) {
+//            JSONObject obj = chatArray.getJSONObject(i);
+//            ChatEntry entry = new ChatEntry(
+//                    UUID.fromString(obj.getString("internal_id")),
+//                    obj.optString("id", ""),  // displayId
+//                    obj.optString("name", ""),  // name
+//                    obj.optString("image_url", ""),
+//                    obj.getString("type"),
+//                    null,  // last message time (if needed, parse it)
+//                    obj.optBoolean("is_owner", false),
+//                    obj.optBoolean("is_admin", false)
+//            );
+//            entry.setPermissions(obj.optJSONObject("permissions"));
+//            chatList.add(entry);
+//        }
+//    }
+
+
+    public static void updateChatList(JSONArray chatArray) {
+        chatList.clear();
+        for (int i = 0; i < chatArray.length(); i++) {
+            JSONObject obj = chatArray.getJSONObject(i);
+
+            LocalDateTime lastMessageTime = null;
+            if (obj.has("last_message_time") && !obj.isNull("last_message_time")) {
+                String timeStr = obj.getString("last_message_time");
+                if (!timeStr.isBlank()) {
+                    lastMessageTime = LocalDateTime.parse(timeStr);
+                }
+            }
+
+            ChatEntry entry = new ChatEntry(
+                    UUID.fromString(obj.getString("internal_id")),
+                    obj.optString("id", ""),  // displayId
+                    obj.optString("name", ""),  // name
+                    obj.optString("image_url", ""),
+                    obj.getString("type"),
+                    lastMessageTime,
+                    obj.optBoolean("is_owner", false),
+                    obj.optBoolean("is_admin", false)
+            );
+
+            entry.setPermissions(obj.optJSONObject("permissions"));
+            chatList.add(entry);
+        }
+
+        chatList.sort((c1, c2) -> {
+            if (c1.getLastMessageTime() == null && c2.getLastMessageTime() == null) return 0;
+            if (c1.getLastMessageTime() == null) return 1;
+            if (c2.getLastMessageTime() == null) return -1;
+            return c2.getLastMessageTime().compareTo(c1.getLastMessageTime());
+        });
+
+        activeChats = chatList.stream().filter(c -> !c.isArchived()).toList();
+        archivedChats = chatList.stream().filter(ChatEntry::isArchived).toList();
+    }
+
+    public static List<ChatEntry> getChatList() {
+        return chatList;
+    }
+
+
+    public static void refreshChatLists() {
+        Session.activeChats = Session.chatList.stream()
+                .filter(c -> !c.isArchived())
+                .toList();
+
+        Session.archivedChats = Session.chatList.stream()
+                .filter(ChatEntry::isArchived)
+                .toList();
+    }
+
+    public void setDownloadIndex(DownloadsIndex idx){ this.downloadsIndex = idx; }
+
+
+    // ==== ADD to Session class ====
+
+    /** پیدا کردن چت با internal_id */
+    public static ChatEntry findChatByInternalId(UUID internalId) {
+        for (ChatEntry c : chatList) {
+            if (c.getId().equals(internalId)) return c;
+        }
+        return null;
+    }
+
+    /** درج در ابتدای لیست (با جلوگیری از دوبل) و سپس resort + refresh */
+    public static void prependChat(ChatEntry entry) {
+        // اگر قبلاً تو لیست هست، اول پاکش کن
+        chatList.removeIf(c -> c.getId().equals(entry.getId()));
+        // اول لیست بذار
+        chatList.add(0, entry);
+        resortAndRefresh();
+    }
+
+    public static void resortAndRefresh() {
+        chatList.sort((c1, c2) -> {
+            if (c1.getLastMessageTime() == null && c2.getLastMessageTime() == null) return 0;
+            if (c1.getLastMessageTime() == null) return 1;
+            if (c2.getLastMessageTime() == null) return -1;
+            return c2.getLastMessageTime().compareTo(c1.getLastMessageTime());
+        });
+        refreshChatLists();
+    }
+
+
+    public static ChatEntry upsertSavedMessages(UUID chatId, String name, String chatType, String imageUrlIfAny) {
+        ChatEntry existing = findChatByInternalId(chatId);
+        if (existing != null) {
+            // برای اینکه بیاد بالا، می‌تونی زمان آخرین پیام رو الان بذاری (اختیاری)
+            if (existing.getLastMessageTime() == null) {
+                existing.setLastMessageTime(LocalDateTime.now());
+                resortAndRefresh();
+            }
+            return existing;
+        }
+
+        ChatEntry entry = new ChatEntry(
+                chatId,
+                "",                         // displayId برای Saved لازم نیست
+                (name == null || name.isBlank()) ? "Saved Messages" : name,
+                imageUrlIfAny == null ? "" : imageUrlIfAny,
+                (chatType == null || chatType.isBlank()) ? "private" : chatType,
+                LocalDateTime.now(),        // بذار بالا بیاد
+                true,                       // owner? برای self-chat می‌تونه true باشه (اثری روی permission نداره)
+                true                        // admin? اختیاری—تأثیر خاصی نداره؛ می‌تونی false بذاری
+        );
+        // اگر توی UI برای Saved Messages آیکن خاص داری، اینجا ست کن:
+        // entry.setImageUrl("/org/to/telegramfinalproject/Icons/saved_messages_dark.png");
+
+        prependChat(entry);
+        return entry;
+    }
+
+
+
+    public static boolean inArchivedView = false;
+
+    public static boolean isArchived(UUID chatId) {
+        if (archivedChats == null) return false;
+        for (ChatEntry e : archivedChats) if (e.getId().equals(chatId)) return true;
+        return false;
+    }
+
+    public static void moveToArchived(ChatEntry e) {
+        if (e == null) return;
+        if (chatList != null)      chatList.removeIf(x -> x.getId().equals(e.getId()));
+        if (activeChats != null)   activeChats.removeIf(x -> x.getId().equals(e.getId()));
+        if (archivedChats != null) archivedChats.removeIf(x -> x.getId().equals(e.getId()));
+        if (archivedChats != null) archivedChats.add(e);
+    }
+
+    public static void moveToActive(ChatEntry e) {
+        if (e == null) return;
+        if (archivedChats != null) archivedChats.removeIf(x -> x.getId().equals(e.getId()));
+        if (activeChats != null)   activeChats.removeIf(x -> x.getId().equals(e.getId()));
+        if (chatList != null)      chatList.removeIf(x -> x.getId().equals(e.getId()));
+        if (activeChats != null)   activeChats.add(e);
+    }
+
+    // مرتب‌سازی بر اساس آخرین پیام (در صورت داشتن فیلد)
+    public static void sortListsByLastMessage() {
+        java.util.Comparator<ChatEntry> cmp =
+                java.util.Comparator.comparing(ChatEntry::getLastMessageTime, java.util.Comparator.nullsLast(java.util.Comparator.naturalOrder()))
+                        .reversed();
+        if (activeChats != null)   activeChats.sort(cmp);
+        if (archivedChats != null) archivedChats.sort(cmp);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/SidebarAction.java b/src/main/java/org/to/telegramfinalproject/Client/SidebarAction.java
new file mode 100644
index 0000000..4a16145
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/SidebarAction.java
@@ -0,0 +1,12 @@
+package org.to.telegramfinalproject.Client;
+
+public enum SidebarAction {
+    MY_PROFILE,
+    NEW_GROUP,
+    NEW_CHANNEL,
+    CONTACTS,
+    SAVED_MESSAGES,
+    SETTINGS,
+    FEATURES,
+    Q_AND_A
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/SidebarHandler.java b/src/main/java/org/to/telegramfinalproject/Client/SidebarHandler.java
new file mode 100644
index 0000000..2960707
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/SidebarHandler.java
@@ -0,0 +1,580 @@
+package org.to.telegramfinalproject.Client;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Models.ChatEntry;
+import org.to.telegramfinalproject.Models.FileAttachment;
+import org.to.telegramfinalproject.Models.Message;
+
+import java.time.LocalDateTime;
+import java.util.*;
+
+import static org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse;
+
+public class SidebarHandler {
+    private final Scanner scanner;
+    private  ActionHandler actionHandler ;
+    private final String userUUID;
+
+    public SidebarHandler(Scanner scanner, ActionHandler actionHandler, ActionHandler action) {
+        this.scanner = scanner;
+        this.actionHandler = action;
+        this.userUUID = Session.getUserUUID();
+
+    }
+
+    public SidebarHandler(Scanner scanner, ActionHandler actionHandler) {
+        this.scanner = scanner;
+        this.actionHandler = actionHandler;
+        this.userUUID = Session.getUserUUID();
+
+    }
+
+    public void handleSidebarAction(SidebarAction action) {
+        switch (action) {
+            case MY_PROFILE:
+                openUserProfile();
+                break;
+            case NEW_GROUP:
+                createNewGroup();
+                break;
+            case NEW_CHANNEL:
+                createNewChannel();
+                break;
+            case CONTACTS:
+                showContacts();
+                break;
+            case SAVED_MESSAGES:
+                ensureSavedMessagesCreated();
+                break;
+            case SETTINGS:
+                openSettings();
+                break;
+            case FEATURES:
+                showTelegramFeatures();
+                break;
+            case Q_AND_A:
+                showTelegramQA();
+                break;
+        }
+    }
+
+    private void openUserProfile() {
+        // Step 1: Request profile info from the server
+        JSONObject request = new JSONObject();
+        request.put("action", "get_user_profile");
+
+        JSONObject response = sendWithResponse(request);
+        if (response == null || !response.optString("status", "fail").equals("success")) {
+            System.out.println("Failed to load profile information.");
+            return;
+        }
+
+        JSONObject profile;
+        try {
+            profile = response.getJSONObject("data");
+        } catch (JSONException e) {
+            System.out.println("Received malformed profile data from server.");
+            return;
+        }
+
+        String profileName = profile.optString("profile_name", "NOT-AVAILABLE");
+        String userId = profile.optString("user_id", "NOT-AVAILABLE");
+        String status = profile.optString("status", "NOT-AVAILABLE");
+        String bio = profile.optString("bio", "NOT-AVAILABLE");
+        String profilePictureUrl = profile.optString("profile_picture_url", "NOT-AVAILABLE");
+
+        // Step 2: Show profile info
+        System.out.println("===== My Profile =====");
+        System.out.println("Profile Picture URL : " + profilePictureUrl);
+        System.out.println("Profile Name        : " + profileName);
+        System.out.println("User ID             : @" + userId);
+        System.out.println("Status              : " + status);
+        System.out.println("Bio                 : " + bio);
+        System.out.println("======================");
+
+        // Step 3: Ask if user wants to edit anything
+        System.out.println("Do you want to edit any of these? (yes/no)");
+        while (true) {
+            String choice = scanner.nextLine().trim().toLowerCase();
+            if (choice.equals("no")) return;
+            if (!choice.equals("yes")) {
+                System.out.println("Invalid input. Please enter 'yes' or 'no'.");
+                continue;
+            }
+
+            // Step 4: Show editable fields
+            System.out.println("Which field do you want to edit?");
+            System.out.println("1. Profile Name");
+            System.out.println("2. User ID");
+            System.out.println("3. Bio");
+            System.out.println("4. Profile Picture URL");
+            System.out.println("0. Cancel");
+
+            String option = scanner.nextLine().trim();
+            switch (option) {
+                case "1" -> editProfileName();
+                case "2" -> editUserId();
+                case "3" -> editBio();
+                case "4" -> editProfilePictureUrl();
+                case "0" -> { return; }
+                default -> System.out.println("Invalid choice. Try again.");
+            }
+
+            // Re-fetch and re-display profile after editing
+            openUserProfile();
+            return;
+        }
+    }
+
+    private void editProfileName() {
+        System.out.println("Enter your new profile name:");
+        String newProfileName = scanner.nextLine().trim();
+
+        // Step 1: Validate input
+        while (newProfileName.trim().isEmpty()) {
+            System.out.println("Profile name cannot be empty. Enter another name.");
+            newProfileName = scanner.nextLine().trim();
+        }
+
+        // Step 2: Create request
+        JSONObject request = new JSONObject();
+        request.put("action", "edit_profile_name");
+        request.put("new_profile_name", newProfileName);
+
+        // Step 3: Send request and receive response
+        JSONObject response = sendWithResponse(request);
+
+        // Step 4: Handle response
+        if (response == null || !response.optString("status", "fail").equals("success")) {
+            System.out.println("Failed to update profile name.");
+        } else {
+            System.out.println("Profile name updated successfully!");
+        }
+    }
+
+    private void editUserId() {
+        while (true) {
+            System.out.println("Enter your new user ID: ");
+            String newUserId = scanner.nextLine().trim();
+
+            if (newUserId.isEmpty()) {
+                System.out.println("User ID cannot be empty.");
+                continue;
+            }
+
+            if (newUserId.contains(" ")) {
+                System.out.println("User ID cannot contain spaces.");
+                continue;
+            }
+
+            if (!newUserId.matches("^[a-zA-Z0-9_]+$")) {
+                System.out.println("User ID can only contain letters, digits, and underscores.");
+                continue;
+            }
+
+            // Send to server
+            JSONObject request = new JSONObject();
+            request.put("action", "edit_user_id");
+            request.put("new_user_id", newUserId);
+            JSONObject response = sendWithResponse(request);
+
+            if (response.getString("status").equals("success")) {
+                System.out.println("User ID updated successfully.");
+                break;
+            } else {
+                // Server-side error message (e.g., ID already exists)
+                System.out.println(response.getString("message"));
+            }
+        }
+    }
+
+    private void editBio() {
+        System.out.println("Enter your new bio:");
+        String newBio = scanner.nextLine().trim();
+
+        // Limit the bio length
+        if (newBio.length() > 70) {
+            System.out.println("Bio cannot be more than 70 characters.");
+            return;
+        }
+
+        JSONObject request = new JSONObject();
+        request.put("action", "edit_bio");
+        request.put("new_bio", newBio);
+
+        JSONObject response = sendWithResponse(request);
+
+        if (response.getString("status").equals("success")) {
+            System.out.println("Bio updated successfully.");
+        } else {
+            System.out.println(response.getString("message"));
+        }
+    }
+
+    private void editProfilePictureUrl() {
+        while (true) {
+            System.out.println("Enter new profile picture URL (or leave empty to remove):");
+            String newImageUrl = scanner.nextLine().trim();
+
+            // URL validation
+            if (newImageUrl.contains(" ")) {
+                System.out.println("URL cannot contain spaces.");
+                continue;
+            }
+
+            if (!newImageUrl.isEmpty() && !newImageUrl.matches("^(http|https)://.*$")) {
+                System.out.println("Invalid URL format. Please enter a valid HTTP/HTTPS link.");
+                continue;
+            }
+
+            JSONObject request = new JSONObject();
+            request.put("action", "edit_profile_picture");
+            request.put("new_image_url", newImageUrl);
+            JSONObject response = sendWithResponse(request);
+
+            if (response.getString("status").equals("success")) {
+                System.out.println("Bio updated successfully.");
+            } else {
+                System.out.println(response.getString("message"));
+            }
+            break;
+        }
+    }
+
+    private void createNewGroup() {
+        actionHandler.createGroup();
+    }
+
+    private void createNewChannel() {
+        actionHandler.createChannel();
+    }
+
+    private void showContacts() {
+        actionHandler.showContactList();
+    }
+
+
+
+
+
+    public void ensureSavedMessagesCreated() {
+        // 1) Client-side quick check
+        boolean alreadyExists = false;
+        if (Session.activeChats != null) {
+            for (ChatEntry e : Session.activeChats) {
+                if (e != null && e.isSavedMessages()) { alreadyExists = true; break; }
+            }
+        }
+        if (alreadyExists) {
+            System.out.println("ℹ️ Saved Messages already exists.");
+            return;
+        }
+
+        // 2) Ask server to get or create the self-chat
+        JSONObject res = sendWithResponse(new JSONObject().put("action", "get_or_create_saved_messages"));
+        if (res == null || !"success".equals(res.optString("status"))) {
+            System.out.println("❌ Failed to create/open Saved Messages: " + (res != null ? res.optString("message","") : ""));
+            return;
+        }
+
+        JSONObject data = res.optJSONObject("data");
+        if (data == null) {
+            System.out.println("❌ Invalid server response for Saved Messages.");
+            return;
+        }
+
+        boolean created = data.optBoolean("created", true); // if server sends it
+        String chatId = data.optString("chat_id", null);
+
+        if (created) {
+            System.out.println("✅ Saved Messages created." + (chatId != null ? " chat_id=" + chatId : ""));
+             try {
+                 UUID cid = UUID.fromString(chatId);
+                 ChatEntry saved = new ChatEntry(cid, "Saved Messages", "Saved Messages", "", "private", null, true, false);
+                 saved.setSavedMessages(true);
+                 if (Session.activeChats == null) Session.activeChats = new ArrayList<>();
+                 Session.activeChats.add(0, saved);
+             } catch (Exception ignore) {}
+        } else {
+            System.out.println("ℹ️ Saved Messages already exists." + (chatId != null ? " chat_id=" + chatId : ""));
+        }
+    }
+
+
+
+    private void openSettings() {
+        while (true) {
+            System.out.println("⚙️  Settings\n");
+
+            String imageUrl    = Session.currentUser.optString("image_url", "—");
+            String profileName = Session.currentUser.optString("profile_name", "—");
+            String userId      = Session.currentUser.optString("user_id", "—");
+
+            renderUserCard(imageUrl, profileName, userId);
+            System.out.println();
+            renderMenu();
+
+            System.out.print("\nChoose an option (0-4): ");
+            String pick = scanner.nextLine().trim();
+
+            switch (pick) {
+                case "1": openUserProfile(); break;
+                case "2": showPrivacySettings(); break;
+                case "3": showTelegramQA(); break;
+                case "4": showTelegramFeatures(); break;
+                case "0": return;
+                default:
+                    System.out.println("❌ Invalid choice. Press Enter to continue...");
+                    scanner.nextLine();
+            }
+        }
+    }
+
+
+
+    private void showPrivacySettings() {
+        while (true) {
+            System.out.println("🔒 Privacy\n");
+            System.out.println("1) Blocked users");
+            System.out.println("2) Change username / password");
+            System.out.println("0) Back");
+            System.out.print("\nChoose: ");
+            String pick = scanner.nextLine().trim();
+
+            switch (pick) {
+                case "1": viewBlockedUsers(); break;
+                case "2": changeCredentialsFlow(); break;
+                case "0": return;
+                default:
+                    System.out.println("❌ Invalid choice. Press Enter...");
+                    scanner.nextLine();
+            }
+        }
+    }
+
+    private void viewBlockedUsers() {
+        System.out.println("🚫 Blocked Users\n");
+
+        org.json.JSONObject req = new org.json.JSONObject();
+        req.put("action", "get_blocked_users");
+
+        org.json.JSONObject res = sendWithResponse(req);
+        if (res == null || !res.optString("status","error").equals("success")) {
+            System.out.println("❌ Failed to fetch blocked users. Press Enter...");
+            scanner.nextLine();
+            return;
+        }
+
+        org.json.JSONArray arr = res.getJSONObject("data").optJSONArray("blocked_users");
+        if (arr == null || arr.isEmpty()) {
+            System.out.println("📭 No blocked users.");
+            System.out.println("\nPress Enter...");
+            scanner.nextLine();
+            return;
+        }
+
+        for (int i = 0; i < arr.length(); i++) {
+            org.json.JSONObject u = arr.getJSONObject(i);
+            String profileName = u.optString("profile_name", "—");
+            String userId = u.optString("user_id", "—");
+            System.out.printf("%d) %s  (@%s)\n", i + 1, profileName, userId);
+        }
+        System.out.println("\n0) Back");
+        System.out.print("\nChoose a user to UNBLOCK (number): ");
+        String pick = scanner.nextLine().trim();
+
+        if (pick.equals("0")) return;
+        int idx;
+        try { idx = Integer.parseInt(pick) - 1; } catch (Exception e) { idx = -1; }
+        if (idx < 0 || idx >= arr.length()) {
+            System.out.println("❌ Invalid index. Press Enter...");
+            scanner.nextLine();
+            return;
+        }
+
+        org.json.JSONObject target = arr.getJSONObject(idx);
+        String targetDisplayId = target.optString("user_id", "");
+        java.util.UUID targetInternalId = java.util.UUID.fromString(target.getString("internal_uuid"));
+
+        System.out.printf("Unblock %s (@%s)? (yes/no): ", target.optString("profile_name","—"), targetDisplayId);
+        if (!scanner.nextLine().trim().equalsIgnoreCase("yes")) return;
+
+        org.json.JSONObject unReq = new org.json.JSONObject();
+        unReq.put("action", "toggle_block");
+        unReq.put("user_id",Session.getUserUUID());
+        unReq.put("target_id", targetInternalId.toString());
+
+        org.json.JSONObject unRes = sendWithResponse(unReq);
+        if (unRes != null && unRes.optString("status","error").equals("success")) {
+            System.out.println("✅ User unblocked.");
+        } else {
+            System.out.println("❌ Failed to unblock.");
+        }
+        System.out.println("Press Enter...");
+        scanner.nextLine();
+    }
+
+
+    private void changeCredentialsFlow() {
+        System.out.println("🛡️  Change Username / Password\n");
+
+        System.out.print("Enter current password: ");
+        String currentPassword = scanner.nextLine();
+
+        org.json.JSONObject verReq = new org.json.JSONObject();
+        verReq.put("action", "verify_password");
+        verReq.put("current_password", currentPassword);
+
+        org.json.JSONObject verRes = sendWithResponse(verReq);
+        if (verRes == null || !verRes.optString("status","error").equals("success")) {
+            System.out.println("❌ Current password is incorrect.");
+            System.out.println("Press Enter...");
+            scanner.nextLine();
+            return;
+        }
+
+        String currentUsername = Session.currentUser.optString("username", "—");
+        System.out.println("\n✅ Verified.");
+        System.out.println("Current username: " + currentUsername);
+        System.out.println("Current password: ******** (hidden)");
+        System.out.println("\nWhat do you want to change?");
+        System.out.println("1) Username");
+        System.out.println("2) Password");
+        System.out.println("3) Both");
+        System.out.println("0) Back");
+        System.out.print("\nChoose: ");
+        String pick = scanner.nextLine().trim();
+
+        switch (pick) {
+            case "1":
+                changeUsername(currentPassword);
+                break;
+            case "2":
+                changePassword(currentPassword);
+                break;
+            case "3":
+                boolean uOk = changeUsername(currentPassword);
+                boolean pOk = changePassword(currentPassword);
+                if (uOk && pOk) System.out.println("✅ Username and password updated.");
+                System.out.println("Press Enter...");
+                scanner.nextLine();
+                break;
+            case "0":
+                return;
+            default:
+                System.out.println("❌ Invalid choice. Press Enter...");
+                scanner.nextLine();
+        }
+    }
+
+
+    private boolean changeUsername(String currentPassword) {
+        System.out.print("\nNew username: ");
+        String newUsername = scanner.nextLine().trim();
+
+        if (!isValidUsername(newUsername)) {
+            System.out.println("❌ Invalid username. Use 4–32 chars: letters, digits, underscore.");
+            return false;
+        }
+
+        org.json.JSONObject req = new org.json.JSONObject();
+        req.put("action", "update_username");
+        req.put("current_password", currentPassword);
+        req.put("new_username", newUsername);
+
+        org.json.JSONObject res = sendWithResponse(req);
+        if (res != null && res.optString("status","error").equals("success")) {
+            Session.currentUser.put("username", newUsername);
+            System.out.println("✅ Username updated.");
+            return true;
+        } else {
+            String msg = (res == null) ? "No response." : res.optString("message","Update failed.");
+            System.out.println("❌ " + msg);
+            return false;
+        }
+    }
+
+    private boolean isValidUsername(String s) {
+        //4-32 char
+        return s != null && s.matches("^[A-Za-z0-9_]{4,32}$");
+    }
+
+    private boolean changePassword(String currentPassword) {
+        System.out.print("\nNew password: ");
+        String newPassword = scanner.nextLine();
+        System.out.print("Repeat new password: ");
+        String repeat = scanner.nextLine();
+
+        if (!newPassword.equals(repeat)) {
+            System.out.println("❌ Passwords do not match.");
+            return false;
+        }
+        if (!isStrongPassword(newPassword)) {
+            System.out.println("❌ Weak password. Min 8 chars, include letters and digits.");
+            return false;
+        }
+
+        org.json.JSONObject req = new org.json.JSONObject();
+        req.put("action", "update_password");
+        req.put("current_password", currentPassword);
+        req.put("new_password", newPassword);
+
+        org.json.JSONObject res = sendWithResponse(req);
+        if (res != null && res.optString("status","error").equals("success")) {
+            System.out.println("✅ Password updated.");
+            return true;
+        } else {
+            String msg = (res == null) ? "No response." : res.optString("message","Update failed.");
+            System.out.println("❌ " + msg);
+            return false;
+        }
+    }
+
+
+    private void renderUserCard(String imageUrl, String profileName, String userId) {
+        int w = 60;
+        String top = "┌" + "─".repeat(w - 2) + "┐";
+        String bot = "└" + "─".repeat(w - 2) + "┘";
+        System.out.println(top);
+        System.out.println(padBoxLine("Profile", w));
+        System.out.println("├" + "─".repeat(w - 2) + "┤");
+        System.out.println(padBoxLine("Image URL: "   + imageUrl, w));
+        System.out.println(padBoxLine("Profile Name: "+ profileName, w));
+        System.out.println(padBoxLine("User ID: "     + userId, w));
+        System.out.println(bot);
+    }
+
+    private String padBoxLine(String text, int width) {
+        final int inner = width - 2;
+        if (text.length() > inner) {
+            text = text.substring(0, inner - 1) + "…";
+        }
+        int spaces = inner - text.length();
+        return "│" + text + " ".repeat(Math.max(0, spaces)) + "│";
+    }
+
+    private void renderMenu() {
+        System.out.println("1) My Account");
+        System.out.println("2) Privacy");
+        System.out.println("3) Telegram Q&A");
+        System.out.println("4) Telegram Features");
+        System.out.println("0) Back");
+    }
+
+    private void showTelegramFeatures() {
+        System.out.println("🌟 Showing Telegram features...");
+    }
+
+    private void showTelegramQA() {
+        System.out.println("❓ Showing Q&A...");
+    }
+
+    private boolean isStrongPassword(String s) {
+        boolean approved = s.matches("\\b(?=[^\\s]*[A-Z])(?=[^\\s]*[a-z])(?=[^\\s]*\\d)(?=[^\\s]*[!@#$%^&*])[^\\s]{8,}\\b");
+        return approved ;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/SocketMediaDownloader.java b/src/main/java/org/to/telegramfinalproject/Client/SocketMediaDownloader.java
new file mode 100644
index 0000000..4a43d89
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/SocketMediaDownloader.java
@@ -0,0 +1,75 @@
+package org.to.telegramfinalproject.Client;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.PrintWriter;
+
+public final class SocketMediaDownloader {
+    private static final int MAGIC_DL = 0x4D444D32;
+    private final PrintWriter outText;         // NEW
+    private final DataInputStream inBin;
+    private final DataOutputStream outBin;
+
+    public SocketMediaDownloader(PrintWriter outText, DataInputStream inBin, DataOutputStream outBin) {
+        this.outText = outText;
+        this.inBin = inBin;
+        this.outBin = outBin;
+    }
+
+
+    public java.nio.file.Path download(java.util.UUID mediaKey, java.nio.file.Path saveDir, String fileNameHint) throws Exception {
+        outText.print("MEDIA_DL\n");
+        outText.flush();
+
+        org.json.JSONObject req = new org.json.JSONObject()
+                .put("op","download")
+                .put("media_key", mediaKey.toString())
+                .put("offset", 0);
+        byte[] hb = req.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+
+        outBin.writeInt(MAGIC_DL);
+        outBin.writeInt(hb.length);
+        outBin.write(hb);
+        outBin.flush();
+
+        int magic = inBin.readInt();
+        if (magic != MAGIC_DL) throw new java.io.IOException("bad magic");
+
+        int hlen = inBin.readInt();
+        byte[] hbytes = inBin.readNBytes(hlen);
+        org.json.JSONObject hdr = new org.json.JSONObject(new String(hbytes, java.nio.charset.StandardCharsets.UTF_8));
+        if (!"success".equalsIgnoreCase(hdr.optString("status"))) {
+            throw new java.io.IOException("download error: " + hdr.optString("message"));
+        }
+
+        long contentLen = inBin.readLong();
+        String serverName = hdr.optString("file_name", fileNameHint != null ? fileNameHint : mediaKey.toString());
+
+        java.nio.file.Files.createDirectories(saveDir);
+        java.nio.file.Path dest = uniquePath(saveDir, serverName);
+
+        try (java.io.OutputStream os = java.nio.file.Files.newOutputStream(dest)) {
+            byte[] buf = new byte[8192];
+            long remain = contentLen;
+            while (remain > 0) {
+                int toRead = (int) Math.min(buf.length, remain);
+                int n = inBin.read(buf, 0, toRead);
+                if (n == -1) throw new java.io.EOFException("unexpected EOF");
+                os.write(buf, 0, n);
+                remain -= n;
+            }
+        }
+        return dest;
+    }
+
+    private static java.nio.file.Path uniquePath(java.nio.file.Path dir, String name) throws java.io.IOException {
+        java.nio.file.Path p = dir.resolve(name);
+        if (!java.nio.file.Files.exists(p)) return p;
+        String base = name, ext = "";
+        int dot = name.lastIndexOf('.');
+        if (dot >= 0) { base = name.substring(0, dot); ext = name.substring(dot); }
+        int i = 1;
+        while (java.nio.file.Files.exists(dir.resolve(base + " (" + i + ")" + ext))) i++;
+        return dir.resolve(base + " (" + i + ")" + ext);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Client/TelegramClient.java b/src/main/java/org/to/telegramfinalproject/Client/TelegramClient.java
new file mode 100644
index 0000000..6d68f5a
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Client/TelegramClient.java
@@ -0,0 +1,339 @@
+//package org.to.telegramfinalproject.Client;
+//
+//import org.json.JSONObject;
+//
+//import java.io.BufferedReader;
+//import java.io.IOException;
+//import java.io.InputStreamReader;
+//import java.io.PrintWriter;
+//import java.net.Socket;
+//import java.util.Map;
+//import java.util.Scanner;
+//import java.util.UUID;
+//import java.util.concurrent.BlockingQueue;
+//import java.util.concurrent.ConcurrentHashMap;
+//import java.util.concurrent.LinkedBlockingQueue;
+//
+//public class TelegramClient {
+//    private static final String SERVER_HOST = "localhost";
+//    private static final int SERVER_PORT = 8000;
+//    private static Socket socket;
+//    private BufferedReader in;
+//    private PrintWriter out;
+//    private final Scanner scanner;
+//    private ActionHandler handler;
+//    public static BlockingQueue<JSONObject> responseQueue = new LinkedBlockingQueue<>();
+//    public static UUID loggedInUserId = null;
+//    public static final Map<String, BlockingQueue<JSONObject>> pendingResponses = new ConcurrentHashMap<>();
+//
+//
+//    private static TelegramClient instance;
+//
+//    public TelegramClient() {
+//        this.scanner = new Scanner(System.in);
+//        instance = this;
+//    }
+//
+//    public static TelegramClient getInstance() {
+//        return instance;
+//    }
+//
+//    public void start() {
+//        try {
+//            socket = new Socket(SERVER_HOST, SERVER_PORT);
+//            in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+//            out = new PrintWriter(socket.getOutputStream(), true);
+//            System.out.println("✅ Connected to Telegram Server");
+//            handler = new ActionHandler(out, in, scanner);
+//
+//            Thread listenerThread = new Thread(new IncomingMessageListener(in));
+//            listenerThread.setDaemon(true);
+//            listenerThread.start();
+//
+//            showMainMenu();
+//
+//        } catch (IOException e) {
+//            System.err.println("❌ Error connecting to server: " + e.getMessage());
+//        }
+//    }
+//
+//    private void showMainMenu() throws IOException {
+//        while (true) {
+//            System.out.println("Main Menu:");
+//            System.out.println("1. Register");
+//            System.out.println("2. Login");
+//            System.out.println("3. Exit");
+//            System.out.print("Choose an option: ");
+//            String choice = scanner.nextLine();
+//
+//            switch (choice) {
+//                case "1" -> handler.register();
+//                case "2" -> {
+//                    handler.loginHandler();
+//                    if (Session.currentUser != null) {
+//                        System.out.println("✅ Login successful.");
+//                        new Thread(new ActionHandler.ChatStateMonitor(out)).start();
+////                        new Thread(new ActionHandler.CurrentChatMenuRefresher(this.handler)).start();
+//
+//
+//                        UUID internalId = UUID.fromString(Session.currentUser.getString("internal_uuid"));
+//                        loggedInUserId = internalId;
+//
+//                        handler.userMenu(internalId);
+//                    } else {
+//                        System.out.println("❌ Login failed.");
+//                    }
+//                }
+//                case "3" -> {
+//                    System.out.println("Exiting...");
+//                    return;
+//                }
+//                default -> System.out.println("Invalid choice.");
+//            }
+//        }
+//    }
+//
+//    public static void send(JSONObject req) {
+//        try {
+//            responseQueue.clear();  // optional: clear old responses
+//            getInstance().out.println(req.toString());
+//            System.out.println("📤 [SEND] " + req.toString(2));
+//
+//        } catch (Exception e) {
+//            System.err.println("❌ Error sending request: " + e.getMessage());
+//        }
+//    }
+//
+//
+//
+//
+//    public static Socket getSocket() {
+//        return socket;
+//    }
+//
+//    public static void main(String[] args) {
+//        new TelegramClient().start();
+//    }
+//
+//    public PrintWriter getOut() {
+//        return out;
+//    }
+//
+//
+//}
+
+
+
+package org.to.telegramfinalproject.Client;
+
+import org.json.JSONObject;
+
+import java.io.*;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+
+public class TelegramClient {
+    private static final String SERVER_HOST = "localhost";
+    private static final int SERVER_PORT = 8080;
+
+    private static TelegramClient instance;
+
+    private static Socket socket;
+    private BufferedReader in;
+    private PrintWriter out;
+
+
+    private final Scanner scanner;
+    private ActionHandler handler;
+
+    public static final BlockingQueue<JSONObject> responseQueue = new LinkedBlockingQueue<>();
+    public static final Map<String, BlockingQueue<JSONObject>> pendingResponses = new ConcurrentHashMap<>();
+    public static UUID loggedInUserId = null;
+    private DataInputStream inBin;                 // NEW
+    private DataOutputStream outBin;               // NEW
+    private static SocketMediaDownloader downloader; // NEW
+    public static final java.util.concurrent.atomic.AtomicBoolean mediaBusy = new java.util.concurrent.atomic.AtomicBoolean(false); // NEW
+
+    public static SocketMediaDownloader getDownloader() { return downloader; }
+    public DataInputStream  getInBin()  { return inBin;  }
+    public DataOutputStream getOutBin() { return outBin; }
+
+    private volatile boolean listenerStarted = false;
+
+    public TelegramClient() {
+        this.scanner = new Scanner(System.in);
+        instance = this;
+    }
+
+    public static synchronized TelegramClient getInstance() {
+        if (instance == null) instance = new TelegramClient();
+        return instance;
+    }
+
+//    public void startConsole() {
+//        try {
+//            connectIfNeeded();
+//            initHandlerIfNeeded();
+//            startListenerOnce();
+//            showMainMenu();
+//        } catch (IOException e) {
+//            System.err.println("❌ Error connecting to server: " + e.getMessage());
+//        }
+//    }
+
+    public void startConsole() {
+        try {
+            connectIfNeeded();
+            initHandlerIfNeeded();
+            startListenerOnce(IncomingMessageListener.UIMode.CONSOLE);  // ← کنسول
+            showMainMenu();
+        } catch (IOException e) {
+            System.err.println("❌ Error connecting to server: " + e.getMessage());
+        }
+    }
+
+    public void start() { startConsole(); }
+
+    //UI only
+//    public static synchronized TelegramClient getOrInitForUI() throws IOException {
+//        TelegramClient cli = getInstance();
+//        cli.connectIfNeeded();
+//        cli.initHandlerIfNeeded();
+//        cli.startListenerOnce();
+//        return cli;
+//    }
+
+    public static synchronized TelegramClient getOrInitForUI() throws IOException {
+        TelegramClient cli = getInstance();
+        cli.connectIfNeeded();
+        cli.initHandlerIfNeeded();
+        cli.startListenerOnce(IncomingMessageListener.UIMode.UI);       // ← UI
+        return cli;
+    }
+
+
+    private synchronized void connectIfNeeded() throws IOException {
+        if (socket != null && socket.isConnected() && !socket.isClosed()) return;
+
+        socket = new Socket(SERVER_HOST, SERVER_PORT);
+        InputStream   rawIn  = socket.getInputStream();
+        OutputStream  rawOut = socket.getOutputStream();
+
+        in  = new BufferedReader(new InputStreamReader(rawIn,  java.nio.charset.StandardCharsets.UTF_8));
+        out = new PrintWriter(new OutputStreamWriter(rawOut, java.nio.charset.StandardCharsets.UTF_8), true);
+
+        // NEW: binary streams
+        inBin  = new DataInputStream(rawIn);
+        outBin = new DataOutputStream(rawOut);
+
+        // NEW: media downloader helper
+        downloader = new SocketMediaDownloader(out, inBin, outBin);
+
+        System.out.println("✅ Connected to Telegram Server");
+    }
+
+    private synchronized void initHandlerIfNeeded() {
+        if (handler == null) {
+            handler = new ActionHandler(out, in, outBin, scanner);
+        }
+    }
+
+//    private void startListenerOnce() {
+//        if (listenerStarted) return;
+//        listenerStarted = true;
+//        Thread listenerThread = new Thread(new IncomingMessageListener(in), "socket-listener");
+//        listenerThread.setDaemon(true);
+//        listenerThread.start();
+//    }
+
+
+//    private void startListenerOnce(IncomingMessageListener.UIMode mode) {
+//        if (listenerStarted) return;
+//        listenerStarted = true;
+//
+//        Thread listenerThread = new Thread(
+//                new IncomingMessageListener(in, mode),
+//                "socket-listener"
+//        );
+//        listenerThread.setDaemon(true);
+//        listenerThread.start();
+//    }
+
+    private void startListenerOnce(IncomingMessageListener.UIMode mode) {
+        if (listenerStarted) return;
+        listenerStarted = true;
+
+        listener = new IncomingMessageListener(in, mode);
+        Thread listenerThread = new Thread(listener, "socket-listener");
+        listenerThread.setDaemon(true);
+        listenerThread.start();
+    }
+
+    //console
+    private void showMainMenu() throws IOException {
+        while (true) {
+            System.out.println("Main Menu:");
+            System.out.println("1. Register");
+            System.out.println("2. Login");
+            System.out.println("3. Exit");
+            System.out.print("Choose an option: ");
+            String choice = scanner.nextLine();
+
+            switch (choice) {
+                case "1" -> handler.register();
+                case "2" -> {
+                    handler.loginHandler();
+                    if (Session.currentUser != null) {
+                        System.out.println("✅ Login successful.");
+                        new Thread(new ActionHandler.ChatStateMonitor(out)).start();
+
+                        UUID internalId = UUID.fromString(Session.currentUser.getString("internal_uuid"));
+                        loggedInUserId = internalId;
+
+                        handler.userMenu(internalId);
+                    } else {
+                        System.out.println("❌ Login failed.");
+                    }
+                }
+                case "3" -> {
+                    System.out.println("Exiting...");
+                    return;
+                }
+                default -> System.out.println("Invalid choice.");
+            }
+        }
+    }
+
+    public static void send(JSONObject req) {
+        try {
+            responseQueue.clear();
+            getInstance().out.println(req.toString());
+            System.out.println("📤 [SEND] " + req.toString(2));
+        } catch (Exception e) {
+            System.err.println("❌ Error sending request: " + e.getMessage());
+        }
+    }
+
+    public BufferedReader getIn()  { return in; }
+    public PrintWriter   getOut()  { return out; }
+    public ActionHandler getHandler() { return handler; }
+    public static Socket getSocket() { return socket; }
+
+    public static void main(String[] args) {
+        new TelegramClient().startConsole();
+    }
+
+    // TelegramClient.java
+    private IncomingMessageListener listener;
+
+    public IncomingMessageListener getListener() {
+        return listener;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Database/ArchivedChatDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/ArchivedChatDatabase.java
new file mode 100644
index 0000000..7ad71ba
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/ArchivedChatDatabase.java
@@ -0,0 +1,72 @@
+package org.to.telegramfinalproject.Database;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class ArchivedChatDatabase {
+    public static boolean archiveChat(UUID userId, UUID chatId, String chatType) {
+        String sql = "INSERT INTO archived_chats (user_id, chat_id, chat_type) VALUES (?, ?, ?) ON CONFLICT DO NOTHING";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            ps.setObject(2, chatId);
+            ps.setString(3, chatType);
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean unarchiveChat(UUID userId, UUID chatId) {
+        String sql = "DELETE FROM archived_chats WHERE user_id = ? AND chat_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            ps.setObject(2, chatId);
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean isChatArchived(UUID userId, UUID chatId) {
+        String sql = "SELECT 1 FROM archived_chats WHERE user_id = ? AND chat_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            ps.setObject(2, chatId);
+            ResultSet rs = ps.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static List<UUID> getArchivedChats(UUID userId) {
+        List<UUID> list = new ArrayList<>();
+        String sql = "SELECT chat_id FROM archived_chats WHERE user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                list.add(UUID.fromString(rs.getString("chat_id")));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Database/ChannelDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/ChannelDatabase.java
new file mode 100644
index 0000000..c908fef
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/ChannelDatabase.java
@@ -0,0 +1,773 @@
+package org.to.telegramfinalproject.Database;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Models.Channel;
+import org.to.telegramfinalproject.Models.Group;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class ChannelDatabase {
+    public static List<Channel> getChannelsByUser(UUID internalUuid) {
+        List<Channel> channels = new ArrayList<>();
+
+        String sql = """
+            SELECT c.* FROM channels c
+            JOIN channel_subscribers cs ON c.internal_uuid = cs.channel_id
+            WHERE cs.user_id = ?
+        """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, internalUuid);
+            ResultSet rs = stmt.executeQuery();
+
+            while (rs.next()) {
+                Channel channel = new Channel();
+
+                channel.setInternal_uuid(UUID.fromString(rs.getString("internal_uuid")));
+                channel.setChannel_id(rs.getString("channel_id"));
+                channel.setChannel_name(rs.getString("channel_name"));
+                channel.setCreator_id(UUID.fromString(rs.getString("creator_id")));
+                channel.setImage_url(rs.getString("image_url"));
+                channel.setDescription(rs.getString("description"));
+                channel.setCreated_at(rs.getTimestamp("created_at").toLocalDateTime());
+
+                channels.add(channel);
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return channels;
+    }
+
+
+    public static List<Channel> searchChannels(String keyword) {
+        List<Channel> result = new ArrayList<>();
+        String sql = "SELECT * FROM channels WHERE channel_name ILIKE ? OR channel_id ILIKE ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, "%" + keyword + "%");
+            stmt.setString(2, keyword);
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                Channel channel = new Channel(
+                        UUID.fromString(rs.getString("internal_uuid")),
+                        rs.getString("channel_name"),
+                        UUID.fromString(rs.getString("creator_id")),
+                        rs.getTimestamp("created_at").toLocalDateTime()
+                );
+                channel.setChannel_id(rs.getString("channel_id"));
+                channel.setImage_url(rs.getString("image_url"));
+                channel.setDescription(rs.getString("description"));
+                result.add(channel);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+
+    public static List<UUID> getSubscriberUUIDs(UUID channelInternalUUID) {
+        List<UUID> subscriberIds = new ArrayList<>();
+        String sql = "SELECT user_id FROM channel_subscribers WHERE channel_id = ?";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelInternalUUID);
+
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    subscriberIds.add((UUID) rs.getObject("user_id"));
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return subscriberIds;
+    }
+
+    public static Channel findByChannelId(String channelId) {
+        String sql = "SELECT * FROM channels WHERE channel_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setString(1, channelId);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                Channel channel = new Channel();
+                channel.setInternal_uuid(UUID.fromString(rs.getString("internal_uuid")));
+                channel.setChannel_id(rs.getString("channel_id"));
+                channel.setChannel_name(rs.getString("channel_name"));
+                channel.setImage_url(rs.getString("image_url"));
+                channel.setCreator_id(UUID.fromString(rs.getString("creator_id")));
+                channel.setDescription(rs.getString("description"));
+                channel.setCreated_at(rs.getTimestamp("created_at").toLocalDateTime());
+                return channel;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+
+
+    public static boolean isUserSubscribed(UUID userId, UUID channelInternalId) {
+        String sql = "SELECT * FROM channel_subscribers WHERE user_id = ? AND channel_id = ?";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            stmt.setObject(2, channelInternalId);
+            ResultSet rs = stmt.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+
+
+    public static UUID findInternalUUIDByChannelId(String channelId) {
+        String sql = "SELECT internal_uuid FROM channels WHERE channel_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, channelId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return (UUID) rs.getObject("internal_uuid");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static boolean addSubscriberToChannel(UUID userId, UUID channelUUID) {
+        String sql = """
+        INSERT INTO channel_subscribers (channel_id, user_id)
+        VALUES (?, ?)
+        ON CONFLICT DO NOTHING
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelUUID);
+            stmt.setObject(2, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean createChannel(Channel channel, UUID creatorId) {
+        String sql = """
+            INSERT INTO channels (
+                internal_uuid, channel_id, channel_name,
+                creator_id, image_url, description, created_at
+            )
+            VALUES (gen_random_uuid(), ?, ?, ?, ?, ?, ?)
+            RETURNING internal_uuid
+        """;
+
+        String subscriberSql = """
+            INSERT INTO channel_subscribers (channel_id, user_id) VALUES (?, ?)
+        """;
+
+        try (Connection conn = ConnectionDb.connect()) {
+
+            PreparedStatement stmt = conn.prepareStatement(sql);
+            stmt.setString(1, channel.getChannel_id());
+            stmt.setString(2, channel.getChannel_name());
+            stmt.setObject(3, creatorId);
+            stmt.setString(4, channel.getImage_url());
+            stmt.setString(5, channel.getDescription());
+            stmt.setObject(6, channel.getCreated_at());
+
+            ResultSet rs = stmt.executeQuery();
+            if (!rs.next()) return false;
+
+            UUID internalUUID = (UUID) rs.getObject("internal_uuid");
+            channel.setInternal_uuid(internalUUID);
+
+            PreparedStatement subStmt = conn.prepareStatement(subscriberSql);
+            subStmt.setObject(1, internalUUID);
+            subStmt.setObject(2, creatorId);
+            subStmt.executeUpdate();
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+//    public static boolean insertChannel(UUID internalUUID, String channelId, String channelName, UUID creatorId, String imageUrl, LocalDateTime createdAt) {
+//        String sql = "INSERT INTO channels (internal_uuid, channel_id, channel_name, creator_id, image_url, created_at) VALUES (?, ?, ?, ?, ?, ?)";
+//
+//        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+//            stmt.setObject(1, internalUUID);
+//            stmt.setString(2, channelId);
+//            stmt.setString(3, channelName);
+//            stmt.setObject(4, creatorId);
+//            stmt.setString(5, imageUrl);
+//            stmt.setObject(6, createdAt);
+//            stmt.executeUpdate();
+//            return true;
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//            return false;
+//        }
+//    }
+
+    public static boolean insertChannel(UUID internalUUID,
+                                        String channelId,
+                                        String channelName,
+                                        UUID creatorId,
+                                        String imageUrl,
+                                        String description,
+                                        LocalDateTime createdAt) {
+        String sql = "INSERT INTO channels " +
+                "(internal_uuid, channel_id, channel_name, creator_id, image_url, description, created_at) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?)";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, internalUUID);
+            stmt.setString(2, channelId);
+            stmt.setString(3, channelName);
+            stmt.setObject(4, creatorId);
+
+            if (imageUrl != null && !imageUrl.isBlank()) {
+                stmt.setString(5, imageUrl);
+            } else {
+                stmt.setNull(5, java.sql.Types.VARCHAR);
+            }
+
+            if (description != null && !description.isBlank()) {
+                // اگر می‌خوای مطمئن بشی 255 نشکنه:
+                stmt.setString(6, description.length() > 255 ? description.substring(0, 255) : description);
+            } else {
+                stmt.setNull(6, java.sql.Types.VARCHAR);
+            }
+
+            stmt.setObject(7, createdAt);
+
+            stmt.executeUpdate();
+            return true;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static void addSubscriber(UUID channelId, UUID userId, String role) {
+        String sql = "INSERT INTO channel_subscribers (channel_id, user_id, role) VALUES (?, ?, ?) ON CONFLICT DO NOTHING";
+
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+            stmt.setString(3, role);
+
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static Channel findByInternalUUID(UUID internalUUID) {
+        String sql = "SELECT * FROM channels WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, internalUUID);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                Channel channel = new Channel();
+                channel.setInternal_uuid(UUID.fromString(rs.getString("internal_uuid")));
+                channel.setChannel_id(rs.getString("channel_id"));
+                channel.setChannel_name(rs.getString("channel_name"));
+                channel.setImage_url(rs.getString("image_url"));
+                channel.setCreator_id(UUID.fromString(rs.getString("creator_id")));
+                channel.setDescription(rs.getString("description"));
+                channel.setCreated_at(rs.getTimestamp("created_at").toLocalDateTime());
+                return channel;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static boolean addOwnerToChannel(UUID channelId, UUID userId) {
+        String sql = "INSERT INTO channel_subscribers (channel_id, user_id, role) VALUES (?, ?, 'owner')";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean addAdminToChannel(UUID channelId, UUID userId, JSONObject permissions) {
+        String sql = "UPDATE channel_subscribers SET role = 'admin', permissions = ?::jsonb WHERE channel_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, permissions.toString());
+            stmt.setObject(2, channelId);
+            stmt.setObject(3, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static String getChannelRole(UUID channelId, UUID userId) {
+        String sql = "SELECT role FROM channel_subscribers WHERE channel_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return rs.getString("role");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return "subscriber"; // پیش‌فرض
+    }
+
+
+
+    public static JSONObject getChannelPermissions(UUID channelId, UUID userId) {
+        String sql = "SELECT permissions FROM channel_subscribers WHERE channel_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return new JSONObject(rs.getString("permissions"));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new JSONObject();
+    }
+
+
+
+    public static boolean updateChannelAdminPermissions(UUID channelId, UUID userId, JSONObject permissions) {
+        String sql = "UPDATE channel_subscribers SET permissions = ?::jsonb WHERE channel_id = ? AND user_id = ? AND role = 'admin'";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, permissions.toString());
+            stmt.setObject(2, channelId);
+            stmt.setObject(3, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+
+    public static List<JSONObject> getChannelAdminsAndOwner(UUID channelId) {
+        List<JSONObject> admins = new ArrayList<>();
+
+        String sql = """
+        SELECT u.internal_uuid, u.profile_name, u.user_id, cs.role, cs.permissions
+        FROM channel_subscribers cs
+        JOIN users u ON cs.user_id = u.internal_uuid
+        WHERE cs.channel_id = ? AND (cs.role = 'owner' OR cs.role = 'admin')
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, channelId);
+
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    JSONObject obj = new JSONObject();
+                    obj.put("internal_uuid", rs.getObject("internal_uuid").toString());
+                    obj.put("profile_name", rs.getString("profile_name"));
+                    obj.put("user_id", rs.getString("user_id"));
+                    obj.put("role", rs.getString("role"));
+                    obj.put("permissions", new JSONObject(rs.getString("permissions")));
+                    admins.add(obj);
+                }
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return admins;
+    }
+
+
+    public static boolean isOwner(UUID channelId, UUID userId) {
+        String sql = "SELECT role FROM channel_subscribers WHERE channel_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return "owner".equals(rs.getString("role"));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static boolean isAdmin(UUID channelId, UUID userId) {
+        String sql = "SELECT role FROM channel_subscribers WHERE channel_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                String role = rs.getString("role");
+                return "admin".equals(role) || "owner".equals(role); // owner هم admin هست
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static boolean isUserInChannel(UUID userId, UUID channelId) {
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(
+                     "SELECT 1 FROM channel_subscribers WHERE channel_id = ? AND user_id = ?")) {
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+
+            ResultSet rs = stmt.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean removeSubscriberFromChannel(UUID channelId, UUID userId) {
+        String sql = "DELETE FROM channel_subscribers WHERE channel_id = ? AND user_id = ?";
+
+        try (Connection conn =ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+
+            int affectedRows = stmt.executeUpdate();
+            return affectedRows > 0;
+
+        } catch (SQLException e) {
+            System.err.println("Error removing subscriber from channel: " + e.getMessage());
+            return false;
+        }
+    }
+    public static JSONArray getChannelSubscribers(UUID channelId) {
+        JSONArray subscribers = new JSONArray();
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(
+                     "SELECT u.internal_uuid, u.user_id, u.profile_name, " +
+                             "CASE WHEN cs.role = 'owner' THEN 'owner' " +
+                             "     WHEN cs.role = 'admin' THEN 'admin' " +
+                             "     ELSE 'subscriber' END AS role " +
+                             "FROM channel_subscribers cs " +
+                             "JOIN users u ON cs.user_id = u.internal_uuid " +
+                             "WHERE cs.channel_id = ?")) {
+
+            stmt.setObject(1, channelId);
+            ResultSet rs = stmt.executeQuery();
+
+            while (rs.next()) {
+                JSONObject obj = new JSONObject();
+                obj.put("internal_uuid", rs.getObject("internal_uuid").toString());
+                obj.put("user_id", rs.getString("user_id"));
+                obj.put("profile_name", rs.getString("profile_name"));
+                obj.put("role", rs.getString("role"));
+                subscribers.put(obj);
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return subscribers;
+    }
+
+
+
+    public static boolean updateChannelInfo(UUID channelId, String newId, String name, String description, String imageUrl) {
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(
+                     "UPDATE channels SET channel_id = ?, channel_name = ?, description = ?, image_url = ? WHERE internal_uuid = ?")) {
+
+            stmt.setString(1, newId);
+            stmt.setString(2, name);
+            stmt.setString(3, description);
+            stmt.setString(4, imageUrl);
+            stmt.setObject(5, channelId);
+
+            int rows = stmt.executeUpdate();
+            return rows > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean isChannelIdUnique(String channelId, UUID excludeChannelUUID) {
+        String query = "SELECT COUNT(*) FROM channels WHERE channel_id = ? AND internal_uuid != ?";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(query)) {
+
+            stmt.setString(1, channelId);
+            stmt.setObject(2, excludeChannelUUID);
+
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                int count = rs.getInt(1);
+                return count == 0;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static boolean demoteAdminToSubscriber(UUID channelId, UUID userId) {
+        String sql = "UPDATE channel_subscribers SET role = 'member', permissions = '{}'::jsonb WHERE channel_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+
+            int affected = stmt.executeUpdate();
+            return affected > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean deleteChannel(UUID channelId) {
+        String sql = "DELETE FROM channels WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, channelId);
+            int affected = stmt.executeUpdate();
+            return affected > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean transferOwnership(UUID channelId, UUID newOwnerUUID) {
+        String updateRoles = """
+        UPDATE channel_subscribers
+        SET role = CASE
+            WHEN user_id = ? THEN 'owner'
+            WHEN role = 'owner' THEN 'admin'
+            ELSE role
+        END
+        WHERE channel_id = ?
+    """;
+
+        String clearPermissions = """
+        UPDATE channel_subscribers
+        SET permissions = '{}'::jsonb
+        WHERE channel_id = ? AND user_id = ?
+    """;
+
+        try (Connection conn = ConnectionDb.connect()) {
+            conn.setAutoCommit(false);
+
+            try (PreparedStatement roleStmt = conn.prepareStatement(updateRoles);
+                 PreparedStatement clearPermsStmt = conn.prepareStatement(clearPermissions)) {
+
+                roleStmt.setObject(1, newOwnerUUID);
+                roleStmt.setObject(2, channelId);
+                roleStmt.executeUpdate();
+
+                clearPermsStmt.setObject(1, channelId);
+                clearPermsStmt.setObject(2, newOwnerUUID);
+                clearPermsStmt.executeUpdate();
+
+                conn.commit();
+                return true;
+
+            } catch (SQLException e) {
+                conn.rollback();
+                e.printStackTrace();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
+
+
+    public static List<UUID> getChannelSubscriberUUIDs(UUID channelId) {
+        List<UUID> subscriberIds = new ArrayList<>();
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement("SELECT user_id FROM channel_subscribers WHERE channel_id = ?")) {
+            stmt.setObject(1, channelId);
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                subscriberIds.add(UUID.fromString(rs.getString("user_id")));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return subscriberIds;
+    }
+
+    public static boolean updateAdminPermissions(UUID channelId, UUID userId, JSONObject permissions) {
+        String sql = "UPDATE channel_subscribers SET permissions = ?::jsonb WHERE channel_id = ? AND user_id = ? AND role = 'admin'";
+        try (Connection conn = ConnectionDb.connect();
+                PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, permissions.toString());
+            stmt.setObject(2, channelId);
+            stmt.setObject(3, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static JSONObject getChannelInfo(UUID channelId, UUID viewerUuid) throws SQLException {
+        JSONObject result = new JSONObject();
+
+        try (Connection conn = ConnectionDb.connect()) {
+            // === Channel header (name, subscriber count, etc.)
+            String channelQuery = """
+        SELECT c.internal_uuid, c.channel_id, c.channel_name, c.image_url, c.description,
+               COUNT(s.user_id) as subscriber_count
+        FROM channels c
+        LEFT JOIN channel_subscribers s ON c.internal_uuid = s.channel_id
+        WHERE c.internal_uuid = ?
+        GROUP BY c.internal_uuid, c.channel_id, c.channel_name, c.image_url, c.description
+        """;
+
+            try (PreparedStatement ps = conn.prepareStatement(channelQuery)) {
+                ps.setObject(1, channelId);
+                ResultSet rs = ps.executeQuery();
+                if (rs.next()) {
+                    result.put("internal_uuid", rs.getString("internal_uuid"));
+                    result.put("channel_id", rs.getString("channel_id")); // varchar if needed
+                    result.put("channel_name", rs.getString("channel_name"));
+                    result.put("subscriber_count", rs.getInt("subscriber_count"));
+                    result.put("image_url", rs.getString("image_url"));
+                    result.put("description", rs.getString("description")); // ✅ here
+                } else {
+                    return null; // no such channel
+                }
+            }
+
+            // === Subscribers (id, name, role, status, image)
+            JSONArray subscribersArr = new JSONArray();
+
+            String subscribersQuery = """
+        SELECT u.internal_uuid, u.profile_name, u.user_id, u.image_url,
+               cs.role, u.status, u.last_seen
+        FROM channel_subscribers cs
+        JOIN users u ON cs.user_id = u.internal_uuid
+        WHERE cs.channel_id = ?
+        """;
+
+            try (PreparedStatement ps = conn.prepareStatement(subscribersQuery)) {
+                ps.setObject(1, channelId);
+                ResultSet rs = ps.executeQuery();
+                while (rs.next()) {
+                    JSONObject sub = new JSONObject();
+                    sub.put("user_id", rs.getString("internal_uuid"));
+                    sub.put("profile_name", rs.getString("profile_name"));
+                    sub.put("username", rs.getString("user_id"));
+                    sub.put("image_url", rs.getString("image_url"));
+                    sub.put("role", rs.getString("role"));
+                    sub.put("status", rs.getString("status"));
+                    sub.put("last_seen", rs.getString("last_seen"));
+                    subscribersArr.put(sub);
+                }
+            }
+
+            result.put("subscribers", subscribersArr);
+
+            // === Viewer role (so UI knows if viewer can manage/delete)
+            String roleQuery = """
+        SELECT role
+        FROM channel_subscribers
+        WHERE channel_id = ? AND user_id = ?
+        """;
+
+            try (PreparedStatement ps = conn.prepareStatement(roleQuery)) {
+                ps.setObject(1, channelId);
+                ps.setObject(2, viewerUuid);
+                ResultSet rs = ps.executeQuery();
+                if (rs.next()) {
+                    result.put("my_role", rs.getString("role"));
+                } else {
+                    result.put("my_role", ""); // not a subscriber
+                }
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Database/ChatInfoDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/ChatInfoDatabase.java
new file mode 100644
index 0000000..63a3eec
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/ChatInfoDatabase.java
@@ -0,0 +1,130 @@
+package org.to.telegramfinalproject.Database;
+
+import org.json.JSONObject;
+
+import java.sql.*;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+public class ChatInfoDatabase {
+
+    /**
+     * هدر چت را بر اساس نوع آن برمی‌گرداند.
+     * private: name,image_url, online,last_seen
+     * group : name,image_url, member_count
+     * channel: name,image_url, member_count
+     */
+    public static JSONObject getHeaderInfo(String type, UUID receiverId, UUID viewerId) throws SQLException {
+        try (Connection conn = ConnectionDb.connect()) {
+            switch (type.toLowerCase()) {
+                case "private":
+                    return getPrivateHeader(conn, receiverId, viewerId);
+                case "group":
+                    return getGroupHeader(conn, receiverId);
+                case "channel":
+                    return getChannelHeader(conn, receiverId);
+                default:
+                    throw new IllegalArgumentException("Unsupported receiver_type: " + type);
+            }
+        }
+    }
+
+    /** هدر چت خصوصی: other-user نسبت به viewerId را پیدا می‌کنیم */
+    private static JSONObject getPrivateHeader(Connection conn, UUID chatId, UUID viewerId) throws SQLException {
+        if (viewerId == null) throw new IllegalArgumentException("viewerId is required for private header.");
+
+        final String sql = """
+        SELECT
+            u.profile_name            AS name,
+            COALESCE(u.image_url, '') AS image_url,
+            (u.status = 'online')     AS online,
+            u.status                  AS status,
+            u.last_seen               AS last_seen
+        FROM private_chat pc
+        JOIN users u
+          ON u.internal_uuid = CASE WHEN pc.user1_id = ? THEN pc.user2_id ELSE pc.user1_id END
+        WHERE pc.chat_id = ?
+          AND (pc.user1_id = ? OR pc.user2_id = ?)
+        LIMIT 1
+    """;
+
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {
+            int i = 1;
+            ps.setObject(i++, viewerId);
+            ps.setObject(i++, chatId);
+            ps.setObject(i++, viewerId);
+            ps.setObject(i++, viewerId);
+
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) throw new SQLException("Private chat not found or viewer is not a participant.");
+
+                JSONObject j = new JSONObject();
+                j.put("type", "private");
+                j.put("name", rs.getString("name"));
+                j.put("image_url", rs.getString("image_url"));
+
+                // خواندن بولینِ online با سازگاری DB
+                Object onlineObj = rs.getObject("online");
+                boolean online = (onlineObj instanceof Boolean) ? (Boolean) onlineObj
+                        : rs.getInt("online") == 1;
+                j.put("online", online);
+                j.put("status", rs.getString("status")); // رشته‌ی وضعیت هم می‌آید
+
+                Timestamp ts = rs.getTimestamp("last_seen");
+                j.put("last_seen", ts == null ? JSONObject.NULL : ts.toInstant().toString());
+                return j;
+            }
+        }
+    }
+
+
+    /** هدر گروه: نام، عکس و تعداد اعضا */
+    private static JSONObject getGroupHeader(Connection conn, UUID groupInternalId) throws SQLException {
+        String sql = """
+            SELECT
+                g.group_name                        AS name,
+                COALESCE(g.image_url, '')           AS image_url,
+                (SELECT COUNT(*) FROM group_members gm WHERE gm.group_id = g.internal_uuid) AS member_count
+            FROM groups g
+            WHERE g.internal_uuid = ?
+            LIMIT 1
+        """;
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, groupInternalId);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) throw new SQLException("Group not found.");
+                JSONObject j = new JSONObject();
+                j.put("type", "group");
+                j.put("name", rs.getString("name"));
+                j.put("image_url", rs.getString("image_url"));
+                j.put("member_count", rs.getInt("member_count"));
+                return j;
+            }
+        }
+    }
+
+    /** هدر کانال: نام، عکس و تعداد سابسکرایبر */
+    private static JSONObject getChannelHeader(Connection conn, UUID channelInternalId) throws SQLException {
+        String sql = """
+            SELECT
+                c.channel_name                      AS name,
+                COALESCE(c.image_url, '')           AS image_url,
+                (SELECT COUNT(*) FROM channel_subscribers cs WHERE cs.channel_id = c.internal_uuid) AS member_count
+            FROM channels c
+            WHERE c.internal_uuid = ?
+            LIMIT 1
+        """;
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, channelInternalId);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) throw new SQLException("Channel not found.");
+                JSONObject j = new JSONObject();
+                j.put("type", "channel");
+                j.put("name", rs.getString("name"));
+                j.put("image_url", rs.getString("image_url"));
+                j.put("member_count", rs.getInt("member_count"));
+                return j;
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Database/ConnectionDb.java b/src/main/java/org/to/telegramfinalproject/Database/ConnectionDb.java
new file mode 100644
index 0000000..b58f4c0
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/ConnectionDb.java
@@ -0,0 +1,18 @@
+package org.to.telegramfinalproject.Database;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+public class ConnectionDb {
+    private static final String JDBC_URL = "jdbc:postgresql://localhost:5432/Telegram";
+    private static final String USERNAME = "postgres";
+    private static final String PASSWORD = "Partow@1384";
+
+    public ConnectionDb() {
+    }
+
+    public static Connection connect() throws SQLException {
+        return DriverManager.getConnection(JDBC_URL, USERNAME, PASSWORD);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Database/ContactDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/ContactDatabase.java
new file mode 100644
index 0000000..051475d
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/ContactDatabase.java
@@ -0,0 +1,385 @@
+package org.to.telegramfinalproject.Database;
+
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Models.Contact;
+import org.to.telegramfinalproject.Models.ContactEntry;
+import org.to.telegramfinalproject.Models.User;
+
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class ContactDatabase {
+    public ContactDatabase(){}
+
+
+    private static Connection getConnection() throws SQLException {
+        return ConnectionDb.connect();
+    }
+
+    public static boolean addContact(UUID userId, UUID contactId) {
+        String sql = """
+        INSERT INTO contacts (user_id, contact_id)
+        VALUES (?, ?)
+        ON CONFLICT DO NOTHING
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            stmt.setObject(2, contactId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static List<UUID> getContactUUIDs(UUID userId) {
+        List<Contact> contacts = getContacts(userId);
+        List<UUID> contactIds = new ArrayList<>();
+        for (Contact c : contacts) {
+            contactIds.add(c.getContact_id());
+        }
+        return contactIds;
+    }
+
+
+
+    public static boolean removeContact(UUID user_id, UUID contact_id)  {
+        String sql = "DELETE FROM contacts WHERE user_id = ? AND contact_id = ?";
+        try (Connection connection = getConnection()) {
+            PreparedStatement stmt = connection.prepareStatement(sql);
+            stmt.setObject(1, user_id);
+            stmt.setObject(2, contact_id);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean toggleBlock(UUID userId, UUID targetId) {
+        String selectSql = "SELECT is_blocked FROM contacts WHERE user_id = ? AND contact_id = ?";
+        String updateSql = "UPDATE contacts SET is_blocked = ? WHERE user_id = ? AND contact_id = ?";
+
+        try (Connection conn = getConnection();
+             PreparedStatement selectStmt = conn.prepareStatement(selectSql)) {
+
+            selectStmt.setObject(1, userId);
+            selectStmt.setObject(2, targetId);
+
+            ResultSet rs = selectStmt.executeQuery();
+            if (rs.next()) {
+                boolean currentlyBlocked = rs.getBoolean("is_blocked");
+
+                try (PreparedStatement updateStmt = conn.prepareStatement(updateSql)) {
+                    updateStmt.setBoolean(1, !currentlyBlocked);
+                    updateStmt.setObject(2, userId);
+                    updateStmt.setObject(3, targetId);
+                    updateStmt.executeUpdate();
+                }
+                return !currentlyBlocked;
+            } else {
+                String insertSql = "INSERT INTO contacts (user_id, contact_id, is_blocked) VALUES (?, ?, ?)";
+                try (PreparedStatement insertStmt = conn.prepareStatement(insertSql)) {
+                    insertStmt.setObject(1, userId);
+                    insertStmt.setObject(2, targetId);
+                    insertStmt.setBoolean(3, true);
+                    insertStmt.executeUpdate();
+                }
+                return true;
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static List<JSONObject> getBlockedUsers(UUID userId) {
+        String sql = """
+            SELECT u.internal_uuid, u.user_id, u.profile_name
+            FROM contacts c
+            JOIN users u ON u.internal_uuid = c.contact_id
+            WHERE c.user_id = ? AND c.is_blocked = TRUE
+            ORDER BY u.profile_name NULLS LAST, u.user_id
+        """;
+        List<JSONObject> out = new ArrayList<>();
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    JSONObject j = new JSONObject();
+                    j.put("internal_uuid", rs.getObject("internal_uuid").toString());
+                    j.put("user_id", rs.getString("user_id"));
+                    j.put("profile_name", rs.getString("profile_name"));
+                    out.add(j);
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return out;
+    }
+
+    public static UUID findOtherUserInPrivateChat(UUID chatId, UUID viewerId) {
+        if (chatId == null || viewerId == null) return null;
+
+        final String sql = """
+            SELECT user1_id, user2_id
+            FROM private_chat
+            WHERE chat_id = ?
+            """;
+
+        try (Connection cn = getConnection();
+             PreparedStatement ps = cn.prepareStatement(sql)) {
+
+            ps.setObject(1, chatId);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return null;
+
+                UUID u1 = (UUID) rs.getObject("user1_id");
+                UUID u2 = (UUID) rs.getObject("user2_id");
+
+                if (viewerId.equals(u1)) return u2;
+                if (viewerId.equals(u2)) return u1;
+
+                // اگر viewer عضو این چت نیست
+                return null;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public boolean unblockContact(UUID user_id, UUID contact_id) {
+        String sql = "UPDATE contacts SET is_blocked = FALSE WHERE user_id = ? AND contact_id = ?";
+        try (Connection connection = getConnection()) {
+            PreparedStatement stmt = connection.prepareStatement(sql);
+            stmt.setObject(1, user_id);
+            stmt.setObject(2, contact_id);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static List<Contact> getContacts(UUID user_id) {
+        List<Contact> contacts = new ArrayList<>();
+        String sql = "SELECT * FROM contacts WHERE user_id = ?";
+        try (Connection connection = getConnection()) {
+            PreparedStatement stmt = connection.prepareStatement(sql);
+            stmt.setObject(1, user_id);
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                UUID contactId = (UUID) rs.getObject("contact_id");
+                boolean isBlocked = rs.getBoolean("is_blocked");
+                Timestamp addedAt = rs.getTimestamp("added_at");
+
+                Contact contact = new Contact(user_id, contactId);
+                contact.setIs_blocked(isBlocked);
+                contact.setAdd_at(addedAt.toLocalDateTime());
+                contacts.add(contact);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return contacts;
+    }
+
+
+    public static boolean existsContact(UUID user_id, UUID contact_id) {
+        String sql = "SELECT 1 FROM contacts WHERE user_id = ? AND contact_id = ? LIMIT 1"; // stop searching when find the first item in DB(LIMIT 1)
+        try (Connection connection = getConnection()) {
+            PreparedStatement stmt = connection.prepareStatement(sql);
+            stmt.setObject(1, user_id);
+            stmt.setObject(2, contact_id);
+            ResultSet rs = stmt.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public boolean eitherBlocks(UUID userA, UUID userB) {
+        return isBlocked(userA, userB) || isBlocked(userB, userA);
+    }
+
+
+
+    public static boolean isBlocked(UUID user_id, UUID contact_id) {
+        String sql = "SELECT is_blocked FROM contacts WHERE user_id = ? AND contact_id = ?";
+        try (Connection connection = getConnection()) {
+            PreparedStatement stmt = connection.prepareStatement(sql);
+            stmt.setObject(1, user_id);
+            stmt.setObject(2, contact_id);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return rs.getBoolean("is_blocked");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static boolean deleteChatOneSide(UUID currentUserId, UUID otherUserId) {
+        String sql = """
+            UPDATE private_chat
+            SET user1_deleted = CASE WHEN user1_id = ? THEN TRUE ELSE user1_deleted END,
+                user2_deleted = CASE WHEN user2_id = ? THEN TRUE ELSE user2_deleted END
+            WHERE (user1_id = ? AND user2_id = ?) OR (user1_id = ? AND user2_id = ?)
+        """;
+
+        try (Connection conn = getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, currentUserId);
+            stmt.setObject(2, currentUserId);
+            stmt.setObject(3, currentUserId);
+            stmt.setObject(4, otherUserId);
+            stmt.setObject(5, otherUserId);
+            stmt.setObject(6, currentUserId);
+
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean deleteChatBoth(UUID currentUserId, UUID otherUserId) {
+        String sqlDeleteMessages = """
+            DELETE FROM messages
+            WHERE receiver_type = 'private' AND (
+                (sender_id = ? AND receiver_id = ?) OR
+                (sender_id = ? AND receiver_id = ?)
+            )
+        """;
+
+        String sqlDeleteChat = """
+            DELETE FROM private_chat
+            WHERE (user1_id = ? AND user2_id = ?) OR (user1_id = ? AND user2_id = ?)
+        """;
+
+        try (Connection conn = getConnection()) {
+            conn.setAutoCommit(false);
+
+            try (PreparedStatement stmtMsg = conn.prepareStatement(sqlDeleteMessages);
+                 PreparedStatement stmtChat = conn.prepareStatement(sqlDeleteChat)) {
+
+                stmtMsg.setObject(1, currentUserId);
+                stmtMsg.setObject(2, otherUserId);
+                stmtMsg.setObject(3, otherUserId);
+                stmtMsg.setObject(4, currentUserId);
+                stmtMsg.executeUpdate();
+
+                stmtChat.setObject(1, currentUserId);
+                stmtChat.setObject(2, otherUserId);
+                stmtChat.setObject(3, otherUserId);
+                stmtChat.setObject(4, currentUserId);
+                stmtChat.executeUpdate();
+
+                conn.commit();
+                return true;
+
+            } catch (SQLException e) {
+                conn.rollback();
+                e.printStackTrace();
+                return false;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static List<ContactEntry> getContactEntries(UUID userId) {
+        List<ContactEntry> entries = new ArrayList<>();
+
+        String sql = """
+        SELECT c.contact_id, c.is_blocked, u.user_id, u.profile_name, u.image_url
+        FROM contacts c
+        JOIN users u ON c.contact_id = u.internal_uuid
+        WHERE c.user_id = ?
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            ResultSet rs = ps.executeQuery();
+
+            while (rs.next()) {
+                UUID contactId = UUID.fromString(rs.getString("contact_id"));
+                boolean isBlocked = rs.getBoolean("is_blocked");
+                String userIdStr = rs.getString("user_id");
+                String profileName = rs.getString("profile_name");
+                String imageUrl = rs.getString("image_url");
+
+                ContactEntry entry = new ContactEntry(contactId, userIdStr, profileName, imageUrl, isBlocked);
+                entries.add(entry);
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return entries;
+    }
+
+    public static List<ContactEntry> searchContacts(UUID userId, String searchTerm) {
+        List<ContactEntry> results = new ArrayList<>();
+
+        String sql = """
+        SELECT u.internal_uuid, u.user_id, c.is_blocked
+        FROM contacts c
+        JOIN users u ON c.contact_id = u.internal_uuid
+        WHERE c.user_id = ? 
+          AND (u.user_id ILIKE ? OR u.profile_name ILIKE ?)
+    """;
+
+        try (Connection connection = getConnection();
+             PreparedStatement stmt = connection.prepareStatement(sql)) {
+
+            stmt.setObject(1, userId);
+            stmt.setString(2, "%" + searchTerm + "%");
+            stmt.setString(3, "%" + searchTerm + "%");
+
+            ResultSet rs = stmt.executeQuery();
+
+            userDatabase userDB = new userDatabase();
+            while (rs.next()) {
+                UUID contactId = (UUID) rs.getObject("internal_uuid");
+                String displayId = rs.getString("user_id");
+                String contact_displayId = userDB.getUserId(contactId);
+                String profileName = userDB.getProfileName(contactId);
+                String imageUrl = userDB.getProfilePicture(contactId);
+                boolean isBlocked = rs.getBoolean("is_blocked");
+
+                String lastSeenString = userDB.getLastSeen(contactId);
+
+                // Convert to LocalDateTime
+                LocalDateTime lastSeen = null;
+                if (!"Unknown".equals(lastSeenString)) {
+                    lastSeen = LocalDateTime.parse(lastSeenString);
+                }
+
+                results.add(new ContactEntry(contactId, displayId, contact_displayId, profileName, imageUrl, isBlocked, lastSeen));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return results;
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Database/GroupDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/GroupDatabase.java
new file mode 100644
index 0000000..e8eecaa
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/GroupDatabase.java
@@ -0,0 +1,784 @@
+package org.to.telegramfinalproject.Database;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Models.Group;
+import org.to.telegramfinalproject.Models.User;
+
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+
+public class GroupDatabase {
+
+    public static List<Group> getGroupsByUser(UUID internalUuid) {
+        List<Group> groups = new ArrayList<>();
+
+        String sql = """
+            SELECT g.* FROM groups g
+            JOIN group_members gm ON g.internal_uuid = gm.group_id
+            WHERE gm.user_id = ?
+        """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, internalUuid);
+            ResultSet rs = stmt.executeQuery();
+
+            while (rs.next()) {
+                Group group = new Group();
+
+                group.setInternal_uuid(UUID.fromString(rs.getString("internal_uuid")));
+                group.setGroup_id(rs.getString("group_id"));
+                group.setGroup_name(rs.getString("group_name"));
+                group.setCreator_id(UUID.fromString(rs.getString("creator_id")));
+                group.setImage_url(rs.getString("image_url"));
+                group.setDescription(rs.getString("description"));
+                group.setCreated_at(rs.getTimestamp("created_at").toLocalDateTime());
+
+                groups.add(group);
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return groups;
+    }
+
+    public static List<Group> searchGroups(String keyword) {
+        List<Group> result = new ArrayList<>();
+        String sql = "SELECT * FROM groups WHERE group_name ILIKE ? OR group_id ILIKE ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, "%" + keyword + "%");
+            stmt.setString(2, keyword);
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                Group group = new Group(
+                        UUID.fromString(rs.getString("internal_uuid")),
+                        rs.getString("group_name"),
+                        UUID.fromString(rs.getString("creator_id")),
+                        rs.getTimestamp("created_at").toLocalDateTime()
+                );
+                group.setGroup_id(rs.getString("group_id"));
+                group.setImage_url(rs.getString("image_url"));
+                group.setDescription(rs.getString("description"));
+                result.add(group);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    public static List<UUID> getMemberUUIDs(UUID groupInternalUUID) {
+        List<UUID> memberIds = new ArrayList<>();
+        String sql = "SELECT user_id FROM group_members WHERE group_id = ?";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupInternalUUID);
+
+            try (ResultSet rs = stmt.executeQuery()) {
+                while (rs.next()) {
+                    memberIds.add((UUID) rs.getObject("user_id"));
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return memberIds;
+    }
+
+
+
+    public static Group findByGroupId(String groupId) {
+        String sql = "SELECT * FROM groups WHERE group_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setString(1, groupId);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                Group group = new Group();
+                group.setInternal_uuid(UUID.fromString(rs.getString("internal_uuid")));
+                group.setGroup_id(rs.getString("group_id"));
+                group.setGroup_name(rs.getString("group_name"));
+                group.setImage_url(rs.getString("image_url"));
+                group.setCreator_id(UUID.fromString(rs.getString("creator_id")));
+                group.setDescription(rs.getString("description"));
+                group.setCreated_at(rs.getTimestamp("created_at").toLocalDateTime());
+                return group;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+
+    public static boolean isUserInGroup(UUID userId, UUID groupInternalId) {
+        String sql = "SELECT * FROM group_members WHERE user_id = ? AND group_id = ?";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            stmt.setObject(2, groupInternalId);
+            ResultSet rs = stmt.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static boolean updateGroupInfo(UUID internalUUID, String newGroupId, String name, String description, String imageUrl) {
+        String sql = "UPDATE groups SET group_id = ?, group_name = ?, description = ?, image_url = ? WHERE internal_uuid = ?";
+
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, newGroupId);
+            stmt.setString(2, name);
+            stmt.setString(3, description);
+            if (imageUrl == null) {
+                stmt.setNull(4, Types.VARCHAR);
+            } else {
+                stmt.setString(4, imageUrl);
+            }
+            stmt.setObject(5, internalUUID);
+
+            int affectedRows = stmt.executeUpdate();
+            return affectedRows > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean isGroupIdUnique(String groupId, UUID excludeUUID) {
+        String sql = "SELECT COUNT(*) FROM groups WHERE group_id = ? AND internal_uuid != ?";
+
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, groupId);
+            stmt.setObject(2, excludeUUID);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return rs.getInt(1) == 0;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+
+    public static void addMember(UUID groupInternalId, UUID userId) {
+        String sql = "INSERT INTO group_members (group_id, user_id) VALUES (?, ?) ON CONFLICT DO NOTHING";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupInternalId);
+            stmt.setObject(2, userId);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+    public static UUID findInternalUUIDByGroupId(String groupId) {
+        String sql = "SELECT internal_uuid FROM groups WHERE group_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, groupId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return (UUID) rs.getObject("internal_uuid");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static boolean addMemberToGroup(UUID userId, UUID groupUUID) {
+        String sql = """
+        INSERT INTO group_members (group_id, user_id)
+        VALUES (?, ?)
+        ON CONFLICT DO NOTHING
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupUUID);
+            stmt.setObject(2, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+    public static boolean createGroup(Group group, UUID creatorId) {
+        String sql = """
+            INSERT INTO groups (
+                internal_uuid, group_id, group_name,
+                creator_id, image_url, description, created_at
+            )
+            VALUES (gen_random_uuid(), ?, ?, ?, ?, ?, ?)
+            RETURNING internal_uuid
+        """;
+
+        String memberSql = """
+            INSERT INTO group_members (group_id, user_id) VALUES (?, ?)
+        """;
+
+        try (Connection conn = ConnectionDb.connect()) {
+            PreparedStatement stmt = conn.prepareStatement(sql);
+            stmt.setString(1, group.getGroup_id());
+            stmt.setString(2, group.getGroup_name());
+            stmt.setObject(3, creatorId);
+            stmt.setString(4, group.getImage_url());
+            stmt.setString(5, group.getDescription());
+            stmt.setObject(6, group.getCreated_at());
+
+            ResultSet rs = stmt.executeQuery();
+            if (!rs.next()) return false;
+
+            UUID internalUUID = (UUID) rs.getObject("internal_uuid");
+            group.setInternal_uuid(internalUUID);
+
+            PreparedStatement memberStmt = conn.prepareStatement(memberSql);
+            memberStmt.setObject(1, internalUUID);
+            memberStmt.setObject(2, creatorId);
+            memberStmt.executeUpdate();
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean insertGroup(UUID internalUUID, String groupId, String groupName, UUID creatorId, String imageUrl, LocalDateTime createdAt) {
+        String sql = "INSERT INTO groups (internal_uuid, group_id, group_name, creator_id, image_url, created_at) VALUES (?, ?, ?, ?, ?, ?)";
+
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, internalUUID);
+            stmt.setString(2, groupId);
+            stmt.setString(3, groupName);
+            stmt.setObject(4, creatorId);
+            stmt.setString(5, imageUrl);
+            stmt.setObject(6, createdAt);
+            stmt.executeUpdate();
+            return true;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static void addMember(UUID groupId, UUID userId, String role) {
+        String sql = "INSERT INTO group_members (group_id, user_id, role) VALUES (?, ?, ?) ON CONFLICT DO NOTHING";
+
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            stmt.setString(3, role);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+
+    public static Group findByInternalUUID(UUID internalUUID) {
+        String sql = "SELECT * FROM groups WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, internalUUID);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                Group group = new Group();
+                group.setInternal_uuid(UUID.fromString(rs.getString("internal_uuid")));
+                group.setGroup_id(rs.getString("group_id"));
+                group.setGroup_name(rs.getString("group_name"));
+                group.setImage_url(rs.getString("image_url"));
+                group.setCreator_id(UUID.fromString(rs.getString("creator_id")));
+                group.setDescription(rs.getString("description"));
+                group.setCreated_at(rs.getTimestamp("created_at").toLocalDateTime());
+                return group;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static boolean addOwnerToGroup(UUID groupId, UUID userId) {
+        String sql = "INSERT INTO group_members (group_id, user_id, role) VALUES (?, ?, 'owner')";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean addAdminToGroup(UUID groupId, UUID userId, JSONObject permissions) {
+        String sql = """
+        UPDATE group_members
+        SET role = 'admin',
+            permissions = ?::jsonb
+        WHERE group_id = ? AND user_id = ? AND role = 'member'
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setString(1, permissions.toString());
+            stmt.setObject(2, groupId);
+            stmt.setObject(3, userId);
+
+            return stmt.executeUpdate() > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+
+    public static String getGroupRole(UUID groupId, UUID userId) {
+        String sql = "SELECT role FROM group_members WHERE group_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return rs.getString("role");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return "member";
+    }
+
+
+
+
+
+    public static boolean updateGroupAdminPermissions(UUID groupId, UUID userId, JSONObject permissions) {
+        String sql = """
+        UPDATE group_members
+        SET permissions = ?::jsonb
+        WHERE group_id = ? AND user_id = ? AND role = 'admin'
+    """;
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, permissions.toString());
+            stmt.setObject(2, groupId);
+            stmt.setObject(3, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static List<JSONObject> getGroupAdminsAndOwner(UUID groupId) {
+        List<JSONObject> admins = new ArrayList<>();
+
+        String sql = "SELECT gm.user_id, gm.role, gm.permissions, u.profile_name " +
+                "FROM group_members gm " +
+                "JOIN users u ON gm.user_id = u.internal_uuid " +
+                "WHERE gm.group_id = ? AND gm.role IN ('owner', 'admin')";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, groupId);
+            ResultSet rs = stmt.executeQuery();
+
+            while (rs.next()) {
+                JSONObject obj = new JSONObject();
+                obj.put("user_id", rs.getObject("user_id").toString());
+                obj.put("role", rs.getString("role"));
+                obj.put("permissions", new JSONObject(rs.getString("permissions")));
+                obj.put("profile_name", rs.getString("profile_name"));
+                admins.add(obj);
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return admins;
+    }
+
+
+    public static boolean isOwner(UUID groupId, UUID userId) {
+        String sql = "SELECT 1 FROM group_members WHERE group_id = ? AND user_id = ? AND role = 'owner'";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+
+            ResultSet rs = stmt.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    public static boolean isAdmin(UUID groupId, UUID userId) {
+        String sql = "SELECT role FROM group_members WHERE group_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                String role = rs.getString("role");
+                return "admin".equals(role) || "owner".equals(role);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    public static JSONObject getGroupPermissions(UUID groupId, UUID userId) {
+        String sql = "SELECT permissions FROM group_members WHERE group_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                String permissions = rs.getString("permissions");
+                if (permissions != null && !permissions.isBlank()) {
+                    return new JSONObject(permissions);
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return new JSONObject();
+    }
+
+
+
+    public static JSONArray getGroupMembers(UUID groupId) {
+        String sql = """
+        SELECT u.profile_name, u.user_id, u.internal_uuid, gm.role, gm.permissions
+        FROM group_members gm
+        JOIN users u ON gm.user_id = u.internal_uuid
+        WHERE gm.group_id = ?
+    """;
+
+        JSONArray members = new JSONArray();
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, groupId);
+            ResultSet rs = stmt.executeQuery();
+
+            while (rs.next()) {
+                JSONObject member = new JSONObject();
+                member.put("profile_name", rs.getString("profile_name"));
+                member.put("user_id", rs.getString("user_id"));
+                member.put("internal_uuid", rs.getObject("internal_uuid").toString());
+                member.put("role", rs.getString("role"));
+
+                String permissions = rs.getString("permissions");
+                if (permissions != null && !permissions.isBlank()) {
+                    member.put("permissions", new JSONObject(permissions));
+                }
+
+                members.put(member);
+            }
+
+            return members;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static boolean demoteAdminToMember(UUID groupId, UUID userId) {
+        String sql = "UPDATE group_members SET role = 'member', permissions = '{}'::jsonb WHERE group_id = ? AND user_id = ? AND role = 'admin'";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean removeMemberFromGroup(UUID groupId, UUID userId) {
+        String sql = "DELETE FROM group_members WHERE group_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static boolean transferOwnership(UUID groupId, UUID newOwnerId) {
+        String demoteOldOwner = "UPDATE group_members SET role = 'admin' WHERE group_id = ? AND role = 'owner'";
+        String promoteNewOwner = "UPDATE group_members SET role = 'owner', permissions = '{}'::jsonb WHERE group_id = ? AND user_id = ?";
+
+        try (Connection conn = ConnectionDb.connect()) {
+            conn.setAutoCommit(false);
+
+            try (PreparedStatement demoteStmt = conn.prepareStatement(demoteOldOwner);
+                 PreparedStatement promoteStmt = conn.prepareStatement(promoteNewOwner)) {
+
+                demoteStmt.setObject(1, groupId);
+                demoteStmt.executeUpdate();
+
+                promoteStmt.setObject(1, groupId);
+                promoteStmt.setObject(2, newOwnerId);
+                promoteStmt.executeUpdate();
+
+                conn.commit();
+                return true;
+            } catch (SQLException e) {
+                conn.rollback();
+                e.printStackTrace();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static boolean deleteGroup(UUID groupId) {
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement("DELETE FROM groups WHERE internal_uuid = ?")) {
+
+            stmt.setObject(1, groupId);
+            int affectedRows = stmt.executeUpdate();
+
+            return affectedRows > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static List<UUID> getGroupMemberUUIDs(UUID groupId) {
+        List<UUID> memberIds = new ArrayList<>();
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement("SELECT user_id FROM group_members WHERE group_id = ?")) {
+            stmt.setObject(1, groupId);
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                memberIds.add(UUID.fromString(rs.getString("user_id")));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return memberIds;
+    }
+
+    public static boolean updateAdminPermissions(UUID groupId, UUID userId, JSONObject permissions) {
+        String sql = "UPDATE group_members SET permissions = ?::jsonb WHERE group_id = ? AND user_id = ? AND role = 'admin'";
+        try (Connection conn = ConnectionDb.connect();
+                PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, permissions.toString());
+            stmt.setObject(2, groupId);
+            stmt.setObject(3, userId);
+            return stmt.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean isMember(UUID groupId, UUID userId) {
+        String sql = "SELECT 1 FROM group_members WHERE group_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+//    public static List<User> searchGroupMembers(UUID groupId, String keyword) {
+//        List<User> result = new ArrayList<>();
+//        String sql = """
+//        SELECT u.*
+//        FROM users u
+//        JOIN group_members gm ON gm.user_id = u.internal_uuid
+//        WHERE gm.group_id = ?
+//          AND (
+//                LOWER(u.profile_name) LIKE ?
+//                OR LOWER(u.username) LIKE ?
+//                OR LOWER(u.user_id) LIKE ?
+//              )
+//    """;
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//
+//            stmt.setObject(1, groupId);
+//            String likePattern = "%" + keyword.toLowerCase() + "%";
+//            stmt.setString(2, likePattern);
+//            stmt.setString(3, likePattern);
+//            stmt.setString(4, likePattern);
+//
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                User user = User.fromResultSet(rs);
+//                result.add(user);
+//            }
+//
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//        return result;
+//    }
+
+    public static JSONObject getGroupInfo(UUID groupId, UUID viewerUuid) throws SQLException {
+        JSONObject result = new JSONObject();
+
+        try (Connection conn = ConnectionDb.connect()) {
+            // === Group header (name, member count, etc.)
+            String groupQuery = """
+            SELECT g.internal_uuid, g.group_id, g.group_name, g.image_url,
+                   COUNT(m.user_id) as member_count
+            FROM groups g
+            LEFT JOIN group_members m ON g.internal_uuid = m.group_id
+            WHERE g.internal_uuid = ?
+            GROUP BY g.internal_uuid, g.group_id, g.group_name, g.image_url
+        """;
+
+            try (PreparedStatement ps = conn.prepareStatement(groupQuery)) {
+                ps.setObject(1, groupId); // ✅ compare UUID with UUID
+                ResultSet rs = ps.executeQuery();
+                if (rs.next()) {
+                    result.put("internal_uuid", rs.getString("internal_uuid"));
+                    result.put("group_id", rs.getString("group_id")); // varchar handle
+                    result.put("group_name", rs.getString("group_name"));
+                    result.put("member_count", rs.getInt("member_count"));
+                    result.put("image_url", rs.getString("image_url"));
+                } else {
+                    return null; // no such group
+                }
+            }
+
+            // === Members (id, name, role, status, image)
+            JSONArray membersArr = new JSONArray();
+
+            String membersQuery = """
+            SELECT u.internal_uuid, u.profile_name, u.user_id, u.image_url,
+                   gm.role, u.status, u.last_seen
+            FROM group_members gm
+            JOIN users u ON gm.user_id = u.internal_uuid
+            WHERE gm.group_id = ?
+        """;
+
+            try (PreparedStatement ps = conn.prepareStatement(membersQuery)) {
+                ps.setObject(1, groupId); // ✅ gm.group_id is UUID
+                ResultSet rs = ps.executeQuery();
+                while (rs.next()) {
+                    JSONObject member = new JSONObject();
+                    member.put("user_id", rs.getString("internal_uuid"));
+                    member.put("profile_name", rs.getString("profile_name"));
+                    member.put("username", rs.getString("user_id"));
+                    member.put("image_url", rs.getString("image_url"));
+                    member.put("role", rs.getString("role"));
+                    member.put("status", rs.getString("status"));
+                    member.put("last_seen", rs.getString("last_seen"));
+                    membersArr.put(member);
+                }
+            }
+
+            result.put("members", membersArr);
+
+            // === Viewer role (to decide if they can delete group, etc.)
+            String roleQuery = """
+            SELECT role
+            FROM group_members
+            WHERE group_id = ? AND user_id = ?
+        """;
+
+            try (PreparedStatement ps = conn.prepareStatement(roleQuery)) {
+                ps.setObject(1, groupId);
+                ps.setObject(2, viewerUuid);
+                ResultSet rs = ps.executeQuery();
+                if (rs.next()) {
+                    result.put("my_role", rs.getString("role"));
+                } else {
+                    result.put("my_role", ""); // not a member
+                }
+            }
+        }
+
+        return result;
+    }
+
+    public static JSONObject getAdminPermissions(UUID groupId, UUID adminId) throws SQLException {
+        String sql = """
+        SELECT permissions
+        FROM group_members
+        WHERE group_id = ? AND user_id = ? AND role = 'admin'
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, groupId);
+            ps.setObject(2, adminId);
+
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                String jsonStr = rs.getString("permissions");
+                if (jsonStr != null && !jsonStr.isBlank()) {
+                    return new JSONObject(jsonStr);
+                }
+            }
+        }
+        return null; // not found or no permissions
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
new file mode 100644
index 0000000..cca3521
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
@@ -0,0 +1,1573 @@
+package org.to.telegramfinalproject.Database;
+
+import org.to.telegramfinalproject.Models.FileAttachment;
+import org.to.telegramfinalproject.Models.MediaRow;
+import org.to.telegramfinalproject.Models.Message;
+import org.to.telegramfinalproject.Utils.ChannelPermissionUtil;
+
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class MessageDatabase {
+
+
+
+
+
+    public static boolean insertMessage(UUID messageId, UUID senderId, UUID receiverId,
+                                        String receiverType, String content, String messageType) {
+        String sql = "INSERT INTO messages (message_id, sender_id, receiver_type, receiver_id, content, message_type) " +
+                "VALUES (?, ?, ?, ?, ?, ?)";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, messageId);
+            ps.setObject(2, senderId);
+            ps.setString(3, receiverType);
+            ps.setObject(4, receiverId);
+            ps.setString(5, content);
+            ps.setString(6, messageType);
+
+            return ps.executeUpdate() > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+
+    public static boolean insertAttachments(UUID messageId, List<FileAttachment> attachments) {
+        String sql = "INSERT INTO message_attachments (attachment_id, message_id, file_url, file_type) " +
+                "VALUES (?, ?, ?, ?)";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            for (FileAttachment att : attachments) {
+                ps.setObject(1, UUID.randomUUID());
+                ps.setObject(2, messageId);
+                ps.setString(3, att.getFileUrl());
+                ps.setString(4, att.getFileType());
+                ps.addBatch();
+            }
+
+            ps.executeBatch();
+            return true;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static void markGloballyDeleted(UUID chatId) {
+        String sql = "UPDATE messages SET is_deleted_globally = true WHERE receiver_id = ? AND receiver_type = 'private'";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, chatId);
+            ps.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void logDeletedMessagesFor(UUID chatId, UUID userId) {
+        List<Message> messages = MessageDatabase.privateChatHistory(chatId, userId);
+        for (Message message : messages) {
+            if (!isMessageDeleted(message.getMessage_id(), userId)) {
+                String sql = """
+                INSERT INTO deleted_messages (message_id, user_id)
+                VALUES (?, ?)
+                ON CONFLICT (message_id, user_id) DO NOTHING
+                """;
+                try (Connection conn = ConnectionDb.connect();
+                     PreparedStatement ps = conn.prepareStatement(sql)) {
+                    ps.setObject(1, message.getMessage_id());
+                    ps.setObject(2, userId);
+                    ps.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    public static boolean isMessageDeleted(UUID messageId, UUID userId) {
+        String sql = "SELECT 1 FROM deleted_messages WHERE message_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ps.setObject(2, userId);
+            ResultSet rs = ps.executeQuery();
+            return rs.next();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static List<Message> getMessagesForChat(UUID chatId, String chatType, UUID currentUserId, int offset, int limit) {
+        List<Message> messages = new ArrayList<>();
+
+        String sql = """
+        SELECT * FROM messages m
+        WHERE m.receiver_type = ?
+          AND m.receiver_id = ?
+          AND m.is_deleted_globally = FALSE
+          AND NOT EXISTS (
+              SELECT 1 FROM deleted_messages d
+              WHERE d.message_id = m.message_id
+                AND d.user_id = ?
+          )
+        ORDER BY m.send_at DESC
+        LIMIT ? OFFSET ?
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setString(1, chatType);
+            ps.setObject(2, chatId);
+            ps.setObject(3, currentUserId);
+            ps.setInt(4, limit);
+            ps.setInt(5, offset);
+
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    Message msg = new Message(
+                            UUID.fromString(rs.getString("message_id")),
+                            UUID.fromString(rs.getString("sender_id")),
+                            rs.getString("receiver_type"),
+                            UUID.fromString(rs.getString("receiver_id")),
+                            rs.getString("content"),
+                            rs.getString("message_type"),
+                            rs.getTimestamp("send_at").toLocalDateTime(),
+                            rs.getString("status"),
+                            rs.getObject("reply_to_id") != null ? UUID.fromString(rs.getString("reply_to_id")) : null,
+                            rs.getBoolean("is_edited"),
+                            rs.getBoolean("is_deleted_globally"),
+                            rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
+                            rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
+                            rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null,
+                            rs.getTimestamp("edited_at") != null
+                                    ? rs.getTimestamp("edited_at").toLocalDateTime()
+                                    : null
+
+
+                    );
+
+                    messages.add(msg);
+                }
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return messages;
+    }
+
+    public static Message findById(UUID messageId) {
+        String sql = "SELECT * FROM messages WHERE message_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                return new Message(
+                        UUID.fromString(rs.getString("message_id")),
+                        UUID.fromString(rs.getString("sender_id")),
+                        rs.getString("receiver_type"),
+                        UUID.fromString(rs.getString("receiver_id")),
+                        rs.getString("content"),
+                        rs.getString("message_type"),
+                        rs.getTimestamp("send_at").toLocalDateTime(),
+                        rs.getString("status"),
+                        rs.getObject("reply_to_id") != null ? UUID.fromString(rs.getString("reply_to_id")) : null,
+                        rs.getBoolean("is_edited"),
+                        rs.getBoolean("is_deleted_globally"),
+                        rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
+                        rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
+                        rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null
+                );
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static boolean markAsDeletedForUser(UUID messageId, UUID userId) {
+        String sql = "INSERT INTO deleted_messages (message_id, user_id) VALUES (?, ?) ON CONFLICT DO NOTHING";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ps.setObject(2, userId);
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean markAsGloballyDeleted(UUID messageId) {
+        String sql = "UPDATE messages SET is_deleted_globally = true WHERE message_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean updateContentAndMarkEdited(UUID messageId, String newContent) {
+        String sql = """
+        UPDATE messages
+        SET content = ?, is_edited = TRUE, edited_at = CURRENT_TIMESTAMP
+        WHERE message_id = ?
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setString(1, newContent);
+            ps.setObject(2, messageId);
+
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean saveReplyMessage(Message message) {
+        String sql = """
+        INSERT INTO messages (
+            message_id, sender_id, receiver_type, receiver_id, content, message_type,
+            send_at, status, reply_to_id, is_edited, is_deleted_globally,
+            original_message_id, forwarded_by, forwarded_from, edited_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, message.getMessage_id());
+            ps.setObject(2, message.getSender_id());
+            ps.setString(3, message.getReceiver_type());
+            ps.setObject(4, message.getReceiver_id());
+            ps.setString(5, message.getContent());
+            ps.setString(6, message.getMessage_type());
+            ps.setTimestamp(7, Timestamp.valueOf(message.getSend_at()));
+            ps.setString(8, message.getStatus());
+            ps.setObject(9, message.getReply_to_id()); //Important part because of reply message id
+            ps.setBoolean(10, message.isIs_edited());
+            ps.setBoolean(11, message.isIs_deleted_globally());
+            ps.setObject(12, message.getOriginal_message_id());
+            ps.setObject(13, message.getForwarded_by());
+            ps.setObject(14, message.getForwarded_from());
+            ps.setTimestamp(15, message.getEdited_at() != null ? Timestamp.valueOf(message.getEdited_at()) : null);
+
+            return ps.executeUpdate() > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean saveForwardedMessage(Message message) {
+        String sql = """
+        INSERT INTO messages (
+            message_id, sender_id, receiver_type, receiver_id,
+            content, message_type, send_at, status,
+            reply_to_id, is_edited, is_deleted_globally,
+            original_message_id, forwarded_by, forwarded_from
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, message.getMessage_id());
+            ps.setObject(2, message.getSender_id());
+            ps.setString(3, message.getReceiver_type());
+            ps.setObject(4, message.getReceiver_id());
+            ps.setString(5, message.getContent());
+            ps.setString(6, message.getMessage_type());
+            ps.setTimestamp(7, Timestamp.valueOf(message.getSend_at()));
+            ps.setString(8, message.getStatus());
+            ps.setObject(9, message.getReply_to_id());
+            ps.setBoolean(10, message.isIs_edited());
+            ps.setBoolean(11, message.isIs_deleted_globally());
+            ps.setObject(12, message.getOriginal_message_id()); //original id
+            ps.setObject(13, message.getForwarded_by());       //forwarded by
+            ps.setObject(14, message.getForwarded_from());      //forwarded from
+
+            return ps.executeUpdate() > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static String getExcerpt(UUID messageId) {
+        return getExcerpt(messageId, 80);
+    }
+
+    public static String getExcerpt(UUID messageId, int maxLen) {
+        String sql = "SELECT content, message_type, is_deleted_globally FROM messages WHERE message_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, messageId);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return "Message isn't available";
+
+                String content = rs.getString("content");
+                String type = rs.getString("message_type"); // e.g. TEXT, IMAGE, VIDEO, AUDIO, FILE, STICKER...
+                boolean deleted = rs.getBoolean("is_deleted_globally");
+
+                if (deleted) return "This message was deleted";
+
+                if (type == null || type.equalsIgnoreCase("TEXT")) {
+                    if (content == null || content.isBlank()) return "(empty)";
+                    return shorten(content, maxLen);
+                }
+
+                //for media
+                switch (type.toUpperCase()) {
+                    case "IMAGE":  return "[Photo]";
+                    case "VIDEO":  return "[Video]";
+                    case "AUDIO":  return "[Audio]";
+                    case "VOICE":  return "[Voice]";
+                    case "FILE":   return "[File]";
+                    case "STICKER":return "[Sticker]";
+                    default:       return "[" + type + "]";
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return "Error";
+        }
+    }
+
+    private static String shorten(String s, int maxLen) {
+        if (s.length() <= maxLen) return s;
+        return s.substring(0, Math.max(0, maxLen - 1)).trim() + "…";
+    }
+
+    public static boolean saveMessageWithOptionalAttachments(
+            UUID messageId, UUID senderId, UUID receiverId,
+            String receiverType, String content, String messageType,
+            List<FileAttachment> attachments
+    ) {
+        Connection conn = null;
+        try {
+            conn = ConnectionDb.connect();
+            conn.setAutoCommit(false);
+
+            boolean isText  = "TEXT".equalsIgnoreCase(messageType);
+            boolean isImage = "IMAGE".equalsIgnoreCase(messageType);
+            boolean isAudio = "AUDIO".equalsIgnoreCase(messageType);
+            if (!isText && !isImage && !isAudio) {
+                throw new IllegalArgumentException("messageType must be TEXT, IMAGE, or AUDIO");
+            }
+
+            if (isText) {
+                if (attachments != null && !attachments.isEmpty())
+                    throw new IllegalArgumentException("TEXT must not have attachments");
+                if (content == null || content.isBlank())
+                    throw new IllegalArgumentException("TEXT must have non-empty content");
+            } else {
+                if (attachments == null || attachments.isEmpty())
+                    throw new IllegalArgumentException("Non-TEXT must have at least one attachment");
+
+                for (FileAttachment a : attachments) {
+                    if (a == null) throw new IllegalArgumentException("Attachment is null");
+                    String ft = a.getFileType();
+                    if (isImage && !"IMAGE".equalsIgnoreCase(ft))
+                        throw new IllegalArgumentException("All attachments must be IMAGE for messageType=IMAGE");
+                    if (isAudio && !"AUDIO".equalsIgnoreCase(ft))
+                        throw new IllegalArgumentException("All attachments must be AUDIO for messageType=AUDIO");
+                }
+            }
+
+            insertMessageTx(conn, messageId, senderId, receiverId, receiverType, content, messageType.toUpperCase());
+            if (!isText) insertAttachmentsTx(conn, messageId, attachments);
+
+            conn.commit();
+            return true;
+        } catch (Exception e) {
+            if (conn != null) try { conn.rollback(); } catch (SQLException ignored) {}
+            e.printStackTrace();
+            return false;
+        } finally {
+            if (conn != null) {
+                try { conn.setAutoCommit(true); } catch (SQLException ignored) {}
+                try { conn.close(); } catch (SQLException ignored) {}
+            }
+        }
+    }
+
+
+    public static boolean insertMessageTx(Connection conn, UUID messageId, UUID senderId, UUID receiverId,
+                                          String receiverType, String content, String messageType) throws SQLException {
+        String sql = "INSERT INTO messages (message_id, sender_id, receiver_type, receiver_id, content, message_type) " +
+                "VALUES (?, ?, ?, ?, ?, ?)";
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ps.setObject(2, senderId);
+            ps.setString(3, receiverType);
+            ps.setObject(4, receiverId);
+            if (content == null || content.isBlank()) ps.setNull(5, java.sql.Types.VARCHAR); else ps.setString(5, content);
+            ps.setString(6, messageType);
+            return ps.executeUpdate() > 0;
+        }
+    }
+
+    public static boolean insertAttachmentsTx(Connection conn, UUID messageId, List<FileAttachment> attachments) throws SQLException {
+        if (attachments == null || attachments.isEmpty()) return true;
+
+        final String sql = """
+        INSERT INTO message_attachments(
+            attachment_id, message_id,
+            file_url, file_type, file_name, file_size, mime_type,
+            width, height, duration_seconds, thumbnail_url,
+            media_key, storage_path
+        ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
+    """;
+
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {
+            for (FileAttachment att : attachments) {
+                if (att == null) throw new IllegalArgumentException("Attachment is null");
+                UUID attachmentId = att.getAttachmentId() != null ? att.getAttachmentId() : UUID.randomUUID();
+                UUID mediaKey     = att.getMediaKey()     != null ? att.getMediaKey()     : attachmentId; // ساده‌ترین حالت
+
+                String ft = att.getFileType();
+                if (!"IMAGE".equalsIgnoreCase(ft) && !"AUDIO".equalsIgnoreCase(ft)) {
+                    throw new IllegalArgumentException("file_type must be IMAGE or AUDIO");
+                }
+                if (att.getStoragePath() == null || att.getStoragePath().isBlank()) {
+                    throw new IllegalArgumentException("storage_path is required for socket downloads");
+                }
+
+                int i = 1;
+                ps.setObject(i++, attachmentId);
+                ps.setObject(i++, messageId);
+                //file url (display link)
+                if (att.getFileUrl() == null || att.getFileUrl().isBlank()) ps.setNull(i++, java.sql.Types.VARCHAR);
+                else ps.setString(i++, att.getFileUrl());
+
+                ps.setString(i++, ft.toUpperCase());
+                ps.setString(i++, att.getFileName());
+                if (att.getFileSize() == null) ps.setNull(i++, java.sql.Types.BIGINT); else ps.setLong(i++, att.getFileSize());
+                if (att.getMimeType() == null) ps.setNull(i++, java.sql.Types.VARCHAR); else ps.setString(i++, att.getMimeType());
+                if (att.getWidth() == null) ps.setNull(i++, java.sql.Types.INTEGER); else ps.setInt(i++, att.getWidth());
+                if (att.getHeight() == null) ps.setNull(i++, java.sql.Types.INTEGER); else ps.setInt(i++, att.getHeight());
+                if (att.getDurationSeconds() == null) ps.setNull(i++, java.sql.Types.INTEGER); else ps.setInt(i++, att.getDurationSeconds());
+                if (att.getThumbnailUrl() == null || att.getThumbnailUrl().isBlank()) ps.setNull(i++, java.sql.Types.VARCHAR);
+                else ps.setString(i++, att.getThumbnailUrl());
+
+                ps.setObject(i++, mediaKey);
+                ps.setString(i++, att.getStoragePath());
+
+                ps.addBatch();
+
+                att.setAttachmentId(attachmentId);
+                att.setMediaKey(mediaKey);
+            }
+            ps.executeBatch();
+            return true;
+        }
+    }
+
+    public static MediaRow findMediaByKey(UUID mediaKey) throws SQLException {
+        String sql = """
+        SELECT
+          ma.attachment_id,
+          ma.message_id,
+          ma.media_key,
+          ma.file_name,
+          ma.file_size,
+          ma.mime_type,
+          ma.file_type,
+          ma.width,
+          ma.height,
+          ma.duration_seconds,
+          ma.thumbnail_url,
+          ma.file_url,
+          ma.storage_path,
+          m.receiver_type,
+          m.receiver_id,
+          m.sender_id
+        FROM message_attachments ma
+        JOIN messages m ON m.message_id = ma.message_id
+        WHERE ma.media_key = ?
+        LIMIT 1
+    """;
+
+        try (Connection c = ConnectionDb.connect();
+             PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setObject(1, mediaKey);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return null;
+
+                MediaRow a = new MediaRow();
+                a.attachmentId    = (UUID) rs.getObject("attachment_id");
+                a.messageId       = (UUID) rs.getObject("message_id");
+                a.mediaKey        = (UUID) rs.getObject("media_key");
+                a.fileName        = rs.getString("file_name");
+
+                long sz = rs.getLong("file_size");
+                a.fileSize = rs.wasNull() ? null : sz; // MediaRow.fileSize = Long
+
+                a.mimeType        = rs.getString("mime_type");
+                a.fileType        = rs.getString("file_type");
+                int w = rs.getInt("width");            a.width  = rs.wasNull() ? null : w;
+                int h = rs.getInt("height");           a.height = rs.wasNull() ? null : h;
+                int d = rs.getInt("duration_seconds"); a.durationSeconds = rs.wasNull() ? null : d;
+                a.thumbnailUrl    = rs.getString("thumbnail_url");
+                a.fileUrl         = rs.getString("file_url");
+                a.storagePath     = rs.getString("storage_path");
+                a.receiverType    = rs.getString("receiver_type");
+                a.receiverId      = (UUID) rs.getObject("receiver_id");
+                a.senderId        = (UUID) rs.getObject("sender_id");
+                return a;
+            }
+        }
+    }
+
+    public static boolean canAccess(UUID requester, MediaRow mr) {
+        if (requester == null || mr == null || mr.receiverType == null) return false;
+
+        // اختیاری: فرستنده همیشه مجاز
+        if (requester.equals(mr.senderId)) return true;
+
+        switch (mr.receiverType.toLowerCase(Locale.ROOT)) {
+            case "private":
+                // receiver_id در پیام‌های private = UUID چت خصوصی
+                return PrivateChatDatabase.isParticipant(mr.receiverId, requester);
+
+            case "group":
+                return GroupDatabase.isMember(mr.receiverId, requester);
+
+            case "channel":
+                return ChannelPermissionUtil.isUserInChannel(requester, mr.receiverId);
+
+            default:
+                return false;
+        }
+    }
+
+
+
+    public void markMessageAsRead(UUID messageId, UUID userId) {
+        String sql = "INSERT INTO message_receipts (message_id, user_id) VALUES (?, ?) ON CONFLICT DO NOTHING";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, messageId);
+            stmt.setObject(2, userId);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+
+
+//    public static List<Message> getUnreadMessages(UUID userId) {
+//        List<Message> messages = new ArrayList<>();
+//
+//        String sql = """
+//        SELECT m.*
+//        FROM messages m
+//        LEFT JOIN message_receipts r ON m.message_id = r.message_id AND r.user_id = ?
+//        LEFT JOIN deleted_messages d ON m.message_id = d.message_id AND d.user_id = ?
+//        WHERE r.user_id IS NULL
+//          AND d.message_id IS NULL
+//          AND m.is_deleted_globally = FALSE
+//          AND (
+//              (m.receiver_type = 'private' AND m.receiver_id = ?)
+//              OR
+//              (m.receiver_type = 'group' AND EXISTS (
+//                  SELECT 1 FROM group_members gm WHERE gm.group_id = m.receiver_id AND gm.user_id = ?
+//              ))
+//              OR
+//              (m.receiver_type = 'channel' AND EXISTS (
+//                  SELECT 1 FROM channel_subscribers cs WHERE cs.channel_id = m.receiver_id AND cs.user_id = ?
+//              ))
+//          )
+//        ORDER BY m.send_at DESC
+//    """;
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//
+//            stmt.setObject(1, userId); // for message_receipts
+//            stmt.setObject(2, userId); // for deleted_messages
+//            stmt.setObject(3, userId); // for private messages
+//            stmt.setObject(4, userId); // for group members
+//            stmt.setObject(5, userId); // for channel subscribers
+//
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                Message message = new Message(
+//                        UUID.fromString(rs.getString("message_id")),
+//                        rs.getObject("sender_id") != null ? UUID.fromString(rs.getString("sender_id")) : null,
+//                        rs.getString("receiver_type"),
+//                        UUID.fromString(rs.getString("receiver_id")),
+//                        rs.getString("content"),
+//                        rs.getString("message_type"),
+//                        rs.getTimestamp("send_at").toLocalDateTime(),
+//                        rs.getString("status"),
+//                        rs.getObject("reply_to_id") != null ? UUID.fromString(rs.getString("reply_to_id")) : null,
+//                        rs.getBoolean("is_edited"),
+//                        rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
+//                        rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
+//                        rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null,
+//                        rs.getBoolean("is_deleted_globally"),
+//                        rs.getTimestamp("edited_at") != null ? rs.getTimestamp("edited_at").toLocalDateTime() : null
+//                        );
+//
+//                messages.add(message);
+//            }
+//
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//
+//        return messages;
+//    }
+
+
+
+    public static List<Message> getUnreadMessages(UUID userId) {
+        return getUnreadMessages(userId, 200);
+    }
+
+    public static List<Message> getUnreadMessages(UUID userId, int limit) {
+        List<Message> messages = new ArrayList<>();
+
+        String sql = """
+        SELECT m.*
+        FROM messages m
+        LEFT JOIN message_receipts r
+               ON r.message_id = m.message_id AND r.user_id = ?
+        LEFT JOIN deleted_messages d
+               ON d.message_id = m.message_id AND d.user_id = ?
+        WHERE r.message_id IS NULL
+          AND d.message_id IS NULL
+          AND m.is_deleted_globally = FALSE
+          AND m.sender_id <> ?
+          AND (
+                (m.receiver_type = 'private' AND EXISTS (
+                    SELECT 1
+                    FROM private_chat pc
+                    WHERE pc.chat_id = m.receiver_id
+                      AND (pc.user1_id = ? OR pc.user2_id = ?)
+                ))
+             OR (m.receiver_type = 'group' AND EXISTS (
+                    SELECT 1
+                    FROM group_members gm
+                    WHERE gm.group_id = m.receiver_id
+                      AND gm.user_id  = ?
+                ))
+             OR (m.receiver_type = 'channel' AND EXISTS (
+                    SELECT 1
+                    FROM channel_subscribers cs
+                    WHERE cs.channel_id = m.receiver_id
+                      AND cs.user_id    = ?
+                ))
+          )
+        ORDER BY m.send_at ASC
+        LIMIT ?
+        """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            int i = 1;
+            ps.setObject(i++, userId); // r.user_id
+            ps.setObject(i++, userId); // d.user_id
+            ps.setObject(i++, userId); // m.sender_id <> ?
+            ps.setObject(i++, userId); // pc.user1_id
+            ps.setObject(i++, userId); // pc.user2_id
+            ps.setObject(i++, userId); // gm.user_id
+            ps.setObject(i++, userId); // cs.user_id
+            ps.setInt(i, Math.max(1, limit));
+
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) messages.add(mapMessage(rs));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return messages;
+    }
+
+
+
+    private static java.util.UUID readUUID(ResultSet rs, String col) throws SQLException {
+        Object o = rs.getObject(col);
+        if (o == null) return null;
+        if (o instanceof java.util.UUID) return (java.util.UUID) o;
+        return java.util.UUID.fromString(o.toString());
+    }
+
+    private static java.time.LocalDateTime readLdt(ResultSet rs, String col) throws SQLException {
+        java.sql.Timestamp ts = rs.getTimestamp(col);
+        return (ts == null) ? null : ts.toLocalDateTime();
+    }
+
+    private static boolean readBool(ResultSet rs, String col) throws SQLException {
+        boolean v = rs.getBoolean(col);
+        return v;
+    }
+
+    private static Message mapMessage(ResultSet rs) throws SQLException {
+        Message m = new Message();
+
+        m.setMessage_id(          readUUID(rs, "message_id")            );
+        m.setSender_id(           readUUID(rs, "sender_id")             );
+        m.setReceiver_type(       rs.getString("receiver_type")         );
+        m.setReceiver_id(         readUUID(rs, "receiver_id")           );
+        m.setContent(             rs.getString("content")               );
+        m.setMessage_type(        rs.getString("message_type")          );
+        m.setSend_at(             readLdt(rs, "send_at")                );
+        m.setStatus(              rs.getString("status")                );
+        m.setReply_to_id(         readUUID(rs, "reply_to_id")           );
+        m.setIs_edited(           readBool(rs, "is_edited")             );
+        m.setEdited_at(           readLdt(rs, "edited_at")              );
+        m.setOriginal_message_id( readUUID(rs, "original_message_id")   );
+        m.setForwarded_by(        readUUID(rs, "forwarded_by")          );
+        m.setForwarded_from(      readUUID(rs, "forwarded_from")        );
+        m.setIs_deleted_globally( readBool(rs, "is_deleted_globally")   );
+
+        return m;
+    }
+
+    public static List<FileAttachment> getAttachments(UUID messageId) {
+        List<FileAttachment> attachments = new ArrayList<>();
+        String sql = "SELECT file_url, file_type FROM message_attachments WHERE message_id = ?";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, messageId);
+            ResultSet rs = stmt.executeQuery();
+
+            while (rs.next()) {
+                attachments.add(new FileAttachment(
+                        rs.getString("file_url"),
+                        rs.getString("file_type")
+                ));
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return attachments;
+    }
+
+
+
+    public static LocalDateTime getLastMessageTimeBetween(UUID user1, UUID user2, String type) {
+        String sql = """
+        SELECT MAX(send_at) FROM messages
+        WHERE receiver_type = ?
+        AND (
+            (sender_id = ? AND receiver_id = ?)
+            OR (sender_id = ? AND receiver_id = ?)
+        )
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, type);
+            stmt.setObject(2, user1);
+            stmt.setObject(3, user2);
+            stmt.setObject(4, user2);
+            stmt.setObject(5, user1);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                Timestamp ts = rs.getTimestamp(1);
+                return ts != null ? ts.toLocalDateTime() : null;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+
+    public static LocalDateTime getLastMessageTime(UUID receiverId, String type) {
+        String sql = "SELECT MAX(send_at) FROM messages WHERE receiver_id = ? AND receiver_type = ?";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, receiverId);
+            stmt.setString(2, type);
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                Timestamp ts = rs.getTimestamp(1);
+                return ts != null ? ts.toLocalDateTime() : null;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+
+    public static Message extractMessage(ResultSet rs) throws SQLException {
+        return new Message(
+                UUID.fromString(rs.getString("message_id")),
+                UUID.fromString(rs.getString("sender_id")),
+                rs.getString("receiver_type"),
+                UUID.fromString(rs.getString("receiver_id")),
+                rs.getString("content"),
+                rs.getString("message_type"),
+                rs.getTimestamp("send_at").toLocalDateTime(),
+                rs.getString("status"),
+                (UUID) rs.getObject("reply_to_id"),
+                rs.getBoolean("is_edited"),
+                (UUID) rs.getObject("original_message_id"),
+                (UUID) rs.getObject("forwarded_by"),
+                (UUID) rs.getObject("forwarded_from"),
+                rs.getBoolean("is_deleted_globally"),
+                (rs.getTimestamp("edited_at") != null) ? rs.getTimestamp("edited_at").toLocalDateTime() : null
+        );
+    }
+
+
+
+
+//    public static List<Message> searchMessagesForUser(UUID userId, String keyword) {
+//        List<Message> result = new ArrayList<>();
+//        String sql = """
+//        SELECT * FROM messages
+//        WHERE receiver_type = 'private'
+//          AND (sender_id = ? OR receiver_id = ?)
+//          AND content ILIKE ?
+//        ORDER BY send_at DESC
+//    """;
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//            stmt.setObject(1, userId);
+//            stmt.setObject(2, userId);
+//            stmt.setString(3, "%" + keyword + "%");
+//
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                result.add(extractMessage(rs));
+//            }
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//
+//        return result;
+//    }
+
+    public static List<Message> searchMessagesForUser(UUID userId, String keyword) {
+        String sql = """
+        SELECT * FROM messages m
+        WHERE m.receiver_type = 'private'
+          AND m.content ILIKE ?
+          AND m.is_deleted_globally = FALSE
+          AND (m.sender_id = ? OR m.receiver_id = ?)
+          AND NOT EXISTS (
+              SELECT 1 FROM deleted_messages d
+              WHERE d.message_id = m.message_id AND d.user_id = ?
+          )
+        ORDER BY m.send_at DESC
+        """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setString(1, "%" + keyword + "%");
+            ps.setObject(2, userId); // m.sender_id
+            ps.setObject(3, userId); // m.receiver_id
+            ps.setObject(4, userId); // deleted_messages
+
+            ResultSet rs = ps.executeQuery();
+            List<Message> messages = new ArrayList<>();
+            while (rs.next()) {
+                messages.add(mapResultSetToMessage(rs));
+            }
+            return messages;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return Collections.emptyList();
+        }
+    }
+
+    private static Message mapResultSetToMessage(ResultSet rs) throws SQLException {
+        return new Message(
+                UUID.fromString(rs.getString("message_id")),
+                rs.getObject("sender_id") != null ? UUID.fromString(rs.getString("sender_id")) : null,
+                rs.getString("receiver_type"),
+                UUID.fromString(rs.getString("receiver_id")),
+                rs.getString("content"),
+                rs.getString("message_type"),
+                rs.getTimestamp("send_at").toLocalDateTime(),
+                rs.getString("status"),
+                rs.getObject("reply_to_id") != null ? UUID.fromString(rs.getString("reply_to_id")) : null,
+                rs.getBoolean("is_edited"),
+                rs.getBoolean("is_deleted_globally"),
+                rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
+                rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
+                rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null
+        );
+    }
+
+
+
+//    public static List<Message> privateChatHistory(UUID chatId) {
+//        List<Message> result = new ArrayList<>();
+//        String sql = """
+//        SELECT * FROM messages
+//        WHERE receiver_type = 'private'
+//        AND receiver_id = ?
+//        ORDER BY send_at
+//    """;
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//            stmt.setObject(1, chatId);
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                result.add(extractMessage(rs));
+//            }
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//        return result;
+//    }
+
+    public static List<Message> privateChatHistory(UUID chatId, UUID userId) {
+        List<Message> result = new ArrayList<>();
+        String sql = """
+        SELECT * FROM messages
+        WHERE receiver_type = 'private'
+          AND receiver_id = ?
+          AND is_deleted_globally = FALSE
+          AND message_id NOT IN (
+              SELECT message_id FROM deleted_messages WHERE user_id = ?
+          )
+        ORDER BY send_at
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, chatId);
+            stmt.setObject(2, userId);
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                result.add(extractMessage(rs));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+
+
+
+//    public static List<Message> groupChatHistory(UUID groupId) {
+//        List<Message> result = new ArrayList<>();
+//        String sql = """
+//        SELECT * FROM messages
+//        WHERE receiver_type = 'group' AND receiver_id = ?
+//        ORDER BY send_at
+//    """;
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//            stmt.setObject(1, groupId);
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                result.add(extractMessage(rs));
+//            }
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//        return result;
+//    }
+
+
+    public static List<Message> groupChatHistory(UUID groupId,UUID userId) {
+        List<Message> result = new ArrayList<>();
+        String sql = """
+        SELECT * FROM messages
+        WHERE receiver_type = 'group'
+          AND receiver_id = ?
+          AND is_deleted_globally = FALSE
+          AND message_id NOT IN (
+              SELECT message_id FROM deleted_messages WHERE user_id = ?
+          )
+        ORDER BY send_at
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, groupId);
+            stmt.setObject(2, userId);
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                result.add(extractMessage(rs));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+
+//    public static List<Message> channelChatHistory(UUID channelId) {
+//        List<Message> result = new ArrayList<>();
+//        String sql = """
+//        SELECT * FROM messages
+//        WHERE receiver_type = 'channel' AND receiver_id = ?
+//        ORDER BY send_at
+//    """;
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//            stmt.setObject(1, channelId);
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                result.add(extractMessage(rs));
+//            }
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//        return result;
+//    }
+
+
+    public static List<Message> channelChatHistory(UUID channelId, UUID userId) {
+        List<Message> result = new ArrayList<>();
+        String sql = """
+        SELECT * FROM messages
+        WHERE receiver_type = 'channel'
+          AND receiver_id = ?
+          AND is_deleted_globally = FALSE
+          AND message_id NOT IN (
+              SELECT message_id FROM deleted_messages WHERE user_id = ?
+          )
+        ORDER BY send_at
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, channelId);
+            stmt.setObject(2, userId);
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                result.add(extractMessage(rs));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+
+//    public static List<Message> searchMessagesInGroups(List<UUID> groupIds, String keyword) {
+//        List<Message> result = new ArrayList<>();
+//        if (groupIds.isEmpty()) return result;
+//
+//        String placeholders = groupIds.stream().map(id -> "?").collect(Collectors.joining(", "));
+//        String sql = """
+//        SELECT * FROM messages
+//        WHERE receiver_type = 'group'
+//        AND receiver_id IN (%s)
+//        AND content ILIKE ?
+//        ORDER BY send_at DESC
+//    """.formatted(placeholders);
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//
+//            int i = 1;
+//            for (UUID id : groupIds) {
+//                stmt.setObject(i++, id);
+//            }
+//            stmt.setString(i, "%" + keyword + "%");
+//
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                result.add(extractMessage(rs));
+//            }
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//
+//        return result;
+//    }
+
+
+
+    public static List<Message> searchMessagesInGroups(List<UUID> groupIds, String keyword, UUID userId) {
+        List<Message> result = new ArrayList<>();
+        if (groupIds.isEmpty()) return result;
+
+        String placeholders = groupIds.stream().map(id -> "?").collect(Collectors.joining(", "));
+        String sql = """
+        SELECT m.*
+        FROM messages m
+        LEFT JOIN deleted_messages d ON m.message_id = d.message_id AND d.user_id = ?
+        WHERE m.receiver_type = 'group'
+          AND m.receiver_id IN (%s)
+          AND d.message_id IS NULL
+          AND m.is_deleted_globally = FALSE
+          AND m.content ILIKE ?
+        ORDER BY m.send_at DESC
+    """.formatted(placeholders);
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            int i = 1;
+            stmt.setObject(i++, userId);
+            for (UUID groupId : groupIds) {
+                stmt.setObject(i++, groupId);
+            }
+
+            stmt.setString(i, "%" + keyword + "%");
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                result.add(mapResultSetToMessage(rs));
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+
+//    public static List<Message> searchMessagesInChannels(List<UUID> channelIds, String keyword) {
+//        List<Message> result = new ArrayList<>();
+//        if (channelIds.isEmpty()) return result;
+//
+//        String placeholders = channelIds.stream().map(id -> "?").collect(Collectors.joining(", "));
+//        String sql = """
+//        SELECT * FROM messages
+//        WHERE receiver_type = 'channel'
+//        AND receiver_id IN (%s)
+//        AND content ILIKE ?
+//        ORDER BY send_at DESC
+//    """.formatted(placeholders);
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement stmt = conn.prepareStatement(sql)) {
+//
+//            int i = 1;
+//            for (UUID id : channelIds) {
+//                stmt.setObject(i++, id);
+//            }
+//            stmt.setString(i, "%" + keyword + "%");
+//
+//            ResultSet rs = stmt.executeQuery();
+//            while (rs.next()) {
+//                result.add(extractMessage(rs));
+//            }
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//        }
+//
+//        return result;
+//    }
+
+
+
+    public static List<Message> searchMessagesInChannels(List<UUID> channelIds, String keyword) {
+        List<Message> result = new ArrayList<>();
+        if (channelIds.isEmpty()) return result;
+
+        String placeholders = channelIds.stream().map(id -> "?").collect(Collectors.joining(", "));
+        String sql = """
+        SELECT m.*
+        FROM messages m
+        WHERE m.receiver_type = 'channel'
+          AND m.receiver_id IN (%s)
+          AND m.is_deleted_globally = FALSE
+          AND m.content ILIKE ?
+        ORDER BY m.send_at DESC
+    """.formatted(placeholders);
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            int i = 1;
+            for (UUID channelId : channelIds) {
+                stmt.setObject(i++, channelId);
+            }
+
+            stmt.setString(i, "%" + keyword + "%");
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                result.add(mapResultSetToMessage(rs));
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+
+    public List<Message> getMessagesForPrivateChat(UUID user1, UUID user2) {
+        UUID chatId = PrivateChatDatabase.findChatIdByUsers(user1, user2);
+        if (chatId == null) return new ArrayList<>();
+        return findByReceiver("private", chatId);
+    }
+
+    public static List<Message> findByReceiver(String receiverType, UUID receiverId) {
+        List<Message> messages = new ArrayList<>();
+        String sql = "SELECT * FROM messages WHERE receiver_type = ? AND receiver_id = ? ORDER BY send_at";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setString(1, receiverType);
+            ps.setObject(2, receiverId);
+
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                UUID messageId = (UUID) rs.getObject("message_id");
+                UUID senderId = (UUID) rs.getObject("sender_id");
+                UUID recId = (UUID) rs.getObject("receiver_id");
+                String type = rs.getString("receiver_type");
+                String content = rs.getString("content");
+                String messageType = rs.getString("message_type");
+                LocalDateTime sendAt = rs.getTimestamp("send_at").toLocalDateTime();
+
+                Message message = new Message(messageId, senderId, recId, type, content, messageType, sendAt);
+                messages.add(message);
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return messages;
+    }
+
+    public static List<Message> getMessages(UUID chatId, UUID userId) {
+        String sql = """
+        SELECT * FROM messages
+        WHERE receiver_id = ?
+          AND is_deleted_globally = false
+          AND message_id NOT IN (
+              SELECT message_id FROM deleted_messages
+              WHERE user_id = ?
+          )
+        ORDER BY send_at
+    """;
+
+        List<Message> messages = new ArrayList<>();
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, chatId);
+            ps.setObject(2, userId);
+
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                Message m = extractMessage(rs);
+                messages.add(m);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return messages;
+    }
+
+    public static boolean insertSavedMessage(Message message) {
+        String sql = "INSERT INTO messages (message_id, sender_id, receiver_type, receiver_id, content, message_type, send_at, status, reply_to_id, is_edited, edited_at," +
+                " original_message_id, forwarded_by, forwarded_from, is_deleted_globally) " +
+                "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, message.getMessage_id());                        // message_id
+            ps.setObject(2, message.getSender_id());                         // sender_id
+            ps.setString(3, message.getReceiver_type());                     // receiver_type (private)
+            ps.setObject(4, message.getReceiver_id());                       // receiver_id (same as sender_id for saved messages)
+            ps.setString(5, message.getContent());                          // content
+            ps.setString(6, message.getMessage_type());                      // message_type
+            ps.setTimestamp(7, Timestamp.valueOf(message.getSend_at()));     // send_at
+            ps.setString(8, message.getStatus());                           // status
+            if (message.getReply_to_id() != null)
+                ps.setObject(9, message.getReply_to_id());                    // reply_to_id
+            else
+                ps.setNull(9, Types.OTHER);
+
+            ps.setBoolean(10, message.isIs_edited());                          // is_edited
+
+            if (message.getEdited_at() != null)
+                ps.setTimestamp(11, Timestamp.valueOf(message.getEdited_at())); // edited_at
+            else
+                ps.setNull(11, Types.TIMESTAMP);
+
+            if (message.getOriginal_message_id() != null)
+                ps.setObject(12, message.getOriginal_message_id());           // original_message_id
+            else
+                ps.setNull(12, Types.OTHER);
+
+            if (message.getForwarded_by() != null)
+                ps.setObject(13, message.getForwarded_by());                 // forwarded_by
+            else
+                ps.setNull(13, Types.OTHER);
+
+            if (message.getForwarded_from() != null)
+                ps.setObject(14, message.getForwarded_from());               // forwarded_from
+            else
+                ps.setNull(14, Types.OTHER);
+
+            ps.setBoolean(15, message.getIs_deleted_globally());                 // is_deleted_globally
+
+            return ps.executeUpdate() > 0;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static Message getLastMessage(UUID targetId, String type) {
+        final String sql =
+                "SELECT * FROM messages " +
+                        "WHERE receiver_type = ? AND receiver_id = ? " +
+                        "ORDER BY send_at DESC LIMIT 1";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setString(1, type.toLowerCase()); // "private" | "group" | "channel"
+            ps.setObject(2, targetId);
+
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? mapRow(rs) : null;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+//    public static int getUnreadCount(UUID me, UUID targetId, String type) {
+//        final String sql =
+//                "SELECT COUNT(*) FROM messages " +
+//                        "WHERE receiver_type = ? AND receiver_id = ? " +
+//                        "AND sender_id <> ? " +
+//                        "AND (status IS NULL OR status <> 'SEEN')";
+//
+//        try (Connection conn = ConnectionDb.connect();
+//             PreparedStatement ps = conn.prepareStatement(sql)) {
+//
+//            ps.setString(1, type.toLowerCase());
+//            ps.setObject(2, targetId);
+//            ps.setObject(3, me);
+//
+//            try (ResultSet rs = ps.executeQuery()) {
+//                return rs.next() ? rs.getInt(1) : 0;
+//            }
+//        } catch (SQLException e) {
+//            e.printStackTrace();
+//            return 0;
+//        }
+//
+//
+//    }
+
+    private static Message mapRow(ResultSet rs) throws SQLException {
+        Message m = new Message();
+        m.setMessage_id((UUID) rs.getObject("message_id"));
+        m.setSender_id((UUID) rs.getObject("sender_id"));
+        m.setReceiver_id((UUID) rs.getObject("receiver_id"));
+        m.setReceiver_type(rs.getString("receiver_type"));
+        if ("private".equalsIgnoreCase(m.getReceiver_type())) {
+            m.setReceiver_id(m.getReceiver_id());
+        } else {
+            m.setReceiver_id(null);
+        }
+        m.setMessage_type(rs.getString("message_type"));
+        m.setContent(rs.getString("content"));
+        Timestamp ts = rs.getTimestamp("send_at");
+        if (ts != null) m.setSend_at(ts.toLocalDateTime());
+        m.setIs_edited(rs.getBoolean("is_edited"));
+        m.setStatus(rs.getString("status"));
+        Object rtid = rs.getObject("reply_to_id");
+        m.setReply_to_id(rtid == null ? null : (UUID) rtid);
+        return m;
+    }
+
+
+
+    public static List<UUID> getUnreadMessageIds(UUID me, UUID chatId, String chatType, int limit) {
+        String sql = """
+        SELECT m.message_id
+        FROM messages m
+        WHERE m.receiver_id = ? AND m.receiver_type = ?
+          AND m.sender_id <> ?
+          AND NOT EXISTS (
+              SELECT 1 FROM message_receipts r
+              WHERE r.message_id = m.message_id
+                AND r.user_id = ?
+          )
+        ORDER BY m.send_at ASC
+        LIMIT ?
+    """;
+        List<UUID> ids = new ArrayList<>();
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, chatId);
+            ps.setString(2, chatType);
+            ps.setObject(3, me);
+            ps.setObject(4, me);
+            ps.setInt(5, limit);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    ids.add((UUID) rs.getObject(1));
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return ids;
+    }
+
+    // تعداد ناخوانده‌ها (برای چت‌لیست)
+    public static int getUnreadCount(UUID me, UUID chatId, String chatType) {
+        String sql = """
+        SELECT COUNT(1)
+        FROM messages m
+        WHERE m.receiver_id = ?
+          AND m.receiver_type = ?
+          AND m.sender_id <> ?
+          AND NOT EXISTS (
+              SELECT 1 FROM message_receipts r
+              WHERE r.message_id = m.message_id
+                AND r.user_id = ?
+          )
+    """;
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, chatId);
+            ps.setString(2, chatType);
+            ps.setObject(3, me);
+            ps.setObject(4, me);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? rs.getInt(1) : 0;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+
+    public static int insertReceiptIfAbsent(UUID messageId, UUID userId) {
+        String sql = """
+        INSERT INTO message_receipts(message_id, user_id, read_at)
+        VALUES (?, ?, now())
+        ON CONFLICT (message_id, user_id) DO NOTHING
+    """;
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ps.setObject(2, userId);
+            return ps.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    //Read status if it's first reader
+    public static int setMessageReadIfNeeded(UUID messageId, UUID viewerId) {
+        String sql = """
+        UPDATE messages m
+        SET status = 'READ'
+        WHERE m.message_id = ?
+          AND m.sender_id <> ?
+          AND m.status <> 'READ'
+    """;
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ps.setObject(2, viewerId);
+            return ps.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+
+
+    public static String getFirstAttachmentUrlByType(UUID messageId, String messageType) {
+        final String sql = """
+        SELECT file_url
+        FROM message_attachments
+        WHERE message_id = ?
+          AND (file_type = ? OR ? IS NULL)
+        ORDER BY attachment_id
+        LIMIT 1
+    """;
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            // اگر messageType خالی بود، با NULL بفرست که شرط OR ? IS NULL برقرار شه
+            String mt = (messageType == null || messageType.isBlank()) ? null : messageType.toUpperCase();
+            ps.setString(2, mt);
+            if (mt == null) ps.setNull(3, Types.VARCHAR); else ps.setString(3, mt);
+
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? rs.getString("file_url") : null;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Database/MessageReactionDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/MessageReactionDatabase.java
new file mode 100644
index 0000000..65ade2d
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/MessageReactionDatabase.java
@@ -0,0 +1,82 @@
+package org.to.telegramfinalproject.Database;
+
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Models.MediaRow;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+public class MessageReactionDatabase {
+
+    public static boolean saveOrUpdateReaction(UUID messageId, UUID userId, String reaction) {
+        String sql = """
+                    INSERT INTO message_reactions (message_id, user_id, emoji)
+                    VALUES (?, ?, ?)
+                    ON CONFLICT (message_id, user_id)
+                    DO UPDATE SET emoji = EXCLUDED.emoji, reacted_at = CURRENT_TIMESTAMP
+                    """;
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ps.setObject(2, userId);
+            ps.setString(3, reaction);
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static List<String> getReactions(UUID messageId) {
+        String sql = "SELECT emoji FROM message_reactions WHERE message_id = ?";
+        List<String> reactions = new ArrayList<>();
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, messageId);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                reactions.add(rs.getString("emoji"));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return reactions;
+    }
+    public static JSONObject getCountsAsJson(UUID messageId) {
+        String sql = """
+        SELECT emoji, COUNT(*) AS c
+        FROM message_reactions
+        WHERE message_id = ?
+        GROUP BY emoji
+    """;
+
+        JSONObject counts = new JSONObject();
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, messageId);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    String emoji = rs.getString("emoji");
+                    int c = rs.getInt("c");
+                    counts.put(emoji, c);
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return counts; // مثال: {"❤️":2,"👍":1}
+    }
+
+
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Database/PrivateChatDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/PrivateChatDatabase.java
new file mode 100644
index 0000000..6424fdb
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/PrivateChatDatabase.java
@@ -0,0 +1,413 @@
+package org.to.telegramfinalproject.Database;
+
+import org.to.telegramfinalproject.Models.PrivateChat;
+
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+
+public class PrivateChatDatabase {
+
+
+    public static List<UUID> getMembers(UUID privateChatId) {
+        String sql = "SELECT user1_id, user2_id FROM private_chat WHERE chat_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, privateChatId);
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                UUID user1 = (UUID) rs.getObject("user1_id");
+                UUID user2 = (UUID) rs.getObject("user2_id");
+                return new ArrayList<>(Arrays.asList(user1, user2));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return new ArrayList<>();
+    }
+
+    public static UUID getOrCreateSavedMessagesChat(UUID userId) {
+        String query = "SELECT chat_id FROM private_chat WHERE user1_id = ? AND user2_id = ?";
+        try (Connection conn = ConnectionDb.connect()) {
+            PreparedStatement stmt = conn.prepareStatement(query);
+            stmt.setObject(1, userId);
+            stmt.setObject(2, userId); // Saved Messages is self-chat
+
+            ResultSet rs = stmt.executeQuery();
+            if (rs.next()) {
+                return (UUID) rs.getObject("chat_id"); // Chat already exists
+            } else {
+                // Create a new chat
+                UUID chatId = UUID.randomUUID();
+                String insert = "INSERT INTO private_chat (chat_id, user1_id, user2_id) VALUES (?, ?, ?)";
+                try (PreparedStatement insertStmt = conn.prepareStatement(insert)) {
+                    insertStmt.setObject(1, chatId);
+                    insertStmt.setObject(2, userId);
+                    insertStmt.setObject(3, userId);
+                    insertStmt.executeUpdate();
+                    return chatId;
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static UUID findChatIdByUsers(UUID user1, UUID user2) {
+        UUID u1 = user1.compareTo(user2) < 0 ? user1 : user2;
+        UUID u2 = user1.compareTo(user2) < 0 ? user2 : user1;
+
+        String sql = "SELECT chat_id FROM private_chat WHERE user1_id = ? AND user2_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, u1);
+            ps.setObject(2, u2);
+
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                return (UUID) rs.getObject("chat_id");
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static UUID getOrCreateChat(UUID user1, UUID user2) {
+        UUID u1 = user1.compareTo(user2) < 0 ? user1 : user2;
+        UUID u2 = user1.compareTo(user2) < 0 ? user2 : user1;
+
+        String select = "SELECT chat_id FROM private_chat WHERE user1_id = ? AND user2_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(select)) {
+            ps.setObject(1, u1);
+            ps.setObject(2, u2);
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                return UUID.fromString(rs.getString("chat_id"));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        UUID newChatId = UUID.randomUUID();
+        String insert = "INSERT INTO private_chat(chat_id, user1_id, user2_id) VALUES (?, ?, ?)";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(insert)) {
+            ps.setObject(1, newChatId);
+            ps.setObject(2, u1);
+            ps.setObject(3, u2);
+            ps.executeUpdate();
+            return newChatId;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static List<PrivateChat> findChatsOfUser(UUID userId) {
+        List<PrivateChat> chats = new ArrayList<>();
+        String sql = "SELECT * FROM private_chat WHERE user1_id = ? OR user2_id = ?";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+
+            ps.setObject(1, userId);
+            ps.setObject(2, userId);
+
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()) {
+                UUID chatId = (UUID) rs.getObject("chat_id");
+                UUID user1 = (UUID) rs.getObject("user1_id");
+                UUID user2 = (UUID) rs.getObject("user2_id");
+
+                chats.add(new PrivateChat(chatId, user1, user2));
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return chats;
+    }
+
+
+    public static UUID getOtherUserInChat(UUID chatId, UUID currentUserId) {
+        String sql = "SELECT user1_id, user2_id FROM private_chat WHERE chat_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, chatId);
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                UUID user1 = (UUID) rs.getObject("user1_id");
+                UUID user2 = (UUID) rs.getObject("user2_id");
+                return currentUserId.equals(user1) ? user2 : user1;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    private static PrivateChat extractPrivateChat(ResultSet rs) throws SQLException {
+        UUID chatId = UUID.fromString(rs.getString("chat_id"));
+        UUID user1 = rs.getObject("user1_id", UUID.class);
+        UUID user2 = rs.getObject("user2_id", UUID.class);
+        boolean user1Deleted = rs.getBoolean("user1_deleted");
+        boolean user2Deleted = rs.getBoolean("user2_deleted");
+        LocalDateTime createdAt = rs.getTimestamp("created_at").toLocalDateTime();
+
+        return new PrivateChat(chatId, user1, user2, user1Deleted, user2Deleted, createdAt);
+    }
+
+    public static void markChatDeleted(UUID userId, UUID chatId) {
+        String sql = """
+        UPDATE private_chat 
+        SET user1_deleted = CASE WHEN user1_id = ? THEN true ELSE user1_deleted END,
+            user2_deleted = CASE WHEN user2_id = ? THEN true ELSE user2_deleted END
+        WHERE chat_id = ?
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            stmt.setObject(2, userId);
+            stmt.setObject(3, chatId);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void unmarkChatDeleted(UUID userId, UUID chatId) {
+        String sql = """
+        UPDATE private_chat 
+        SET user1_deleted = CASE WHEN user1_id = ? THEN false ELSE user1_deleted END,
+            user2_deleted = CASE WHEN user2_id = ? THEN false ELSE user2_deleted END
+        WHERE chat_id = ?
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            stmt.setObject(2, userId);
+            stmt.setObject(3, chatId);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void markUser1Deleted(UUID chatId) {
+        updateBoolField(chatId, "user1_deleted", true);
+    }
+
+    public static void markUser2Deleted(UUID chatId) {
+        updateBoolField(chatId, "user2_deleted", true);
+    }
+
+    public static void markBothDeleted(UUID chatId) {
+        String sql = "UPDATE private_chat SET user1_deleted = true, user2_deleted = true WHERE chat_id = ?";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, chatId);
+            ps.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void updateBoolField(UUID chatId, String field, boolean value) {
+        String sql = "UPDATE private_chat SET " + field + " = ? WHERE chat_id = ?";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setBoolean(1, value);
+            ps.setObject(2, chatId);
+            ps.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static PrivateChat findById(UUID chatId) {
+        String sql = "SELECT * FROM private_chat WHERE chat_id = ?";
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, chatId);
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                UUID user1_id = (UUID) rs.getObject("user1_id");
+                UUID user2_id = (UUID) rs.getObject("user2_id");
+                boolean user1_deleted = rs.getBoolean("user1_deleted");
+                boolean user2_deleted = rs.getBoolean("user2_deleted");
+                LocalDateTime created_at = rs.getTimestamp("created_at").toLocalDateTime();
+
+                return new PrivateChat(chatId, user1_id, user2_id, user1_deleted, user2_deleted, created_at);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static void clearDeletedFlag(UUID senderId, UUID chatId) {
+        String sql = """
+        UPDATE private_chat
+        SET user1_deleted = CASE WHEN user1_id = ? THEN FALSE ELSE user1_deleted END,
+            user2_deleted = CASE WHEN user2_id = ? THEN FALSE ELSE user2_deleted END
+        WHERE chat_id = ?
+    """;
+
+        try (Connection conn = ConnectionDb.connect(); PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, senderId);
+            ps.setObject(2, senderId);
+            ps.setObject(3, chatId);
+            int rows = ps.executeUpdate();
+            System.out.println("✅ clearDeletedFlag updated rows = " + rows);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static UUID findChatBetween(UUID user1, UUID user2) {
+        String sql = """
+        SELECT chat_id FROM private_chat
+        WHERE (user1_id = ? AND user2_id = ?) OR (user1_id = ? AND user2_id = ?)
+    """;
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, user1);
+            ps.setObject(2, user2);
+            ps.setObject(3, user2);
+            ps.setObject(4, user1);
+
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                return (UUID) rs.getObject("chat_id");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+//    public static UUID getOtherParticipant(UUID chatId, UUID me) {
+//        List<UUID> members = getMembers(chatId);
+//        for (UUID u : members) {
+//            if (!u.equals(me)) return u;
+//        }
+//        return null;
+//    }
+
+    public static UUID getOtherParticipant(UUID chatId, UUID me) {
+        List<UUID> members = getMembers(chatId); // باید [user1_id, user2_id] بده
+        if (members == null || members.isEmpty()) return null;
+
+        boolean isMember = false;
+        UUID other = null;
+
+        for (UUID u : members) {
+            if (u == null) continue;
+            if (u.equals(me)) {
+                isMember = true;
+            } else {
+                other = u;
+            }
+        }
+
+        if (!isMember) return null;
+        return (other != null) ? other
+                : me;
+    }
+
+
+
+
+
+    public static PrivateChat findSelfChat(UUID userId) {
+        String sql = """
+            SELECT chat_id, user1_id, user2_id, user1_deleted, user2_deleted
+            FROM private_chat
+            WHERE user1_id = ? AND user2_id = ?
+            LIMIT 1
+        """;
+        try (Connection c = ConnectionDb.connect();
+             PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            ps.setObject(2, userId);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) return map(rs);
+            }
+        } catch (SQLException e) { e.printStackTrace(); }
+        return null;
+    }
+
+    public static UUID createSelfChat(UUID userId) {
+        String sql = """
+            INSERT INTO private_chat (chat_id, user1_id, user2_id, user1_deleted, user2_deleted, created_at)
+            VALUES (gen_random_uuid(), ?, ?, FALSE, FALSE, NOW())
+            RETURNING chat_id
+        """;
+        try (Connection c = ConnectionDb.connect();
+             PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            ps.setObject(2, userId);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) return (UUID) rs.getObject("chat_id");
+            }
+        } catch (SQLException e) { e.printStackTrace(); }
+        return null;
+    }
+
+
+
+
+
+    private static PrivateChat map(ResultSet rs) throws SQLException {
+        return new PrivateChat(
+                (UUID) rs.getObject("chat_id"),
+                (UUID) rs.getObject("user1_id"),
+                (UUID) rs.getObject("user2_id"),
+                rs.getBoolean("user1_deleted"),
+                rs.getBoolean("user2_deleted")
+        );
+    }
+    public static boolean isParticipant(java.util.UUID chatId, java.util.UUID userId) {
+        String sql = """
+        SELECT 1
+        FROM private_chat
+        WHERE chat_id = ?
+          AND (user1_id = ? OR user2_id = ?)
+        LIMIT 1
+    """;
+        try (var c = ConnectionDb.connect();
+             var ps = c.prepareStatement(sql)) {
+            ps.setObject(1, chatId);
+            ps.setObject(2, userId);
+            ps.setObject(3, userId);
+            try (var rs = ps.executeQuery()) {
+                return rs.next();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Database/userDatabase.java b/src/main/java/org/to/telegramfinalproject/Database/userDatabase.java
new file mode 100644
index 0000000..ddf9d27
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Database/userDatabase.java
@@ -0,0 +1,450 @@
+package org.to.telegramfinalproject.Database;
+
+
+import org.to.telegramfinalproject.Models.User;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class userDatabase {
+    
+    
+    public userDatabase() {
+    }
+
+    public static boolean isUserOnline(UUID userId) {
+        String sql = "SELECT status FROM users WHERE internal_uuid = ?";
+
+        try (Connection conn = getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                String status = rs.getString("status");
+                return "online".equalsIgnoreCase(status);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
+
+
+
+    private static Connection getConnection() throws SQLException {
+        return ConnectionDb.connect();
+    }
+
+    public static String getLastSeen(UUID userId) {
+        String sql = "SELECT last_seen FROM users WHERE internal_uuid = ?";
+
+        try (Connection conn = getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                Timestamp lastSeen = rs.getTimestamp("last_seen");
+                if (lastSeen != null) {
+                    return lastSeen.toLocalDateTime().toString();
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return "Unknown";
+    }
+
+
+    public User findByUserId(String userId) {
+        String query = "SELECT * FROM users WHERE user_id = ?";
+
+        try {
+            User var6;
+            try (Connection conn = ConnectionDb.connect()) {
+                try (PreparedStatement stmt = conn.prepareStatement(query)) {
+                    stmt.setString(1, userId);
+                    ResultSet rs = stmt.executeQuery();
+                    if (!rs.next()) {
+                        return null;
+                    }
+
+                    var6 = this.extractUser(rs);
+                }
+            }
+
+            return var6;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public User findByUsername(String username) {
+        String query = "SELECT * FROM users WHERE username = ?";
+
+        try {
+            User var6;
+            try (Connection conn = this.getConnection()) {
+                try (PreparedStatement stmt = conn.prepareStatement(query)) {
+                    stmt.setString(1, username);
+                    ResultSet rs = stmt.executeQuery();
+                    if (!rs.next()) {
+                        return null;
+                    }
+
+                    var6 = this.extractUser(rs);
+                }
+            }
+
+            return var6;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public boolean existsByUsername(String username) {
+        String query = "SELECT 1 FROM users WHERE username = ?";
+
+        try {
+            boolean var6;
+            try (
+                    Connection conn = this.getConnection();
+                    PreparedStatement stmt = conn.prepareStatement(query);
+            ) {
+                stmt.setString(1, username);
+                ResultSet rs = stmt.executeQuery();
+                var6 = rs.next();
+            }
+
+            return var6;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public boolean existsByUserId(String user_id) {
+        String query = "SELECT 1 FROM users WHERE user_id = ?";
+
+        try {
+            boolean var6;
+            try (
+                    Connection conn = this.getConnection();
+                    PreparedStatement stmt = conn.prepareStatement(query);
+            ) {
+                stmt.setString(1, user_id);
+                ResultSet rs = stmt.executeQuery();
+                var6 = rs.next();
+            }
+
+            return var6;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public boolean save(User user) {
+        String query = "INSERT INTO users (user_id, internal_uuid, username, password, profile_name, bio, image_url) VALUES (?, ?, ?, ?, ?, ?, ?)";
+
+        try {
+            boolean var5;
+            try (
+                    Connection conn = this.getConnection();
+                    PreparedStatement stmt = conn.prepareStatement(query);
+            ) {
+                stmt.setString(1, user.getUser_id());
+                stmt.setObject(2, user.getInternal_uuid());
+                stmt.setString(3, user.getUsername());
+                stmt.setString(4, user.getPassword());
+                stmt.setString(5, user.getProfile_name());
+                stmt.setString(6, user.getBio());
+                stmt.setString(7, user.getImage_url());
+                var5 = stmt.executeUpdate() > 0;
+            }
+
+            return var5;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public boolean updateByUUID(UUID uuid, User user) {
+        String query = "UPDATE users SET user_id=?, username=?, password=?, profile_name=?, bio=?, image_url=?, status=?, last_seen=? WHERE internal_uuid=?";
+
+        try {
+            boolean var6;
+            try (
+                    Connection conn = this.getConnection();
+                    PreparedStatement stmt = conn.prepareStatement(query);
+            ) {
+                stmt.setString(1, user.getUser_id());
+                stmt.setString(2, user.getUsername());
+                stmt.setString(3, user.getPassword());
+                stmt.setString(4, user.getProfile_name());
+                stmt.setString(5, user.getBio());
+                stmt.setString(6, user.getImage_url());
+                stmt.setString(7, user.getStatus());
+                stmt.setObject(8, user.getLast_seen());
+                stmt.setObject(9, uuid);
+                var6 = stmt.executeUpdate() > 0;
+            }
+
+            return var6;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public List<User> getAll() {
+        List<User> users = new ArrayList();
+        String query = "SELECT * FROM users";
+
+        try (
+                Connection conn = this.getConnection();
+                PreparedStatement stmt = conn.prepareStatement(query);
+                ResultSet rs = stmt.executeQuery();
+        ) {
+            while(rs.next()) {
+                users.add(this.extractUser(rs));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return users;
+    }
+
+    private User extractUser(ResultSet rs) throws SQLException {
+        return new User(rs.getString("user_id"), UUID.fromString(rs.getString("internal_uuid")), rs.getString("username"), rs.getString("password"), rs.getString("profile_name"), rs.getString("bio"), rs.getString("image_url"));
+    }
+
+    public boolean deleteByUUID(UUID uuid) {
+        String query = "DELETE FROM users WHERE internal_uuid = ?";
+
+        try {
+            boolean var5;
+            try (
+                    Connection conn = this.getConnection();
+                    PreparedStatement stmt = conn.prepareStatement(query);
+            ) {
+                stmt.setObject(1, uuid);
+                var5 = stmt.executeUpdate() > 0;
+            }
+
+            return var5;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    public static void updateUserStatus(UUID uuid, String status) {
+        String sql = "UPDATE users SET status = ? WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setString(1, status);
+            stmt.setObject(2, uuid);
+            int rows = stmt.executeUpdate();
+            System.out.println("🔁 updateUserStatus: set '" + status + "' for " + uuid + " → affected rows = " + rows);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static void updateLastSeen(UUID uuid) {
+        String sql = "UPDATE users SET last_seen = CURRENT_TIMESTAMP WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, uuid);
+            stmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static User findByInternalUUID(UUID internalUuid) {
+        String sql = "SELECT * FROM users WHERE internal_uuid = ?";
+
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setObject(1, internalUuid);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                User user = new User(
+                        rs.getString("user_id"),
+                        UUID.fromString(rs.getString("internal_uuid")),
+                        rs.getString("username"),
+                        rs.getString("password"),
+                        rs.getString("profile_name"),
+                        rs.getString("bio"),
+                        rs.getString("image_url")
+                );
+
+                user.setBio(rs.getString("bio"));
+                user.setImage_url(rs.getString("image_url"));
+                user.setStatus(rs.getString("status"));
+
+                Timestamp lastSeenTs = rs.getTimestamp("last_seen");
+                if (lastSeenTs != null) {
+                    user.setLast_seen(lastSeenTs.toLocalDateTime());
+                }
+
+                return user;
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+
+    public List<User> searchUsers(String keyword, UUID currentUserId) {
+        String query = """
+        SELECT * FROM users 
+        WHERE (user_id ILIKE ? OR profile_name ILIKE ?)
+        AND internal_uuid <> ?
+    """;
+
+        List<User> result = new ArrayList<>();
+        try (Connection conn = getConnection();
+             PreparedStatement stmt = conn.prepareStatement(query)) {
+
+            stmt.setString(1, "%" + keyword + "%");
+            stmt.setString(2, "%" + keyword + "%");
+            stmt.setObject(3, currentUserId);
+
+            ResultSet rs = stmt.executeQuery();
+            while (rs.next()) {
+                result.add(extractUser(rs));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+
+
+    public static void setAllUsersOffline() {
+        String sql = "UPDATE users SET status = 'offline'";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            int affected = stmt.executeUpdate();
+            System.out.println("🔁 All users set to offline. Rows affected: " + affected);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static String getProfileName(UUID userId) {
+        String sql = "SELECT profile_name FROM users WHERE internal_uuid = ?";
+
+        try (Connection conn = getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                String profileName = rs.getString("profile_name");
+                return profileName;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return "Unknown";
+    }
+
+    public static String getProfilePicture(UUID userId) {
+        String sql = "SELECT image_url FROM users WHERE internal_uuid = ?";
+
+        try (Connection conn = getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                String imageUrl = rs.getString("image_url");
+                return imageUrl;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return "Unknown";
+    }
+
+    public static String getUserId(UUID userId) {
+        String sql = "SELECT user_id FROM users WHERE internal_uuid = ?";
+
+        try (Connection conn = getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            stmt.setObject(1, userId);
+            ResultSet rs = stmt.executeQuery();
+
+            if (rs.next()) {
+                String user_id = rs.getString("user_id");
+                return user_id;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        return "Unknown";
+    }
+
+    public static String getPasswordHash(UUID userId) {
+        String sql = "SELECT password FROM users WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setObject(1, userId);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) return rs.getString("password");
+            }
+        } catch (SQLException e) { e.printStackTrace(); }
+        return null;
+    }
+
+    public static boolean updateUsername(UUID userId, String newUsername) throws SQLException {
+        String sql = "UPDATE users SET username = ? WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setString(1, newUsername);
+            ps.setObject(2, userId);
+            ps.executeUpdate();
+            return true;
+        } catch (SQLException e) {
+            // 23505 = unique_violation در PostgreSQL
+            if ("23505".equals(e.getSQLState())) throw e;
+            throw e;
+        }
+    }
+
+    public static boolean updatePasswordHash(UUID userId, String newHash) {
+        String sql = "UPDATE users SET password = ? WHERE internal_uuid = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(sql)) {
+            ps.setString(1, newHash);
+            ps.setObject(2, userId);
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) { e.printStackTrace(); return false; }
+    }
+}
+
diff --git a/src/main/java/org/to/telegramfinalproject/HelloApplication.java b/src/main/java/org/to/telegramfinalproject/HelloApplication.java
deleted file mode 100644
index 5751500..0000000
--- a/src/main/java/org/to/telegramfinalproject/HelloApplication.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.to.telegramfinalproject;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-
-public class HelloApplication extends Application {
-    @Override
-    public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 320, 240);
-        stage.setTitle("Hello!");
-        stage.setScene(scene);
-        stage.show();
-    }
-
-    public static void main(String[] args) {
-        launch();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/HelloController.java b/src/main/java/org/to/telegramfinalproject/HelloController.java
deleted file mode 100644
index 0641baf..0000000
--- a/src/main/java/org/to/telegramfinalproject/HelloController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.to.telegramfinalproject;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-
-public class HelloController {
-    @FXML
-    private Label welcomeText;
-
-    @FXML
-    protected void onHelloButtonClick() {
-        welcomeText.setText("Welcome to JavaFX Application!");
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Models/Channel.java b/src/main/java/org/to/telegramfinalproject/Models/Channel.java
new file mode 100644
index 0000000..8965066
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/Channel.java
@@ -0,0 +1,49 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public class Channel {
+    private UUID internal_uuid;
+    private String channel_id;
+    private String channel_name;
+    private UUID creator_id;
+    private String image_url;
+    private String description;
+    private LocalDateTime created_at;
+    private List<ChannelSubscribe> members;
+
+    public Channel(UUID internal_uuid, String channel_name, UUID creator_id, LocalDateTime created_at){
+        this.internal_uuid = internal_uuid;
+        this.channel_name = channel_name;
+        this.creator_id = creator_id;
+        this.created_at = created_at;
+    }
+
+    public Channel() {
+
+    }
+
+    public void setChannel_id(String Channel_id){this.channel_id = Channel_id;}
+    public void setCreator_id(UUID creator_id){this.creator_id = creator_id;}
+    public void setChannel_name(String channel_name){this.channel_name = channel_name;}
+    public void setImage_url(String image_url){this.image_url = image_url;}
+    public void setCreated_at(LocalDateTime created_at){this.created_at = created_at;}
+    public void setDescription(String description){this.description =description;}
+    public void setMembers(List<ChannelSubscribe> members){this.members = members;}
+
+    public String getChannel_id(){return  this.channel_id;}
+    public UUID getCreator_id(){return   this.creator_id;}
+    public String getChannel_name(){return  this.channel_name;}
+    public String getImage_url(){return  this.image_url;}
+    public LocalDateTime getCreated_at(){return  this.created_at;}
+    public String getDescription(){return  this.description;}
+    public List<ChannelSubscribe> getMembers(){return  this.members;}
+    public UUID getInternal_uuid() {
+        return this.internal_uuid;
+    }
+
+    public void setInternal_uuid(UUID internalUuid) { this.internal_uuid = internalUuid;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/ChannelAdmin.java b/src/main/java/org/to/telegramfinalproject/Models/ChannelAdmin.java
new file mode 100644
index 0000000..ebe32fd
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/ChannelAdmin.java
@@ -0,0 +1,136 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class ChannelAdmin {
+    private String channelId;
+    private UUID userId;
+    private LocalDateTime addedAt;
+    private UUID addedBy;
+    private String role; // e.g., "owner", "admin"
+    private boolean canPostMessage;
+    private boolean canEditSetting;
+    private boolean canDeleteMessages;
+    private boolean canDeleteMembers;
+    private boolean canAddMembers;
+
+    public ChannelAdmin(String channelId, UUID userId, LocalDateTime addedAt, UUID addedBy,
+                        String role, boolean canPostMessage, boolean canEditSetting, boolean canDeleteMessages,
+                        boolean canDeleteMembers, boolean canAddMembers) {
+        this.channelId = channelId;
+        this.userId = userId;
+        this.addedAt = addedAt;
+        this.addedBy = addedBy;
+        this.role = role;
+        this.canPostMessage = canPostMessage;
+        this.canEditSetting = canEditSetting;
+        this.canDeleteMessages = canDeleteMessages;
+        this.canDeleteMembers = canDeleteMembers;
+        this.canAddMembers = canAddMembers;
+    }
+
+    // Overloaded constructor with default values from SQL
+    public ChannelAdmin(String channelId, UUID userId, UUID addedBy) {
+        this.channelId = channelId;
+        this.userId = userId;
+        this.addedBy = addedBy;
+    }
+
+    // Getters and setters
+    public String getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    public UUID getUserId() {
+        return userId;
+    }
+
+    public void setUserId(UUID userId) {
+        this.userId = userId;
+    }
+
+    public LocalDateTime getAddedAt() {
+        return addedAt;
+    }
+
+    public void setAddedAt(LocalDateTime addedAt) {
+        this.addedAt = addedAt;
+    }
+
+    public UUID getAddedBy() {
+        return addedBy;
+    }
+
+    public void setAddedBy(UUID addedBy) {
+        this.addedBy = addedBy;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+
+    public boolean getCanPostMessage() {
+        return canPostMessage;
+    }
+
+    public void setCanPostMessage(boolean canPostMessage) {
+        this.canPostMessage = canPostMessage;
+    }
+
+    public boolean getCanEditSetting() {
+        return canEditSetting;
+    }
+
+    public void setCanEditSetting(boolean canEditSetting) {
+        this.canEditSetting = canEditSetting;
+    }
+
+    public boolean getCanDeleteMessages() {
+        return canDeleteMessages;
+    }
+
+    public void setCanDeleteMessages(boolean canDeleteMessages) {
+        this.canDeleteMessages = canDeleteMessages;
+    }
+
+    public boolean getCanDeleteMembers() {
+        return canDeleteMembers;
+    }
+
+    public void setCanDeleteMembers(boolean canDeleteMembers) {
+        this.canDeleteMembers = canDeleteMembers;
+    }
+
+    public boolean getCanAddMembers() {
+        return canAddMembers;
+    }
+
+    public void setCanAddMembers(boolean canAddMembers) {
+        this.canAddMembers = canAddMembers;
+    }
+
+    @Override
+    public String toString() {
+        return "ChannelAdmin{" +
+                "channelId='" + channelId + '\'' +
+                ", userId=" + userId +
+                ", addedAt=" + addedAt +
+                ", addedBy=" + addedBy +
+                ", role='" + role + '\'' +
+                ", canPost=" + canPostMessage +
+                ", canEdit=" + canEditSetting +
+                ", canDeleteMessages=" + canDeleteMessages +
+                ", canDeleteMembers=" + canDeleteMembers +
+                ", canAddMembers=" + canAddMembers +
+                '}';
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/ChannelSubscribe.java b/src/main/java/org/to/telegramfinalproject/Models/ChannelSubscribe.java
new file mode 100644
index 0000000..1950890
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/ChannelSubscribe.java
@@ -0,0 +1,29 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class ChannelSubscribe{
+    private UUID channel_id;
+    private UUID user_id;
+    private LocalDateTime Subscribed_at;
+
+
+    public ChannelSubscribe(UUID channel_id, UUID user_id, String role){
+        this.channel_id = channel_id;
+        this.user_id = user_id;
+        this.Subscribed_at = LocalDateTime.now();
+    }
+
+    public  void  setChannel_id(UUID group_id){this.channel_id = group_id;}
+    public void  setUser_id(UUID user_id){this.user_id = user_id;}
+    public void  setJoin_at(LocalDateTime join_at){this.Subscribed_at = join_at;}
+
+
+
+    public  UUID  getChannel_id(){return  this.channel_id;}
+    public UUID  getUser_id(){return  this.user_id;}
+    public LocalDateTime  getJoin_at(){return  this.Subscribed_at;}
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/ChatEntry.java b/src/main/java/org/to/telegramfinalproject/Models/ChatEntry.java
new file mode 100644
index 0000000..f66c169
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/ChatEntry.java
@@ -0,0 +1,213 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONObject;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class ChatEntry {
+    private UUID internalId;
+    private String displayId;
+    private String name;
+    private String imageUrl;
+    private String type;
+    private LocalDateTime lastMessageTime;
+    private boolean archived = false;
+    private UUID otherUser;
+    private boolean savedMessages = false;
+
+
+    private boolean isOwner = false;
+    private boolean isAdmin = false;
+    private JSONObject permissions;
+
+
+
+
+
+//    private UUID otherUserId;
+    private int unreadCount;
+    private String lastMessagePreview;
+    private String lastMessageType;      // TEXT / IMAGE / AUDIO / VIDEO / ...
+    private UUID lastMessageSenderId;
+
+
+
+    public ChatEntry(UUID internalId, String displayId, String name, String imageUrl, String type, LocalDateTime lastMessageTime) {
+        this.internalId = internalId;
+        this.displayId = displayId;
+        this.name = name;
+        this.imageUrl = imageUrl;
+        this.type = type;
+        this.lastMessageTime = lastMessageTime;
+    }
+
+    public ChatEntry(UUID internalId, String displayId, String name, String imageUrl, String type, LocalDateTime lastMessageTime, boolean isOwner, boolean isAdmin) {
+        this(internalId, displayId, name, imageUrl, type, lastMessageTime);
+        this.isOwner = isOwner;
+        this.isAdmin = isAdmin;
+        this.permissions = permissions;
+
+    }
+
+    public ChatEntry() {
+
+    }
+
+    public ChatEntry(UUID internalId, String type, String name, String displayId) {
+        this.internalId = internalId;
+        this.type = type;
+        this.displayId = displayId;
+        this.name = name;
+
+    }
+
+
+    public boolean isOwner() {
+        return isOwner;
+    }
+
+    public void setOwner(boolean owner) {
+        isOwner = owner;
+    }
+
+    public boolean isAdmin() {
+        return isAdmin;
+    }
+
+    public void setAdmin(boolean admin) {
+        isAdmin = admin;
+    }
+
+    public UUID getId() {
+        return internalId;
+    }
+
+
+    public String getDisplayId() {
+        return displayId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public LocalDateTime getLastMessageTime() {
+        return lastMessageTime;
+    }
+
+
+    public JSONObject getPermissions() {
+        return permissions;
+    }
+
+    public void setPermissions(JSONObject permissions) {
+        this.permissions = permissions;
+    }
+
+    public void setName(String name) {this.name = name;
+    }
+
+    public void setDisplayId(String id) {this.displayId = id;
+    }
+
+    public void setImageUrl(String image_url) {this.imageUrl = image_url;
+    }
+
+    public void setType(String type) {this.type =type;
+    }
+
+    public void setId(String internalId) {this.internalId = UUID.fromString(internalId);
+    }
+
+
+
+    public boolean isArchived() {
+        return archived;
+    }
+
+    public void setArchived(boolean archived) {
+        this.archived = archived;
+    }
+
+
+
+    public void setLastMessageTime(String newTime) {
+        if (newTime == null || newTime.isBlank()) {
+            this.lastMessageTime = null;
+            return;
+        }
+
+        try {
+            this.lastMessageTime = LocalDateTime.parse(newTime);
+        } catch (Exception e) {
+            System.out.println("❌ Failed to parse lastMessageTime: " + newTime);
+            this.lastMessageTime = null;
+        }
+    }
+
+    public void setOtherUserId(UUID otherId) {this.otherUser =  otherId;
+    }
+
+    public UUID getOtherUserId(){
+        return otherUser;
+    }
+
+    public boolean isSavedMessages() {
+        return savedMessages;
+    }
+
+    public void setSavedMessages(boolean savedMessages) {
+        this.savedMessages = savedMessages;
+    }
+
+
+    public int getUnreadCount() { return unreadCount; }
+    public void setUnreadCount(int unreadCount) { this.unreadCount = unreadCount; }
+
+    public String getLastMessagePreview() { return lastMessagePreview; }
+    public void setLastMessagePreview(String lastMessagePreview) { this.lastMessagePreview = lastMessagePreview; }
+
+    public String getLastMessageType() { return lastMessageType; }
+    public void setLastMessageType(String lastMessageType) { this.lastMessageType = lastMessageType; }
+
+    public UUID getLastMessageSenderId() { return lastMessageSenderId; }
+    public void setLastMessageSenderId(UUID lastMessageSenderId) { this.lastMessageSenderId = lastMessageSenderId; }
+
+    public void setUnread(int unreadCount){this.unreadCount = unreadCount;}
+    public int getUnread(){return unreadCount;}
+
+
+    public void setLastMessageTime(LocalDateTime t) {
+        this.lastMessageTime = t;
+    }
+
+
+
+    public static ChatEntry fromServer(UUID internalId,
+                                       String type,
+                                       String name,
+                                       String displayId,
+                                       String imageUrl,
+                                       boolean isOwner,
+                                       boolean isAdmin) {
+        ChatEntry e = new ChatEntry(internalId, type, name, displayId); // اگر سازنده‌ات فرق دارد، مطابق آن بساز
+        e.setImageUrl(imageUrl);
+        e.setOwner(isOwner);
+        e.setAdmin(isAdmin);
+        return e;
+    }
+
+
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/Contact.java b/src/main/java/org/to/telegramfinalproject/Models/Contact.java
new file mode 100644
index 0000000..1240f21
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/Contact.java
@@ -0,0 +1,44 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public class Contact {
+    private UUID user_id;
+    private UUID contact_id;
+    private LocalDateTime added_at;
+    private Boolean is_blocked;
+
+    public Contact(UUID user_id, UUID contact_id){
+        this.user_id = user_id;
+        this.contact_id = contact_id;
+        this.added_at = LocalDateTime.now();
+    }
+
+
+    public void setUser_id(UUID user_id){this.user_id = user_id;}
+    public void setContact_id(UUID contact_id){this.contact_id = contact_id;}
+    public void setAdd_at(LocalDateTime add_at){this.added_at =add_at;}
+    public  void setIs_blocked(Boolean is_blocked){this.is_blocked =is_blocked;}
+
+    public UUID getUser_id(){
+        return this.user_id;
+    }
+
+    public UUID getContact_id(){return this.contact_id;}
+
+    public LocalDateTime getAdd_at() {
+        return added_at;
+    }
+    public Boolean getIs_blocked(){
+        return is_blocked;
+    }
+
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/ContactEntry.java b/src/main/java/org/to/telegramfinalproject/Models/ContactEntry.java
new file mode 100644
index 0000000..0a3a896
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/ContactEntry.java
@@ -0,0 +1,87 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import org.json.JSONObject;
+import java.util.UUID;
+
+public class ContactEntry {
+    private UUID contactId;        // internal UUID
+    private String userId;         // public ID
+    private String profileName;
+    private String imageUrl;
+    private boolean isBlocked;
+    private LocalDateTime lastSeenTime;
+    private String contact_displayId;
+
+
+    public ContactEntry(UUID contactId, String userId, String profileName, String imageUrl, boolean isBlocked) {
+        this.contactId = contactId;
+        this.userId = userId;
+        this.profileName = profileName;
+        this.imageUrl = imageUrl;
+        this.isBlocked = isBlocked;
+    }
+
+    public ContactEntry(UUID contactId, String userId,String contact_displayId , String profileName, String imageUrl, boolean isBlocked, LocalDateTime lastSeenTime){
+        this.contactId = contactId;
+        this.userId = userId;
+        this.contact_displayId = contact_displayId;
+        this.profileName = profileName;
+        this.imageUrl = imageUrl;
+        this.isBlocked = isBlocked;
+        this.lastSeenTime = lastSeenTime;
+    }
+
+    public UUID getContactId() {
+        return contactId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public String getProfileName() {
+        return profileName;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public boolean isBlocked() {
+        return isBlocked;
+    }
+
+    public LocalDateTime getLastSeenTime() {
+        return lastSeenTime;
+    }
+
+    public void setLastSeenTime(LocalDateTime lastSeenTime) {
+        this.lastSeenTime = lastSeenTime;
+    }
+
+    public String getContact_displayId() {
+        return contact_displayId;
+    }
+
+    public void setContact_displayId(String contact_displayId) {
+        this.contact_displayId = contact_displayId;
+    }
+
+    @Override
+    public String toString() {
+        return profileName + " (@" + contact_displayId + ")" + (isBlocked ? " [Blocked]" : "") + " Last Seen:" + (lastSeenTime != null ? " " + lastSeenTime.toString() : "");
+    }
+
+
+    public JSONObject toJson() {
+        JSONObject obj = new JSONObject();
+        obj.put("contact_id", contactId.toString());
+        obj.put("user_id", userId);
+        obj.put("profile_name", profileName);
+        obj.put("image_url", imageUrl);
+        obj.put("is_blocked", isBlocked);
+        return obj;
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/ContactRequestModel.java b/src/main/java/org/to/telegramfinalproject/Models/ContactRequestModel.java
new file mode 100644
index 0000000..ac50e2d
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/ContactRequestModel.java
@@ -0,0 +1,23 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONObject;
+
+public class ContactRequestModel {
+    private String event;
+    private String contactId;
+    private String userId;
+
+    public ContactRequestModel(String event, String contactId, String userId) {
+        this.event = event;
+        this.contactId = contactId;
+        this.userId = userId;
+    }
+
+    public JSONObject toJson() {
+        JSONObject json = new JSONObject();
+        json.put("event", event);
+        json.put("contact_id", contactId);
+        json.put("user_id", userId);
+        return json;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Models/FileAttachment.java b/src/main/java/org/to/telegramfinalproject/Models/FileAttachment.java
new file mode 100644
index 0000000..f3f5d9c
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/FileAttachment.java
@@ -0,0 +1,162 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONObject;
+import java.util.Objects;
+import java.util.UUID;
+
+public class FileAttachment {
+
+    private UUID attachmentId;     // اختیاری؛ اگر null بود، تولید می‌کنیم
+    private UUID mediaKey;
+    private String fileUrl;
+    private String fileType;          // IMAGE, VIDEO, AUDIO, FILE, GIF, STICKER
+    private String fileName;
+    private Long   fileSize;
+    private String mimeType;          // e.g., image/png
+    private Integer width;
+    private Integer height;
+    private Integer durationSeconds;  // for audio/video
+    private String  thumbnailUrl;
+    private String storagePath;
+
+    public FileAttachment(String fileUrl,
+                          String fileType,
+                          String fileName,
+                          Long fileSize,
+                          String mimeType,
+                          Integer width,
+                          Integer height,
+                          Integer durationSeconds,
+                          String thumbnailUrl) {
+        this.fileUrl = fileUrl;
+        this.fileType = fileType;
+        this.fileName = fileName;
+        this.fileSize = fileSize;
+        this.mimeType = mimeType;
+        this.width = width;
+        this.height = height;
+        this.durationSeconds = durationSeconds;
+        this.thumbnailUrl = thumbnailUrl;
+    }
+
+    public FileAttachment(String fileUrl, String fileType) {
+        this(fileUrl, fileType, null, null, null, null, null, null, null);
+    }
+
+    public FileAttachment() {
+    }
+
+
+    // ساخت از JSON /upload
+    public static FileAttachment fromUploadJson(JSONObject j) {
+        return new FileAttachment(
+                j.optString("file_url", ""),
+                j.optString("file_type", "FILE"),
+                emptyToNull(j.optString("file_name", null)),
+                j.has("file_size") && !j.isNull("file_size") ? j.getLong("file_size") : null,
+                emptyToNull(j.optString("mime_type", null)),
+                j.has("width") && !j.isNull("width") ? j.getInt("width") : null,
+                j.has("height") && !j.isNull("height") ? j.getInt("height") : null,
+                j.has("duration_seconds") && !j.isNull("duration_seconds") ? j.getInt("duration_seconds") : null,
+                j.isNull("thumbnail_url") ? null : emptyToNull(j.optString("thumbnail_url", null))
+        );
+    }
+
+    public JSONObject toJson() {
+        JSONObject out = new JSONObject()
+                .put("file_url", fileUrl)
+                .put("file_type", fileType);
+
+        out.put("file_name", fileName == null ? JSONObject.NULL : fileName);
+        out.put("file_size", fileSize == null ? JSONObject.NULL : fileSize);
+        out.put("mime_type", mimeType == null ? JSONObject.NULL : mimeType);
+        out.put("width", width == null ? JSONObject.NULL : width);
+        out.put("height", height == null ? JSONObject.NULL : height);
+        out.put("duration_seconds", durationSeconds == null ? JSONObject.NULL : durationSeconds);
+        out.put("thumbnail_url", thumbnailUrl == null ? JSONObject.NULL : thumbnailUrl);
+        return out;
+    }
+
+    // Helpers
+    public boolean isImage() { return "IMAGE".equalsIgnoreCase(fileType) || "GIF".equalsIgnoreCase(fileType); }
+    public boolean isAudio() { return "AUDIO".equalsIgnoreCase(fileType); }
+    public boolean hasDimensions() { return width != null && height != null; }
+
+    private static String emptyToNull(String s) {
+        return (s == null || s.isBlank()) ? null : s;
+    }
+
+    // Getters
+    public String getFileUrl() { return fileUrl; }
+    public String getFileType() { return fileType; }
+    public String getFileName() { return fileName; }
+    public Long getFileSize() { return fileSize; }
+    public String getMimeType() { return mimeType; }
+    public Integer getWidth() { return width; }
+    public Integer getHeight() { return height; }
+    public Integer getDurationSeconds() { return durationSeconds; }
+    public String getThumbnailUrl() { return thumbnailUrl; }
+
+    // equals/hashCode/toString
+    @Override public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof FileAttachment)) return false;
+        FileAttachment that = (FileAttachment) o;
+        return Objects.equals(fileUrl, that.fileUrl) &&
+                Objects.equals(fileType, that.fileType) &&
+                Objects.equals(fileName, that.fileName) &&
+                Objects.equals(fileSize, that.fileSize) &&
+                Objects.equals(mimeType, that.mimeType) &&
+                Objects.equals(width, that.width) &&
+                Objects.equals(height, that.height) &&
+                Objects.equals(durationSeconds, that.durationSeconds) &&
+                Objects.equals(thumbnailUrl, that.thumbnailUrl);
+    }
+
+    @Override public int hashCode() {
+        return Objects.hash(fileUrl, fileType, fileName, fileSize, mimeType, width, height, durationSeconds, thumbnailUrl);
+    }
+
+    @Override public String toString() {
+        return "FileAttachment{" +
+                "fileUrl='" + fileUrl + '\'' +
+                ", fileType='" + fileType + '\'' +
+                ", fileName='" + fileName + '\'' +
+                ", fileSize=" + fileSize +
+                ", mimeType='" + mimeType + '\'' +
+                ", width=" + width +
+                ", height=" + height +
+                ", durationSeconds=" + durationSeconds +
+                ", thumbnailUrl='" + thumbnailUrl + '\'' +
+                '}';
+    }
+
+    public UUID getAttachmentId() {return attachmentId;
+    }
+
+    public UUID getMediaKey() {return mediaKey;
+    }
+
+    public String getStoragePath() {return storagePath;
+    }
+
+    public void setAttachmentId(UUID attachmentId) {this.attachmentId = attachmentId;
+    }
+
+    public void setMediaKey(UUID mediaKey) {this.mediaKey = mediaKey;
+    }
+
+
+    public void setFileUrl(String fileUrl) {this.fileUrl = fileUrl;
+    }
+    public void setFileType(String fileType){this.fileType = fileType;}
+    public void setFileName(String fileName){this.fileName = fileName;}
+    public void setFileSize(Long fileSize){this.fileSize = fileSize;}
+    public void setMimeType(String mimeType){this.mimeType = mimeType;}
+    public void setWidth(int width){this.width = width;}
+    public void setHeight(int height){this.height = height;}
+    public void setDurationSeconds(Integer durationSeconds){this.durationSeconds = durationSeconds;}
+    public void setThumbnailUrl(String thumbnailUrl){this.thumbnailUrl = thumbnailUrl;}
+    public void setStoragePath(String storagePath) {this.storagePath = storagePath;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/Group.java b/src/main/java/org/to/telegramfinalproject/Models/Group.java
new file mode 100644
index 0000000..922c725
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/Group.java
@@ -0,0 +1,49 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public class Group {
+    private UUID internal_uuid;
+    private String group_id;
+    private String group_name;
+    private UUID creator_id;
+    private String image_url;
+    private String description;
+    private LocalDateTime created_at;
+    private List<GroupMember> members;
+
+    public Group(UUID internal_uuid, String group_name, UUID creator_id, LocalDateTime created_at){
+        this.internal_uuid = internal_uuid;
+        this.group_name = group_name;
+        this.creator_id = creator_id;
+        this.created_at = created_at;
+    }
+
+    public Group() {
+
+    }
+
+    public void setGroup_id(String group_id){this.group_id = group_id;}
+    public void  setCreator_id(UUID creator_id){this.creator_id = creator_id;}
+    public void setGroup_name(String group_name){this.group_name = group_name;}
+    public void setImage_url(String image_url){this.image_url = image_url;}
+    public void setCreated_at(LocalDateTime created_at){this.created_at = created_at;}
+    public void setDescription(String description){this.description =description;}
+    public void setMembers(List<GroupMember> members){this.members = members;}
+
+    public String getGroup_id(){return this.group_id;}
+    public UUID getCreator_id(){return this.creator_id;}
+    public String getGroup_name(){return this.group_name;}
+    public String getImage_url(){return this.image_url;}
+    public LocalDateTime getCreated_at(){return this.created_at;}
+    public String getDescription(){return  this.description;}
+    public List<GroupMember> getMembers(){return this.members;}
+    public UUID getInternal_uuid() {
+        return this.internal_uuid;
+    }
+
+    public void setInternal_uuid(UUID internalUuid) { this.internal_uuid = internalUuid;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/GroupMember.java b/src/main/java/org/to/telegramfinalproject/Models/GroupMember.java
new file mode 100644
index 0000000..a9cb0ed
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/GroupMember.java
@@ -0,0 +1,32 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class GroupMember {
+    private UUID group_id;
+    private UUID user_id;
+    private LocalDateTime join_at;
+    private String role;
+
+    public GroupMember(UUID group_id, UUID user_id, String role){
+        this.group_id = group_id;
+        this.user_id = user_id;
+        this.join_at = LocalDateTime.now();
+        this.role = role;
+    }
+
+    public  void  setGroup_id(UUID group_id){this.group_id = group_id;}
+    public void  setUser_id(UUID user_id){this.user_id = user_id;}
+    public void  setJoin_at(LocalDateTime join_at){this.join_at = join_at;}
+    public void setRole(String role){this.role = role;}
+
+
+
+    public  UUID  getGroup_id(){return this.group_id;}
+    public UUID  getUser_id(){return this.user_id;}
+    public LocalDateTime  getJoin_at(){return this.join_at;}
+    public String getRole(){return this.role;}
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/JsonUtil.java b/src/main/java/org/to/telegramfinalproject/Models/JsonUtil.java
new file mode 100644
index 0000000..63e270f
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/JsonUtil.java
@@ -0,0 +1,215 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Database.userDatabase;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public class JsonUtil {
+    public static JSONArray contactListToJson(List<Contact> contacts) {
+        JSONArray array = new JSONArray();
+
+        for (Contact contact : contacts) {
+            UUID contactId = contact.getContact_id();
+            User contactUser = userDatabase.findByInternalUUID(contactId);
+            if (contactUser == null) continue;
+
+            JSONObject obj = new JSONObject();
+            obj.put("contact_id", contactId.toString());                        // UUID
+            obj.put("user_id", contactUser.getUser_id());                      // public ID
+            obj.put("profile_name", contactUser.getProfile_name());
+            obj.put("image_url", contactUser.getImage_url());
+            obj.put("is_blocked", contact.getIs_blocked());
+
+            array.put(obj);
+        }
+
+        return array;
+    }
+
+    public static JSONArray contactEntryListToJson(List<ContactEntry> contactEntries) {
+        JSONArray array = new JSONArray();
+
+        for (ContactEntry entry : contactEntries) {
+            JSONObject obj = new JSONObject();
+            obj.put("contact_id", entry.getContactId().toString());
+            obj.put("user_id", entry.getUserId());
+            obj.put("profile_name", entry.getProfileName());
+            obj.put("image_url", entry.getImageUrl());
+            obj.put("is_blocked", entry.isBlocked());
+            array.put(obj);
+        }
+
+        return array;
+    }
+
+
+
+
+
+    public static JSONObject userToJson(User user) {
+        JSONObject obj = new JSONObject();
+        obj.put("internal_uuid", user.getInternal_uuid().toString());
+        obj.put("user_id", user.getUser_id() != null ?user.getUser_id().toString() :JSONObject.NULL);
+        obj.put("username", user.getUsername());
+        obj.put("profile_name", user.getProfile_name());
+        obj.put("bio", user.getBio()!= null ?user.getBio().toString() :JSONObject.NULL);
+        obj.put("image_url", user.getImage_url() != null ?user.getImage_url().toString() :JSONObject.NULL);
+        obj.put("status", user.getStatus());
+        obj.put("last_seen", user.getLast_seen() != null ? user.getLast_seen().toString() : JSONObject.NULL);
+        obj.put("contactList", JsonUtil.contactListToJson(user.getContactList()));
+        obj.put("channelList", JsonUtil.channelListToJson(user.getChannelList()));
+        obj.put("groupList", JsonUtil.groupListToJson(user.getGroupList()));
+        obj.put("unreadMessages", JsonUtil.messageListToJson(user.getUnreadMessages()));
+        return obj;
+    }
+
+
+    public static JSONArray messageListToJson(List<Message> messages) {
+        JSONArray array = new JSONArray();
+        for (Message message : messages) {
+            JSONObject obj = new JSONObject();
+            obj.put("message_id", message.getMessage_id().toString());
+            obj.put("sender_id", message.getSender_id() != null ? message.getSender_id().toString() : JSONObject.NULL);
+            obj.put("receiver_type", message.getReceiver_type());
+            obj.put("receiver_id", message.getReceiver_id().toString());
+            obj.put("content", message.getContent());
+            obj.put("message_type", message.getMessage_type());
+            obj.put("send_at", message.getSend_at().toString());
+            obj.put("status", message.getStatus());
+            obj.put("reply_to_id", message.getReply_to_id() != null ? message.getReply_to_id().toString() : JSONObject.NULL);
+            obj.put("is_edited", message.isIs_edited());
+            obj.put("original_message_id", message.getOriginal_message_id() != null ? message.getOriginal_message_id().toString() : JSONObject.NULL);
+            obj.put("forwarded_by", message.getForwarded_by() != null ? message.getForwarded_by().toString() : JSONObject.NULL);
+            obj.put("forwarded_from", message.getForwarded_from() != null ? message.getForwarded_from().toString() : JSONObject.NULL);
+            array.put(obj);
+        }
+        return array;
+    }
+
+
+
+
+    public static JSONArray groupListToJson(List<Group> groups) {
+        JSONArray array = new JSONArray();
+        for (Group group : groups) {
+            JSONObject obj = new JSONObject();
+            obj.put("internal_uuid", group.getInternal_uuid().toString());
+            obj.put("group_id", group.getGroup_id() != null ?group.getGroup_id().toString() :JSONObject.NULL);
+            obj.put("group_name", group.getGroup_name());
+            obj.put("creator_id", group.getCreator_id().toString());
+            obj.put("image_url",group.getImage_url()!= null ?group.getImage_url().toString() : JSONObject.NULL );
+            obj.put("description", group.getDescription() != null ?group.getDescription().toString() : JSONObject.NULL );
+            obj.put("created_at", group.getCreated_at().toString());
+            obj.put("members", JsonUtil.groupMemberListToJson(group.getMembers()));
+            array.put(obj);
+        }
+        return array;
+    }
+
+
+
+
+    public static JSONArray channelListToJson(List<Channel> channels) {
+        JSONArray array = new JSONArray();
+        for (Channel channel : channels) {
+            JSONObject obj = new JSONObject();
+            obj.put("internal_uuid",channel.getInternal_uuid().toString());
+            obj.put("channel_id", channel.getChannel_id() != null ?channel.getChannel_id().toString() :JSONObject.NULL);
+            obj.put("channel_name", channel.getChannel_name());
+            obj.put("creator_id", channel.getCreator_id().toString());
+            obj.put("image_url",channel.getImage_url()!= null ?channel.getImage_url().toString() : JSONObject.NULL );
+            obj.put("description",channel.getDescription() != null ?channel.getDescription().toString() : JSONObject.NULL );
+            obj.put("created_at",channel.getCreated_at().toString());
+            obj.put("members", JsonUtil.channelSubscribeToJson(channel.getMembers()));
+            array.put(obj);
+        }
+        return array;
+    }
+
+
+
+    public static JSONArray groupMemberListToJson(List<GroupMember> members) {
+        JSONArray array = new JSONArray();
+
+        if (members == null) {
+            return array;
+        }
+
+        for (GroupMember m : members) {
+            JSONObject obj = new JSONObject();
+            obj.put("group_id", m.getGroup_id().toString());
+            obj.put("user_id", m.getUser_id().toString());
+            obj.put("joined_at", m.getJoin_at().toString());
+            obj.put("role", m.getRole());
+            array.put(obj);
+        }
+
+        return array;
+    }
+
+
+    public static JSONArray channelSubscribeToJson(List<ChannelSubscribe> subscribes) {
+        JSONArray array = new JSONArray();
+
+        if (subscribes == null) {
+            return array;
+        }
+
+        for (ChannelSubscribe s : subscribes) {
+            JSONObject obj = new JSONObject();
+            obj.put("channel_id", s.getChannel_id().toString());
+            obj.put("user_id", s.getUser_id().toString());
+            obj.put("Subscribed_at", s.getJoin_at().toString());
+            array.put(obj);
+        }
+
+        return array;
+    }
+
+
+
+    public static JSONArray chatListToJson(List<ChatEntry> chatList) {
+        JSONArray jsonArray = new JSONArray();
+
+        for (ChatEntry entry : chatList) {
+            JSONObject obj = new JSONObject();
+            obj.put("internal_id", entry.getId().toString());
+            obj.put("id", entry.getDisplayId());
+            obj.put("name", entry.getName());
+            obj.put("image_url", entry.getImageUrl());
+            obj.put("type", entry.getType());
+            obj.put("last_message_time", entry.getLastMessageTime() == null ? JSONObject.NULL : entry.getLastMessageTime().toString());
+            obj.put("is_owner", entry.isOwner());
+            obj.put("is_admin", entry.isAdmin());
+            obj.put("is_saved_messages", entry.isSavedMessages());
+            obj.put("unread_count", entry.getUnreadCount());
+            obj.put("last_message_preview", entry.getLastMessagePreview());
+            obj.put("last_message_type", entry.getLastMessageType());
+            obj.put("last_message_sender_id",
+                    entry.getLastMessageSenderId() != null ? entry.getLastMessageSenderId().toString() : JSONObject.NULL);
+
+
+            jsonArray.put(obj);
+        }
+
+        return jsonArray;
+    }
+
+
+    public static JSONObject chatToJson(ChatEntry chat) {
+        JSONObject obj = new JSONObject();
+        obj.put("id", chat.getId());
+        obj.put("name", chat.getName());
+        obj.put("image_url", chat.getImageUrl() != null ? chat.getImageUrl() : JSONObject.NULL);
+        obj.put("type", chat.getType());
+        obj.put("last_message_time", chat.getLastMessageTime() != null ? chat.getLastMessageTime().toString() : JSONObject.NULL);
+        return obj;
+    }
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/LoginBootstrapData.java b/src/main/java/org/to/telegramfinalproject/Models/LoginBootstrapData.java
new file mode 100644
index 0000000..c15791f
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/LoginBootstrapData.java
@@ -0,0 +1,32 @@
+package org.to.telegramfinalproject.Models;
+
+import java.util.List;
+
+public class LoginBootstrapData {
+    private User user;
+    private List<Contact> contacts;
+    private List<Group> groups;
+    private List<Channel> channels;
+    private List<Message> unreadMessages;
+
+    public LoginBootstrapData(User user, List<Contact> contacts, List<Group> groups,
+                              List<Channel> channels, List<Message> unreadMessages) {
+        this.user = user;
+        this.contacts = contacts;
+        this.groups = groups;
+        this.channels = channels;
+        this.unreadMessages = unreadMessages;
+    }
+
+    public void  setUnreadMessages(List<Message> unreadMessages){this.unreadMessages = unreadMessages;}
+    public void  setContacts(List<Contact> contacts){this.contacts =contacts;}
+    public void setGroups(List<Group> groups){this.groups = groups;}
+    public void setChannels(List<Channel> channels){this.channels = channels;}
+    public void setUser(User user){this.user = user;}
+
+    public List<Message> getUnreadMessages(){return unreadMessages;}
+    public List<Group> getGroups(){return groups;}
+    public List<Contact> getContacts(){return  contacts;}
+    public List<Channel> getChannels(){return  channels;}
+    public User getUser(User user){return  user;}
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/MediaRow.java b/src/main/java/org/to/telegramfinalproject/Models/MediaRow.java
new file mode 100644
index 0000000..0332ff3
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/MediaRow.java
@@ -0,0 +1,24 @@
+package org.to.telegramfinalproject.Models;
+
+import java.util.UUID;
+
+public class MediaRow {
+    public UUID messageId;
+    public String storagePath;
+    public String fileName;
+    public String mimeType;
+    public Long fileSize;
+    public String receiverType;
+    public UUID receiverId;
+    public UUID senderId;
+    public java.util.UUID attachmentId;
+    public java.util.UUID mediaKey;
+    public String fileType; // IMAGE/AUDIO/...
+    public Integer width;
+    public Integer height;
+    public Integer durationSeconds; //for audio only
+    public String thumbnailUrl;
+    public String fileUrl;     //display link
+    public String chatType;
+    public UUID chatId;
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/Message.java b/src/main/java/org/to/telegramfinalproject/Models/Message.java
new file mode 100644
index 0000000..27c9a15
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/Message.java
@@ -0,0 +1,211 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public class Message {
+    private UUID message_id;
+    private UUID sender_id;
+    private String receiver_type;
+    private UUID receiver_id;
+    private String content;
+    private String message_type;
+    private LocalDateTime send_at;
+    private String status;
+    private UUID reply_to_id;
+    private boolean is_edited;
+    private UUID original_message_id;
+    private UUID forwarded_by;
+    private UUID forwarded_from;
+    private List<FileAttachment> attachments;
+    private boolean is_deleted_globally;
+    private LocalDateTime edited_at;
+    private transient String sender_name;
+    private transient String receiver_name;
+
+
+    // ✅ Full Constructor
+    public Message(UUID message_id, UUID sender_id, String receiver_type, UUID receiver_id, String content,
+                   String message_type, LocalDateTime send_at, String status,
+                   UUID reply_to_id, boolean is_edited, boolean is_deleted_globally,
+                   UUID original_message_id, UUID forwarded_by, UUID forwarded_from) {
+        this.message_id = message_id;
+        this.sender_id = sender_id;
+        this.receiver_type = receiver_type;
+        this.receiver_id = receiver_id;
+        this.content = content;
+        this.message_type = message_type;
+        this.send_at = send_at;
+        this.status = status;
+        this.reply_to_id = reply_to_id;
+        this.is_edited = is_edited;
+        this.is_deleted_globally = is_deleted_globally;
+        this.original_message_id = original_message_id;
+        this.forwarded_by = forwarded_by;
+        this.forwarded_from = forwarded_from;
+    }
+
+    public Message(UUID message_id, UUID sender_id, String receiver_type, UUID receiver_id, String content,
+                   String message_type, LocalDateTime send_at, String status,
+                   UUID reply_to_id, boolean is_edited, UUID original_message_id,
+                   UUID forwarded_by, UUID forwarded_from,boolean is_deleted_globally, LocalDateTime edited_at) {
+        this.message_id = message_id;
+        this.sender_id = sender_id;
+        this.receiver_type = receiver_type;
+        this.receiver_id = receiver_id;
+        this.content = content;
+        this.message_type = message_type;
+        this.send_at = send_at;
+        this.status = status;
+        this.reply_to_id = reply_to_id;
+        this.is_edited = is_edited;
+        this.original_message_id = original_message_id;
+        this.forwarded_by = forwarded_by;
+        this.forwarded_from = forwarded_from;
+        this.is_deleted_globally = is_deleted_globally;
+        this.edited_at = edited_at;
+    }
+
+
+    // ✅ Short Constructors
+    //for normal messages
+    public Message(UUID messageId, UUID senderId, UUID receiverId, String receiverType,
+                   String content, String messageType, LocalDateTime sendAt) {
+        this.message_id = messageId;
+        this.sender_id = senderId;
+        this.receiver_id = receiverId;
+        this.receiver_type = receiverType;
+        this.content = content;
+        this.message_type = messageType;
+        this.send_at = sendAt;
+    }
+
+    //for reply messages
+    public Message(UUID messageId, UUID senderId, String receiverType, UUID receiverId,
+                   String content, String messageType, LocalDateTime sendAt, String status,
+                   UUID replyToId) {
+        this.message_id = messageId;
+        this.sender_id = senderId;
+        this.receiver_type = receiverType;
+        this.receiver_id = receiverId;
+        this.content = content;
+        this.message_type = messageType;
+        this.send_at = sendAt;
+        this.status = status;
+        this.reply_to_id = replyToId;
+        this.is_edited = false;
+        this.is_deleted_globally = false;
+    }
+
+
+
+
+    public Message(UUID messageId, UUID senderId, String receiverType, UUID receiverId,
+                   String content, String messageType, LocalDateTime sendAt, String status,
+                   UUID replyToId, boolean isEdited, boolean isDeletedGlobally,
+                   UUID originalMessageId, UUID forwardedBy, UUID forwardedFrom,
+                   LocalDateTime editedAt) {
+
+        this.message_id = messageId;
+        this.sender_id = senderId;
+        this.receiver_type = receiverType;
+        this.receiver_id = receiverId;
+        this.content = content;
+        this.message_type = messageType;
+        this.send_at = sendAt;
+        this.status = status;
+        this.reply_to_id = replyToId;
+        this.is_edited = isEdited;
+        this.is_deleted_globally = isDeletedGlobally;
+        this.original_message_id = originalMessageId;
+        this.forwarded_by = forwardedBy;
+        this.forwarded_from = forwardedFrom;
+        this.edited_at = editedAt;
+    }
+
+    public Message() {
+
+    }
+
+
+    // ✅ Getters & Setters
+    public UUID getMessage_id() { return message_id; }
+    public void setMessage_id(UUID messageId) { this.message_id = messageId; }
+
+    public UUID getSender_id() { return sender_id; }
+    public void setSender_id(UUID sender_id) { this.sender_id = sender_id; }
+
+    public String getReceiver_type() { return receiver_type; }
+    public void setReceiver_type(String receiver_type) { this.receiver_type = receiver_type; }
+
+    public UUID getReceiver_id() { return receiver_id; }
+    public void setReceiver_id(UUID receiver_id) { this.receiver_id = receiver_id; }
+
+    public String getContent() { return content; }
+    public void setContent(String content) { this.content = content; }
+
+    public String getMessage_type() { return message_type; }
+    public void setMessage_type(String message_type) { this.message_type = message_type; }
+
+    public LocalDateTime getSend_at() { return send_at; }
+    public void setSend_at(LocalDateTime send_at) { this.send_at = send_at; }
+
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+
+    public UUID getReply_to_id() { return reply_to_id; }
+    public void setReply_to_id(UUID reply_to_id) { this.reply_to_id = reply_to_id; }
+
+    public boolean isIs_edited() { return is_edited; }
+    public void setIs_edited(boolean is_edited) { this.is_edited = is_edited; }
+
+    public boolean isIs_deleted_globally() { return is_deleted_globally; }
+    public void setIs_deleted_globally(boolean is_deleted_globally) {
+        this.is_deleted_globally = is_deleted_globally;
+    }
+
+    public UUID getOriginal_message_id() { return original_message_id; }
+    public void setOriginal_message_id(UUID original_message_id) { this.original_message_id = original_message_id; }
+
+    public UUID getForwarded_by() { return forwarded_by; }
+    public void setForwarded_by(UUID forwarded_by) { this.forwarded_by = forwarded_by; }
+
+    public UUID getForwarded_from() { return forwarded_from; }
+    public void setForwarded_from(UUID forwarded_from) { this.forwarded_from = forwarded_from; }
+
+    public List<FileAttachment> getAttachments() { return attachments; }
+    public void setAttachments(List<FileAttachment> attachments) { this.attachments = attachments; }
+    public String getSender_name() {
+        return sender_name;
+    }
+
+    public void setSender_name(String sender_name) {
+        this.sender_name = sender_name;
+    }
+
+    public String getReceiver_name() {
+        return receiver_name;
+    }
+
+    public void setReceiver_name(String receiver_name) {
+        this.receiver_name = receiver_name;
+    }
+
+   public LocalDateTime getEdited_at() {
+       return edited_at;
+     }
+
+    public void setEdited_at(LocalDateTime edited_at) {
+        this.edited_at = edited_at;
+    }
+
+
+    public boolean getIs_deleted_globally() {
+        return is_deleted_globally;
+    }
+
+    public void receiver_id(UUID receiverId) {this.receiver_id = receiverId;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/MessageReceipt.java b/src/main/java/org/to/telegramfinalproject/Models/MessageReceipt.java
new file mode 100644
index 0000000..7247f76
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/MessageReceipt.java
@@ -0,0 +1,58 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class MessageReceipt {
+    private UUID messageId;
+    private UUID userId;
+    private LocalDateTime readAt;
+
+    public MessageReceipt(UUID messageId, UUID userId, LocalDateTime readAt) {
+        this.messageId = messageId;
+        this.userId = userId;
+        this.readAt = readAt;
+    }
+
+    // Overloaded constructor if readAt is not provided (use current timestamp)
+    public MessageReceipt(UUID messageId, UUID userId) {
+        this.messageId = messageId;
+        this.userId = userId;
+        this.readAt = LocalDateTime.now();
+    }
+
+    // Getters
+    public UUID getMessageId() {
+        return messageId;
+    }
+
+    public UUID getUserId() {
+        return userId;
+    }
+
+    public LocalDateTime getReadAt() {
+        return readAt;
+    }
+
+    // Setters
+    public void setMessageId(UUID messageId) {
+        this.messageId = messageId;
+    }
+
+    public void setUserId(UUID userId) {
+        this.userId = userId;
+    }
+
+    public void setReadAt(LocalDateTime readAt) {
+        this.readAt = readAt;
+    }
+
+    @Override
+    public String toString() {
+        return "MessageReceipt{" +
+                "messageId=" + messageId +
+                ", userId=" + userId +
+                ", readAt=" + readAt +
+                '}';
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/PrivateChat.java b/src/main/java/org/to/telegramfinalproject/Models/PrivateChat.java
new file mode 100644
index 0000000..79751f5
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/PrivateChat.java
@@ -0,0 +1,50 @@
+package org.to.telegramfinalproject.Models;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class PrivateChat {
+    private final UUID chat_id;
+    private boolean user1_deleted;
+    private boolean user2_deleted;
+    private UUID user1_id;
+    private UUID user2_id;
+    private LocalDateTime created_at;
+
+    public PrivateChat(UUID chat_id, UUID user1_id, UUID user2_id){
+        this.chat_id = chat_id;
+        this.user1_id =user1_id;
+        this.user2_id =user2_id;
+        this.created_at =created_at;
+    }
+
+    public PrivateChat(UUID chatId, UUID user1, UUID user2, boolean user1Deleted, boolean user2Deleted, LocalDateTime createdAt) {
+        this.chat_id = chatId;
+        this.user1_id = user1;
+        this.user2_id = user2;
+        this.user1_deleted = user1Deleted;
+        this.user2_deleted = user2Deleted;
+        this.created_at = createdAt;
+    }
+
+    public PrivateChat(UUID chatId, UUID user1, UUID user2, boolean user1Deleted, boolean user2Deleted) {
+        this.chat_id = chatId;
+        this.user1_id = user1;
+        this.user2_id = user2;
+        this.user1_deleted = user1Deleted;
+        this.user2_deleted = user2Deleted;
+    }
+
+
+    public void setUser1_id(UUID user1_id){this.user1_id =user1_id;}
+    public void setUser2_id(UUID user2_id){this.user2_id =user2_id;}
+    public void setCreated_at(LocalDateTime created_at){this.created_at = created_at;}
+
+    public UUID getUser1_id(){return this.user1_id;}
+    public UUID getChat_id(){return this.chat_id;}
+    public UUID getUser2_id(){return this.user2_id;}
+    public LocalDateTime getCreated_at(){return this.created_at;}
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/RequestModel.java b/src/main/java/org/to/telegramfinalproject/Models/RequestModel.java
new file mode 100644
index 0000000..d460e5c
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/RequestModel.java
@@ -0,0 +1,39 @@
+package org.to.telegramfinalproject.Models;
+
+public class RequestModel {
+    private String action;
+    private String user_id;
+    private String username;
+    private String password;
+    private String profile_name;
+
+    public RequestModel(String action, String user_id, String username, String password, String profile_name) {
+        this.action = action;
+        this.user_id = user_id;
+        this.username = username;
+        this.password = password;
+        this.profile_name = profile_name;
+    }
+
+    public String getAction() {
+        return this.action;
+    }
+
+    public String getUser_id() {
+        return this.user_id;
+    }
+
+    public String getUsername() {
+        return this.username;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+
+    public String getProfile_name() {
+        return this.profile_name;
+    }
+}
+
+
diff --git a/src/main/java/org/to/telegramfinalproject/Models/ResponseModel.java b/src/main/java/org/to/telegramfinalproject/Models/ResponseModel.java
new file mode 100644
index 0000000..f127dab
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/ResponseModel.java
@@ -0,0 +1,50 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONObject;
+
+public class ResponseModel {
+    private String status;
+    private String message;
+    private JSONObject data;
+    private String requestId;
+
+
+
+    public ResponseModel(String status, String message) {
+        this.status = status;
+        this.message = message;
+        this.data = null;
+    }
+
+    public ResponseModel(String status, String message, JSONObject data) {
+        this.status = status;
+        this.message = message;
+        this.data = data;
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public JSONObject getData() {return this.data;}
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+
+    public JSONObject toJson() {
+        JSONObject json = new JSONObject();
+        json.put("status", this.status);
+        json.put("message", this.message);
+        json.put("data", this.data != null ? this.data : JSONObject.NULL);
+        if (this.requestId != null) {
+            json.put("request_id", this.requestId);
+        }
+        return json;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/SearchRequestModel.java b/src/main/java/org/to/telegramfinalproject/Models/SearchRequestModel.java
new file mode 100644
index 0000000..4751d5c
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/SearchRequestModel.java
@@ -0,0 +1,24 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONObject;
+
+public class SearchRequestModel {
+    private String action;
+    private String keyword;
+    private String user_id;
+
+    public SearchRequestModel(String action, String keyword, String user_id) {
+        this.action = action;
+        this.keyword = keyword;
+        this.user_id = user_id;
+    }
+
+    public JSONObject toJson() {
+        JSONObject json = new JSONObject();
+        json.put("action", action);
+        json.put("keyword", keyword);
+        json.put("user_id", user_id);
+        return json;
+    }
+}
+
diff --git a/src/main/java/org/to/telegramfinalproject/Models/SearchResultModel.java b/src/main/java/org/to/telegramfinalproject/Models/SearchResultModel.java
new file mode 100644
index 0000000..d0e3cb1
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/SearchResultModel.java
@@ -0,0 +1,59 @@
+package org.to.telegramfinalproject.Models;
+
+public class SearchResultModel {
+    private final String type;
+    private final String id;           // ← UUID
+    private final String displayId;    // ← user_id یا group_id برای نمایش
+    private String name;
+    private final String content;
+    private final String sender;
+    private final String time;
+
+    public SearchResultModel(String type, String id, String displayId,
+                             String content, String sender, String time) {
+        this.type = type;
+        this.id = id;
+        this.displayId = displayId;
+        this.content = content;
+        this.sender = sender;
+        this.time = time;
+    }
+
+    // فقط در صورت نیاز برای user/group/channel
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getDisplayId() {
+        return displayId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    @Override
+    public String toString() {
+        return "[" + type.toUpperCase() + "] " + name + " (ID: " + displayId + ")";
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Models/User.java b/src/main/java/org/to/telegramfinalproject/Models/User.java
new file mode 100644
index 0000000..a8d9e29
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Models/User.java
@@ -0,0 +1,123 @@
+package org.to.telegramfinalproject.Models;
+
+import org.json.JSONObject;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+public class User {
+    private String user_id;
+    private UUID internal_uuid;
+    private String username;
+    private String password;
+    private String profile_name;
+    private String bio;
+    private String image_url;
+    private String status;
+    private LocalDateTime last_seen;
+    private List<Contact> contactList;
+    private List<Group> groupList;
+    private List<Channel> channelList;
+    private List<Message> unreadMessages;
+    private List<ChatEntry> chatList;
+
+    public User(String user_id, UUID internal_uuid, String username, String password, String profile_name, String bio, String image_url) {
+        this.user_id = user_id;
+        this.internal_uuid = internal_uuid;
+        this.username = username;
+        this.password = password;
+        this.profile_name = profile_name;
+        this.bio = bio;
+        this.image_url = image_url;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setProfile_name(String profile_name) {
+        this.profile_name = profile_name;
+    }
+
+    public void setBio(String bio) {
+        this.bio = bio;
+    }
+
+    public void setImage_url(String image_url) {
+        this.image_url = image_url;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public void setLast_seen(LocalDateTime last_seen) {
+        this.last_seen = last_seen;
+    }
+
+    public void setContactList(List<Contact> contactList){this.contactList = contactList;}
+
+    public void setChannelList(List<Channel> channelList){this.channelList = channelList;}
+
+    public void setGroupList(List<Group> groupList){this.groupList = groupList;}
+
+    public void setUnreadMessages(List<Message> unreadMessages){this.unreadMessages = unreadMessages;}
+
+    public void setChatList(List<ChatEntry> chatList){this.chatList = chatList;}
+
+    public UUID getInternal_uuid() {
+        return this.internal_uuid;
+    }
+
+    public String getUser_id() {
+        return this.user_id;
+    }
+
+    public String getUsername() {
+        return this.username;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+
+    public String getProfile_name() {
+        return this.profile_name;
+    }
+
+    public String getBio() {
+        return this.bio;
+    }
+
+    public String getImage_url() {
+        return this.image_url;
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public LocalDateTime getLast_seen() {
+        return this.last_seen;
+    }
+
+    public List<Contact> getContactList(){return this.contactList;}
+
+    public List<Channel> getChannelList(){return this.channelList;}
+
+    public List<Group> getGroupList(){return this.groupList;}
+
+    public List<Message> getUnreadMessages(){return  this.unreadMessages;}
+
+    public List<ChatEntry> getChatList(){return  this.chatList;}
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Security/PasswordHashing.java b/src/main/java/org/to/telegramfinalproject/Security/PasswordHashing.java
new file mode 100644
index 0000000..ae1b916
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Security/PasswordHashing.java
@@ -0,0 +1,30 @@
+package org.to.telegramfinalproject.Security;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class PasswordHashing {
+    public PasswordHashing() {
+    }
+
+    public static String hash(String password) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] hashedBytes = md.digest(password.getBytes());
+            StringBuilder sb = new StringBuilder();
+
+            for(byte b : hashedBytes) {
+                sb.append(String.format("%02x", b));
+            }
+
+            return sb.toString();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("Hashing algorithm not found!", e);
+        }
+    }
+
+    public static boolean verify(String password, String hashedPasswordFromDB) {
+        return hash(password).equals(hashedPasswordFromDB);
+    }
+}
+
diff --git a/src/main/java/org/to/telegramfinalproject/Server/AuthService.java b/src/main/java/org/to/telegramfinalproject/Server/AuthService.java
new file mode 100644
index 0000000..f50da87
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/AuthService.java
@@ -0,0 +1,59 @@
+package org.to.telegramfinalproject.Server;
+
+import java.util.UUID;
+import org.to.telegramfinalproject.Database.userDatabase;
+import org.to.telegramfinalproject.Models.User;
+import org.to.telegramfinalproject.Security.PasswordHashing;
+
+public class AuthService {
+    private final userDatabase userDb = new userDatabase();
+
+    public AuthService() {
+    }
+
+    public boolean register(String user_id, String username, String password, String profile_name) {
+        if (!this.userDb.existsByUsername(username) && !this.userDb.existsByUserId(user_id)) {
+            String passwordRegex = "\\b(?=[^\\s]*[A-Z])(?=[^\\s]*[a-z])(?=[^\\s]*\\d)(?=[^\\s]*[!@#$%^&*])[^\\s]{8,}\\b";
+            if (!password.matches(passwordRegex)) {
+                System.out.println("Password doesn't Valid(At list one capital and one special char(!@#$%^&*), minimum 8 char ");
+                return false;
+            } else {
+                UUID uuid = UUID.randomUUID();
+                password = PasswordHashing.hash(password);
+                User user = new User(user_id, uuid, username, password, profile_name, "", "");
+                return this.userDb.save(user);
+            }
+        } else {
+            System.out.println("Username/ user id is already taken");
+            return false;
+        }
+    }
+
+    public User login(String username, String password) {
+        User user = this.userDb.findByUsername(username);
+        if (user == null) {
+            System.out.println("User not found.");
+            return null;
+        } else if (!PasswordHashing.verify(password, user.getPassword())) {
+            System.out.println("Incorrect password");
+            return null;
+        } else {
+            return user;
+        }
+    }
+
+    public boolean loginCheck(String username , String password){
+        User user = userDb.findByUsername(username);
+        String pass = user.getPassword();
+        password = PasswordHashing.hash(password);
+        String Username = user.getUsername();
+        boolean login = false;
+        if(user!= null && Username.equals(username)&& pass.equals(password)){
+            login = true;
+        }
+        return login;
+
+    }
+}
+
+
diff --git a/src/main/java/org/to/telegramfinalproject/Server/ChannelService.java b/src/main/java/org/to/telegramfinalproject/Server/ChannelService.java
new file mode 100644
index 0000000..43560a1
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/ChannelService.java
@@ -0,0 +1,23 @@
+package org.to.telegramfinalproject.Server;
+
+import org.to.telegramfinalproject.Models.Channel;
+import org.to.telegramfinalproject.Database.ChannelDatabase;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class ChannelService {
+    public static boolean createChannel(String channelId, String channelName, UUID creatorUUID, String imageUrl,String description) {
+        UUID internalUUID = UUID.randomUUID();
+        LocalDateTime now = LocalDateTime.now();
+
+        boolean inserted = ChannelDatabase.insertChannel(internalUUID, channelId, channelName, creatorUUID, imageUrl, description,now);
+
+        if (inserted) {
+            ChannelDatabase.addSubscriber(internalUUID, creatorUUID,"owner");
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java b/src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
new file mode 100644
index 0000000..ba79729
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
@@ -0,0 +1,3876 @@
+package org.to.telegramfinalproject.Server;
+
+import javafx.geometry.Side;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Database.*;
+import org.to.telegramfinalproject.Models.*;
+import org.to.telegramfinalproject.Security.PasswordHashing;
+import org.to.telegramfinalproject.Utils.ChannelPermissionUtil;
+import org.to.telegramfinalproject.Utils.GroupPermissionUtil;
+
+import java.io.*;
+import java.net.Socket;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.util.*;
+
+public class ClientHandler implements Runnable {
+    private final Socket socket;
+    private final AuthService authService = new AuthService();
+    private User currentUser;
+
+    // ClientHandler.java
+    private static void log(String msg) {
+        System.out.println(java.time.LocalDateTime.now() + " [ClientHandler] " + msg);
+    }
+    private static void logf(String fmt, Object... args) {
+        log(String.format(fmt, args));
+    }
+
+
+
+    public ClientHandler(Socket socket) {
+        this.socket = socket;
+    }
+
+    @Override
+    public void run() {
+        UUID userId = null;
+
+        try (
+
+//                InputStream  rawIn  = socket.getInputStream();
+//                OutputStream rawOut = socket.getOutputStream();
+//
+//                BufferedReader in = new BufferedReader(new InputStreamReader(rawIn, java.nio.charset.StandardCharsets.UTF_8));
+//                PrintWriter    out = new PrintWriter(new OutputStreamWriter(rawOut, java.nio.charset.StandardCharsets.UTF_8), true);
+
+//                DataInputStream  dis  = new DataInputStream(rawIn);
+//                DataOutputStream dos  = new DataOutputStream(new BufferedOutputStream(rawOut));
+
+//                BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+//                PrintWriter out = new PrintWriter(socket.getOutputStream(), true)
+//                BufferedInputStream bis = new BufferedInputStream(socket.getInputStream());
+                // DataInputStream dis = new DataInputStream(bis); //for binary headers
+
+                //PrintWriter out = new PrintWriter(new OutputStreamWriter(socket.getOutputStream(), java.nio.charset.StandardCharsets.UTF_8), true);
+                InputStream  rawIn  = socket.getInputStream();
+                OutputStream rawOut = socket.getOutputStream();
+
+                BufferedInputStream  bis = new BufferedInputStream(rawIn);
+                BufferedOutputStream bos = new BufferedOutputStream(rawOut);
+
+                DataInputStream  dis = new DataInputStream(bis);
+                DataOutputStream dos = new DataOutputStream(bos);
+                PrintWriter      out = new PrintWriter(new OutputStreamWriter(bos, java.nio.charset.StandardCharsets.UTF_8), true);
+
+        ) {
+
+//            DataInputStream bin = new DataInputStream(new BufferedInputStream(socket.getInputStream()));
+
+            String inputLine;
+            while ((inputLine = readUtf8Line(bis)) != null) {
+
+                String line = inputLine.trim();
+
+
+                if("AVATAR".equalsIgnoreCase(line)){
+
+                    out.println(new JSONObject().put("status","ready").toString());
+                    out.flush();
+                    handleAvatarFrame(dis, out, this.currentUser.getInternal_uuid());
+                    continue;
+
+
+                }
+
+                if ("MEDIA".equalsIgnoreCase(inputLine.trim())) {
+                    handleMediaFrame(dis, out);
+                    continue;
+                }
+
+
+                if ("MEDIA_DL".equalsIgnoreCase(line)) {
+                    UUID cu = (currentUser == null ? null : currentUser.getInternal_uuid());
+                    logf("MEDIA_DL received. currentUser.internal_uuid=%s", cu);
+
+                    if (cu == null) {
+                        log("MEDIA_DL rejected: currentUser is null or no internal_uuid");
+                        sendDlErr(dos, "not authorized");
+                        continue;
+                    }
+                    handleMediaDownload(dis, dos, cu);
+                    continue;
+                }
+
+
+
+                JSONObject requestJson = new JSONObject(inputLine);
+                String action = requestJson.getString("action");
+                ResponseModel response = null;
+                System.out.println("Received action: '" + action + "'");
+                System.out.println("Full request: " + requestJson.toString());
+                if (!requestJson.has("action") || requestJson.isNull("action")) {
+                    ResponseModel errorResponse = new ResponseModel("error", "Missing 'action' in request.");
+                    JSONObject responseJson = new JSONObject();
+                    responseJson.put("status", errorResponse.getStatus());
+                    responseJson.put("message", errorResponse.getMessage());
+                    responseJson.put("data", JSONObject.NULL);
+                    out.println(responseJson.toString());
+                    continue;
+                }
+
+                switch (action) {
+                    case "register":
+                    case "login": {
+                        RequestModel request = new RequestModel(
+                                action,
+                                requestJson.optString("user_id"),
+                                requestJson.optString("username"),
+                                requestJson.optString("password"),
+                                requestJson.optString("profile_name")
+                        );
+
+                        if (action.equals("register")) {
+                            boolean registered = authService.register(
+                                    request.getUser_id(),
+                                    request.getUsername(),
+                                    request.getPassword(),
+                                    request.getProfile_name()
+                            );
+                            response = registered
+                                    ? new ResponseModel("success", "Registration successful.")
+                                    : new ResponseModel("error", "Registration failed.");
+                        } else {
+
+                            User user = authService.login(request.getUsername(), request.getPassword());
+                            if (user == null) {
+                                response = new ResponseModel("error", "Login failed.");
+                                break;
+                            }
+                            this.currentUser = user;
+
+                            SessionManager.addUser(user.getInternal_uuid(), this.socket);
+                            userDatabase.updateUserStatus(user.getInternal_uuid(), "online");
+                            //RealTime
+                            List<UUID> contactIds = ContactDatabase.getContactUUIDs(user.getInternal_uuid());
+                            RealTimeEventDispatcher.notifyUserStatusChanged(user.getInternal_uuid(), "online", contactIds);
+
+                            List<Contact> contacts = ContactDatabase.getContacts(user.getInternal_uuid());
+                            List<Group> groups = GroupDatabase.getGroupsByUser(user.getInternal_uuid());
+                            List<Channel> channels = ChannelDatabase.getChannelsByUser(user.getInternal_uuid());
+                            List<Message> unreadMessages = MessageDatabase.getUnreadMessages(user.getInternal_uuid());
+                            List<UUID> archivedChatIds = ArchivedChatDatabase.getArchivedChats(user.getInternal_uuid());
+
+
+
+                            user.setContactList(contacts);
+                            user.setGroupList(groups);
+                            user.setChannelList(channels);
+                            user.setUnreadMessages(unreadMessages);
+
+
+
+                            List<ChatEntry> chatList = new ArrayList<>();
+                            List<ChatEntry> archivedChatList = new ArrayList<>();
+                            List<ChatEntry> activeChatList = new ArrayList<>();
+
+
+                            JSONArray contactList = new JSONArray();
+                            for (Contact contact : contacts) {
+                                User target = userDatabase.findByInternalUUID(contact.getContact_id());
+                                if (target == null) continue;
+
+                                JSONObject c = new JSONObject();
+                                c.put("user_id", contact.getUser_id().toString());
+                                c.put("contact_id", contact.getContact_id().toString());
+                                User Contact = userDatabase.findByInternalUUID(contact.getContact_id());
+                                c.put("contact_displayId", Contact.getUser_id());
+                                c.put("is_blocked", contact.getIs_blocked());
+
+                                c.put("profile_name", target.getProfile_name());
+                                c.put("image_url", target.getImage_url());
+                                c.put("last_seen", Contact.getLast_seen());
+
+                                contactList.put(c);
+                            }
+
+
+                            List<PrivateChat> privateChats = PrivateChatDatabase.findChatsOfUser(currentUser.getInternal_uuid());
+
+                            ChatEntry savedEntry = null;
+
+                            for (PrivateChat chat : privateChats) {
+                                boolean isSelf =
+                                        chat.getUser1_id().equals(chat.getUser2_id()) &&
+                                                chat.getUser1_id().equals(currentUser.getInternal_uuid());
+
+                                UUID otherId = isSelf
+                                        ? currentUser.getInternal_uuid()
+                                        : (chat.getUser1_id().equals(currentUser.getInternal_uuid())
+                                        ? chat.getUser2_id()
+                                        : chat.getUser1_id());
+
+                                User otherUser = userDatabase.findByInternalUUID(otherId);
+                                if (otherUser == null) continue;
+
+                                LocalDateTime lastMessageTime = MessageDatabase.getLastMessageTime(chat.getChat_id(), "private");
+
+                                ChatEntry entry = new ChatEntry(
+                                        chat.getChat_id(),                               // internal_id = chat_id
+                                        isSelf ? "Saved Messages" : otherUser.getUser_id(),      // id/display
+                                        isSelf ? "Saved Messages" : otherUser.getProfile_name(), // name
+                                        isSelf ? null : otherUser.getImage_url(),
+                                        "private",
+                                        lastMessageTime,
+                                        false, // isOwner
+                                        false  // isAdmin
+                                );
+                                entry.setOtherUserId(otherId);
+                                if (isSelf) {
+                                    entry.setSavedMessages(true);
+                                    savedEntry = entry;
+                                }
+
+                                enrichChatEntry(entry, user.getInternal_uuid());
+
+                                if (!isSelf && archivedChatIds.contains(chat.getChat_id())) {
+                                    archivedChatList.add(entry);
+                                } else {
+                                    activeChatList.add(entry);
+                                }
+                                chatList.add(entry);
+                            }
+
+
+
+
+                            for (Group group : groups) {
+                                LocalDateTime last = MessageDatabase.getLastMessageTime(group.getInternal_uuid(), "group");
+                                boolean isOwner = GroupDatabase.isOwner(group.getInternal_uuid(), user.getInternal_uuid());
+                                boolean isAdmin = GroupDatabase.isAdmin(group.getInternal_uuid(), user.getInternal_uuid());
+
+//                                chatList.add(new ChatEntry(
+//                                        group.getInternal_uuid(),
+//                                        group.getGroup_id(),
+//                                        group.getGroup_name(),
+//                                        group.getImage_url(),
+//                                        "group",
+//                                        last,
+//                                        isOwner,
+//                                        isAdmin
+//                                ));
+
+                                ChatEntry entry = new ChatEntry(
+                                        group.getInternal_uuid(),
+                                        group.getGroup_id(),
+                                        group.getGroup_name(),
+                                        group.getImage_url(),
+                                        "group",
+                                        last,
+                                        isOwner,
+                                        isAdmin
+                                );
+                                enrichChatEntry(entry, user.getInternal_uuid());
+
+                                if (archivedChatIds.contains(group.getInternal_uuid())) {
+                                    archivedChatList.add(entry);
+                                    chatList.add(entry);
+                                } else {
+                                    activeChatList.add(entry);
+                                    chatList.add(entry);
+                                }
+
+
+                            }
+
+                            for (Channel channel : channels) {
+                                LocalDateTime last = MessageDatabase.getLastMessageTime(channel.getInternal_uuid(), "channel");
+                                boolean isOwner = ChannelDatabase.isOwner(channel.getInternal_uuid(), user.getInternal_uuid());
+                                boolean isAdmin = ChannelDatabase.isAdmin(channel.getInternal_uuid(), user.getInternal_uuid());
+
+//                                chatList.add(new ChatEntry(
+//                                        channel.getInternal_uuid(),
+//                                        channel.getChannel_id(),
+//                                        channel.getChannel_name(),
+//                                        channel.getImage_url(),
+//                                        "channel",
+//                                        last,
+//                                        isOwner,
+//                                        isAdmin
+//                                ));
+
+                                ChatEntry entry = new ChatEntry(
+                                        channel.getInternal_uuid(),
+                                        channel.getChannel_id(),
+                                        channel.getChannel_name(),
+                                        channel.getImage_url(),
+                                        "channel",
+                                        last,
+                                        isOwner,
+                                        isAdmin
+                                );
+
+                                enrichChatEntry(entry, user.getInternal_uuid());
+
+                                if (archivedChatIds.contains(channel.getInternal_uuid())) {
+                                    archivedChatList.add(entry);
+                                    chatList.add(entry);
+                                } else {
+                                    activeChatList.add(entry);
+                                    chatList.add(entry);
+                                }
+                            }
+
+                            activeChatList.sort((a, b) -> {
+                                if (a.getLastMessageTime() == null) return 1;
+                                if (b.getLastMessageTime() == null) return -1;
+                                return b.getLastMessageTime().compareTo(a.getLastMessageTime());
+                            });
+
+                            archivedChatList.sort((a, b) -> {
+                                if (a.getLastMessageTime() == null) return 1;
+                                if (b.getLastMessageTime() == null) return -1;
+                                return b.getLastMessageTime().compareTo(a.getLastMessageTime());
+                            });
+
+
+                            chatList.sort((a, b) -> {
+                                if (a.getLastMessageTime() == null) return 1;
+                                if (b.getLastMessageTime() == null) return -1;
+                                return b.getLastMessageTime().compareTo(a.getLastMessageTime());
+                            });
+
+                            JSONObject userData = JsonUtil.userToJson(user);
+                            userData.put("chat_list", JsonUtil.chatListToJson(chatList));
+                            userData.put("archived_chat_list", JsonUtil.chatListToJson(archivedChatList));
+                            userData.put("active_chat_list", JsonUtil.chatListToJson(activeChatList));
+                            userData.put("contact_list", contactList);
+                            response = new ResponseModel("success", "Welcome " + user.getProfile_name(), userData);
+                        }
+                        break;
+                    }
+                    case "logout": {
+                        String user_Id = requestJson.optString("user_id");
+                        if (user_Id != null && !user_Id.isEmpty()) {
+                            try {
+                                userId = UUID.fromString(user_Id);
+
+                                userDatabase.updateUserStatus(userId, "offline");
+
+                                // Real-Time
+                                List<UUID> contacts = ContactDatabase.getContactUUIDs(userId);
+                                RealTimeEventDispatcher.notifyUserStatusChanged(userId, "offline", contacts);
+
+                                userDatabase.updateLastSeen(userId);
+                                SessionManager.removeUser(userId);
+
+                                response = new ResponseModel("success", "Logged out.");
+                            } catch (IllegalArgumentException e) {
+                                response = new ResponseModel("error", "Invalid UUID format.");
+                            }
+                        } else {
+                            response = new ResponseModel("error", "Invalid user_id for logout.");
+                        }
+                        break;
+                    }
+
+
+                    case "searchInUsers":{
+                        String keyword = requestJson.optString("keyword");
+                        List<JSONObject> results = new ArrayList<>();
+                        String user_Id = requestJson.getString("user_id");
+                        User currentUser = new userDatabase().findByUserId(user_Id);
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "User not found or not logged in.");
+                            break;
+                        }
+                        UUID currentUserUUID = currentUser.getInternal_uuid();
+
+                        for (User u : new userDatabase().searchUsers(keyword, currentUserUUID)) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "user");
+                            obj.put("id", u.getUser_id());
+                            obj.put("uuid", u.getInternal_uuid().toString());
+                            obj.put("name", u.getProfile_name());
+                            results.add(obj);
+                        }
+                        JSONObject data = new JSONObject();
+                        data.put("results", new JSONArray(results));
+                        response = new ResponseModel("success", "Search results found", data);
+                        break;
+                    }
+
+
+
+                    case "searchEligibleUsers": {
+                        String keyword = requestJson.optString("keyword");
+                        UUID entityId = UUID.fromString(requestJson.getString("entity_id"));
+                        String entityType = requestJson.getString("entity_type");  // group یا channel
+
+                        String user_Id = requestJson.getString("user_id");
+                        User currentUser = new userDatabase().findByUserId(user_Id);
+
+                        List<JSONObject> results = new ArrayList<>();
+                        for (User u : new userDatabase().searchUsers(keyword, currentUser.getInternal_uuid())) {
+
+                            boolean isMember = switch (entityType) {
+                                case "group" -> GroupDatabase.isUserInGroup(u.getInternal_uuid(), entityId);
+                                case "channel" -> ChannelDatabase.isUserInChannel(u.getInternal_uuid(), entityId);
+                                default -> true;
+                            };
+
+                            if (isMember || u.getInternal_uuid().equals(currentUser.getInternal_uuid())) continue;
+
+                            JSONObject obj = new JSONObject();
+                            obj.put("id", u.getUser_id());
+                            obj.put("uuid", u.getInternal_uuid().toString());
+                            obj.put("name", u.getProfile_name());
+                            results.add(obj);
+                        }
+
+
+                        JSONObject data = new JSONObject();
+                        data.put("results", new JSONArray(results));
+                        response = new ResponseModel("success", "Eligible users found", data);
+                        break;
+                    }
+
+                    case "search": {
+
+                        String keyword = requestJson.optString("keyword");
+                        List<JSONObject> results = new ArrayList<>();
+                        String user_Id = requestJson.getString("user_id");
+                        User currentUser = new userDatabase().findByUserId(user_Id);
+
+                        UUID currentUserUUID = currentUser.getInternal_uuid();
+
+                        for (User u : new userDatabase().searchUsers(keyword, currentUserUUID)) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "user");
+                            obj.put("id", u.getUser_id());
+                            obj.put("uuid", u.getInternal_uuid().toString());
+                            obj.put("name", u.getProfile_name());
+                            results.add(obj);
+                        }
+
+                        for (Group g : GroupDatabase.searchGroups(keyword)) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "group");
+                            obj.put("id", g.getGroup_id());
+                            obj.put("uuid", g.getInternal_uuid().toString());
+                            obj.put("name", g.getGroup_name());
+                            results.add(obj);
+                        }
+
+                        for (Channel c : ChannelDatabase.searchChannels(keyword)) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "channel");
+                            obj.put("id", c.getChannel_id());
+                            obj.put("uuid", c.getInternal_uuid().toString());
+                            obj.put("name", c.getChannel_name());
+                            results.add(obj);
+                        }
+
+                        List<Message> matchedMessages = MessageDatabase.searchMessagesForUser(currentUser.getInternal_uuid(), keyword);
+                        for (Message m : matchedMessages) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "message");
+                            obj.put("content", m.getContent());
+                            obj.put("time", m.getSend_at().toString());
+                            obj.put("sender", m.getSender_id() != null ? m.getSender_id().toString() : "N/A");
+                            obj.put("receiver_id", m.getReceiver_id().toString());
+                            obj.put("receiver_type", m.getReceiver_type());
+                            User senderUser = userDatabase.findByInternalUUID(m.getSender_id());
+                            String senderName = senderUser != null ? senderUser.getProfile_name() : "Unknown";
+                            obj.put("sender_name", senderName);
+
+                            results.add(obj);
+                        }
+
+
+
+                        List<UUID> groupIds = new ArrayList<>();
+                        for (Group g : GroupDatabase.getGroupsByUser(currentUser.getInternal_uuid())) {
+                            groupIds.add(g.getInternal_uuid());
+                        }
+
+                        List<UUID> channelIds = new ArrayList<>();
+                        for (Channel c : ChannelDatabase.getChannelsByUser(currentUser.getInternal_uuid())) {
+                            channelIds.add(c.getInternal_uuid());
+                        }
+
+
+                        List<Message> groupMessages = MessageDatabase.searchMessagesInGroups(groupIds, keyword, currentUser.getInternal_uuid());
+                        for (Message m : groupMessages) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "message");
+                            obj.put("from", "group");
+                            obj.put("content", m.getContent());
+                            obj.put("time", m.getSend_at().toString());
+                            obj.put("sender", m.getSender_id() != null ? m.getSender_id().toString() : "N/A");
+                            obj.put("receiver_id", m.getReceiver_id().toString());
+                            obj.put("receiver_type", "group");
+                            Group senderGroup = GroupDatabase.findByInternalUUID(m.getReceiver_id());
+                            String groupName = senderGroup != null ? senderGroup.getGroup_name() : "Unknown";
+                            obj.put("group_name", groupName);
+                            User senderUser = userDatabase.findByInternalUUID(m.getSender_id());
+                            String senderName = senderUser != null ? senderUser.getProfile_name() : "Unknown";
+                            obj.put("sender_name", senderName);
+
+                            results.add(obj);
+                        }
+
+                        List<Message> channelMessages = MessageDatabase.searchMessagesInChannels(channelIds, keyword);
+                        for (Message m : channelMessages) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("type", "message");
+                            obj.put("from", "channel");
+                            obj.put("content", m.getContent());
+                            obj.put("time", m.getSend_at().toString());
+                            obj.put("sender", m.getSender_id() != null ? m.getSender_id().toString() : "N/A");
+                            obj.put("receiver_id", m.getReceiver_id().toString());
+                            obj.put("receiver_type", "channel");
+                            Channel SenderChannel = ChannelDatabase.findByInternalUUID(m.getReceiver_id());
+                            String channelName = SenderChannel != null ? SenderChannel.getChannel_name() : "Unknown";
+                            obj.put("channel_name", channelName);
+                            User senderUser = userDatabase.findByInternalUUID(m.getSender_id());
+                            String senderName = senderUser != null ? senderUser.getProfile_name() : "Unknown";
+                            obj.put("sender_name", senderName);
+                            results.add(obj);
+                        }
+
+
+                        JSONObject data = new JSONObject();
+                        data.put("results", new JSONArray(results));
+                        response = new ResponseModel("success", "Search results found", data);
+                        break;
+                    }
+
+                    case "add_contact": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        UUID userUUID = new userDatabase().findByUserId(requestJson.getString("user_id")).getInternal_uuid();
+                        UUID contactUUID = UUID.fromString(requestJson.getString("contact_id"));
+
+                        boolean success = ContactDatabase.addContact(userUUID, contactUUID);
+
+                        //RealTime
+                        if (success) {
+                            RealTimeEventDispatcher.notifyAddedToChat(
+                                    "private",
+                                    userUUID,
+                                    currentUser.getProfile_name(),
+                                    currentUser.getImage_url(),
+                                    contactUUID
+                            );
+
+                        }
+
+                        response = success
+                                ? new ResponseModel("success", "Contact added successfully.")
+                                : new ResponseModel("error", "Failed to add contact. Maybe already exists.");
+                        break;
+                    }
+
+                    case "join_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID userUUID = UUID.fromString(requestJson.getString("user_id"));
+                        Group group = GroupDatabase.findByInternalUUID(UUID.fromString(requestJson.getString("id")));
+                        if (group == null) {
+                            response = new ResponseModel("error", "Group not found.");
+                            break;
+                        }
+
+
+                        boolean joined = GroupDatabase.addMemberToGroup(userUUID, group.getInternal_uuid());
+
+                        //RealTime
+                        if (joined) {
+                            List<UUID> members = GroupDatabase.getMemberUUIDs(group.getInternal_uuid());
+                            RealTimeEventDispatcher.sendGroupOrChannelUpdate("group", group.getInternal_uuid(), group.getGroup_name(), group.getImage_url(), group.getDescription(), members);
+                        }
+
+                        response = joined
+                                ? new ResponseModel("success", "Joined group.")
+                                : new ResponseModel("error", "Failed to join group.");
+                        break;
+                    }
+
+                    case "join_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID userUUID = UUID.fromString(requestJson.getString("user_id"));
+                        Channel channel = ChannelDatabase.findByInternalUUID(UUID.fromString(requestJson.getString("id")));
+                        if (channel == null) {
+                            response = new ResponseModel("error", "Channel not found.");
+                            break;
+                        }
+
+
+                        boolean joined = ChannelDatabase.addSubscriberToChannel(userUUID, channel.getInternal_uuid());
+
+                        //RealTime
+                        if (joined) {
+                            List<UUID> members = ChannelDatabase.getChannelSubscriberUUIDs(channel.getInternal_uuid());
+                            RealTimeEventDispatcher.sendGroupOrChannelUpdate("channel", channel.getInternal_uuid(), channel.getChannel_name(), channel.getImage_url(), channel.getDescription(), members);
+                        }
+
+                        response = joined
+                                ? new ResponseModel("success", "Joined channel.")
+                                : new ResponseModel("error", "Failed to join channel.");
+                        break;
+                    }
+
+
+                    case "get_chat_info": {
+
+
+                        try {
+                            String id = requestJson.getString("receiver_id");
+                            String type = requestJson.getString("receiver_type");
+                            JSONObject data = new JSONObject();
+
+                            switch (type) {
+                                case "private" -> {
+                                    userDatabase userDatabase = new userDatabase();
+                                    User u = userDatabase.findByUserId(id);
+                                    if (u == null) {
+                                        try {
+                                            UUID uuid = UUID.fromString(id);
+                                            u = userDatabase.findByInternalUUID(uuid);
+                                        } catch (IllegalArgumentException ignored) {}
+                                    }
+
+                                    if (u != null) {
+                                        data.put("internal_id", u.getInternal_uuid().toString());
+                                        data.put("name", u.getProfile_name());
+                                        data.put("image_url", u.getImage_url());
+                                        data.put("type", "private");
+                                        data.put("id", u.getUser_id());
+                                    } else {
+                                        response = new ResponseModel("error", "User not found.");
+                                        break;
+                                    }
+                                }
+
+                                case "group" -> {
+                                    Group group = GroupDatabase.findByInternalUUID(UUID.fromString(id));
+                                    if (group != null) {
+                                        data.put("internal_id", group.getInternal_uuid().toString());
+                                        data.put("name", group.getGroup_name());
+                                        data.put("image_url", group.getImage_url());
+                                        data.put("description", group.getDescription() != null ? group.getDescription() : "");
+                                        data.put("type", "group");
+                                        data.put("id", group.getGroup_id());
+
+                                        boolean isOwner = GroupDatabase.isOwner(group.getInternal_uuid(), currentUser.getInternal_uuid());
+                                        boolean isAdmin = GroupDatabase.isAdmin(group.getInternal_uuid(), currentUser.getInternal_uuid());
+
+                                        data.put("is_owner", isOwner);
+                                        data.put("is_admin", isAdmin);
+                                    } else {
+                                        response = new ResponseModel("error", "Group not found.");
+                                        break;
+                                    }
+                                }
+
+
+
+                                case "channel" -> {
+                                    Channel channel = ChannelDatabase.findByInternalUUID(UUID.fromString(id));
+                                    if (channel != null) {
+                                        data.put("internal_id", channel.getInternal_uuid().toString());
+                                        data.put("name", channel.getChannel_name());
+                                        data.put("image_url", channel.getImage_url());
+                                        data.put("description", channel.getDescription() != null ? channel.getDescription() : "");
+                                        data.put("type", "channel");
+                                        data.put("id", channel.getChannel_id());
+
+                                        boolean isOwner = ChannelDatabase.isOwner(channel.getInternal_uuid(), currentUser.getInternal_uuid());
+                                        boolean isAdmin = ChannelDatabase.isAdmin(channel.getInternal_uuid(), currentUser.getInternal_uuid());
+
+                                        data.put("is_owner", isOwner);
+                                        data.put("is_admin", isAdmin);
+                                    } else {
+                                        response = new ResponseModel("error", "Channel not found.");
+                                        break;
+                                    }
+                                }
+
+
+                                default -> {
+                                    response = new ResponseModel("error", "Unknown type.");
+                                    break;
+                                }
+                            }
+
+                            if (response == null) {
+                                response = new ResponseModel("success", "Chat info fetched", data);
+                            }
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error fetching chat info: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+
+
+                    case "get_chat_list": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        List<Contact> contacts = ContactDatabase.getContacts(currentUser.getInternal_uuid());
+                        List<Group> groups = GroupDatabase.getGroupsByUser(currentUser.getInternal_uuid());
+                        List<Channel> channels = ChannelDatabase.getChannelsByUser(currentUser.getInternal_uuid());
+                        List<UUID> archivedChatIds = ArchivedChatDatabase.getArchivedChats(currentUser.getInternal_uuid());
+                        List<ChatEntry> chatList = new ArrayList<>();
+                        List<ChatEntry> archivedChatList = new ArrayList<>();
+                        List<ChatEntry> activeChatList = new ArrayList<>();
+
+
+
+
+
+
+//                        for (Contact contact : contacts) {
+//                            User target = userDatabase.findByInternalUUID(contact.getContact_id());
+//                            if (target == null) continue;
+//
+//                            LocalDateTime last = MessageDatabase.getLastMessageTimeBetween(currentUser.getInternal_uuid(), target.getInternal_uuid(), "private");
+//
+//                            chatList.add(new ChatEntry(
+//                                    target.getInternal_uuid(),
+//                                    target.getUser_id(),
+//                                    target.getProfile_name(),
+//                                    target.getImage_url(),
+//                                    "private",
+//                                    last,
+//                                    false,
+//                                    false
+//                            ));
+//                        }
+//
+
+                        List<PrivateChat> privateChats = PrivateChatDatabase.findChatsOfUser(currentUser.getInternal_uuid());
+                        for (PrivateChat chat : privateChats) {
+                            UUID otherId = chat.getUser1_id().equals(currentUser.getInternal_uuid()) ?
+                                    chat.getUser2_id() : chat.getUser1_id();
+
+                            User otherUser = userDatabase.findByInternalUUID(otherId);
+                            if (otherUser == null) continue;
+
+                            LocalDateTime lastMessageTime = MessageDatabase.getLastMessageTime(chat.getChat_id(), "private");
+
+                            boolean isSavedMessages = chat.getUser1_id().equals(currentUser.getInternal_uuid())
+                                    && chat.getUser2_id().equals(currentUser.getInternal_uuid());
+
+                            ChatEntry entry = new ChatEntry(
+                                    chat.getChat_id(),
+                                    isSavedMessages ? "Saved Messages" : otherUser.getUser_id(),
+                                    isSavedMessages ? "Saved Messages" : otherUser.getProfile_name(),
+                                    isSavedMessages ? null : otherUser.getImage_url(),
+                                    "private",
+                                    lastMessageTime,
+                                    false,
+                                    false
+                            );
+                            entry.setOtherUserId(otherId);
+
+
+                            // Mark it as saved messages if it's the special self-chat
+                            if (isSavedMessages) {
+                                entry.setSavedMessages(true);
+                            }
+                            enrichChatEntry(entry, currentUser.getInternal_uuid());
+
+                            if (archivedChatIds.contains(chat.getChat_id()) && !isSavedMessages) {
+                                archivedChatList.add(entry);
+                            } else {
+                                activeChatList.add(entry);
+                            }
+                            chatList.add(entry);
+
+                        }
+
+
+                        for (Group group : groups) {
+                            LocalDateTime last = MessageDatabase.getLastMessageTime(group.getInternal_uuid(), "group");
+                            boolean isOwner = GroupDatabase.isOwner(group.getInternal_uuid(), currentUser.getInternal_uuid());
+                            boolean isAdmin = GroupDatabase.isAdmin(group.getInternal_uuid(), currentUser.getInternal_uuid());
+
+//                                chatList.add(new ChatEntry(
+//                                        group.getInternal_uuid(),
+//                                        group.getGroup_id(),
+//                                        group.getGroup_name(),
+//                                        group.getImage_url(),
+//                                        "group",
+//                                        last,
+//                                        isOwner,
+//                                        isAdmin
+//                                ));
+
+                            ChatEntry entry = new ChatEntry(
+                                    group.getInternal_uuid(),
+                                    group.getGroup_id(),
+                                    group.getGroup_name(),
+                                    group.getImage_url(),
+                                    "group",
+                                    last,
+                                    isOwner,
+                                    isAdmin
+                            );
+
+                            enrichChatEntry(entry, currentUser.getInternal_uuid());
+
+                            if (archivedChatIds.contains(group.getInternal_uuid())) {
+                                archivedChatList.add(entry);
+                                chatList.add(entry);
+                            } else {
+                                activeChatList.add(entry);
+                                chatList.add(entry);
+                            }
+
+
+                        }
+
+                        for (Channel channel : channels) {
+                            LocalDateTime last = MessageDatabase.getLastMessageTime(channel.getInternal_uuid(), "channel");
+                            boolean isOwner = ChannelDatabase.isOwner(channel.getInternal_uuid(), currentUser.getInternal_uuid());
+                            boolean isAdmin = ChannelDatabase.isAdmin(channel.getInternal_uuid(), currentUser.getInternal_uuid());
+
+//                                chatList.add(new ChatEntry(
+//                                        channel.getInternal_uuid(),
+//                                        channel.getChannel_id(),
+//                                        channel.getChannel_name(),
+//                                        channel.getImage_url(),
+//                                        "channel",
+//                                        last,
+//                                        isOwner,
+//                                        isAdmin
+//                                ));
+
+                            ChatEntry entry = new ChatEntry(
+                                    channel.getInternal_uuid(),
+                                    channel.getChannel_id(),
+                                    channel.getChannel_name(),
+                                    channel.getImage_url(),
+                                    "channel",
+                                    last,
+                                    isOwner,
+                                    isAdmin
+                            );
+                            enrichChatEntry(entry, currentUser.getInternal_uuid());
+
+                            if (archivedChatIds.contains(channel.getInternal_uuid())) {
+                                archivedChatList.add(entry);
+                                chatList.add(entry);
+                            } else {
+                                activeChatList.add(entry);
+                                chatList.add(entry);
+                            }
+                        }
+
+                        activeChatList.sort((a, b) -> {
+                            if (a.getLastMessageTime() == null) return 1;
+                            if (b.getLastMessageTime() == null) return -1;
+                            return b.getLastMessageTime().compareTo(a.getLastMessageTime());
+                        });
+
+                        archivedChatList.sort((a, b) -> {
+                            if (a.getLastMessageTime() == null) return 1;
+                            if (b.getLastMessageTime() == null) return -1;
+                            return b.getLastMessageTime().compareTo(a.getLastMessageTime());
+                        });
+
+
+                        chatList.sort((a, b) -> {
+                            if (a.getLastMessageTime() == null) return 1;
+                            if (b.getLastMessageTime() == null) return -1;
+                            return b.getLastMessageTime().compareTo(a.getLastMessageTime());
+                        });
+                        JSONObject data = new JSONObject();
+                        data.put("chat_list", JsonUtil.chatListToJson(chatList));
+                        data.put("archived_chat_list", JsonUtil.chatListToJson(archivedChatList));
+                        data.put("active_chat_list", JsonUtil.chatListToJson(activeChatList));
+                        response = new ResponseModel("success", "Chat list updated.", data);
+
+                        break;
+                    }
+
+
+
+
+                    case "create_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            String groupId = requestJson.getString("group_id");
+                            String groupName = requestJson.getString("group_name");
+                            String userIdStr = requestJson.getString("user_id");
+                            String imageUrl = requestJson.optString("image_url", null);
+
+                            UUID creatorUUID = UUID.fromString(userIdStr);
+
+                            boolean created = GroupService.createGroup(groupId, groupName, creatorUUID, imageUrl);
+
+                            if (created) {
+                                Group createdGroup = GroupDatabase.findByGroupId(groupId);
+                                if (createdGroup != null) {
+                                    JSONObject data = new JSONObject();
+                                    data.put("internal_id", createdGroup.getInternal_uuid().toString());
+                                    data.put("id", createdGroup.getGroup_id());
+                                    data.put("name", createdGroup.getGroup_name());
+                                    data.put("image_url", createdGroup.getImage_url());
+                                    data.put("type", "group");
+
+                                    response = new ResponseModel("success", "Group created.", data);
+                                } else {
+                                    response = new ResponseModel("error", "Group created but not found.");
+                                }
+                            } else {
+                                response = new ResponseModel("error", "Group creation failed.");
+                            }
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error creating group: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+
+                    case "create_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            String channelId   = requestJson.getString("channel_id");
+                            String channelName = requestJson.getString("channel_name");
+                            String userIdStr   = requestJson.getString("user_id");
+                            String imageUrl    = requestJson.optString("image_url", null);
+                            String description = requestJson.optString("description", null); // اختیاری
+
+                            UUID creatorUUID = UUID.fromString(userIdStr);
+
+                            // اگر سرویس‌ات ورودی توضیح را می‌پذیرد، از متد اورلودشده استفاده کن:
+                             boolean created = ChannelService.createChannel(channelId, channelName, creatorUUID, imageUrl, description);
+                             //boolean created = ChannelService.createChannel(channelId, channelName, creatorUUID, imageUrl);
+
+                            if (created) {
+                                Channel createdChannel = ChannelDatabase.findByChannelId(channelId);
+                                if (createdChannel != null) {
+                                    org.json.JSONObject data = new org.json.JSONObject();
+                                    data.put("internal_id", createdChannel.getInternal_uuid().toString());
+                                    data.put("id", createdChannel.getChannel_id());
+                                    data.put("name", createdChannel.getChannel_name());
+                                    data.put("image_url", createdChannel.getImage_url());
+                                    data.put("type", "channel");
+                                    if (description != null) data.put("description", description);
+
+                                    response = new ResponseModel("success", "Channel created.", data);
+                                } else {
+                                    response = new ResponseModel("error", "Channel created but not found.");
+                                }
+                            } else {
+                                response = new ResponseModel("error", "Channel creation failed.");
+                            }
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error creating channel: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+                    case "add_admin_to_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                            UUID targetUserId = UUID.fromString(requestJson.getString("target_user_id"));
+                            JSONObject permissions = requestJson.optJSONObject("permissions");
+
+                            if (!ChannelPermissionUtil.canAddAdmins(channelId, currentUser.getInternal_uuid())) {
+                                response = new ResponseModel("error", "You are not allowed to add admins to the channel.");
+                                break;
+                            }
+
+                            String targetRole = ChannelDatabase.getChannelRole(channelId, targetUserId);
+                            if (targetRole == null) {
+                                response = new ResponseModel("error", "User is not a subscriber of the channel.");
+                                break;
+                            }
+
+                            if (targetRole.equals("owner") || targetRole.equals("admin")) {
+                                response = new ResponseModel("error", "User is already an admin or owner.");
+                                break;
+                            }
+
+                            boolean success = ChannelDatabase.addAdminToChannel(channelId, targetUserId, permissions);
+
+                            //RealTime
+                            if (success) {
+                                Channel channel = ChannelDatabase.findByInternalUUID(channelId);
+                                if (channel != null) {
+                                    RealTimeEventDispatcher.notifyBecameAdmin(
+                                            "channel",
+                                            channel.getInternal_uuid(),
+                                            channel.getChannel_name(),
+                                            channel.getImage_url(),
+                                            targetUserId
+                                    );
+                                }
+                            }
+                            response = success
+                                    ? new ResponseModel("success", "Admin added to channel.")
+                                    : new ResponseModel("error", "Failed to add admin.");
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error adding admin to channel: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+                    case "edit_channel_admin_permissions": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                        UUID targetUserId = UUID.fromString(requestJson.getString("target_user_id"));
+                        JSONObject permissions = requestJson.optJSONObject("permissions");
+
+                        String role = ChannelDatabase.getChannelRole(channelId, currentUser.getInternal_uuid());
+                        if (!role.equals("owner")) {
+                            response = new ResponseModel("error", "Only owner can update admin permissions.");
+                            break;
+                        }
+
+                        boolean success = ChannelDatabase.updateChannelAdminPermissions(channelId, targetUserId, permissions);
+                        response = success
+                                ? new ResponseModel("success", "Permissions updated.")
+                                : new ResponseModel("error", "Failed to update permissions.");
+                        break;
+                    }
+
+
+                    case "edit_group_info": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            UUID groupUUID = UUID.fromString(requestJson.getString("group_id")); // internal_uuid
+                            String newGroupId = requestJson.getString("new_group_id").trim(); // شناسه نمایشی جدید
+                            String name = requestJson.optString("name");
+                            String description = requestJson.optString("description", null);
+                            String imageUrl = requestJson.has("image_url") && !requestJson.isNull("image_url")
+                                    ? requestJson.getString("image_url") : null;
+
+                            boolean isOwner = GroupDatabase.isOwner(groupUUID, currentUser.getInternal_uuid());
+                            if (!isOwner && !GroupPermissionUtil.canEditGroup(groupUUID, currentUser.getInternal_uuid())) {
+                                response = new ResponseModel("error", "You don't have permission to edit this group.");
+                                break;
+                            }
+
+                            if (isOwner && !GroupDatabase.isGroupIdUnique(newGroupId, groupUUID)) {
+                                response = new ResponseModel("error", "Group ID is already taken by another group.");
+                                break;
+                            }
+
+                            boolean updated = GroupDatabase.updateGroupInfo(groupUUID, newGroupId, name, description, imageUrl);
+                            response = updated
+                                    ? new ResponseModel("success", "Group info updated successfully.")
+                                    : new ResponseModel("error", "Failed to update group info.");
+
+                            //RealTime
+                            if (updated) {
+                                List<UUID> members = GroupDatabase.getMemberUUIDs(groupUUID);
+                                RealTimeEventDispatcher.sendGroupOrChannelUpdate("group", groupUUID, name, imageUrl, description, members);
+                            }
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error updating group: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+
+
+
+                    case "view_channel_admins": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+
+
+
+                        List<JSONObject> admins = ChannelDatabase.getChannelAdminsAndOwner(channelId);
+                        JSONObject data = new JSONObject();
+                        data.put("admins", new JSONArray(admins));
+                        response = new ResponseModel("success", "Admins fetched.", data);
+                        break;
+                    }
+
+
+
+                    case "add_admin_to_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                        UUID targetUserId = UUID.fromString(requestJson.getString("user_id"));
+                        JSONObject permissions = requestJson.optJSONObject("permissions");
+
+                        if (!GroupPermissionUtil.canAddAdmins(groupId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to add admins.");
+                            break;
+                        }
+
+
+                        boolean success = GroupDatabase.addAdminToGroup(groupId, targetUserId, permissions);
+
+                        //RealTime
+                        if (success) {
+                            Group group = GroupDatabase.findByInternalUUID(groupId);
+                            if (group != null) {
+                                RealTimeEventDispatcher.notifyBecameAdmin(
+                                        "group",
+                                        group.getInternal_uuid(),
+                                        group.getGroup_name(),
+                                        group.getImage_url(),
+                                        targetUserId
+                                );
+                            }
+                        }
+                        response = success
+                                ? new ResponseModel("success", "Admin added to group.")
+                                : new ResponseModel("error", "Failed to add admin.");
+                        break;
+                    }
+
+
+                    case "edit_group_admin_permissions": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                        UUID targetUserId = UUID.fromString(requestJson.getString("target_user_id"));
+                        JSONObject permissions = requestJson.optJSONObject("permissions");
+
+                        if (!GroupPermissionUtil.canAddAdmins(groupId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to edit admin permissions.");
+                            break;
+                        }
+
+                        boolean success = GroupDatabase.updateGroupAdminPermissions(groupId, targetUserId, permissions);
+                        response = success
+                                ? new ResponseModel("success", "Permissions updated.")
+                                : new ResponseModel("error", "Failed to update permissions.");
+                        break;
+                    }
+
+
+
+
+
+                    case "remove_admin_from_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                        UUID targetUserUUID = UUID.fromString(requestJson.getString("target_user_id"));
+
+                        if (!ChannelPermissionUtil.canRemoveAdmins(channelId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to remove admins.");
+                            break;
+                        }
+
+                        String targetRole = ChannelDatabase.getChannelRole(channelId, targetUserUUID);
+                        if (targetRole.equals("owner")) {
+                            response = new ResponseModel("error", "You cannot remove the owner.");
+                            break;
+                        }
+                        if (!targetRole.equals("admin")) {
+                            response = new ResponseModel("error", "Target user is not an admin.");
+                            break;
+                        }
+
+                        boolean success = ChannelDatabase.demoteAdminToSubscriber(channelId, targetUserUUID);
+
+                        //RealTime
+                        if (success) {
+                            Channel channel = ChannelDatabase.findByInternalUUID(channelId);
+                            if (channel != null) {
+                                RealTimeEventDispatcher.notifyRemovedAdminFromChat(
+                                        "channel",
+                                        channel.getInternal_uuid(),
+                                        channel.getChannel_name(),
+                                        channel.getImage_url(),
+                                        targetUserUUID
+                                );
+                            }
+                        }
+
+                        response = success
+                                ? new ResponseModel("success", "Admin removed successfully.")
+                                : new ResponseModel("error", "Failed to remove admin.");
+                        break;
+                    }
+
+
+//                    case "add_member_to_group": {
+//                        if (currentUser == null) {
+//                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+//                            break;
+//                        }
+//                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+//                        UUID targetUserId = UUID.fromString(requestJson.getString("user_id"));
+//
+//                        if (!GroupPermissionUtil.canAddMembers(groupId, currentUser.getInternal_uuid())) {
+//                            response = new ResponseModel("error", "You are not allowed to add members.");
+//                            break;
+//                        }
+//
+//                        if (GroupDatabase.isUserInGroup(targetUserId, groupId)) {
+//                            response = new ResponseModel("error", "User is already a member.");
+//                            break;
+//                        }
+//
+//                        boolean success = GroupDatabase.addMemberToGroup(targetUserId, groupId);
+//
+//                        Group group = GroupDatabase.findByInternalUUID(groupId);
+//
+//                        //RealTime
+//                        if (success && group != null) {
+//                            RealTimeEventDispatcher.notifyAddedToChat(
+//                                    "group",
+//                                    group.getInternal_uuid(),
+//                                    group.getGroup_name(),
+//                                    group.getImage_url(),
+//                                    targetUserId
+//                            );
+//                        }
+//
+//                        response = success
+//                                ? new ResponseModel("success", "Member added to group.")
+//                                : new ResponseModel("error", "Failed to add member.");
+//                        break;
+//
+//                    }
+
+
+                    case "add_members_to_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                        if (!GroupPermissionUtil.canAddMembers(groupId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to add members.");
+                            break;
+                        }
+
+                        org.json.JSONArray arr = requestJson.optJSONArray("user_ids");
+                        if (arr == null || arr.isEmpty()) {
+                            response = new ResponseModel("error", "user_ids is empty.");
+                            break;
+                        }
+
+                        Group group = GroupDatabase.findByInternalUUID(groupId);
+                        if (group == null) {
+                            response = new ResponseModel("error", "Group not found.");
+                            break;
+                        }
+
+                        int added = 0, skipped = 0, failed = 0;
+                        for (int i = 0; i < arr.length(); i++) {
+                            try {
+                                UUID targetUserId = UUID.fromString(arr.getString(i));
+                                if (GroupDatabase.isUserInGroup(targetUserId, groupId)) {
+                                    skipped++;
+                                    continue;
+                                }
+                                boolean ok = GroupDatabase.addMemberToGroup(targetUserId, groupId);
+                                if (ok) {
+                                    added++;
+                                    RealTimeEventDispatcher.notifyAddedToChat(
+                                            "group",
+                                            group.getInternal_uuid(),
+                                            group.getGroup_name(),
+                                            group.getImage_url(),
+                                            targetUserId
+                                    );
+                                } else {
+                                    failed++;
+                                }
+                            } catch (Exception ex) {
+                                failed++;
+                            }
+                        }
+
+                        JSONObject data = new JSONObject()
+                                .put("added", added)
+                                .put("skipped", skipped)
+                                .put("failed", failed)
+                                .put("group_id", group.getInternal_uuid().toString());
+
+                        response = new ResponseModel("success", "Batch add finished.", data);
+                        break;
+                    }
+
+
+                    case "remove_member_from_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                        UUID targetUserId = UUID.fromString(requestJson.getString("user_id"));
+
+                        if (!GroupPermissionUtil.canRemoveMembers(groupId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to remove members.");
+                            break;
+                        }
+
+                        String targetRole = GroupDatabase.getGroupRole(groupId, targetUserId);
+                        if (targetRole == null) {
+                            response = new ResponseModel("error", "User is not a member of the group.");
+                            break;
+                        }
+
+                        if (targetRole.equals("owner")) {
+                            response = new ResponseModel("error", "You cannot remove the owner.");
+                            break;
+                        }
+
+                        //RealTime
+                        boolean success = GroupDatabase.removeMemberFromGroup(groupId, targetUserId);
+                        if (success) {
+                            Group group = GroupDatabase.findByInternalUUID(groupId);
+                            if (group != null) {
+                                RealTimeEventDispatcher.notifyRemovedFromChat(
+                                        "group",
+                                        group.getInternal_uuid(),
+                                        targetUserId
+                                );
+                            }
+                        }
+                        response = success
+                                ? new ResponseModel("success", "Member removed from group.")
+                                : new ResponseModel("error", "Failed to remove member.");
+                        break;
+                    }
+
+
+
+                    case "view_group_admins": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+
+                        String role = GroupDatabase.getGroupRole(groupId, currentUser.getInternal_uuid());
+                        if (!role.equals("owner") && !role.equals("admin")) {
+                            response = new ResponseModel("error", "You are not authorized to view admins.");
+                            break;
+                        }
+
+                        List<JSONObject> admins = GroupDatabase.getGroupAdminsAndOwner(groupId);
+                        JSONObject data = new JSONObject();
+                        data.put("admins", new JSONArray(admins));
+                        response = new ResponseModel("success", "Admins fetched.", data);
+                        break;
+                    }
+
+
+                    case "get_messages": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            String receiverId = requestJson.getString("receiver_id");
+                            String receiverType = requestJson.getString("receiver_type");
+
+                            List<Message> messages = new ArrayList<>();
+
+                            switch (receiverType) {
+                                case "private" -> {
+                                    UUID chatId = UUID.fromString(receiverId);
+                                    List<UUID> members = PrivateChatDatabase.getMembers(chatId);
+                                    if (!members.contains(currentUser.getInternal_uuid())) {
+                                        response = new ResponseModel("error", "You're not a member of this private chat.");
+                                        break;
+                                    }
+
+                                    messages = MessageDatabase.privateChatHistory(chatId, currentUser.getInternal_uuid());
+                                }
+
+
+                                case "group" -> {
+                                    Group group = GroupDatabase.findByInternalUUID(UUID.fromString(receiverId));
+                                    if (group == null) {
+                                        response = new ResponseModel("error", "Group not found.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.groupChatHistory(group.getInternal_uuid(),currentUser.getInternal_uuid());
+                                }
+
+
+                                case "channel" -> {
+                                    Channel channel = ChannelDatabase.findByInternalUUID(UUID.fromString(receiverId));
+                                    if (channel == null) {
+                                        response = new ResponseModel("error", "Channel not found.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.channelChatHistory(channel.getInternal_uuid(),currentUser.getInternal_uuid());
+                                }
+                                default -> {
+                                    response = new ResponseModel("error", "Invalid receiver type.");
+                                    break;
+                                }
+                            }
+
+                            if (response == null) {
+                                JSONArray messageArray = new JSONArray();
+                                for (Message m : messages) {
+                                    JSONObject obj = new JSONObject();
+                                    obj.put("id", m.getMessage_id().toString());
+                                    obj.put("sender_id", m.getSender_id().toString());
+                                    obj.put("receiver_id", m.getReceiver_id().toString());
+                                    obj.put("receiver_type", m.getReceiver_type());
+                                    obj.put("content", m.getContent());
+                                    obj.put("send_at", m.getSend_at().toString());
+                                    User senderUser = userDatabase.findByInternalUUID(m.getSender_id());
+                                    String senderName = senderUser != null ? senderUser.getProfile_name() : "Unknown";
+                                    obj.put("sender_name", senderName);
+                                    messageArray.put(obj);
+                                }
+
+                                JSONObject data = new JSONObject();
+                                data.put("messages", messageArray);
+
+                                response = new ResponseModel("success", "Messages fetched.", data);
+                            }
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error fetching messages: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+                    case "get_messages_UI": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        try {
+                            final String receiverId   = requestJson.getString("receiver_id");
+                            final String receiverType = requestJson.getString("receiver_type").toLowerCase();
+                            final int offset          = requestJson.optInt("offset", 0);
+                            final int limit           = requestJson.optInt("limit", 50);
+
+                            List<Message> messages = new ArrayList<>();
+
+                            switch (receiverType) {
+                                case "private" -> {
+                                    // receiver_id = private_chat.chat_id
+                                    UUID chatId = UUID.fromString(receiverId);
+                                    List<UUID> members = PrivateChatDatabase.getMembers(chatId);
+                                    if (members == null || !members.contains(currentUser.getInternal_uuid())) {
+                                        response = new ResponseModel("error", "You're not a member of this private chat.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.privateChatHistory(chatId, currentUser.getInternal_uuid());
+                                }
+                                case "group" -> {
+                                    Group group = GroupDatabase.findByInternalUUID(UUID.fromString(receiverId));
+                                    if (group == null) {
+                                        response = new ResponseModel("error", "Group not found.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.groupChatHistory(group.getInternal_uuid(), currentUser.getInternal_uuid());
+                                }
+                                case "channel" -> {
+                                    Channel channel = ChannelDatabase.findByInternalUUID(UUID.fromString(receiverId));
+                                    if (channel == null) {
+                                        response = new ResponseModel("error", "Channel not found.");
+                                        break;
+                                    }
+                                    messages = MessageDatabase.channelChatHistory(channel.getInternal_uuid(), currentUser.getInternal_uuid());
+                                }
+                                default -> {
+                                    response = new ResponseModel("error", "Invalid receiver type.");
+                                    break;
+                                }
+                            }
+                            if (response != null) break;
+
+                            if (offset > 0 || limit > 0) {
+                                int from = Math.max(0, Math.min(offset, messages.size()));
+                                int to   = Math.max(from, Math.min(from + limit, messages.size()));
+                                messages = messages.subList(from, to);
+                            }
+
+                            JSONArray messageArray = new JSONArray();
+
+                            for (Message m : messages) {
+                                JSONObject obj = new JSONObject();
+
+                                obj.put("message_id", m.getMessage_id().toString());
+                                obj.put("sender_id",  m.getSender_id().toString());
+
+                                User senderUser = userDatabase.findByInternalUUID(m.getSender_id());
+                                obj.put("sender_name", senderUser != null ? senderUser.getProfile_name() : "Unknown");
+
+                                obj.put("receiver_id",   m.getReceiver_id().toString());
+                                obj.put("receiver_type", m.getReceiver_type());
+
+                                String receiverName = switch (m.getReceiver_type()) {
+                                    case "group" -> {
+                                        Group g = GroupDatabase.findByInternalUUID(m.getReceiver_id());
+                                        yield g != null ? g.getGroup_name() : "Unknown group";
+                                    }
+                                    case "channel" -> {
+                                        Channel c = ChannelDatabase.findByInternalUUID(m.getReceiver_id());
+                                        yield c != null ? c.getChannel_name() : "Unknown channel";
+                                    }
+                                    case "private" -> {
+                                        UUID otherId = PrivateChatDatabase.getOtherParticipant(m.getReceiver_id(), currentUser.getInternal_uuid());
+                                        User other   = userDatabase.findByInternalUUID(otherId);
+                                        yield other != null ? other.getProfile_name() : "Unknown user";
+                                    }
+                                    default -> "Unknown";
+                                };
+                                obj.put("receiver_name", receiverName);
+
+                                obj.put("content",       m.getContent());
+                                obj.put("message_type",  m.getMessage_type());      // TEXT/IMAGE/AUDIO/VIDEO/FILE
+                                obj.put("send_at",       m.getSend_at().toString());
+
+                                obj.put("is_edited",           m.isIs_edited());
+                                obj.put("is_deleted_globally", m.isIs_deleted_globally());
+                                obj.put("edited_at",           m.getEdited_at() != null ? m.getEdited_at().toString() : JSONObject.NULL);
+
+                                if (m.getReply_to_id() != null) {
+                                    obj.put("reply_to_id", m.getReply_to_id().toString());
+
+                                    Message replied = MessageDatabase.findById(m.getReply_to_id());
+                                    if (replied != null) {
+                                        User rSender = userDatabase.findByInternalUUID(replied.getSender_id());
+                                        obj.put("reply_to_sender",  rSender != null ? rSender.getProfile_name() : "Unknown");
+                                        obj.put("reply_to_content", replied.getContent());
+                                        obj.put("reply_to_type",    replied.getMessage_type());
+                                    }
+                                } else {
+                                    obj.put("reply_to_id", JSONObject.NULL);
+                                }
+
+                                if (m.getOriginal_message_id() != null && m.getForwarded_from() != null) {
+                                    User originalSender = userDatabase.findByInternalUUID(m.getForwarded_from());
+                                    obj.put("is_forwarded", true);
+                                    obj.put("forwarded_from", originalSender != null
+                                            ? originalSender.getProfile_name()
+                                            : m.getForwarded_from().toString());
+                                    obj.put("forwarded_by", senderUser != null ? senderUser.getProfile_name() : "Unknown");
+                                    obj.put("forwarded_from_id", m.getForwarded_from().toString());
+                                } else {
+                                    obj.put("is_forwarded",   false);
+                                    obj.put("forwarded_from", JSONObject.NULL);
+                                    obj.put("forwarded_by",   JSONObject.NULL);
+                                }
+
+                                String mt = m.getMessage_type();
+                                if (mt != null && !mt.equalsIgnoreCase("TEXT")) {
+                                    String fileUrl = MessageDatabase.getFirstAttachmentUrlByType(m.getMessage_id(), mt);
+                                    if (fileUrl != null && !fileUrl.isBlank()) {
+                                        obj.put("file_url", fileUrl);
+                                    }
+                                }
+
+                                JSONArray reactionsArr = new JSONArray();
+                                try {
+                                    List<String> reactions = MessageReactionDatabase.getReactions(m.getMessage_id());
+                                    if (reactions != null && !reactions.isEmpty()) {
+                                        Map<String, Integer> counter = new HashMap<>();
+                                        for (String r : reactions) {
+                                            counter.put(r, counter.getOrDefault(r, 0) + 1);
+                                        }
+                                        for (Map.Entry<String, Integer> e : counter.entrySet()) {
+                                            JSONObject ro = new JSONObject();
+                                            ro.put("emoji", e.getKey());
+                                            ro.put("count", e.getValue());
+                                            reactionsArr.put(ro);
+                                        }
+                                    }
+                                } catch (Exception ignore) {}
+                                obj.put("reactions", reactionsArr);
+
+                                messageArray.put(obj);
+                            }
+
+                            JSONObject data = new JSONObject();
+                            data.put("messages", messageArray);
+
+                            response = new ResponseModel("success", "Messages fetched.", data);
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error fetching messages: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+                    case "toggle_block": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            UUID userUUID = UUID.fromString(requestJson.getString("user_id"));
+                            UUID targetUUID = UUID.fromString(requestJson.getString("target_id"));
+
+                            boolean isBlocked = ContactDatabase.toggleBlock(userUUID, targetUUID);
+
+                            //RealTime
+                            if (isBlocked) {
+                                RealTimeEventDispatcher.notifyBlocked(userUUID, targetUUID);
+                            } else {
+                                RealTimeEventDispatcher.notifyUnblocked(userUUID, targetUUID);
+                            }
+
+
+                            String message = isBlocked ? "🔒 User blocked successfully." : "🔓 User unblocked successfully.";
+                            response = new ResponseModel("success", message);
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error processing block/unblock: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+
+
+                    case "transfer_group_ownership": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                        UUID newOwnerUserId = UUID.fromString(requestJson.getString("new_owner_user_id"));
+                        User newOwner = userDatabase.findByInternalUUID(newOwnerUserId);
+                        if (newOwner == null) {
+                            response = new ResponseModel("error", "New owner not found.");
+                            break;
+                        }
+
+                        if (!GroupDatabase.isOwner(groupId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "Only current owner can transfer ownership.");
+                            break;
+                        }
+
+                        if (!GroupDatabase.isAdmin(groupId, newOwner.getInternal_uuid())) {
+                            response = new ResponseModel("error", "Selected user is not an admin.");
+                            break;
+                        }
+
+                        boolean success = GroupDatabase.transferOwnership(groupId, newOwner.getInternal_uuid());
+
+                        //RealTime
+                        if (success) {
+                            List<UUID> members = GroupDatabase.getMemberUUIDs(groupId);
+                            Group group = GroupDatabase.findByInternalUUID(groupId);
+
+                            //update for new owner
+                            RealTimeEventDispatcher.sendOwnershipTransferred(
+                                    "group",
+                                    groupId,
+                                    group.getGroup_name(),
+                                    List.of(newOwner.getInternal_uuid())
+                            );
+
+                            //Update for everyone
+                            RealTimeEventDispatcher.sendGroupOrChannelUpdate(
+                                    "group",
+                                    groupId,
+                                    group.getGroup_name(),
+                                    group.getImage_url(),
+                                    group.getDescription(),
+                                    members
+                            );
+                        }
+
+
+
+
+                        response = success
+                                ? new ResponseModel("success", "Ownership transferred.")
+                                : new ResponseModel("error", "Failed to transfer ownership.");
+
+                        break;
+                    }
+
+
+                    case "view_group_members" : {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+
+                        JSONArray members = GroupDatabase.getGroupMembers(groupId);
+
+                        if (members != null) {
+                            JSONObject data = new JSONObject();
+                            data.put("members", members);
+                            response = new ResponseModel("success", "Members fetched successfully.", data);
+                        } else {
+                            response = new ResponseModel("error", "Failed to fetch members.");
+                        }
+                        break;
+                    }
+
+
+
+                    case "delete_private_chat": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        UUID targetId = UUID.fromString(requestJson.getString("chat_id"));
+                        boolean both = requestJson.getBoolean("both");
+
+                        if (both) {
+                            RealTimeEventDispatcher.notifyChatDeleted("private", targetId, List.of(currentUser.getInternal_uuid()));
+                            RealTimeEventDispatcher.notifyChatDeleted("private", currentUser.getInternal_uuid(), List.of(targetId));
+                        } else {
+                            RealTimeEventDispatcher.notifyChatDeleted("private", targetId, List.of(currentUser.getInternal_uuid()));
+                        }
+
+                        response = handleDeleteChat(requestJson);
+                        break;
+                    }
+
+
+
+                    case "get_group_permissions": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                        userId = currentUser.getInternal_uuid();
+
+                        JSONObject permissions = GroupDatabase.getGroupPermissions(groupId, userId);
+
+                        response = new ResponseModel("success", "Permissions fetched.", permissions);
+                        break;
+                    }
+
+
+                    case "leave_chat": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        String chatType = requestJson.getString("chat_type");
+                        UUID chatId = UUID.fromString(requestJson.getString("chat_id"));
+                        userId = UUID.fromString(requestJson.getString("user_id"));
+
+                        boolean success = false;
+
+
+
+
+                        switch (chatType) {
+                            case "group" -> success = GroupDatabase.removeMemberFromGroup(chatId, userId);
+                            case "channel" -> success = ChannelDatabase.removeSubscriberFromChannel(chatId, userId);
+                            default -> {
+                                response = new ResponseModel("error", "Unsupported chat type.");
+                                break;
+                            }
+                        }
+
+                        //RealTime
+                        if (success) {
+                            if (chatType.equals("group")) {
+                                RealTimeEventDispatcher.notifyRemovedFromChat("group", chatId, userId);
+                            } else if (chatType.equals("channel")) {
+                                RealTimeEventDispatcher.notifyRemovedFromChat("channel", chatId, userId);
+                            }
+                        }
+
+                        if (response == null) {
+                            response = success
+                                    ? new ResponseModel("success", "Left the " + chatType + " successfully.")
+                                    : new ResponseModel("error", "Failed to leave the " + chatType + ".");
+                        }
+
+                        break;
+                    }
+
+
+                    case "delete_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+
+                        if (!GroupDatabase.isOwner(groupId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "Only the group owner can delete the group.");
+                            break;
+                        }
+
+                        List<UUID> memberIds = GroupDatabase.getGroupMemberUUIDs(groupId);
+
+                        boolean success = GroupDatabase.deleteGroup(groupId);
+
+                        //RealTime
+                        if (success) {
+                            RealTimeEventDispatcher.notifyChatDeleted("group", groupId, memberIds);
+                            response = new ResponseModel("success", "Group deleted successfully.");
+                        } else {
+                            response = new ResponseModel("error", "Failed to delete group.");
+                        }
+                        break;
+                    }
+
+
+                    case "get_channel_permissions": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                            userId = currentUser.getInternal_uuid();
+
+                            JSONObject permissions = ChannelDatabase.getChannelPermissions(channelId, userId);
+
+                            response = new ResponseModel("success", "Permissions fetched.", permissions);
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error fetching channel permissions: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+
+                    case "view_channel_subscribers": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+
+                        boolean isOwner = ChannelDatabase.isOwner(channelId, currentUser.getInternal_uuid());
+                        boolean isAdmin = ChannelDatabase.isAdmin(channelId, currentUser.getInternal_uuid());
+
+                        if (!isOwner && !isAdmin) {
+                            response = new ResponseModel("error", "You are not authorized to view subscribers.");
+                            break;
+                        }
+
+                        JSONArray subscribers = ChannelDatabase.getChannelSubscribers(channelId);
+
+                        if (subscribers != null) {
+                            JSONObject data = new JSONObject();
+                            data.put("subscribers", subscribers);
+                            response = new ResponseModel("success", "Subscribers fetched successfully.", data);
+                        } else {
+                            response = new ResponseModel("error", "Failed to fetch subscribers.");
+                        }
+                        break;
+                    }
+
+
+                    case "add_subscriber_to_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                        UUID targetUserId = UUID.fromString(requestJson.getString("user_id"));
+
+                        if (!ChannelPermissionUtil.canAddSubscribers(channelId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to add subscribers.");
+                            break;
+                        }
+
+                        if (ChannelDatabase.isUserInChannel(targetUserId, channelId)) {
+                            response = new ResponseModel("error", "User is already a subscriber.");
+                            break;
+                        }
+
+                        boolean success = ChannelDatabase.addSubscriberToChannel(targetUserId, channelId);
+
+                        //RealTime
+                        if (success) {
+                            Channel channel = ChannelDatabase.findByInternalUUID(channelId);
+                            if (channel != null) {
+                                RealTimeEventDispatcher.notifyAddedToChat(
+                                        "channel",
+                                        channel.getInternal_uuid(),
+                                        channel.getChannel_name(),
+                                        channel.getImage_url(),
+                                        targetUserId
+                                );
+                            }
+                        }
+                        response = success
+                                ? new ResponseModel("success", "Subscriber added to channel.")
+                                : new ResponseModel("error", "Failed to add subscriber.");
+                        break;
+                    }
+
+                    case "remove_subscriber_from_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                        UUID targetUserId = UUID.fromString(requestJson.getString("user_id"));
+
+                        if (!ChannelPermissionUtil.canRemoveSubscribers(channelId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to remove subscribers.");
+                            break;
+                        }
+
+                        String targetRole = ChannelDatabase.getChannelRole(channelId, targetUserId);
+                        if (targetRole == null) {
+                            response = new ResponseModel("error", "User is not a subscriber of the channel.");
+                            break;
+                        }
+
+                        if (targetRole.equals("owner")) {
+                            response = new ResponseModel("error", "You cannot remove the owner.");
+                            break;
+                        }
+
+                        boolean success = ChannelDatabase.removeSubscriberFromChannel(channelId, targetUserId);
+
+                        //RealTime
+                        if (success) {
+                            Channel channel = ChannelDatabase.findByInternalUUID(channelId);
+                            if (channel != null) {
+                                RealTimeEventDispatcher.notifyRemovedFromChat(
+                                        "channel",
+                                        channel.getInternal_uuid(),
+                                        targetUserId
+                                );
+                            }
+                        }
+                        response = success
+                                ? new ResponseModel("success", "Subscriber removed from channel.")
+                                : new ResponseModel("error", "Failed to remove subscriber.");
+                        break;
+                    }
+
+
+                    case "edit_channel_info": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            UUID channelUUID = UUID.fromString(requestJson.getString("channel_id")); // internal_uuid
+                            String newChannelId = requestJson.getString("new_channel_id").trim();
+                            String name = requestJson.optString("name");
+                            String description = requestJson.optString("description", null);
+                            String imageUrl = requestJson.has("image_url") && !requestJson.isNull("image_url")
+                                    ? requestJson.getString("image_url") : null;
+
+                            boolean isOwner = ChannelDatabase.isOwner(channelUUID, currentUser.getInternal_uuid());
+                            if (!isOwner && !ChannelPermissionUtil.canEditChannel(channelUUID, currentUser.getInternal_uuid())) {
+                                response = new ResponseModel("error", "You don't have permission to edit this channel.");
+                                break;
+                            }
+
+                            if (isOwner && !ChannelDatabase.isChannelIdUnique(newChannelId, channelUUID)) {
+                                response = new ResponseModel("error", "Channel ID is already taken by another channel.");
+                                break;
+                            }
+
+                            boolean updated = ChannelDatabase.updateChannelInfo(channelUUID, newChannelId, name, description, imageUrl);
+
+                            //RealTime
+                            if (updated) {
+                                List<UUID> subscribers = ChannelDatabase.getChannelSubscriberUUIDs(channelUUID);
+                                RealTimeEventDispatcher.sendGroupOrChannelUpdate("channel", channelUUID, name, imageUrl, description, subscribers);
+                            }
+
+                            response = updated
+                                    ? new ResponseModel("success", "Channel info updated successfully.")
+                                    : new ResponseModel("error", "Failed to update channel info.");
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error updating channel: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+
+                    case "delete_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+
+                        if (!ChannelDatabase.isOwner(channelId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "Only the owner can delete the channel.");
+                            break;
+                        }
+
+                        List<UUID> subscriberIds = ChannelDatabase.getChannelSubscriberUUIDs(channelId);
+
+                        boolean success = ChannelDatabase.deleteChannel(channelId);
+
+                        //RealTime
+                        if (success) {
+                            RealTimeEventDispatcher.notifyChatDeleted("channel", channelId, subscriberIds);
+                            response = new ResponseModel("success", "Channel deleted successfully.");
+                        } else {
+                            response = new ResponseModel("error", "Failed to delete channel.");
+                        }
+
+                        break;
+                    }
+
+                    case "remove_admin_from_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                        UUID targetUserId = UUID.fromString(requestJson.getString("target_user_id"));
+
+                        if (!GroupPermissionUtil.canRemoveAdmins(groupId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You are not allowed to remove admins.");
+                            break;
+                        }
+
+                        String targetRole = GroupDatabase.getGroupRole(groupId, targetUserId);
+                        if (targetRole == null) {
+                            response = new ResponseModel("error", "User is not a member of the group.");
+                            break;
+                        }
+
+                        if (targetRole.equals("owner")) {
+                            response = new ResponseModel("error", "You cannot remove the owner.");
+                            break;
+                        }
+
+                        if (!targetRole.equals("admin")) {
+                            response = new ResponseModel("error", "Target user is not an admin.");
+                            break;
+                        }
+
+                        boolean success = GroupDatabase.demoteAdminToMember(groupId, targetUserId);
+
+                        // RealTime
+                        if (success) {
+                            Group group = GroupDatabase.findByInternalUUID(groupId);
+                            if (group != null) {
+                                RealTimeEventDispatcher.notifyRemovedAdminFromChat(
+                                        "group",
+                                        group.getInternal_uuid(),
+                                        group.getGroup_name(),
+                                        group.getImage_url(),
+                                        targetUserId
+                                );
+                            }
+                        }
+
+                        response = success
+                                ? new ResponseModel("success", "Admin removed successfully.")
+                                : new ResponseModel("error", "Failed to remove admin.");
+
+                        break;
+                    }
+
+
+
+                    case "transfer_channel_ownership": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                        String newOwnerUserIdStr = requestJson.getString("new_owner_user_id");
+
+                        User newOwner = new userDatabase().findByUserId(newOwnerUserIdStr);
+                        if (newOwner == null) {
+                            response = new ResponseModel("error", "User not found.");
+                            break;
+                        }
+
+                        if (!ChannelDatabase.isOwner(channelId, currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "Only the owner can transfer ownership.");
+                            break;
+                        }
+
+                        boolean success = ChannelDatabase.transferOwnership(channelId, newOwner.getInternal_uuid());
+
+                        //RealTime
+                        if (success) {
+                            List<UUID> subscribers = ChannelDatabase.getChannelSubscriberUUIDs(channelId);
+                            Channel channel = ChannelDatabase.findByInternalUUID(channelId);  // 🟢 گرفتن اطلاعات کامل
+
+                            // 1. ارسال ownership_transferred فقط به owner جدید
+                            RealTimeEventDispatcher.sendOwnershipTransferred(
+                                    "channel",
+                                    channelId,
+                                    channel.getChannel_name(), // ✅ اسم واقعی کانال
+                                    List.of(newOwner.getInternal_uuid())
+                            );
+
+                            // 2. ارسال update_group_or_channel برای بروزرسانی UI تمام افراد
+                            RealTimeEventDispatcher.sendGroupOrChannelUpdate(
+                                    "channel",
+                                    channelId,
+                                    channel.getChannel_name(),     // ✅ name واقعی
+                                    channel.getImage_url(),        // ✅ image
+                                    channel.getDescription(),     // ✅ description
+                                    subscribers
+                            );
+                        }
+
+
+
+                        response = success
+
+                                ? new ResponseModel("success", "Ownership transferred successfully.")
+                                : new ResponseModel("error", "Failed to transfer ownership.");
+                        break;
+                    }
+
+                    case "view_profile": {
+                        UUID targetId = UUID.fromString(requestJson.getString("target_id"));
+                        User user = userDatabase.findByInternalUUID(targetId);
+                        if (user == null) {
+                            response = new ResponseModel("error", "User not found.");
+                            break;
+                        }
+
+                        JSONObject data = new JSONObject();
+                        data.put("profile_name", user.getProfile_name());
+                        data.put("user_id", user.getUser_id());
+                        data.put("bio", user.getBio());
+                        data.put("image_url", user.getImage_url());
+                        data.put("is_online", userDatabase.isUserOnline(user.getInternal_uuid()));
+                        data.put("last_seen", userDatabase.getLastSeen(user.getInternal_uuid()));
+
+                        response = new ResponseModel("success", "Profile data", data);
+                        break;
+                    }
+
+                    case "edit_admin_permissions": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        UUID chatId = UUID.fromString(requestJson.getString("chat_id"));
+                        String chatType = requestJson.getString("chat_type");
+                        UUID adminId = UUID.fromString(requestJson.getString("admin_id"));
+                        JSONObject newPermissions = requestJson.getJSONObject("permissions");
+
+                        boolean success = false;
+
+                        if (chatType.equals("group")) {
+                            success = GroupDatabase.updateAdminPermissions(chatId, adminId, newPermissions);
+                        } else if (chatType.equals("channel")) {
+                            success = ChannelDatabase.updateAdminPermissions(chatId, adminId, newPermissions);
+                        } else {
+                            response = new ResponseModel("error", "Invalid chat type.");
+                            break;
+                        }
+
+                        if (success) {
+                            JSONObject data = new JSONObject();
+                            data.put("chat_id", chatId.toString());
+                            data.put("chat_type", chatType);
+                            data.put("permissions", newPermissions);
+
+                            JSONObject event = new JSONObject();
+                            event.put("action", "admin_permissions_updated");
+                            event.put("data", data);
+
+                            RealTimeEventDispatcher.sendToUser(adminId, event);
+                        }
+
+
+                        response = success
+                                ? new ResponseModel("success", "Permissions updated successfully.")
+                                : new ResponseModel("error", "Failed to update permissions.");
+                        break;
+                    }
+
+
+
+//                    case "search_chat_members": {
+//                        if (currentUser == null) {
+//                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+//                            break;
+//                        }
+//
+//                        UUID chatId = UUID.fromString(requestJson.getString("chat_id"));
+//                        String chatType = requestJson.getString("chat_type");
+//                        String query = requestJson.getString("query").toLowerCase();
+//
+//                        List<User> matched = new ArrayList<>();
+//
+//                        if (chatType.equals("group")) {
+//                            if (!GroupDatabase.isMember(chatId, currentUser.getInternal_uuid())) {
+//                                response = new ResponseModel("error", "You are not a member of this group.");
+//                                break;
+//                            }
+//                            matched = GroupDatabase.searchGroupMembers(chatId, query);
+//                        } else if (chatType.equals("channel")) {
+//                            if (!ChannelDatabase.isAdmin(chatId, currentUser.getInternal_uuid())||!ChannelDatabase.isOwner(chatId, currentUser.getInternal_uuid())) {
+//                                response = new ResponseModel("error", "Only admins or owner can search subscribers.");
+//                                break;
+//                            }
+//                            matched = ChannelDatabase.searchSubscribers(chatId, query);
+//                        } else {
+//                            response = new ResponseModel("error", "Invalid chat type.");
+//                            break;
+//                        }
+//
+//                        JSONArray arr = new JSONArray();
+//                        for (User u : matched) arr.put(u.toJSON());
+//                        response = new ResponseModel("success", "Results found", Map.of("results", arr));
+//                        break;
+//                    }
+//
+
+                    case "archive_chat": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        UUID chatId = UUID.fromString(requestJson.getString("chat_id"));
+                        String chatType = requestJson.getString("chat_type");
+
+                        boolean success = ArchivedChatDatabase.archiveChat(currentUser.getInternal_uuid(), chatId, chatType);
+                        response = success
+                                ? new ResponseModel("success", "Chat archived successfully.")
+                                : new ResponseModel("error", "Failed to archive chat.");
+                        break;
+                    }
+
+
+                    case "unarchive_chat": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        UUID chatId = UUID.fromString(requestJson.getString("chat_id"));
+
+                        boolean success = ArchivedChatDatabase.unarchiveChat(currentUser.getInternal_uuid(), chatId);
+                        response = success
+                                ? new ResponseModel("success", "Chat unarchived successfully.")
+                                : new ResponseModel("error", "Failed to unarchive chat.");
+                        break;
+                    }
+
+                    case "send_message" : {
+                        response = handleSendMessage(requestJson);
+                    }
+                    break;
+
+                    case "get_or_create_private_chat": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        try {
+                            UUID user1 = UUID.fromString(requestJson.getString("user1"));
+                            UUID user2 = UUID.fromString(requestJson.getString("user2"));
+
+                            UUID oldChat = PrivateChatDatabase.findChatBetween(user1, user2);
+                            UUID chatId = PrivateChatDatabase.getOrCreateChat(user1, user2);
+                            boolean isNew = oldChat == null;
+
+                            if (isNew) {
+                                JSONObject chatPayload = new JSONObject();
+                                chatPayload.put("action", "created_private_chat");
+
+                                JSONObject chatData = new JSONObject();
+                                chatData.put("chat_id", chatId.toString());
+                                chatData.put("chat_type", "private");
+                                chatData.put("last_message_time", LocalDateTime.now().toString());
+                                chatPayload.put("data", chatData);
+
+                                RealTimeEventDispatcher.sendToUser(user1, chatPayload);
+                                RealTimeEventDispatcher.sendToUser(user2, chatPayload);
+                            }
+
+                            JSONObject data = new JSONObject();
+                            data.put("chat_id", chatId.toString());
+                            response = new ResponseModel("success", "Private chat ID retrieved.", data);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            response = new ResponseModel("error", "Invalid data or internal error.");
+                        }
+
+                        break;
+                    }
+
+
+
+
+                    case "get_private_chat_target": {
+                        UUID chatId = UUID.fromString(requestJson.getString("chat_id"));
+                        userId = currentUser.getInternal_uuid();
+
+                        UUID targetId = PrivateChatDatabase.getOtherUserInChat(chatId, userId);
+                        if (targetId == null) {
+                            PrivateChat chat = PrivateChatDatabase.findById(chatId);
+                            if (chat != null
+                                    && (userId.equals(chat.getUser1_id()) || userId.equals(chat.getUser2_id()))
+                                    && chat.getUser1_id().equals(chat.getUser2_id())) {
+                                targetId = userId;
+                            }
+                        }
+
+                        if (targetId == null) {
+                            response = new ResponseModel("error", "Could not find other user.");
+                        } else {
+                            JSONObject data = new JSONObject();
+                            data.put("target_id", targetId.toString());
+                            response = new ResponseModel("success", "Target fetched.", data);
+                        }
+                        break;
+                    }
+
+
+
+                    case "get_contact_list": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        List<Contact> contacts = ContactDatabase.getContacts(currentUser.getInternal_uuid());
+                        List<ContactEntry> contactEntries = new ArrayList<>();
+
+                        JSONArray contactList = new JSONArray();
+                        for (Contact contact : contacts) {
+                            User target = userDatabase.findByInternalUUID(contact.getContact_id());
+                            if (target == null) continue;
+
+                            JSONObject c = new JSONObject();
+                            c.put("user_id", contact.getUser_id().toString());
+                            c.put("contact_id", contact.getContact_id().toString());
+                            User Contact = userDatabase.findByInternalUUID(contact.getContact_id());
+                            c.put("contact_displayId", Contact.getUser_id());
+                            c.put("is_blocked", contact.getIs_blocked());
+
+                            c.put("profile_name", target.getProfile_name());
+                            c.put("image_url", target.getImage_url());
+                            c.put("last_seen", Contact.getLast_seen());
+
+                            contactList.put(c);
+                        }
+
+                        // Optional: sort alphabetically
+                        contactEntries.sort(Comparator.comparing(ContactEntry::getProfileName, String.CASE_INSENSITIVE_ORDER));
+
+                        JSONObject data = new JSONObject();
+                        data.put("contact_list", contactList);
+
+                        response = new ResponseModel("success", "Contact list refreshed", data);
+                        break;
+                    }
+
+                    case "get_chat_messages" : {
+                        UUID chatId = UUID.fromString(requestJson.getString("chat_id"));
+                        String chatType = requestJson.getString("chat_type");
+                        int offset = requestJson.optInt("offset", 0);
+                        int limit = requestJson.optInt("limit", 10);
+
+                        List<Message> messages = MessageDatabase.getMessagesForChat(chatId, chatType, currentUser.getInternal_uuid(), offset, limit);
+
+                        JSONArray result = new JSONArray();
+                        for (Message m : messages) {
+                            JSONObject obj = new JSONObject();
+                            obj.put("message_id", m.getMessage_id().toString());
+                            obj.put("sender_id", m.getSender_id().toString());
+
+                            User sender = userDatabase.findByInternalUUID(m.getSender_id());
+                            obj.put("sender_name", sender != null ? sender.getProfile_name() : "Unknown");
+
+                            obj.put("receiver_id", m.getReceiver_id().toString());
+                            obj.put("receiver_type", m.getReceiver_type());
+
+                            String receiverName = switch (m.getReceiver_type()) {
+                                case "group" -> {
+                                    Group g = GroupDatabase.findByInternalUUID(m.getReceiver_id());
+                                    yield g != null ? g.getGroup_name() : "Unknown group";
+                                }
+                                case "channel" -> {
+                                    Channel c = ChannelDatabase.findByInternalUUID(m.getReceiver_id());
+                                    yield c != null ? c.getChannel_name() : "Unknown channel";
+                                }
+                                case "private" -> {
+                                    UUID otherId = PrivateChatDatabase.getOtherParticipant(
+                                            m.getReceiver_id(),             // chat_id
+                                            currentUser.getInternal_uuid()  // my user uuid
+                                    );
+                                    User other = userDatabase.findByInternalUUID(otherId);
+                                    yield other != null ? other.getProfile_name() : "Unknown user";
+                                }
+
+                                default -> "Unknown";
+                            };
+                            obj.put("receiver_name", receiverName);
+
+                            obj.put("content", m.getContent());
+                            obj.put("message_type", m.getMessage_type());
+                            obj.put("time", m.getSend_at().toString());
+                            obj.put("is_edited", m.isIs_edited());
+                            obj.put("is_deleted_globally", m.isIs_deleted_globally());
+                            obj.put("edited_at", m.getEdited_at() != null ? m.getEdited_at().toString() : JSONObject.NULL);
+
+                            //For reply messages
+                            if (m.getReply_to_id() != null) {
+                                Message replied = MessageDatabase.findById(m.getReply_to_id());
+                                if (replied != null) {
+                                    User repliedSender = userDatabase.findByInternalUUID(replied.getSender_id());
+                                    obj.put("reply_to_id", replied.getMessage_id().toString());
+                                    obj.put("reply_to_sender", repliedSender != null ? repliedSender.getProfile_name() : "Unknown");
+                                    obj.put("reply_to_content", replied.getContent());
+                                }
+                            }
+
+                            //  For forwarded messages
+                            if (m.getOriginal_message_id() != null && m.getForwarded_from() != null) {
+                                User originalSender = userDatabase.findByInternalUUID(m.getForwarded_from());
+                                obj.put("is_forwarded", true);
+                                obj.put("forwarded_from_id", m.getForwarded_from().toString());
+                                obj.put("forwarded_from_name", originalSender != null ? originalSender.getProfile_name() : "Unknown");
+                            } else {
+                                obj.put("is_forwarded", false);
+                            }
+
+                            //For reactions
+                            List<String> reactions = MessageReactionDatabase.getReactions(m.getMessage_id());
+                            obj.put("reactions", new JSONArray(reactions));
+
+
+                            result.put(obj);
+                        }
+
+
+
+                        JSONObject data = new JSONObject();
+                        data.put("get_chat_messages", result);
+
+                        response = new ResponseModel("success", "get messages ", data);
+                        break;
+                    }
+
+                    case "delete_message" : {
+                        UUID messageId = UUID.fromString(requestJson.getString("message_id"));
+                        String deleteType = requestJson.getString("delete_type");
+
+                        Message msg = MessageDatabase.findById(messageId);
+                        if (msg == null) {
+                            response = new ResponseModel("error", "Message not found.");
+                            break;
+                        }
+
+                        UUID currentUserId = currentUser.getInternal_uuid();
+
+                        if (deleteType.equals("one-sided")) {
+                            boolean success = MessageDatabase.markAsDeletedForUser(messageId, currentUserId);
+                            if (success)
+                                response = new ResponseModel("success", "Message deleted for current user.");
+                            else
+                                response = new ResponseModel("error", "Failed to delete message for user.");
+                            break;
+                        }
+
+                        //If allowed to delete the message
+                        if (deleteType.equals("global")) {
+                            boolean allowed = false;
+
+                            String type = msg.getReceiver_type();
+                            UUID chatId = msg.getReceiver_id();
+
+                            if (type.equals("private") || type.equals("group")) {
+                                allowed = msg.getSender_id().equals(currentUserId);
+                            } else if (type.equals("channel")) {
+                                //Only owner and admins can delete messages
+                                allowed = ChannelPermissionUtil.canDeleteMessage(chatId, currentUserId);
+                            }
+
+                            if (!allowed) {
+                                response = new ResponseModel("error", "You are not allowed to delete this message globally.");
+                                break;
+                            }
+
+                            boolean success = MessageDatabase.markAsGloballyDeleted(messageId);
+                            if (success) {
+                                response = new ResponseModel("success", "Message deleted globally.");
+                                Message updated = MessageDatabase.findById(messageId);
+                                List<UUID> receivers = Receivers.resolveFor(updated.getReceiver_type(), updated.getReceiver_id(), null);
+                                RealTimeEventDispatcher.notifyMessageDeletedGlobal(updated.getReceiver_id(), messageId, receivers);
+
+                            }
+                            else{
+                                response = new ResponseModel("error", "Failed to delete message globally.");
+                            }
+                            break;
+                        }
+
+                        response = new ResponseModel("error", "Invalid delete_type.");
+                        break;
+                    }
+
+                    case "edit_message" : {
+                        UUID msgId = UUID.fromString(requestJson.getString("message_id"));
+                        String newContent = requestJson.getString("new_content");
+
+                        Message msg = MessageDatabase.findById(msgId);
+                        if (msg == null) {
+                            response = new ResponseModel("error", "Message not found.");
+                            break;
+                        }
+
+                        //Only sender can edit
+                        if (!msg.getSender_id().equals(currentUser.getInternal_uuid())) {
+                            response = new ResponseModel("error", "You can only edit your own messages.");
+                            break;
+                        }
+
+                        boolean success = MessageDatabase.updateContentAndMarkEdited(msgId, newContent);
+                        if (!success) {
+                            response = new ResponseModel("error", "Failed to update message.");
+                        } else {
+                            response = new ResponseModel("success", "Message edited.");
+                            Message updated = MessageDatabase.findById(msgId);
+                            List<UUID> receivers = Receivers.resolveFor(updated.getReceiver_type(), updated.getReceiver_id(), null);
+                            RealTimeEventDispatcher.notifyMessageEdited(updated.getReceiver_id(), updated.getMessage_id(), newContent, LocalDateTime.now(), receivers);
+
+                        }
+                        break;
+                    }
+
+                    case "send_reply_message" : {
+                        UUID senderId = currentUser.getInternal_uuid();
+                        String content = requestJson.getString("content");
+                        String receiverType = requestJson.getString("receiver_type");
+                        UUID receiverId = UUID.fromString(requestJson.getString("receiver_id"));
+                        //For block
+                        if ("private".equals(receiverType) && !canSendToPrivate(receiverId, senderId)) {
+                            response = new ResponseModel("error", "You can't message this user (blocked).");
+                            break;
+                        }
+
+                        UUID replyToId = UUID.fromString(requestJson.getString("reply_to_id"));
+
+                        Message message = new Message(
+                                UUID.randomUUID(),
+                                senderId,
+                                receiverType,
+                                receiverId,
+                                content,
+                                "TEXT",
+                                LocalDateTime.now(),
+                                "SEND",
+                                replyToId
+                        );
+
+                        boolean saved = MessageDatabase.saveReplyMessage(message);
+
+                        String excerpt = MessageDatabase.getExcerpt(replyToId);
+                        JSONObject meta = new JSONObject().put("reply_to", new JSONObject()
+                                .put("id", replyToId.toString())
+                                .put("excerpt", excerpt));
+
+                        List<UUID> receivers = Receivers.resolveFor(receiverType, receiverId, senderId);
+                        receivers = Receivers.resolveFor(receiverType, receiverId, /*exclude*/ null);
+                        RealTimeEventDispatcher.sendNewMessage(message, receivers, "reply", meta);
+
+
+                        response = saved ?
+                                new ResponseModel("success", "Reply sent") :
+                                new ResponseModel("error", "Failed to send reply");
+                        break;
+                    }
+
+                    case "forward_message" : {
+                        UUID senderId = currentUser.getInternal_uuid();
+                        UUID originalMessageId = UUID.fromString(requestJson.getString("original_message_id"));
+                        UUID targetChatId = UUID.fromString(requestJson.getString("target_chat_id"));
+                        String targetChatType = requestJson.getString("target_chat_type");
+
+                        //For block
+                        if ("private".equals(targetChatType) && !canSendToPrivate(targetChatId, senderId)) {
+                            response = new ResponseModel("error", "You can't message this user (blocked).");
+                            break;
+                        }
+
+                        // original message
+                        Message original = MessageDatabase.findById(originalMessageId);
+                        if (original == null) {
+                            response = new ResponseModel("error", "Original message not found.");
+                            break;
+                        }
+
+                        //make forwarded message
+                        Message forwarded = new Message(
+                                UUID.randomUUID(),
+                                currentUser.getInternal_uuid(),
+                                targetChatType,
+                                targetChatId,
+                                original.getContent(),
+                                original.getMessage_type(),
+                                LocalDateTime.now(),
+                                "SEND",
+                                null,           // reply_to_id
+                                false,          // is_edited
+                                false,          // is_deleted_globally
+                                original.getMessage_id(), //original message id
+                                currentUser.getInternal_uuid(),       // forwarded_by
+                                original.getSender_id(),              // forwarded_from
+                                null                                   // edited_at
+                        );
+
+                        boolean success = MessageDatabase.saveForwardedMessage(forwarded);
+
+                        if (success) {
+                            response = new ResponseModel("success", "Message forwarded.");
+                            JSONObject meta = new JSONObject().put("forwarded_from", new JSONObject()
+                                    .put("chat_id", original.getReceiver_id().toString())
+                                    .put("message_id", original.getMessage_id().toString())
+                                    .put("sender_id", original.getSender_id().toString())
+                                    .put("sender_name", userDatabase.findByInternalUUID(original.getSender_id()).getProfile_name()));
+
+                            List<UUID> receivers = Receivers.resolveFor(targetChatType, targetChatId, /*exclude*/ null);
+                            RealTimeEventDispatcher.sendNewMessage(forwarded, receivers, "forward", meta);
+                        }
+                        break;
+                    }
+
+                    case "react_to_message": {
+                        UUID messageId = UUID.fromString(requestJson.getString("message_id"));
+                        String reaction = requestJson.getString("reaction");
+                        boolean success = MessageReactionDatabase.saveOrUpdateReaction(messageId, currentUser.getInternal_uuid(), reaction);
+
+
+                        if (success) {
+                            Message msg = MessageDatabase.findById(messageId);
+
+                            JSONObject counts = MessageReactionDatabase.getCountsAsJson(messageId);
+
+                            List<UUID> receivers = Receivers.resolveFor(msg.getReceiver_type(), msg.getReceiver_id(), null);
+
+                            RealTimeEventDispatcher.notifyReactionAdded(
+                                    msg.getReceiver_id(),           // chatId
+                                    messageId,                       // messageId
+                                    reaction,                        // emoji
+                                    counts.optInt(reaction, 0),
+                                    counts,
+                                    receivers
+                            );
+
+                            response = new ResponseModel("success", "Reaction saved.");
+                        } else {
+                            response = new ResponseModel("error", "Failed to save reaction.");
+                        }
+
+                        break;
+                    }
+
+                    case "get_user_profile": {
+                        // Get the current user's UUID
+                        UUID user_UUID = this.currentUser.getInternal_uuid();
+
+                        // Get the profile JSON from SidebarService
+                        JSONObject data = SidebarService.getUserProfile(user_UUID);
+
+                        if (data == null) {
+                            response = new ResponseModel("error", "Failed to retrieve user profile.");
+                        } else {
+                            response = new ResponseModel("success", "User profile retrieved successfully.", data);
+                        }
+                        break;
+                    }
+
+                    case "edit_profile_name": {
+                        // Validate input
+                        if (!requestJson.has("new_profile_name")) {
+                            response = new ResponseModel("error", "Missing new profile name.");
+                            break;
+                        }
+
+                        UUID user_UUID = this.currentUser.getInternal_uuid();
+                        String newProfileName = requestJson.getString("new_profile_name");
+
+                        response = SidebarService.updateProfileName(user_UUID, newProfileName);
+                        break;
+                    }
+
+                    case "edit_user_id": {
+                        // Validate input
+                        if (!requestJson.has("new_user_id")) {
+                            response = new ResponseModel("error", "Missing new user ID.");
+                            break;
+                        }
+
+                        UUID user_UUID = this.currentUser.getInternal_uuid();
+                        String newUserId = requestJson.getString("new_user_id");
+
+                        response = SidebarService.updateUserId(user_UUID, newUserId);
+                        break;
+                    }
+
+                    case "edit_bio": {
+                        // Validate input
+                        if (!requestJson.has("new_bio")) {
+                            response = new ResponseModel("error", "Missing new bio.");
+                            break;
+                        }
+
+                        UUID user_UUID = this.currentUser.getInternal_uuid();
+                        String newBio = requestJson.getString("new_bio").trim();
+
+                        response = SidebarService.updateBio(user_UUID, newBio);
+                        break;
+                    }
+
+                    case "edit_profile_picture": {
+                        // Validate input
+                        if (!requestJson.has("new_image_url")) {
+                            response = new ResponseModel("error", "Missing new image url.");
+                            break;
+                        }
+
+                        UUID user_UUID = this.currentUser.getInternal_uuid();
+                        String newImageUrl = requestJson.getString("new_image_url").trim();
+
+                        response = SidebarService.updateProfilePicture(user_UUID, newImageUrl);
+                        break;
+                    }
+
+//                    case "get_saved_messages": {
+//                        UUID user_Id = UUID.fromString(requestJson.getString("user_id"));
+//                        response = SidebarService.handleGetSavedMessages(user_Id);
+//                        break;
+//                    }
+//
+//                    case "send_saved_messages": {
+//                        response = SidebarService.handleSendMessage(requestJson);
+//                        break;
+//                    }
+
+                    case "search_contacts": {
+                        String user_id = requestJson.getString("user_id");
+                        String search_term = requestJson.getString("search_term");
+
+                        response = SidebarService.handleSearchContacts(user_id, search_term);
+                        break;
+                    }
+
+                    case "remove_contact": {
+                        UUID user_id = UUID.fromString(requestJson.getString("user_id"));
+                        UUID contactId = UUID.fromString(requestJson.getString("contact_id"));
+
+                        response = SidebarService.handleRemoveContact(user_id, contactId);
+                        break;
+                    }
+
+                    case "get_or_create_saved_messages": {
+                        response = handleGetOrCreateSavedMessages(requestJson);
+                        break;
+                    }
+
+                    case "get_blocked_users": {
+                        userId = currentUser.getInternal_uuid();
+                        var list = ContactDatabase.getBlockedUsers(userId);
+                        org.json.JSONObject data = new org.json.JSONObject();
+                        data.put("blocked_users", list);
+                        response = new ResponseModel("success", "ok", data);
+                        break;
+                    }
+
+                    case "verify_password": {
+                        userId = currentUser.getInternal_uuid();
+                        String cur = requestJson.getString("current_password");
+                        User user = userDatabase.findByInternalUUID(userId);
+                        boolean ok = PasswordHashing.verify(cur, user.getPassword());
+                        response = ok
+                                ? new ResponseModel("success", "verified")
+                                : new ResponseModel("error", "Invalid password.");
+                        break;
+                    }
+
+                    case "update_username": {
+                        userId = currentUser.getInternal_uuid();
+                        String cur = requestJson.getString("current_password");
+                        String newUsername = requestJson.getString("new_username");
+                        boolean useBCrypt = true;
+
+                        try {
+                            boolean ok = userDatabase.updateUsername(userId, newUsername);
+                            if (ok) response = new ResponseModel("success", "username updated");
+                            else    response = new ResponseModel("error", "Invalid current password.");
+                        } catch (java.sql.SQLException e) {
+                            if ("23505".equals(e.getSQLState())) {
+                                response = new ResponseModel("error", "Username already taken.");
+                            } else {
+                                e.printStackTrace();
+                                response = new ResponseModel("error", "Failed to update username.");
+                            }
+                        }
+                        break;
+                    }
+
+                    case "update_password": {
+                        userId = currentUser.getInternal_uuid();
+                        String cur = requestJson.getString("current_password");
+                        String newPass = requestJson.getString("new_password");
+
+                        String newHash = PasswordHashing.hash(newPass);
+
+                        boolean ok = userDatabase.updatePasswordHash(userId, newHash);
+                        response = ok
+                                ? new ResponseModel("success", "password updated")
+                                : new ResponseModel("error", "Invalid current password.");
+                        break;
+                    }
+
+                    case "mark_as_read": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+                        try {
+                            UUID chatId = UUID.fromString(requestJson.getString("receiver_id"));
+                            String chatType = requestJson.getString("receiver_type").toLowerCase();
+                            int limit = requestJson.optInt("limit", 500);
+
+                            List<UUID> targetMessageIds = new ArrayList<>();
+                            if (requestJson.has("message_ids")) {
+                                JSONArray arr = requestJson.getJSONArray("message_ids");
+                                for (int i = 0; i < arr.length(); i++) {
+                                    targetMessageIds.add(UUID.fromString(arr.getString(i)));
+                                }
+                            } else {
+                                targetMessageIds = MessageDatabase.getUnreadMessageIds(
+                                        currentUser.getInternal_uuid(), chatId, chatType, limit
+                                );
+                            }
+
+                            int updatedStatus = 0;
+                            int insertedReceipts = 0;
+
+                            try (Connection c = ConnectionDb.connect()) {
+                                c.setAutoCommit(false);
+                                for (UUID mid : targetMessageIds) {
+                                    updatedStatus   += MessageDatabase.setMessageReadIfNeeded(mid, currentUser.getInternal_uuid());
+                                    insertedReceipts+= MessageDatabase.insertReceiptIfAbsent(mid, currentUser.getInternal_uuid());
+                                }
+                                c.commit();
+                            } catch (Exception tx) {
+                                tx.printStackTrace();
+                            }
+
+                            JSONObject data = new JSONObject();
+                            data.put("marked_count", targetMessageIds.size());
+                            data.put("status_updates", updatedStatus);
+                            data.put("receipts_inserted", insertedReceipts);
+
+                            response = new ResponseModel("success", "Marked as read.", data);
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error in mark_as_read: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+                    case "get_other_user_status": {
+                        try {
+                            String userIdStr = requestJson.getString("user_id");
+                            UUID user_id = UUID.fromString(userIdStr);
+
+                            String lastSeenStr = userDatabase.getLastSeen(user_id); // returns ISO string?
+                            JSONObject data = new JSONObject();
+
+                            if (lastSeenStr != null && !"Unknown".equals(lastSeenStr)) {
+                                // parse string to time
+                                LocalDateTime lastSeen = LocalDateTime.parse(lastSeenStr);
+                                long diffMillis = java.time.Duration.between(lastSeen, LocalDateTime.now()).toMillis();
+
+                                boolean online = diffMillis <= 120_000;
+
+                                data.put("online", online);
+                                data.put("last_seen", lastSeen.toString());
+
+                                response = new ResponseModel("success", "Status fetched.", data);
+                            } else {
+                                response = new ResponseModel("error", "User not found.");
+                            }
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            response = new ResponseModel("error", "Failed to fetch status.");
+                        }
+                        break;
+                    }
+
+
+
+                    case "get_header_info": {
+                        try {
+                            String type = requestJson.getString("receiver_type"); // "private" | "group" | "channel"
+                            UUID receiverId = UUID.fromString(requestJson.getString("receiver_id"));
+
+                            UUID viewerId = null;
+                            if ("private".equalsIgnoreCase(type)) {
+                                String v = requestJson.optString("viewer_id",
+                                        requestJson.optString("my_id", null));
+                                if (v == null) {
+                                    response = new ResponseModel("error", "viewer_id (or my_id) is required for private chats.");
+                                    break;
+                                }
+                                viewerId = UUID.fromString(v);
+                            }
+
+                            org.json.JSONObject data = org.to.telegramfinalproject.Database.ChatInfoDatabase
+                                    .getHeaderInfo(type, receiverId, viewerId);
+
+                            response = new ResponseModel("success", "Header info fetched.", data);
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            response = new ResponseModel("error", "Failed to fetch header info.");
+                        }
+                        break;
+                    }
+
+                    case "check_block_status_by_chat": {
+                        try {
+                            UUID viewerId = UUID.fromString(requestJson.getString("viewer_id"));
+                            UUID chatId   = UUID.fromString(requestJson.getString("chat_id"));
+
+                            UUID otherId = ContactDatabase.findOtherUserInPrivateChat(chatId, viewerId);
+                            if (otherId == null) {
+                                response = new ResponseModel("error", "Chat not found or not private.");
+                                break;
+                            }
+                            boolean blockedByMe = ContactDatabase.isBlocked(viewerId, otherId);
+                            boolean blockedMe   = ContactDatabase.isBlocked(otherId, viewerId);
+
+                            org.json.JSONObject data = new org.json.JSONObject()
+                                    .put("other_id", otherId.toString())
+                                    .put("blocked_by_me", blockedByMe)
+                                    .put("blocked_me", blockedMe);
+
+                            response = new ResponseModel("success", "ok", data);
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Invalid parameters.");
+                        }
+                        break;
+                    }
+
+                    case "view_group": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        try {
+                            UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                            UUID viewerId = UUID.fromString(requestJson.getString("viewer_id"));
+
+                            // Query group details
+                            JSONObject groupData = GroupDatabase.getGroupInfo(groupId, viewerId);
+
+                            if (groupData == null) {
+                                response = new ResponseModel("error", "Group not found.");
+                            } else {
+                                response = new ResponseModel("success", "Group info fetched.", groupData);
+                            }
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error processing group info: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+                    case "get_group_admin_permissions": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        try {
+                            UUID groupId = UUID.fromString(requestJson.getString("group_id"));
+                            UUID adminId = UUID.fromString(requestJson.getString("admin_id"));
+
+                            // Only owner/admins can view
+                            String myRole = GroupDatabase.getGroupRole(groupId, currentUser.getInternal_uuid());
+                            if (!"owner".equalsIgnoreCase(myRole) && !"admin".equalsIgnoreCase(myRole)) {
+                                response = new ResponseModel("error", "You are not authorized to view admin permissions.");
+                                break;
+                            }
+
+                            JSONObject perms = GroupDatabase.getAdminPermissions(groupId, adminId);
+
+                            if (perms != null) {
+                                JSONObject data = new JSONObject().put("permissions", perms);
+                                response = new ResponseModel("success", "Permissions fetched successfully.", data);
+                            } else {
+                                response = new ResponseModel("error", "Admin permissions not found.");
+                            }
+
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error fetching admin permissions: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+                    case "view_channel": {
+                        if (currentUser == null) {
+                            response = new ResponseModel("error", "Unauthorized. Please login first.");
+                            break;
+                        }
+
+                        try {
+                            UUID channelId = UUID.fromString(requestJson.getString("channel_id"));
+                            UUID viewerId = currentUser.getInternal_uuid(); // logged-in user
+
+                            // Query channel details
+                            JSONObject channelData = ChannelDatabase.getChannelInfo(channelId, viewerId);
+
+                            if (channelData == null) {
+                                response = new ResponseModel("error", "Channel not found.");
+                            } else {
+                                response = new ResponseModel("success", "Channel info fetched.", channelData);
+                            }
+                        } catch (Exception e) {
+                            response = new ResponseModel("error", "Error processing channel info: " + e.getMessage());
+                        }
+                        break;
+                    }
+
+
+                    default:
+                        response = new ResponseModel("error", "Unknown action: " + action);
+                }
+
+                if (response == null) {
+                    response = new ResponseModel("error", "No response generated for action: " + action);
+                }
+
+                JSONObject responseJson = new JSONObject();
+                responseJson.put("status", response.getStatus());
+                responseJson.put("message", response.getMessage());
+                responseJson.put("data", response.getData() != null ? response.getData() : JSONObject.NULL);
+
+                if (requestJson.has("request_id")) {
+                    String requestId = requestJson.getString("request_id");
+                    response.setRequestId(requestId);
+                    responseJson.put("request_id", requestId);
+                }
+
+                out.println(responseJson.toString());
+                System.out.println("📤 Sent response: " + responseJson.toString(2));
+
+            }
+        } catch (IOException e) {
+            System.out.println("Connection with client lost.");
+            userId = (currentUser != null) ? currentUser.getInternal_uuid() : SessionManager.getUserIdBySocket(this.socket);
+            if (userId != null) {
+                userDatabase.updateUserStatus(userId, "offline");
+                userDatabase.updateLastSeen(userId);
+                SessionManager.removeUser(userId);
+            }
+        }   finally {
+            try {
+                if (currentUser != null) {
+                    //RealTime
+                    userId = currentUser.getInternal_uuid();
+                    List<UUID> contacts = ContactDatabase.getContactUUIDs(userId);
+                    RealTimeEventDispatcher.notifyUserStatusChanged(userId, "offline", contacts);
+
+                    System.out.println("🔚 Client disconnected. Cleaning up user " + userId);
+                    userDatabase.updateUserStatus(userId, "offline");
+                    userDatabase.updateLastSeen(userId);
+                    SessionManager.removeUser(userId);
+                }
+                else {
+                    System.out.println("❗ currentUser is null, couldn't set offline.");
+                }
+                socket.close();
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+
+
+    }
+
+
+    private ResponseModel handleSendMessage(JSONObject json) {
+
+        try {
+            if (currentUser == null)
+                return new ResponseModel("error", "Unauthorized. Please login first.");
+
+            UUID messageId = UUID.randomUUID();
+            UUID senderId = currentUser.getInternal_uuid();
+            String receiverType = json.getString("receiver_type");
+            UUID receiverId;
+            receiverId = UUID.fromString(json.getString("receiver_id"));
+
+            if(Objects.equals(receiverType, "private")){
+                PrivateChatDatabase.clearDeletedFlag(senderId, receiverId);
+                UUID other = PrivateChatDatabase.getOtherParticipant(receiverId, senderId);
+                if (other == null) {
+                    return new ResponseModel("error", "Invalid private chat.");
+                }
+                if (ContactDatabase.isBlocked(senderId, other) || ContactDatabase.isBlocked(other, senderId)) {
+                    return new ResponseModel("error", "You can't message this user (blocked).");
+                }
+            }
+
+
+
+            String content = json.optString("content", "");
+            String messageType = json.optString("message_type", "TEXT");
+
+            boolean inserted = MessageDatabase.insertMessage(messageId, senderId, receiverId, receiverType, content, messageType);
+            if (!inserted)
+                return new ResponseModel("error", "Failed to insert message.");
+
+            if (json.has("attachments")) {
+                JSONArray attachmentsArray = json.getJSONArray("attachments");
+                List<FileAttachment> attachments = new ArrayList<>();
+
+                for (int i = 0; i < attachmentsArray.length(); i++) {
+                    JSONObject attJson = attachmentsArray.getJSONObject(i);
+                    attachments.add(new FileAttachment(
+                            attJson.getString("file_url"),
+                            attJson.getString("file_type")
+                    ));
+                }
+
+                boolean attInserted = MessageDatabase.insertAttachments(messageId, attachments);
+                if (!attInserted)
+                    return new ResponseModel("error", "Message inserted but failed to attach files.");
+            }
+
+            // Send real-time message
+            Message msg = new Message(messageId, senderId, receiverId, receiverType, content, messageType, LocalDateTime.now());
+            List<UUID> receivers = getReceiversForChat(receiverId, receiverType);
+            receivers.remove(senderId);
+            RealTimeEventDispatcher.sendNewMessage(msg, receivers);
+
+            // Update chat list (last_message_time)
+            JSONObject chatUpdate = new JSONObject();
+            chatUpdate.put("chat_id", receiverId.toString());
+            chatUpdate.put("chat_type", receiverType);
+            chatUpdate.put("last_message_time", LocalDateTime.now().toString());
+
+            JSONObject chatPayload = new JSONObject();
+            chatPayload.put("action", "chat_updated");
+            chatPayload.put("data", chatUpdate);
+
+            for (UUID receiver : receivers) {
+                RealTimeEventDispatcher.sendToUser(receiver, chatPayload);
+            }
+
+            RealTimeEventDispatcher.sendToUser(senderId, chatPayload);
+
+            JSONObject data = new JSONObject();
+            data.put("message_id", messageId.toString());
+            return new ResponseModel("success", "Message sent successfully.", data);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResponseModel("error", "Exception occurred while sending message.");
+        }
+    }
+
+
+    private List<UUID> getReceiversForChat(UUID receiverId, String receiverType) {
+        switch (receiverType) {
+            case "private":
+                return PrivateChatDatabase.getMembers(receiverId);
+            case "group":
+                return GroupDatabase.getMemberUUIDs(receiverId);
+            case "channel":
+                return ChannelDatabase.getSubscriberUUIDs(receiverId);
+            default:
+                return new ArrayList<>();
+        }
+    }
+
+
+    private ResponseModel handleDeleteChat(JSONObject json) {
+        try {
+            if (currentUser == null)
+                return new ResponseModel("error", "Unauthorized");
+
+            UUID chatId = UUID.fromString(json.getString("chat_id"));
+            boolean bothSides = json.optBoolean("both_sides", json.optBoolean("both", false));
+            PrivateChat chat = PrivateChatDatabase.findById(chatId);
+            if (chat == null) return new ResponseModel("error", "Chat not found.");
+
+            UUID self = currentUser.getInternal_uuid();
+            UUID other = chat.getUser1_id().equals(self) ? chat.getUser2_id() : chat.getUser1_id();
+
+            if (bothSides) {
+                PrivateChatDatabase.markBothDeleted(chatId);
+                MessageDatabase.markGloballyDeleted(chatId);
+                MessageDatabase.logDeletedMessagesFor(chatId, self);
+                MessageDatabase.logDeletedMessagesFor(chatId, other);
+                return new ResponseModel("success", "Chat deleted for both sides.");
+            } else {
+                if (chat.getUser1_id().equals(self))
+                    PrivateChatDatabase.markUser1Deleted(chatId);
+                else
+                    PrivateChatDatabase.markUser2Deleted(chatId);
+
+                MessageDatabase.logDeletedMessagesFor(chatId, self);
+                return new ResponseModel("success", "Chat deleted (one-sided).");
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResponseModel("error", "Exception while deleting chat.");
+        }
+    }
+
+    // helper
+    private boolean canSendToPrivate(UUID chatId, UUID senderId) {
+        UUID other = PrivateChatDatabase.getOtherParticipant(chatId, senderId);
+        if (other == null) return false;
+        return !(ContactDatabase.isBlocked(senderId, other) || ContactDatabase.isBlocked(other, senderId));
+    }
+
+
+
+    private ResponseModel handleGetOrCreateSavedMessages(JSONObject req) {
+        if (currentUser == null) return new ResponseModel("error", "Unauthorized.");
+
+        UUID uid = currentUser.getInternal_uuid();
+        PrivateChat chat = PrivateChatDatabase.findSelfChat(uid);
+        UUID chatId = (chat != null) ? chat.getChat_id() : PrivateChatDatabase.createSelfChat(uid);
+        if (chatId == null) return new ResponseModel("error", "Failed to create Saved Messages.");
+
+        JSONObject data = new JSONObject();
+        data.put("chat_id", chatId.toString());
+        data.put("name", "Saved Messages");
+        data.put("is_saved_messages", true);
+        data.put("chat_type", "private");
+        return new ResponseModel("success", "Saved Messages ready.", data);
+    }
+
+
+
+
+    private void enrichChatEntry(ChatEntry e, UUID me) {
+        Message last = MessageDatabase.getLastMessage(e.getId(), e.getType());
+        if (last != null) {
+            e.setLastMessageTime(String.valueOf(last.getSend_at()));
+            e.setLastMessagePreview(buildPreview(last));
+            e.setLastMessageType(last.getMessage_type());
+            e.setLastMessageSenderId(last.getSender_id());
+        }
+
+        int unread = MessageDatabase.getUnreadCount(me, e.getId(), e.getType());
+        e.setUnreadCount(unread);
+    }
+
+    private String buildPreview(Message m) {
+        String t = m.getMessage_type();
+        if ("TEXT".equalsIgnoreCase(t)) {
+            String c = m.getContent();
+            if (c == null) return "";
+            return c.length() > 120 ? c.substring(0, 120) + "…" : c;
+        }
+        switch (t) {
+            case "IMAGE": return "[Image]";
+            case "AUDIO": return "[Audio]";
+            case "VIDEO": return "[Video]";
+            case "FILE":  return "[File]";
+            default:      return "[Message]";
+        }
+    }
+
+
+
+    private static final int MAGIC_AVATAR = 0x41565431; // "AVT1"
+    private static final long MAX_AVATAR = 3L * 1024 * 1024;
+
+    private void handleAvatarFrame(DataInputStream dis, PrintWriter out, UUID currentUserId) {
+        try {
+            int magic = dis.readInt();
+            if (magic != MAGIC_AVATAR) { out.println(err("bad magic")); out.flush(); return; }
+
+            int headerLen = dis.readInt();
+            if (headerLen <= 0 || headerLen > 64*1024) { out.println(err("bad header length")); out.flush(); return; }
+
+            byte[] headerBytes = dis.readNBytes(headerLen);
+            if (headerBytes.length != headerLen) { out.println(err("header truncated")); out.flush(); return; }
+
+            JSONObject h = new JSONObject(new String(headerBytes, java.nio.charset.StandardCharsets.UTF_8));
+
+            long contentLen = dis.readLong();
+            if (contentLen <= 0 || contentLen > MAX_AVATAR) {
+                skip(dis, contentLen);
+                out.println(err("file too large/invalid")); out.flush(); return;
+            }
+
+            String targetType = h.optString("target_type", "user").toLowerCase();
+            UUID targetId;
+            if ("user".equals(targetType)) {
+                String s = h.optString("target_id", "");
+                targetId = s.isEmpty() ? currentUserId : UUID.fromString(s);
+                if (!targetId.equals(currentUserId)) {
+                    skip(dis, contentLen);
+                    out.println(err("forbidden")); out.flush(); return;
+                }
+            } else {
+                String s = h.optString("target_id", "");
+                if (s.isEmpty()) { skip(dis, contentLen); out.println(err("missing target_id")); out.flush(); return; }
+                targetId = UUID.fromString(s);
+                if (!hasManagePermission(currentUserId, targetType, targetId)) {
+                    skip(dis, contentLen);
+                    out.println(err("forbidden")); out.flush(); return;
+                }
+            }
+
+            String fileName = h.optString("file_name", "avatar.bin");
+            String mimeType = h.optString("mime_type", "application/octet-stream");
+            if (!isAllowedImageMime(mimeType)) { skip(dis, contentLen); out.println(err("unsupported mime")); out.flush(); return; }
+            if (fileName.length() > 200) fileName = fileName.substring(0,200);
+
+            java.nio.file.Path baseDir = java.nio.file.Paths.get("uploads").toAbsolutePath().normalize();
+            String subdir = "avatars/" + java.time.LocalDate.now();
+            java.nio.file.Path dir = baseDir.resolve(subdir).normalize();
+            java.nio.file.Files.createDirectories(dir);
+
+            String ext = guessExt_Profile(fileName, mimeType); // ⬅️ این یکی را صدا بزن
+            String storedName = java.util.UUID.randomUUID() + ext;
+            java.nio.file.Path targetPath = dir.resolve(storedName).normalize();
+
+            try (OutputStream fos = new BufferedOutputStream(java.nio.file.Files.newOutputStream(
+                    targetPath, java.nio.file.StandardOpenOption.CREATE, java.nio.file.StandardOpenOption.TRUNCATE_EXISTING))) {
+                long remaining = contentLen;
+                byte[] buf = new byte[8192];
+                while (remaining > 0) {
+                    int toRead = (int)Math.min(buf.length, remaining);
+                    int n = dis.read(buf, 0, toRead);
+                    if (n == -1) throw new EOFException("stream ended early");
+                    fos.write(buf, 0, n);
+                    remaining -= n;
+                }
+            }
+            String requestId = h.optString("message_id", null); // ⬅️ اضافه
+
+            long fileSize = java.nio.file.Files.size(targetPath);
+            String fileUrl = "/" + subdir.replace('\\','/') + "/" + storedName;  // /avatars/YYYY-MM-DD/uuid.jpg
+
+            boolean ok = updateProfileImageUrl(targetType, targetId, fileUrl);
+
+            JSONObject ack = new JSONObject()
+                    .put("status", ok ? "success" : "error")
+                    .put("message_id", requestId == null ? JSONObject.NULL : requestId) // ⬅️ اضافه
+                    .put("target_type", targetType)
+                    .put("target_id", targetId.toString())
+                    .put("file_name", fileName)
+                    .put("mime_type", mimeType)
+                    .put("file_size", fileSize)
+                    .put("display_url", fileUrl);
+
+            out.println(ack.toString());
+            out.flush();
+
+            if (ok) {
+                // (اختیاری) Broadcast به اعضای مرتبط
+                // broadcastProfileChange(targetType, targetId, fileUrl);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            out.println(err("exception"));
+            out.flush();
+        }
+    }
+
+    private boolean hasManagePermission(UUID currentUserId, String targetType, UUID targetId) {
+        return  true;
+    }
+
+    private static String err(String m) { return new JSONObject().put("status","error").put("message",m).toString(); }
+
+    private static boolean isAllowedImageMime(String mime) {
+        if (mime == null) return false;
+        return mime.equals("image/jpeg") || mime.equals("image/png") || mime.equals("image/webp");
+    }
+
+    private static String guessExt_Profile(String fileName, String mime) {
+        String lower = fileName.toLowerCase();
+        if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return ".jpg";
+        if (lower.endsWith(".png")) return ".png";
+        if (lower.endsWith(".webp")) return ".webp";
+        return switch (mime) {
+            case "image/jpeg" -> ".jpg";
+            case "image/png"  -> ".png";
+            case "image/webp" -> ".webp";
+            default -> ".bin";
+        };
+    }
+
+
+
+    private boolean updateProfileImageUrl(String targetType, UUID targetId, String url) {
+        String sql = switch (targetType) {
+            case "user"    -> "UPDATE users SET image_url=? WHERE internal_uuid=?";
+            case "channel" -> "UPDATE channels SET image_url=? WHERE internal_uuid=?";
+            case "group"   -> "UPDATE groups SET image_url=? WHERE internal_uuid=?";
+            default        -> null;
+        };
+        if (sql == null) return false;
+        try (Connection c = ConnectionDb.connect(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, url);
+            ps.setObject(2, targetId);
+            return ps.executeUpdate() > 0;
+        } catch (SQLException e) { e.printStackTrace(); return false; }
+    }
+
+    private void handleMediaFrame(DataInputStream dis, PrintWriter out) {
+        try {
+            final int MAGIC_EXPECTED = 0x4D444D31; // "MDM1"
+            int magic = dis.readInt();
+            if (magic != MAGIC_EXPECTED) {
+                out.println(new JSONObject().put("status","error").put("message","bad magic").toString()); out.flush(); return;
+            }
+
+            int headerLen = dis.readInt();
+            if (headerLen <= 0 || headerLen > 64 * 1024) {
+                out.println(new JSONObject().put("status","error").put("message","bad header length").toString()); out.flush(); return;
+            }
+
+            byte[] headerBytes = dis.readNBytes(headerLen);
+            if (headerBytes.length != headerLen) {
+                out.println(new JSONObject().put("status","error").put("message","header truncated").toString()); out.flush(); return;
+            }
+
+            JSONObject h = new JSONObject(new String(headerBytes, java.nio.charset.StandardCharsets.UTF_8));
+
+            long contentLen = dis.readLong();
+            long MAX_MEDIA = 25L * 1024 * 1024;
+            if (contentLen <= 0 || contentLen > MAX_MEDIA) {
+                skip(dis, contentLen);
+                out.println(new JSONObject().put("status","error").put("message","file too large/invalid").toString()); out.flush(); return;
+            }
+
+            UUID messageId   = UUID.fromString(h.getString("message_id"));
+            UUID senderId    = UUID.fromString(h.getString("sender_id"));
+            String rType     = h.getString("receiver_type");      // private/group/channel
+            UUID receiverId  = UUID.fromString(h.getString("receiver_id"));
+            String messageType = h.getString("message_type").toUpperCase(); // IMAGE | AUDIO
+
+            if (!"IMAGE".equals(messageType) && !"AUDIO".equals(messageType)) {
+                skip(dis, contentLen);
+                out.println(new JSONObject().put("status","error").put("message","unsupported message_type").toString()); out.flush(); return;
+            }
+
+            String fileName = h.optString("file_name", "file.bin");
+            String mimeType = h.optString("mime_type", "application/octet-stream");
+            String text     = h.optString("text", ""); // کپشن اختیاری
+
+            Integer width  = h.has("width")  && !h.isNull("width")  ? h.getInt("width")  : null;
+            Integer height = h.has("height") && !h.isNull("height") ? h.getInt("height") : null;
+
+            if (fileName.length() > 200) fileName = fileName.substring(0, 200);
+
+            java.nio.file.Path baseDir = java.nio.file.Paths.get("uploads").toAbsolutePath().normalize();
+            java.nio.file.Files.createDirectories(baseDir);
+            String kind = "IMAGE".equals(messageType) ? "images" : "audios";
+            String subdir = kind + "/" + java.time.LocalDate.now();
+            java.nio.file.Path dir = baseDir.resolve(subdir).normalize();
+            java.nio.file.Files.createDirectories(dir);
+
+            String ext = guessExt(fileName, mimeType);
+            String storedName = java.util.UUID.randomUUID() + ext;
+            java.nio.file.Path target = dir.resolve(storedName).normalize();
+
+            try (OutputStream fos = new BufferedOutputStream(java.nio.file.Files.newOutputStream(
+                    target, java.nio.file.StandardOpenOption.CREATE, java.nio.file.StandardOpenOption.TRUNCATE_EXISTING))) {
+                long remaining = contentLen;
+                byte[] buf = new byte[8192];
+                while (remaining > 0) {
+                    int toRead = (int) Math.min(buf.length, remaining);
+                    int n = dis.read(buf, 0, toRead);
+                    if (n == -1) throw new EOFException("stream ended early");
+                    fos.write(buf, 0, n);
+                    remaining -= n;
+                }
+            }
+
+            long fileSize = java.nio.file.Files.size(target);
+
+            String storagePath = target.toString();
+            String fileUrl = "/" + subdir.replace('\\','/') + "/" + storedName;
+            String mt = messageType; // "IMAGE" یا "AUDIO"
+            int safeWidth  = ("IMAGE".equals(mt) && width  != null) ? width  : 0;
+            int safeHeight = ("IMAGE".equals(mt) && height != null) ? height : 0;
+            FileAttachment att = new FileAttachment();
+            att.setFileUrl(fileUrl);
+            att.setFileType(messageType);          // IMAGE/AUDIO
+            att.setFileName(fileName);
+            att.setFileSize(fileSize);
+            att.setMimeType(mimeType);
+            att.setWidth(safeWidth);
+            att.setHeight(safeHeight);
+            att.setDurationSeconds(0);
+            att.setThumbnailUrl(null);
+            att.setStoragePath(storagePath);
+            java.util.List<FileAttachment> atts = java.util.List.of(att);
+
+            boolean ok = MessageDatabase.saveMessageWithOptionalAttachments(
+                    messageId, senderId, receiverId, rType, text, messageType, atts
+            );
+
+            UUID mediaKey = null;
+            try (PreparedStatement q = ConnectionDb.connect().prepareStatement(
+                    "SELECT media_key FROM message_attachments WHERE message_id = ? AND storage_path = ? LIMIT 1"
+            )) {
+                q.setObject(1, messageId);
+                q.setString(2, storagePath);
+                try (ResultSet rs = q.executeQuery()) {
+                    if (rs.next()) mediaKey = (UUID) rs.getObject(1);
+                }
+            } catch (SQLException sqle) {
+                sqle.printStackTrace();
+            }
+
+            JSONObject ack = new JSONObject()
+                    .put("status", ok ? "success" : "error")
+                    .put("message_id", messageId.toString())
+                    .put("media_key", mediaKey != null ? mediaKey.toString() : JSONObject.NULL)
+                    .put("file_name", fileName)
+                    .put("file_size", fileSize)
+                    .put("mime_type", mimeType)
+                    .put("display_path", fileUrl);
+
+            out.println(ack.toString());
+            out.flush();
+
+
+            // بعد از out.flush(); و فقط اگر ok==true
+            if (ok) {
+                try {
+                    // 1) دریافت پیام از DB تا send_at و... دقیق باشد
+                    Message m = MessageDatabase.findById(messageId); // اگر چنین متدی نداری، با پارامترهای همین متد بساز/پر کن
+
+                    // 2) لیست دریافت‌کنندگان بر اساس نوع چت
+                    List<UUID> receivers = getReceiversForChat(receiverId, rType.toLowerCase());
+
+
+                    // 3) ساخت payload شامل اتچمنت (media)
+                    User sender = userDatabase.findByInternalUUID(senderId);
+                    JSONObject payload = new JSONObject()
+                            .put("action", "new_message")
+                            .put("data", new JSONObject()
+                                    .put("id", m.getMessage_id().toString())
+                                    .put("chat_id", receiverId.toString())
+                                    .put("chat_type", rType.toLowerCase())
+                                    .put("sender_id", senderId.toString())
+                                    .put("sender_name", sender != null ? sender.getProfile_name() : JSONObject.NULL)
+                                    .put("message_type", messageType.toLowerCase())
+                                    .put("text", (text == null || text.isEmpty()) ? JSONObject.NULL : text)
+                                    .put("media", new JSONObject()
+                                            .put("media_id", mediaKey != null ? mediaKey.toString() : JSONObject.NULL)
+                                            .put("file_name", fileName)
+                                            .put("mime_type", mimeType)
+                                            .put("size_bytes", fileSize)
+                                            .put("url", fileUrl)
+                                            .put("thumbnail_url", JSONObject.NULL)
+                                            .put("width", safeWidth)
+                                            .put("height", safeHeight)
+                                            .put("duration_ms", 0)
+                                    )
+                                    .put("send_at", m.getSend_at().toString())
+                                    .put("status", "SENT")
+                            );
+
+                    // 4) ارسال به همه اعضا (از جمله خودِ فرستنده اگر می‌خواهی UI آن هم یکپارچه آپدیت شود)
+                    for (UUID uid : receivers) {
+                        RealTimeEventDispatcher.sendToUser(uid, payload);
+                    }
+
+                    // (اختیاری) رویداد آپدیت چت‌لیست برای sort بر اساس آخرین پیام
+                    RealTimeEventDispatcher.notifyChatUpdated(receiverId, rType, m);
+
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                    // اگر ذخیره شد ولی Broadcast شکست خورد، می‌توانی Log کنی یا Retry سبک انجام دهی
+                }
+            }
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            out.println(new JSONObject().put("status","error").put("message","exception").toString());
+            out.flush();
+        }
+    }
+
+    private static final int MAGIC_DL = 0x4D444D32; // "MDM2"
+
+//    private void handleMediaDownload(DataInputStream inBin, DataOutputStream outBin, UUID requesterId) {
+//        try {
+//            int magic = inBin.readInt();
+//            if (magic != MAGIC_DL) { sendDlErr(outBin, "bad magic"); return; }
+//
+//            int hlen = inBin.readInt();
+//            if (hlen <= 0 || hlen > 64 * 1024) { sendDlErr(outBin, "bad header length"); return; }
+//
+//            byte[] hb = inBin.readNBytes(hlen);
+//            if (hb.length != hlen) { sendDlErr(outBin, "header truncated"); return; }
+//
+//            JSONObject hdr = new JSONObject(new String(hb, java.nio.charset.StandardCharsets.UTF_8));
+//            if (!"download".equalsIgnoreCase(hdr.optString("op"))) { sendDlErr(outBin, "bad op"); return; }
+//
+//            UUID mediaKey = UUID.fromString(hdr.getString("media_key"));
+//            long offset   = Math.max(0L, hdr.optLong("offset", 0L));
+//
+//            MediaRow mr = MessageDatabase.findMediaByKey(mediaKey);
+//            if (mr == null) { sendDlErr(outBin, "not found"); return; }
+//            if (!MessageDatabase.canAccess(requesterId, mr)) { sendDlErr(outBin, "not authorized"); return; }
+//
+//            java.nio.file.Path path = java.nio.file.Paths.get(mr.storagePath).normalize();
+//            long size = java.nio.file.Files.size(path);
+//            if (offset > size) offset = 0L;
+//
+//            JSONObject ok = new JSONObject()
+//                    .put("status","success")
+//                    .put("media_key", mediaKey.toString())
+//                    .put("file_name", mr.fileName)
+//                    .put("mime_type", mr.mimeType)
+//                    .put("file_size", size);
+//
+//            byte[] okb = ok.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+//
+//            outBin.writeInt(MAGIC_DL);
+//            outBin.writeInt(okb.length);
+//            outBin.write(okb);
+//            outBin.writeLong(size - offset);
+//
+//            try (java.io.InputStream fis = new java.io.BufferedInputStream(java.nio.file.Files.newInputStream(path))) {
+//                if (offset > 0) fis.skipNBytes(offset);
+//                byte[] buf = new byte[8192];
+//                long remain = size - offset;
+//                while (remain > 0) {
+//                    int n = fis.read(buf, 0, (int) Math.min(buf.length, remain));
+//                    if (n == -1) break;
+//                    outBin.write(buf, 0, n);
+//                    remain -= n;
+//                }
+//            }
+//            outBin.flush();
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            try { sendDlErr(outBin, "exception"); } catch (Exception ignored) {}
+//        }
+//    }
+
+    private void handleMediaDownload(DataInputStream inBin, DataOutputStream outBin, UUID requesterId) {
+        try {
+            logf("MEDIA_DL start. requester=%s", requesterId);
+
+            int magic = inBin.readInt();
+            if (magic != MAGIC_DL) { sendDlErr(outBin, "bad magic"); return; }
+
+            int hlen = inBin.readInt();
+            if (hlen <= 0 || hlen > 64 * 1024) { sendDlErr(outBin, "bad header length"); return; }
+
+            byte[] hb = inBin.readNBytes(hlen);
+            if (hb.length != hlen) { sendDlErr(outBin, "header truncated"); return; }
+
+            String hdrStr = new String(hb, java.nio.charset.StandardCharsets.UTF_8);
+            logf("MEDIA_DL header: %s", hdrStr);
+
+            JSONObject hdr = new JSONObject(hdrStr);
+            if (!"download".equalsIgnoreCase(hdr.optString("op"))) { sendDlErr(outBin, "bad op"); return; }
+
+            UUID mediaKey = UUID.fromString(hdr.getString("media_key"));
+            long offset   = Math.max(0L, hdr.optLong("offset", 0L));
+            logf("Parsed mediaKey=%s offset=%d", mediaKey, offset);
+
+            MediaRow mr = MessageDatabase.findMediaByKey(mediaKey);
+            if (mr == null) { sendDlErr(outBin, "not found"); return; }
+
+            logf("MediaRow: chatType=%s chatId=%s sender=%s receiver=%s storage=%s",
+                    mr.chatType, mr.chatId, mr.senderId, mr.receiverId, mr.storagePath);
+
+            try (java.sql.Connection c = ConnectionDb.connect();
+                 java.sql.PreparedStatement st = c.prepareStatement(
+                         "SELECT 1 FROM channel_subscribers WHERE channel_id = ? AND user_id = ? LIMIT 1")) {
+                st.setObject(1, mr.chatId, java.sql.Types.OTHER);
+                st.setObject(2, requesterId, java.sql.Types.OTHER);
+                boolean direct;
+                try (java.sql.ResultSet r = st.executeQuery()) { direct = r.next(); }
+                logf("[DL] direct channel membership ch=%s user=%s => %s", mr.chatId, requesterId, direct);
+            } catch (Exception e) {
+                logf("[DL] direct membership check ERROR: %s", e.toString());
+            }
+
+            boolean allowed = MessageDatabase.canAccess(requesterId, mr);
+            logf("canAccess(..) -> %s", allowed);
+            if (!allowed) { sendDlErr(outBin, "not authorized"); return; }
+
+            java.nio.file.Path path = java.nio.file.Paths.get(mr.storagePath).normalize();
+            long size = java.nio.file.Files.size(path);
+            if (offset > size) offset = 0L;
+
+            JSONObject ok = new JSONObject()
+                    .put("status","success")
+                    .put("media_key", mediaKey.toString())
+                    .put("file_name", mr.fileName)
+                    .put("mime_type", mr.mimeType)
+                    .put("file_size", size);
+
+            byte[] okb = ok.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+
+            outBin.writeInt(MAGIC_DL);
+            outBin.writeInt(okb.length);
+            outBin.write(okb);
+            outBin.writeLong(size - offset);
+            logf("Sending OK header. file=%s size=%d offset=%d", mr.fileName, size, offset);
+
+            try (java.io.InputStream fis = new java.io.BufferedInputStream(java.nio.file.Files.newInputStream(path))) {
+                if (offset > 0) fis.skipNBytes(offset);
+                byte[] buf = new byte[8192];
+                long remain = size - offset;
+                while (remain > 0) {
+                    int n = fis.read(buf, 0, (int) Math.min(buf.length, remain));
+                    if (n == -1) break;
+                    outBin.write(buf, 0, n);
+                    remain -= n;
+                }
+            }
+            outBin.flush();
+            log("MEDIA_DL done.");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            try { sendDlErr(outBin, "exception"); } catch (Exception ignored) {}
+        }
+    }
+
+    private void sendDlErr(DataOutputStream outBin, String msg) throws java.io.IOException {
+        JSONObject j = new JSONObject().put("status","error").put("message", msg);
+        byte[] b = j.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8);
+        outBin.writeInt(MAGIC_DL);
+        outBin.writeInt(b.length);
+        outBin.write(b);
+        outBin.writeLong(0L);
+        outBin.flush();
+    }
+
+    private static void skip(DataInputStream dis, long n) throws IOException {
+        if (n <= 0) return;
+        byte[] buf = new byte[8192];
+        long left = n;
+        while (left > 0) {
+            int toRead = (int) Math.min(buf.length, left);
+            int r = dis.read(buf, 0, toRead);
+            if (r == -1) break; // EOF
+            left -= r;
+        }
+    }
+
+    private static String guessExt(String original, String mime) {
+        if (original != null && original.contains(".")) {
+            String ext = original.substring(original.lastIndexOf('.'));
+            if (ext.length() <= 10) return ext.toLowerCase();
+        }
+        if (mime == null) return "";
+
+        String m = mime.toLowerCase();
+
+        if (m.equals("image/png"))  return ".png";
+        if (m.equals("image/jpeg") || m.equals("image/jpg")) return ".jpg";
+        if (m.equals("image/gif"))  return ".gif";
+        if (m.equals("image/webp")) return ".webp";
+
+        if (m.equals("audio/mpeg") || m.equals("audio/mp3")) return ".mp3";
+        if (m.equals("audio/ogg"))  return ".ogg";
+        if (m.equals("audio/opus")) return ".opus";
+        if (m.equals("audio/wav") || m.equals("audio/x-wav")) return ".wav";
+        if (m.equals("audio/m4a") || m.equals("audio/mp4"))  return ".m4a";
+
+//        if (m.equals("video/mp4"))  return ".mp4";
+//        if (m.equals("video/webm")) return ".webm";
+
+        // fallback
+        if (m.startsWith("image/")) return "";
+        if (m.startsWith("audio/")) return "";
+        if (m.startsWith("video/")) return "";
+
+        return "";
+    }
+
+
+    private static String readUtf8Line(BufferedInputStream bis) throws java.io.IOException {
+        StringBuilder sb = new StringBuilder();
+        while (true) {
+            int b = bis.read();
+            if (b == -1) {
+                return sb.length() == 0 ? null : sb.toString();
+            }
+            if (b == '\n') {
+                int len = sb.length();
+                if (len > 0 && sb.charAt(len - 1) == '\r') sb.setLength(len - 1);
+                return sb.toString();
+            }
+            sb.append((char) b);
+        }
+    }
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Server/ContactService.java b/src/main/java/org/to/telegramfinalproject/Server/ContactService.java
new file mode 100644
index 0000000..1c00835
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/ContactService.java
@@ -0,0 +1,15 @@
+package org.to.telegramfinalproject.Server;
+
+import java.util.UUID;
+import org.to.telegramfinalproject.Database.userDatabase;
+import org.to.telegramfinalproject.Database.ContactDatabase;
+public class ContactService {
+    public static boolean addContact(UUID userId, UUID contactId) {
+        if (userId.equals(contactId)) return false;
+        if (userDatabase.findByInternalUUID(contactId) == null) return false;
+        if (userDatabase.findByInternalUUID(userId) == null) return false;
+        if (ContactDatabase.existsContact(userId, contactId)) return false;
+
+        return ContactDatabase.addContact(userId, contactId);
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/GroupService.java b/src/main/java/org/to/telegramfinalproject/Server/GroupService.java
new file mode 100644
index 0000000..1d79728
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/GroupService.java
@@ -0,0 +1,26 @@
+package org.to.telegramfinalproject.Server;
+
+import org.to.telegramfinalproject.Models.Group;
+import org.to.telegramfinalproject.Database.GroupDatabase;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+public class GroupService {
+    public static boolean createGroup(String groupId, String groupName, UUID creatorUUID, String imageUrl) {
+        UUID internalUUID = UUID.randomUUID();
+        LocalDateTime now = LocalDateTime.now();
+
+        boolean inserted = GroupDatabase.insertGroup(internalUUID, groupId, groupName, creatorUUID, imageUrl, now);
+
+        if (inserted) {
+            GroupDatabase.addMember(internalUUID, creatorUUID, "owner");
+            return true;
+        }
+        return false;
+    }
+
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/MainServer.java b/src/main/java/org/to/telegramfinalproject/Server/MainServer.java
new file mode 100644
index 0000000..a7882a3
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/MainServer.java
@@ -0,0 +1,33 @@
+package org.to.telegramfinalproject.Server;
+
+import org.to.telegramfinalproject.Database.userDatabase;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+public class MainServer {
+    private static final int PORT = 8080;
+
+
+    public static void main(String[] args) {
+        try (ServerSocket serverSocket = new ServerSocket(PORT)) {
+            System.out.println("Server started on port " + PORT);
+            userDatabase.setAllUsersOffline();
+
+
+            while (true) {
+                Socket clientSocket = serverSocket.accept();
+                System.out.println("New client connected: " + clientSocket.getInetAddress());
+
+                ClientHandler handler = new ClientHandler(clientSocket);
+                new Thread(handler).start();
+            }
+
+        } catch (IOException e) {
+            System.err.println("Server error: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+}
+
diff --git a/src/main/java/org/to/telegramfinalproject/Server/PrivateChatService.java b/src/main/java/org/to/telegramfinalproject/Server/PrivateChatService.java
new file mode 100644
index 0000000..190da7c
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/PrivateChatService.java
@@ -0,0 +1,22 @@
+package org.to.telegramfinalproject.Server;
+
+
+import org.to.telegramfinalproject.Database.ContactDatabase;
+import org.to.telegramfinalproject.Models.ResponseModel;
+
+import java.util.UUID;
+
+public class PrivateChatService {
+
+    public static ResponseModel deletePrivateChat(UUID currentUserId, UUID targetUserId, boolean both) {
+        boolean success = both ?
+                ContactDatabase.deleteChatBoth(currentUserId, targetUserId) :
+                ContactDatabase.deleteChatOneSide(currentUserId, targetUserId);
+
+        if (success) {
+            return new ResponseModel("success", "Chat deleted successfully");
+        } else {
+            return new ResponseModel("error", "Chat not found or failed to delete");
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/RealTimeEventDispatcher.java b/src/main/java/org/to/telegramfinalproject/Server/RealTimeEventDispatcher.java
new file mode 100644
index 0000000..6834bef
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/RealTimeEventDispatcher.java
@@ -0,0 +1,504 @@
+package org.to.telegramfinalproject.Server;
+
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Database.*;
+import org.to.telegramfinalproject.Models.Message;
+import org.to.telegramfinalproject.Models.User;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.UUID;
+
+public class RealTimeEventDispatcher {
+
+    public static void sendToUser(UUID userId, JSONObject data) {
+        Socket socket = SessionManager.getUserSocket(userId);
+
+       
+        if (socket != null && !socket.isClosed()) {
+            try {
+
+
+                PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
+                System.out.println("🚀 Sending to user: " + userId + " → " + data);
+
+                out.println(data.toString());
+            } catch (IOException e) {
+                System.err.println("❌ Error sending to user: " + e.getMessage());
+            }
+
+        }
+        else {
+            System.out.println("⚠️ User " + userId + " is offline. Skipping real-time send.");
+
+        }
+    }
+
+    public static void broadcastToUsers(List<UUID> userIds, JSONObject data) {
+        for (UUID userId : userIds) {
+            sendToUser(userId, data);
+        }
+    }
+
+    public static JSONObject buildEvent(String action, JSONObject payload) {
+        JSONObject json = new JSONObject();
+        json.put("action", action);
+        json.put("data", payload);
+        return json;
+    }
+
+
+    public static void notifyNewMessage(Message msg, User sender) {
+        JSONObject data = new JSONObject();
+        data.put("sender", sender.getUser_id());
+        data.put("receiver_type", msg.getReceiver_type());
+        data.put("receiver_id", msg.getReceiver_id());
+        data.put("content", msg.getContent());
+        data.put("time", msg.getSend_at().toString());
+
+        JSONObject event = buildEvent("new_message", data);
+
+        switch (msg.getReceiver_type()) {
+            case "private" -> RealTimeEventDispatcher.sendToUser(msg.getReceiver_id(), event);
+            case "group" -> {
+                List<UUID> memberIds = GroupDatabase.getMemberUUIDs(msg.getReceiver_id());
+                memberIds.remove(sender.getInternal_uuid());
+                RealTimeEventDispatcher.broadcastToUsers(memberIds, event);
+            }
+            case "channel" -> {
+                List<UUID> subscriberIds = ChannelDatabase.getSubscriberUUIDs(msg.getReceiver_id());
+                subscriberIds.remove(sender.getInternal_uuid());
+                subscriberIds.remove(sender.getInternal_uuid());
+                RealTimeEventDispatcher.broadcastToUsers(subscriberIds, event);
+            }
+        }
+    }
+
+
+
+    public static void notifyMessageEdited(UUID chatId, UUID messageId, String newContent, LocalDateTime editedAt, List<UUID> receivers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_id", chatId.toString());
+        data.put("message_id", messageId.toString());
+        data.put("new_content", newContent);
+        data.put("edited_at", editedAt.toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", "message_edited");
+        event.put("data", data);
+
+        broadcastToUsers(receivers, event);
+    }
+
+
+
+    public static void sendNewMessage(Message message, List<UUID> receivers, String kind, JSONObject meta) {
+        JSONObject payload = new JSONObject();
+        payload.put("action", "new_message");
+
+        JSONObject data = new JSONObject();
+        data.put("id", message.getMessage_id().toString());
+        data.put("chat_id", message.getReceiver_id().toString());
+        data.put("sender_id", message.getSender_id().toString());
+        data.put("receiver_id", message.getReceiver_id().toString());
+        data.put("receiver_type", message.getReceiver_type());
+        data.put("content", message.getContent());
+        data.put("message_type", message.getMessage_type());
+        data.put("send_at", message.getSend_at().toString());
+
+        User sender = userDatabase.findByInternalUUID(message.getSender_id());
+        if (sender != null) data.put("sender_name", sender.getProfile_name());
+
+        data.put("kind", kind == null ? "plain" : kind); // plain|reply|forward
+        if (meta != null) data.put("meta", meta); // reply_to {...} | forwarded_from {...}
+
+        payload.put("data", data);
+        for (UUID userId : receivers) sendToUser(userId, payload);
+    }
+
+    public static void sendNewMessageFiltered(Message m, List<UUID> receivers, UUID senderId, String kind, JSONObject meta) {
+        JSONObject payload = new JSONObject()
+                .put("action", "new_message")
+                .put("data", new JSONObject()
+                        .put("id", m.getMessage_id().toString())
+                        .put("message_id", m.getMessage_id().toString())
+                        .put("sender_id", m.getSender_id().toString())
+                        .put("sender_name", userDatabase.findByInternalUUID(m.getSender_id()).getProfile_name())
+                        .put("receiver_id", m.getReceiver_id().toString())
+                        .put("receiver_type", m.getReceiver_type())
+                        .put("content", m.getContent())
+                        .put("message_type", m.getMessage_type())
+                        .put("send_at", m.getSend_at().toString())
+                        .put("kind", kind)
+                        .put("meta", meta != null ? meta : JSONObject.NULL)
+                );
+
+        for (UUID uid : receivers) {
+            //If receiver blocked
+            if ("private".equalsIgnoreCase(m.getReceiver_type()) && ContactDatabase.isBlocked(uid, senderId)) continue;
+            sendToUser(uid, payload);
+        }
+    }
+
+
+    public static void notifyMessageDeletedGlobal(UUID chatId, UUID messageId, List<UUID> receivers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_id", chatId.toString());
+        data.put("message_id", messageId.toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", "message_deleted_global");
+        event.put("data", data);
+
+        broadcastToUsers(receivers, event);
+    }
+
+
+    public static void notifyReactionAdded(UUID chatId, UUID messageId, String emoji,
+                                           int totalForEmoji, JSONObject countsAll, List<UUID> receivers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_id", chatId.toString());
+        data.put("message_id", messageId.toString());
+        data.put("emoji", emoji);
+        data.put("counts", countsAll); // {"❤️":3,"👍":1,...}
+        data.put("count_for_emoji", totalForEmoji);
+
+        JSONObject event = new JSONObject();
+        event.put("action", "message_reacted");
+        event.put("data", data);
+
+        broadcastToUsers(receivers, event);
+    }
+
+    public static void notifyReactionRemoved(UUID chatId, UUID messageId, String emoji,
+                                             int totalForEmoji, JSONObject countsAll, List<UUID> receivers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_id", chatId.toString());
+        data.put("message_id", messageId.toString());
+        data.put("emoji", emoji);
+        data.put("counts", countsAll);
+        data.put("count_for_emoji", totalForEmoji);
+
+        JSONObject event = new JSONObject();
+        event.put("action", "message_unreacted");
+        event.put("data", data);
+
+        broadcastToUsers(receivers, event);
+    }
+
+
+
+
+    public static void notifyUserUpdated(UUID userId, String newProfileName, String newImageUrl, List<UUID> contactIds) {
+        JSONObject data = new JSONObject();
+        data.put("user_id", userId.toString());
+        data.put("new_name", newProfileName);
+        data.put("new_image_url", newImageUrl);
+
+        JSONObject event = new JSONObject();
+        event.put("action", "update_user");
+        event.put("data", data);
+
+        broadcastToUsers(contactIds, event);
+    }
+
+    public static void notifyChatDeleted(String type, UUID id, List<UUID> affectedUsers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type); // private, group, channel
+        data.put("chat_id", id.toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", "chat_deleted");
+        event.put("data", data);
+
+        broadcastToUsers(affectedUsers, event);
+    }
+
+    public static void notifyGroupOrChannelUpdated(String type, UUID id, String newName, String newImageUrl, List<UUID> affectedUsers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type); // "group" or "channel"
+        data.put("chat_id", id.toString());
+        data.put("new_name", newName);
+        data.put("new_image_url", newImageUrl);
+
+        JSONObject event = new JSONObject();
+        event.put("action", "update_group_or_channel");
+        event.put("data", data);
+
+        broadcastToUsers(affectedUsers, event);
+    }
+
+    public static void notifyMediaMessage(Message msg, User sender) {
+        JSONObject data = new JSONObject();
+        data.put("sender", sender.getUser_id());
+        data.put("receiver_type", msg.getReceiver_type());
+        data.put("receiver_id", msg.getReceiver_id());
+        data.put("file_type", msg.getMessage_type()); // IMAGE, FILE, VIDEO...
+        data.put("time", msg.getSend_at().toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", "new_media");
+        event.put("data", data);
+
+        switch (msg.getReceiver_type()) {
+            case "private" -> sendToUser(msg.getReceiver_id(), event);
+            case "group" -> {
+                List<UUID> members = GroupDatabase.getMemberUUIDs(msg.getReceiver_id());
+                members.remove(sender.getInternal_uuid());
+                broadcastToUsers(members, event);
+            }
+            case "channel" -> {
+                List<UUID> subs = ChannelDatabase.getSubscriberUUIDs(msg.getReceiver_id());
+                subs.remove(sender.getInternal_uuid());
+                broadcastToUsers(subs, event);
+            }
+        }
+    }
+
+    public static void notifyAddedToChat(String type, UUID chatId, String chatName, String imageUrl, UUID userId) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type);
+        data.put("chat_id", chatId.toString());
+        data.put("chat_name", chatName);
+        data.put("image_url", imageUrl);
+
+        JSONObject event = new JSONObject();
+        event.put("action", type.equals("group") ? "added_to_group" : "added_to_channel");
+        event.put("data", data);
+
+        sendToUser(userId, event);
+    }
+
+    public static void notifyRemovedFromChat(String type, UUID chatId, UUID userId) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type);
+        data.put("chat_id", chatId.toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", type.equals("group") ? "removed_from_group" : "removed_from_channel");
+        event.put("data", data);
+
+        sendToUser(userId, event);
+    }
+    public static void notifyMessageSeen(UUID messageId, UUID senderId) {
+        JSONObject data = new JSONObject();
+        data.put("message_id", messageId.toString());
+        data.put("seen_at", LocalDateTime.now().toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", "message_seen");
+        event.put("data", data);
+
+        sendToUser(senderId, event);
+    }
+
+
+    public static void notifyBlocked(UUID blockerId, UUID blockedUserId) {
+        JSONObject data = new JSONObject();
+        data.put("blocker_id", blockerId.toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", "blocked_by_user");
+        event.put("data", data);
+
+        sendToUser(blockedUserId, event);
+    }
+
+
+    public static void notifyUnblocked(UUID unblockerId, UUID unblockedUserId) {
+        JSONObject data = new JSONObject();
+        data.put("unblocker_id", unblockerId.toString());
+
+        JSONObject event = new JSONObject();
+        event.put("action", "unblocked_by_user");
+        event.put("data", data);
+
+        sendToUser(unblockedUserId, event);
+    }
+
+    public static void notifyUserStatusChanged(UUID userId, String status, List<UUID> contacts) {
+        JSONObject data = new JSONObject();
+        data.put("user_id", userId.toString());
+        data.put("status", status); // online | offline
+        data.put("time", LocalDateTime.now().toString());
+
+        JSONObject event = buildEvent("user_status_changed", data);
+
+        broadcastToUsers(contacts, event);
+    }
+
+    public static void sendGroupOrChannelUpdate(String type, UUID chatId, String name, String imageUrl, String description, List<UUID> affectedUsers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type);
+        data.put("chat_id", chatId.toString());
+        data.put("name", name);
+        data.put("image_url", imageUrl);
+        data.put("description", description != null ? description : "");
+
+        JSONObject event = new JSONObject();
+        event.put("action", "chat_updated");
+        event.put("data", data);
+
+        broadcastToUsers(affectedUsers, event);
+    }
+
+
+    public static void notifyBecameAdmin(String type, UUID chatId, String chatName, String imageUrl, UUID userId) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type); // group or channel
+        data.put("chat_id", chatId.toString());
+        data.put("chat_name", chatName);
+        data.put("image_url", imageUrl);
+
+        JSONObject event = new JSONObject();
+        event.put("action", "became_admin");
+        event.put("data", data);
+
+        sendToUser(userId, event);
+    }
+
+
+    public static void notifyRemovedAdminFromChat(String type, UUID chatId, String chatName, String imageUrl, UUID userId) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type);
+        data.put("chat_id", chatId.toString());
+        data.put("chat_name", chatName);
+        data.put("image_url", imageUrl);
+
+        JSONObject event = new JSONObject();
+        event.put("action", "removed_admin");
+        event.put("data", data);
+
+        sendToUser(userId, event);
+    }
+
+
+    public static void sendOwnershipTransferred(String type, UUID chatId, String chatName, List<UUID> affectedUsers) {
+        JSONObject data = new JSONObject();
+        data.put("chat_type", type);         // "group" or "channel"
+        data.put("chat_id", chatId.toString());
+        data.put("chat_name", chatName);
+
+        JSONObject event = new JSONObject();
+        event.put("action", "ownership_transferred");
+        event.put("data", data);
+
+        broadcastToUsers(affectedUsers, event);
+    }
+
+
+    public static void sendNewMessage(Message message, List<UUID> receivers) {
+        JSONObject payload = new JSONObject();
+        payload.put("action", "new_message");
+
+        JSONObject data = new JSONObject();
+        data.put("id", message.getMessage_id().toString());
+        data.put("sender_id", message.getSender_id().toString());
+        data.put("receiver_id", message.getReceiver_id().toString());
+        data.put("receiver_type", message.getReceiver_type());
+        data.put("content", message.getContent());
+        data.put("send_at", message.getSend_at().toString());
+
+        User sender = userDatabase.findByInternalUUID(message.getSender_id());
+        if (sender != null) {
+            data.put("sender_name", sender.getProfile_name());
+        }
+
+        payload.put("data", data);
+
+        for (UUID userId : receivers) {
+            sendToUser(userId, payload);
+        }
+
+
+        for (UUID uid : receivers) {
+            //If receiver blocked
+            if ("private".equalsIgnoreCase(message.getReceiver_type()) && ContactDatabase.isBlocked(uid, message.getSender_id())) continue;
+            sendToUser(uid, payload);
+        }
+    }
+
+
+    public static void notifyChatUpdated(UUID chatId, String chatType, Message lastMsg) {
+        if (chatId == null || chatType == null) return;
+
+        final String type = chatType.toLowerCase(Locale.ROOT);
+
+        List<UUID> receivers;
+        switch (type) {
+            case "private":
+                receivers = PrivateChatDatabase.getMembers(chatId);
+                break;
+
+            case "group":
+                receivers = GroupDatabase.getMemberUUIDs(chatId);
+                break;
+            case "channel":
+                receivers = ChannelDatabase.getSubscriberUUIDs(chatId);
+                break;
+            default:
+                receivers = Collections.emptyList();
+        }
+        if (receivers == null || receivers.isEmpty()) return;
+
+        // 2) ساخت خلاصه آخرین پیام برای نمایش در لیست چت
+        String senderName = null;
+        if (lastMsg != null && lastMsg.getSender_id() != null) {
+            User u = userDatabase.findByInternalUUID(lastMsg.getSender_id());
+            if (u != null) senderName = u.getProfile_name();
+        }
+
+        String messageType = lastMsg != null && lastMsg.getMessage_type() != null
+                ? lastMsg.getMessage_type().toLowerCase(Locale.ROOT) : "text";
+
+        // preview ساده: برای مدیا، برچسب کوتاه؛ برای متن، کوتاه‌سازی
+        String preview;
+        if (!"text".equals(messageType)) {
+            switch (messageType) {
+                case "image":  preview = "[Photo]"; break;
+                case "video":  preview = "[Video]"; break;
+                case "audio":  preview = "[Audio]"; break;
+                case "file":   preview = "[File]";  break;
+                default:       preview = "[Media]";
+            }
+        } else {
+            String t = lastMsg != null ? nullToEmpty(lastMsg.getContent()) : "";
+            preview = t.length() > 80 ? t.substring(0, 80) + "…" : t;
+        }
+
+        String sendAt = (lastMsg != null && lastMsg.getSend_at() != null)
+                ? lastMsg.getSend_at().toString()
+                : java.time.OffsetDateTime.now().toString();
+
+        // 3) payload رویداد chat_updated
+        JSONObject payload = new JSONObject()
+                .put("action", "chat_updated")
+                .put("data", new JSONObject()
+                        .put("chat_id", chatId.toString())
+                        .put("chat_type", type)
+                        .put("last_message", new JSONObject()
+                                .put("id", lastMsg != null ? lastMsg.getMessage_id().toString() : JSONObject.NULL)
+                                .put("sender_id", lastMsg != null ? lastMsg.getSender_id().toString() : JSONObject.NULL)
+                                .put("sender_name", senderName != null ? senderName : JSONObject.NULL)
+                                .put("message_type", messageType)
+                                .put("preview", preview)
+                                .put("send_at", sendAt)
+                        )
+                        .put("last_message_time", sendAt)
+                        .put("update_reason", "new_message") // برای کلاینت مفید است
+                );
+
+        // 4) ارسال به همه اعضای چت
+        for (UUID uid : receivers) {
+            sendToUser(uid, payload);
+        }
+    }
+
+    private static String nullToEmpty(String s) { return s == null ? "" : s; }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/Receivers.java b/src/main/java/org/to/telegramfinalproject/Server/Receivers.java
new file mode 100644
index 0000000..578cde0
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/Receivers.java
@@ -0,0 +1,21 @@
+package org.to.telegramfinalproject.Server;
+
+import org.to.telegramfinalproject.Database.ChannelDatabase;
+import org.to.telegramfinalproject.Database.GroupDatabase;
+import org.to.telegramfinalproject.Database.PrivateChatDatabase;
+
+import java.util.List;
+import java.util.UUID;
+
+public class Receivers {
+    public static List<UUID> resolveFor(String type, UUID chatId, UUID exclude) {
+        List<UUID> ids = switch (type) {
+            case "private" -> PrivateChatDatabase.getMembers(chatId);
+            case "group" -> GroupDatabase.getMemberUUIDs(chatId);
+            case "channel" -> ChannelDatabase.getSubscriberUUIDs(chatId);
+            default -> List.of();
+        };
+        if (exclude != null) ids.remove(exclude);
+        return ids;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/SessionManager.java b/src/main/java/org/to/telegramfinalproject/Server/SessionManager.java
new file mode 100644
index 0000000..66fe669
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/SessionManager.java
@@ -0,0 +1,43 @@
+package org.to.telegramfinalproject.Server;
+
+import java.net.Socket;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class SessionManager {
+    private static final Map<UUID, Socket> onlineUsers = new ConcurrentHashMap<>(); //catch UUID for find the user socket
+
+    public static void addUser(UUID userId, Socket socket) {
+        onlineUsers.put(userId, socket);
+    }
+
+    public static void removeUser(UUID userId) {
+        onlineUsers.remove(userId);
+    }
+
+    public static boolean isOnline(UUID userId) {
+        return onlineUsers.containsKey(userId);
+    }
+
+    public static Socket getUserSocket(UUID userId) {
+        return onlineUsers.get(userId);
+    }
+
+    public static UUID getUserIdBySocket(Socket socket) {
+        for (Map.Entry<UUID, Socket> entry : onlineUsers.entrySet()) {
+            if (entry.getValue().equals(socket)) {
+                return entry.getKey();
+            }
+        }
+        return null;
+    }
+
+    public static boolean contains(UUID userId) {
+        return onlineUsers.containsKey(userId);
+    }
+
+
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/SidebarService.java b/src/main/java/org/to/telegramfinalproject/Server/SidebarService.java
new file mode 100644
index 0000000..7bfb8e6
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/SidebarService.java
@@ -0,0 +1,291 @@
+package org.to.telegramfinalproject.Server;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Database.ContactDatabase;
+import org.to.telegramfinalproject.Database.MessageDatabase;
+import org.to.telegramfinalproject.Database.PrivateChatDatabase;
+import org.to.telegramfinalproject.Database.userDatabase;
+import org.to.telegramfinalproject.Models.ContactEntry;
+import org.to.telegramfinalproject.Models.Message;
+import org.to.telegramfinalproject.Models.ResponseModel;
+import org.to.telegramfinalproject.Models.User;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+
+public class SidebarService {
+    private static userDatabase userDB = new userDatabase();
+
+    // Returns current user's profile data (name, bio, status, etc.)
+    public static JSONObject getUserProfile(UUID userUUID) {
+        User user = userDB.findByInternalUUID(userUUID);
+
+        if (user == null) {
+            return null;
+        }
+
+        JSONObject profile = new JSONObject();
+        profile.put("user_id", user.getUser_id());
+        profile.put("profile_name", user.getProfile_name());
+        profile.put("bio", user.getBio() != null ? user.getBio() : "");
+        profile.put("status", "ONLINE");
+        profile.put("profile_picture_url", user.getImage_url());
+
+        return profile;
+    }
+
+    // Changes the user's profile picture
+    public static ResponseModel updateProfilePicture(UUID userUUID, String newImageUrl) {
+        User user = userDB.findByInternalUUID(userUUID);
+        if (user == null) {
+            return new ResponseModel("error", "User not found.");
+        }
+
+        String currentUrl = user.getImage_url();
+        if (Objects.equals(currentUrl, newImageUrl)) {
+            return new ResponseModel("error", "No changes made. Profile picture is the same.");
+        }
+
+        user.setImage_url(newImageUrl); // Can be null
+        boolean success = userDB.updateByUUID(userUUID, user);
+
+        if (success) {
+            return new ResponseModel("success", "Profile picture updated successfully.");
+        } else {
+            user.setImage_url(currentUrl);
+            return new ResponseModel("error", "Failed to update profile picture.");
+        }
+    }
+
+    // Changes user's bio
+    public static ResponseModel updateBio(UUID userUUID, String newBio) {
+        if (newBio.length() > 70) {
+            return new ResponseModel("error", "Bio is too long.");
+        }
+
+        User user = userDB.findByInternalUUID(userUUID);
+        if (user == null) {
+            return new ResponseModel("error", "User not found.");
+        }
+
+        String currentBio = user.getBio();
+        if (Objects.equals(currentBio, newBio)) {
+            return new ResponseModel("error", "No changes made. Bio is the same.");
+        }
+
+        user.setBio(newBio);
+        boolean success = userDB.updateByUUID(userUUID, user);
+
+        if (success) {
+            return new ResponseModel("success", "Bio updated successfully.");
+        } else {
+            user.setBio(currentBio);
+            return new ResponseModel("error", "Failed to update bio.");
+        }
+    }
+
+    // Changes user-id
+    public static ResponseModel updateUserId(UUID userUUID, String newUserId) {
+        if (newUserId == null || newUserId.trim().isEmpty()) {
+            return new ResponseModel("error", "User ID cannot be empty.");
+        }
+
+        newUserId = newUserId.trim();
+
+        if (newUserId.contains(" ")) {
+            return new ResponseModel("error", "User ID cannot contain spaces.");
+        }
+
+        if (!newUserId.matches("^[a-zA-Z0-9_]+$")) {
+            return new ResponseModel("error", "User ID can only contain letters, digits, and underscores.");
+        }
+
+        if (userDB.findByUserId(newUserId) != null) {
+            return new ResponseModel("error", "This user ID is already taken.");
+        }
+
+        User user = userDB.findByInternalUUID(userUUID);
+        if (user == null) {
+            return new ResponseModel("error", "User not found.");
+        }
+
+        String currentUserId = user.getUser_id();
+        if (Objects.equals(currentUserId, newUserId)) {
+            return new ResponseModel("error", "No changes made. User ID is the same.");
+        }
+
+        user.setUser_id(newUserId);
+
+        boolean saved = userDB.updateByUUID(userUUID, user);
+        if (saved) {
+            return new ResponseModel("success", "User ID updated successfully.");
+        } else {
+            user.setUser_id(currentUserId);
+            return new ResponseModel("error", "Failed to update user ID due to server error.");
+        }
+    }
+
+    // Changes user's profile name
+    public static ResponseModel updateProfileName(UUID userUUID, String newProfileName) {
+        if (newProfileName == null || newProfileName.trim().isEmpty()) {
+            return new ResponseModel("error", "Invalid input."); // Invalid input (empty or just spaces)
+        }
+
+        // Fetch the user from database
+        User user = userDB.findByInternalUUID(userUUID);
+        if (user == null) {
+            return new ResponseModel("error", "User not found."); // User doesn't exist
+        }
+
+        String oldName = user.getProfile_name();
+        if (Objects.equals(oldName, newProfileName)) {
+            return new ResponseModel("error", "No changes made. Profile name is the same.");
+        }
+
+        // Only set the profile name *after* successful DB update
+        user.setProfile_name(newProfileName);
+
+        boolean saved = userDB.updateByUUID(userUUID, user);
+
+        if (saved) {
+            return new ResponseModel("success", "Profile name updated successfully.");
+        } else {
+            user.setProfile_name(oldName);
+            return new ResponseModel("error", "Failed to update profile name.");
+        }
+    }
+
+    // Search in user's contact list
+    public static ResponseModel handleSearchContacts(String userUUID, String searchTerm) {
+        if (searchTerm == null || searchTerm.trim().isEmpty()) {
+            return new ResponseModel("error", "Search term cannot be empty.");
+        }
+
+        List<ContactEntry> searchResult = ContactDatabase.searchContacts(UUID.fromString(userUUID), searchTerm);
+
+        if (searchResult.isEmpty()) {
+            return new ResponseModel("error", "No contacts found.");
+        }
+
+        JSONObject data = new JSONObject();
+        JSONArray contacts = new JSONArray();
+
+        for (ContactEntry entry : searchResult) {
+            contacts.put(new JSONObject()
+                    .put("contact_id", entry.getContactId())
+                    .put("user_id", entry.getUserId())
+                    .put("contact_display_id", entry.getContact_displayId())
+                    .put("profile_name", entry.getProfileName())
+                    .put("image_url", entry.getImageUrl())
+                    .put("is_blocked", entry.isBlocked())
+                    .put("last_seen", entry.getLastSeenTime())
+            );
+        }
+        data.put("contacts", contacts);
+
+        if (searchResult.isEmpty()) {
+            return new ResponseModel("error", "No contacts found.");
+        }
+
+        return new ResponseModel("success", "Search contacts successfully.", data);
+    }
+
+    // Remove a contact in user's contact list
+    public static ResponseModel handleRemoveContact(UUID userUUID, UUID contactId) {
+        if (userUUID == null || contactId == null) {
+            return new ResponseModel("error", "Invalid input.");
+        }
+
+        boolean removed = ContactDatabase.removeContact(userUUID, contactId);
+
+        if (removed) {
+            return new ResponseModel("success", "Contact removed successfully.");
+        } else {
+            return new ResponseModel("error", "Contact not found.");
+        }
+    }
+
+//    public static ResponseModel handleGetSavedMessages(UUID userId) {
+//        try {
+//
+//            UUID chatId = PrivateChatDatabase.getOrCreateSavedMessagesChat(userId);
+//            if (chatId == null) {
+//                return new ResponseModel("error", "Failed to create or find saved messages chat.");
+//            }
+//
+//            List<Message> messages = MessageDatabase.privateChatHistory(chatId, userId);
+//
+//            JSONArray messageArray = new JSONArray();
+//            if (!messages.isEmpty()) {
+//                for (Message msg : messages) {
+//                    JSONObject msgJson = new JSONObject();
+//                    msgJson.put("message_id", msg.getMessage_id().toString());
+//                    msgJson.put("sender_id", msg.getSender_id().toString());
+//                    msgJson.put("receiver_type", msg.getReceiver_type());
+//                    msgJson.put("receiver_id", msg.getReceiver_id().toString());
+//                    msgJson.put("content", msg.getContent());
+//                    msgJson.put("message_type", msg.getMessage_type());
+//                    msgJson.put("send_at", msg.getSend_at().toString()); // LocalDateTime
+//                    msgJson.put("status", msg.getStatus());
+//                    msgJson.put("reply_to_id", msg.getReply_to_id() != null ? msg.getReply_to_id().toString() : JSONObject.NULL);
+//                    msgJson.put("is_edited", msg.isIs_edited());
+//                    msgJson.put("original_message_id", msg.getOriginal_message_id() != null ? msg.getOriginal_message_id().toString() : JSONObject.NULL);
+//                    msgJson.put("forwarded_by", msg.getForwarded_by() != null ? msg.getForwarded_by().toString() : JSONObject.NULL);
+//                    msgJson.put("forwarded_from", msg.getForwarded_from() != null ? msg.getForwarded_from().toString() : JSONObject.NULL);
+//
+//                    messageArray.put(msgJson);
+//                }
+//            }
+//
+//            JSONObject data = new JSONObject();
+//            data.put("chat_id", chatId.toString());
+//            data.put("messages", messageArray);
+//
+//            return new ResponseModel("success", "Saved messages retrieved successfully", data);
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return new ResponseModel("error", "Unexpected server error.");
+//        }
+//    }
+
+    // Save messages to DB
+//    public static ResponseModel handleSendMessage(JSONObject requestJson) {
+//        try {
+//            Message message = new Message(
+//                    UUID.fromString(requestJson.getString("message_id")),
+//                    UUID.fromString(requestJson.getString("sender_id")),
+//                    requestJson.getString("receiver_type"),
+//                    UUID.fromString(requestJson.getString("receiver_id")),
+//                    requestJson.optString("content", null),
+//                    requestJson.optString("message_type", "TEXT"),
+//                    LocalDateTime.now(), // send_at
+//                    requestJson.optString("status", "SEND"),
+//                    requestJson.isNull("reply_to_id") ? null : UUID.fromString(requestJson.getString("reply_to_id")),
+//                    requestJson.optBoolean("is_edited", false),
+//                    requestJson.isNull("original_message_id") ? null : UUID.fromString(requestJson.getString("original_message_id")),
+//                    requestJson.isNull("forwarded_by") ? null : UUID.fromString(requestJson.getString("forwarded_by")),
+//                    requestJson.isNull("forwarded_from") ? null : UUID.fromString(requestJson.getString("forwarded_from")),
+//                    requestJson.optBoolean("is_deleted_globally", false),
+//                    requestJson.isNull("edited_at") ? null :
+//                            LocalDateTime.ofInstant(
+//                                    Instant.ofEpochMilli(requestJson.getLong("edited_at")),
+//                                    ZoneId.systemDefault()
+//                            )
+//                    );
+//
+//            MessageDatabase.insertSavedMessage(message);
+//            return new ResponseModel("success", "Message saved successfully.");
+//
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return new ResponseModel("error", "Unexpected server error.");
+//        }
+//    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/Server/TestServer.java b/src/main/java/org/to/telegramfinalproject/Server/TestServer.java
new file mode 100644
index 0000000..ddbf0c3
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/TestServer.java
@@ -0,0 +1,57 @@
+package org.to.telegramfinalproject.Server;
+
+import org.to.telegramfinalproject.Database.userDatabase;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class TestServer {
+    private static final int SOCKET_PORT = 8000;          // سرور سوکت
+    private static final int HTTP_PORT   = 8080;          // سرور آپلود
+    private static final String UPLOAD_BASE_DIR = "uploads"; // پوشه‌ی ذخیره فایل‌ها
+
+    public static void main(String[] args) {
+        // 1) استارت HTTP Upload در ترد جدا
+        Thread httpThread = new Thread(() -> {
+            try {
+                UploadHttp.start(HTTP_PORT, UPLOAD_BASE_DIR);
+            } catch (IOException e) {
+                System.err.println("Upload HTTP failed to start: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }, "upload-http");
+        httpThread.setDaemon(true);
+        httpThread.start();
+
+        // 2) سرور سوکت با Thread Pool
+        ExecutorService pool = Executors.newCachedThreadPool();
+        try (ServerSocket serverSocket = new ServerSocket(SOCKET_PORT)) {
+            System.out.println("Socket server started on port " + SOCKET_PORT);
+            userDatabase.setAllUsersOffline();
+
+            // 3) Shutdown Hook برای خاموشی تمیز
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                System.out.println("\nShutting down...");
+                try { serverSocket.close(); } catch (IOException ignore) {}
+                pool.shutdownNow();
+                userDatabase.setAllUsersOffline();
+                System.out.println("Goodbye.");
+            }));
+
+            // 4) حلقه پذیرش اتصال‌ها
+            while (!serverSocket.isClosed()) {
+                Socket clientSocket = serverSocket.accept();
+                clientSocket.setTcpNoDelay(true);
+                System.out.println("New client connected: " + clientSocket.getInetAddress());
+                pool.submit(new ClientHandler(clientSocket));
+            }
+
+        } catch (IOException e) {
+            System.err.println("Socket server error: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Server/UploadHttp.java b/src/main/java/org/to/telegramfinalproject/Server/UploadHttp.java
new file mode 100644
index 0000000..fd1e77a
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Server/UploadHttp.java
@@ -0,0 +1,183 @@
+package org.to.telegramfinalproject.Server;
+
+import static spark.Spark.*;
+
+import javax.imageio.ImageIO;
+import javax.servlet.MultipartConfigElement;
+import javax.servlet.http.Part;
+
+import java.awt.image.BufferedImage;
+import java.io.InputStream;
+import java.io.IOException;
+import java.nio.file.*;
+import java.time.LocalDate;
+
+import javax.sound.sampled.*; // برای WAV
+
+import org.json.JSONObject;
+import com.mpatric.mp3agic.Mp3File;
+
+public class UploadHttp {
+
+    public static void start(int httpPort, String baseDir) throws IOException {
+        port(httpPort);
+
+        Path basePath = Paths.get(baseDir).toAbsolutePath().normalize();
+        Files.createDirectories(basePath);
+        staticFiles.externalLocation(basePath.toString());
+
+        post("/upload", (req, res) -> {
+            res.type("application/json");
+            try {
+                long MAX_FILE = 25L * 1024 * 1024; // 25MB
+                req.attribute("org.eclipse.jetty.multipartConfig",
+                        new MultipartConfigElement("/tmp", MAX_FILE, MAX_FILE, 0));
+
+                Part filePart = req.raw().getPart("file");
+                if (filePart == null || filePart.getSize() == 0) {
+                    res.status(400);
+                    return jsonError("empty file");
+                }
+                if (filePart.getSize() > MAX_FILE) {
+                    res.status(413);
+                    return jsonError("file too large");
+                }
+
+                String mime = filePart.getContentType();
+                if (mime == null) {
+                    res.status(415);
+                    return jsonError("unknown mime");
+                }
+
+                String original = filePart.getSubmittedFileName();
+                String ext = guessExt(original, mime);
+                String day = LocalDate.now().toString();
+                String typeDir = subdirFor(mime); // images/audios/files
+                String subdir = typeDir + "/" + day;
+                String name = java.util.UUID.randomUUID() + ext;
+
+                Path dir = basePath.resolve(subdir).normalize();
+                Files.createDirectories(dir);
+                Path target = dir.resolve(name).normalize();
+
+                try (InputStream in = filePart.getInputStream()) {
+                    Files.copy(in, target, StandardCopyOption.REPLACE_EXISTING);
+                } finally {
+                    filePart.delete();
+                }
+
+                String fileUrl = "/" + subdir.replace('\\', '/') + "/" + name;
+                String fileType = mapToFileType(mime);
+
+               //Meta deta only for audio and image
+                Integer width = null, height = null, durationSeconds = null;
+                String thumbnailUrl = null;
+
+                if ("IMAGE".equals(fileType) || "GIF".equals(fileType)) {
+                    int[] wh = imageSize(target);
+                    if (wh != null) { width = wh[0]; height = wh[1]; }
+                } else if ("AUDIO".equals(fileType)) {
+                    durationSeconds = audioDurationSeconds(target, mime, ext);
+                }
+
+                res.status(200);
+                return new JSONObject()
+                        .put("file_url", fileUrl)
+                        .put("file_type", fileType)
+                        .put("file_name", original == null ? "" : safeName(original))
+                        .put("file_size", Files.size(target))
+                        .put("mime_type", mime)
+                        .put("width", width == null ? JSONObject.NULL : width)
+                        .put("height", height == null ? JSONObject.NULL : height)
+                        .put("duration_seconds", durationSeconds == null ? JSONObject.NULL : durationSeconds)
+                        .put("thumbnail_url", JSONObject.NULL)
+                        .toString();
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                res.status(500);
+                return jsonError("internal error");
+            }
+        });
+
+        init();
+        awaitInitialization();
+        System.out.println("Upload HTTP server on http://localhost:" + httpPort + " baseDir=" + basePath);
+    }
+
+    // ---------- Helpers ----------
+
+    private static String jsonError(String msg) {
+        return new JSONObject().put("error", msg).toString();
+    }
+
+    private static String subdirFor(String mime) {
+        String m = mime.toLowerCase();
+        if (m.startsWith("image/")) return "images";
+        if (m.startsWith("audio/")) return "audios";
+        return "files";
+    }
+
+    private static String mapToFileType(String mime) {
+        String m = mime.toLowerCase();
+        if (m.startsWith("image/")) {
+            if (m.contains("gif")) return "GIF";
+            return "IMAGE";
+        }
+        if (m.startsWith("audio/")) return "AUDIO";
+        return "FILE";
+    }
+
+    private static String guessExt(String original, String mime) {
+        if (original != null && original.contains(".")) {
+            String ext = original.substring(original.lastIndexOf('.'));
+            if (ext.length() <= 10) return ext;
+        }
+        if ("image/png".equalsIgnoreCase(mime))  return ".png";
+        if ("image/jpeg".equalsIgnoreCase(mime)) return ".jpg";
+        if ("image/gif".equalsIgnoreCase(mime))  return ".gif";
+        if ("audio/mpeg".equalsIgnoreCase(mime)) return ".mp3";
+        if ("audio/wav".equalsIgnoreCase(mime) || "audio/x-wav".equalsIgnoreCase(mime)) return ".wav";
+        if ("application/pdf".equalsIgnoreCase(mime)) return ".pdf";
+        return "";
+    }
+
+    private static String safeName(String name) {
+        return name.replace("\"", "").replace("\n", "").replace("\r", "");
+    }
+
+    private static int[] imageSize(Path file) {
+        try {
+            BufferedImage bi = ImageIO.read(file.toFile());
+            if (bi != null) return new int[]{bi.getWidth(), bi.getHeight()};
+        } catch (Exception ignore) {}
+        return null;
+    }
+
+    //only audio
+    private static Integer audioDurationSeconds(Path file, String mime, String ext) {
+        try {
+            if ("audio/mpeg".equalsIgnoreCase(mime) || ".mp3".equalsIgnoreCase(ext)) {
+                Mp3File mp3 = new Mp3File(file.toFile());
+                return (int) mp3.getLengthInSeconds();
+            }
+
+            // WAV با javax.sound.sampled
+            if ("audio/wav".equalsIgnoreCase(mime) || "audio/x-wav".equalsIgnoreCase(mime) || ".wav".equalsIgnoreCase(ext)) {
+                try (AudioInputStream ais = AudioSystem.getAudioInputStream(file.toFile())) {
+                    AudioFormat format = ais.getFormat();
+                    long frames = ais.getFrameLength();
+                    if (frames > 0 && format.getFrameRate() > 0) {
+                        double seconds = frames / format.getFrameRate();
+                        return (int)Math.round(seconds);
+                    }
+                }
+            }
+        } catch (UnsupportedAudioFileException | IOException ignore) {
+            // فرمت صوتی پشتیبانی نشده برای AudioSystem
+        } catch (Exception ignore) {
+            // mp3agic یا سایر استثناها
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/AddAdminsController.java b/src/main/java/org/to/telegramfinalproject/UI/AddAdminsController.java
new file mode 100644
index 0000000..027da9e
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/AddAdminsController.java
@@ -0,0 +1,125 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public class AddAdminsController {
+
+    @FXML private VBox addAdminsCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button closeFooterButton;
+    @FXML private ScrollPane membersScroll;
+    @FXML private VBox membersList;
+
+    private String groupId;
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(addAdminsCard.getParent()));
+        closeFooterButton.setOnAction(e -> MainController.getInstance().closeOverlay(addAdminsCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(addAdminsCard.getParent()));
+
+        // Smooth scroll feel
+        membersScroll.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        membersScroll.setPannable(true);
+        membersScroll.setFitToWidth(true);
+        membersScroll.setFitToHeight(false);
+        membersScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            membersScroll.setVvalue(membersScroll.getVvalue() - deltaY);
+        });
+    }
+
+    public void setGroupData(String groupId, JSONArray members) {
+        this.groupId = groupId;
+        membersList.getChildren().clear();
+
+        for (int i = 0; i < members.length(); i++) {
+            JSONObject m = members.getJSONObject(i);
+
+            String role = m.optString("role", "member");
+            if ("owner".equalsIgnoreCase(role) || "admin".equalsIgnoreCase(role)) {
+                continue; // skip existing admins/owner
+            }
+
+            addMemberRow(m);
+        }
+    }
+
+    private void addMemberRow(JSONObject m) {
+        HBox row = new HBox(10);
+        row.getStyleClass().add("member-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        // Avatar
+        ImageView avatar = new ImageView();
+        avatar.setFitWidth(36);
+        avatar.setFitHeight(36);
+        avatar.setPreserveRatio(true);
+
+        String imgUrl = m.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imgUrl);
+            if (img != null) avatar.setImage(img);
+        } else {
+            avatar.setImage(new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"
+            )));
+        }
+
+        // Name + Status
+        VBox details = new VBox(2);
+        Label name = new Label(m.optString("profile_name", "Unknown"));
+        name.getStyleClass().add("member-name");
+
+        Label status = new Label(m.optBoolean("is_online", false) ? "online" : "last seen recently");
+        status.getStyleClass().add("member-status");
+
+        details.getChildren().addAll(name, status);
+
+        Region spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+
+        Button promoteBtn = new Button("Promote");
+        promoteBtn.getStyleClass().add("link-btn");
+        promoteBtn.setOnAction(e -> promoteToAdmin(m.optString("internal_uuid"), row));
+
+        row.getChildren().addAll(avatar, details, spacer, promoteBtn);
+        membersList.getChildren().add(row);
+    }
+
+    private void promoteToAdmin(String internalUuid, HBox row) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/set_group_admin_permissions.fxml"));
+            Node overlay = loader.load();
+
+            SetGroupAdminPermissionsController controller = loader.getController();
+            controller.setTarget(UUID.fromString(groupId), UUID.fromString(internalUuid), false);
+
+            // Pass a callback to remove row if promotion succeeds
+            controller.setOnSuccess(() -> membersList.getChildren().remove(row));
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error", "Could not load permissions scene.", Alert.AlertType.ERROR
+            );
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/AddMembersController.java b/src/main/java/org/to/telegramfinalproject/UI/AddMembersController.java
new file mode 100644
index 0000000..23073a5
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/AddMembersController.java
@@ -0,0 +1,313 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.geometry.Pos;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+
+import java.io.File;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class AddMembersController {
+
+    @FXML private VBox contactsList;
+    @FXML private VBox addMembersCard;
+    @FXML private TextField searchField;
+    @FXML private Pane overlayBackground;
+    @FXML private ScrollPane contactsScroll;
+    @FXML private Button searchIcon;
+    @FXML private Label memberCountLabel;
+    @FXML private FlowPane selectedMembersPane;
+    @FXML private Button cancelButton;
+    @FXML private Button createButton;
+
+    private UUID groupInternalId;
+    private String groupName;
+    private String groupDisplayId;
+    private File groupImageFile;
+
+    public enum Mode {
+        CREATE,   // from New Group
+        ADD       // from Group Info
+    }
+
+    private Mode mode = Mode.CREATE; // default
+
+    private final Set<Contact> selectedContacts = new HashSet<>();
+    private final List<Contact> allContacts = new ArrayList<>();
+
+    @FXML
+    public void initialize() {
+        // Smooth scroll feel
+        contactsScroll.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm()
+        );
+        contactsScroll.setPannable(true);
+        contactsScroll.setFitToWidth(true);
+        contactsScroll.setFitToHeight(false);
+        contactsScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            contactsScroll.setVvalue(contactsScroll.getVvalue() - deltaY);
+        });
+
+        Platform.runLater(() -> {
+            if (addMembersCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(addMembersCard.getScene());
+            }
+        });
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, ov, nv) -> updateSearchIcon(nv));
+        updateSearchIcon(ThemeManager.getInstance().isDarkMode());
+
+        cancelButton.setOnAction(e -> MainController.getInstance().closeOverlay(addMembersCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(addMembersCard.getParent()));
+
+        createButton.setOnAction(e -> onAddMembers());
+
+        searchField.textProperty().addListener((obs, ov, nv) -> applyFilter(nv));
+
+        Platform.runLater(() -> searchField.requestFocus());
+
+        loadContactsFromSession();
+        updateMemberCount();
+        renderContacts(allContacts);
+    }
+
+    // Called when creating a new group from sidebar
+    public void setGroupInfo(UUID internalId, String groupName, String displayId, File groupImageFile) {
+        this.groupInternalId = internalId;
+        this.groupName = groupName;
+        this.groupDisplayId = displayId;
+        this.groupImageFile = groupImageFile;
+        this.mode = Mode.CREATE;
+        updateActionButtonText();
+    }
+
+    // Called when adding to an existing group
+    public void setGroupForAdd(UUID internalId, String groupName) {
+        this.groupInternalId = internalId;
+        this.groupName = groupName;
+        this.mode = Mode.ADD;
+        updateActionButtonText();
+    }
+
+    private void updateActionButtonText() {
+        if (createButton != null) {
+            createButton.setText(mode == Mode.CREATE ? "Create" : "Add");
+        }
+    }
+
+    private void loadContactsFromSession() {
+        allContacts.clear();
+        var u = Session.currentUser;
+        var arr = (u == null) ? null : u.optJSONArray("contact_list");
+        if (arr != null) {
+            for (int i = 0; i < arr.length(); i++) {
+                var c = arr.optJSONObject(i);
+                if (c == null) continue;
+                String name = c.optString("profile_name", "");
+                String id   = c.optString("contact_id", ""); // ← internal_uuid مخاطب
+                if (id.isBlank()) continue;
+                String imageUrl = c.optString("image_url", "").trim();
+                if (imageUrl.isEmpty() || imageUrl.equals("null")) {
+                    imageUrl = "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+                }
+                String status = Optional.ofNullable(c.optString("last_seen", ""))
+                        .filter(s -> !s.isBlank()).map(s -> "last seen " + s).orElse("");
+                allContacts.add(new Contact(id, name, status, imageUrl));
+            }
+        }
+        allContacts.sort(Comparator.comparing(Contact::getName, String.CASE_INSENSITIVE_ORDER));
+    }
+
+    private void applyFilter(String q) {
+        String f = (q == null) ? "" : q.trim().toLowerCase(Locale.ROOT);
+        List<Contact> filtered = allContacts.stream()
+                .filter(c -> c.getName().toLowerCase(Locale.ROOT).contains(f))
+                .collect(Collectors.toList());
+        renderContacts(filtered);
+    }
+
+    private void renderContacts(List<Contact> contacts) {
+        contactsList.getChildren().clear();
+
+        if (contacts.isEmpty()) {
+            StackPane emptyPane = new StackPane();
+            emptyPane.setPrefHeight(240);
+            emptyPane.setAlignment(Pos.CENTER);
+            Label emptyLabel = new Label("No contacts found");
+            emptyLabel.getStyleClass().add("no-contacts-label");
+            emptyPane.getChildren().add(emptyLabel);
+            contactsList.getChildren().add(emptyPane);
+            return;
+        }
+
+        for (Contact c : contacts) {
+            HBox item = new HBox(10);
+            item.getStyleClass().add("contact-item");
+
+            // Avatar
+            ImageView avatar = new ImageView(loadAvatar(c.getImageUrl()));
+            avatar.setFitWidth(48);
+            avatar.setFitHeight(48);
+            avatar.setPreserveRatio(true);
+
+            // Details (name + status)
+            VBox details = new VBox(2);
+            Label nameLabel = new Label(c.getName());
+            nameLabel.getStyleClass().add("contact-name");
+            Label statusLabel = new Label(c.getStatus());
+            statusLabel.getStyleClass().add("contact-status");
+            details.getChildren().addAll(nameLabel, statusLabel);
+
+            Region spacer = new Region();
+            HBox.setHgrow(spacer, Priority.ALWAYS);
+
+            // Add elements (no checkbox here)
+            item.getChildren().addAll(avatar, details, spacer);
+
+            // Highlight if already selected
+            if (selectedContacts.contains(c)) {
+                item.getStyleClass().add("contact-selected");
+            }
+
+            // Toggle selection by clicking the whole row
+            item.setOnMouseClicked(e -> {
+                if (selectedContacts.contains(c)) {
+                    selectedContacts.remove(c);
+                    item.getStyleClass().remove("contact-selected");
+                } else {
+                    selectedContacts.add(c);
+                    item.getStyleClass().add("contact-selected");
+                }
+                updateMemberCount();
+                updateSelectedMembersPane();
+            });
+
+            contactsList.getChildren().add(item);
+        }
+    }
+
+    private Image loadAvatar(String path) {
+        try {
+            var in = getClass().getResourceAsStream(path);
+            if (in != null) return new Image(in);
+
+            return new Image(path, true);
+        } catch (Exception e) {
+            return new Image(
+                    Objects.requireNonNull(
+                            getClass().getResourceAsStream("/org/to/telegramfinalproject/Avatars/default_user_profile.png")
+                    )
+            );
+        }
+    }
+
+    private void onAddMembers() {
+        if (groupInternalId == null) {
+            showToast("Group internal_id is missing. Make sure setGroupInfo(UUID, ...) was called.");
+            return;
+        }
+        if (selectedContacts.isEmpty()) {
+            MainController.getInstance().closeOverlay(addMembersCard.getParent());
+            return;
+        }
+
+        List<String> ids = selectedContacts.stream().map(Contact::getId).toList();
+
+        JSONObject batchReq = new JSONObject()
+                .put("action", "add_members_to_group")
+                .put("group_id", groupInternalId.toString())
+                .put("user_ids", new JSONArray(ids));
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(batchReq);
+            if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() -> {
+                    MainController.getInstance().closeOverlay(addMembersCard.getParent());
+                });
+                return;
+            }
+
+            boolean allOk = true;
+            for (String uid : ids) {
+                JSONObject single = new JSONObject()
+                        .put("action", "add_members_to_group")
+                        .put("group_id", groupInternalId.toString())
+                        .put("user_id", uid);
+                JSONObject r = ActionHandler.sendWithResponse(single);
+                if (r == null || !"success".equalsIgnoreCase(r.optString("status"))) {
+                    allOk = false;
+                }
+            }
+            boolean finalAllOk = allOk;
+            Platform.runLater(() -> {
+                if (!finalAllOk) {
+                    showToast("Some members failed.");
+                }
+                MainController.getInstance().closeOverlay(addMembersCard.getParent());
+            });
+        }).start();
+    }
+
+    private void updateSelectedMembersPane() {
+        selectedMembersPane.getChildren().clear();
+        for (Contact c : selectedContacts) {
+            Label chip = new Label(c.getName());
+            chip.getStyleClass().add("member-chip");
+            selectedMembersPane.getChildren().add(chip);
+        }
+    }
+
+    private void updateMemberCount() {
+        memberCountLabel.setText(selectedContacts.size() + " / 200000");
+    }
+
+    private void updateSearchIcon(boolean darkMode) {
+        String iconPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/search_light.png"
+                : "/org/to/telegramfinalproject/Icons/search_dark.png";
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(iconPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        searchIcon.setGraphic(icon);
+    }
+
+    private void showToast(String msg) {
+        Alert a = new Alert(Alert.AlertType.INFORMATION, msg, ButtonType.OK);
+        a.initOwner(addMembersCard.getScene().getWindow());
+        a.show();
+    }
+
+    public static class Contact {
+        private final String id;      // internal_uuid
+        private final String name;
+        private final String status;
+        private final String imageUrl;
+
+        public Contact(String id, String name, String status, String imageUrl) {
+            this.id = id;
+            this.name = name;
+            this.status = status;
+            this.imageUrl = imageUrl;
+        }
+        public String getId() { return id; }
+        public String getName() { return name; }
+        public String getStatus() { return status; }
+        public String getImageUrl() { return imageUrl; }
+
+        @Override public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof Contact c)) return false;
+            return Objects.equals(id, c.id);
+        }
+        @Override public int hashCode() { return Objects.hash(id); }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/AddSubscriberController.java b/src/main/java/org/to/telegramfinalproject/UI/AddSubscriberController.java
new file mode 100644
index 0000000..57dd7fd
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/AddSubscriberController.java
@@ -0,0 +1,291 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+
+import java.io.File;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class AddSubscriberController {
+
+    @FXML private VBox contactsList;
+    @FXML private VBox addMembersCard;
+    @FXML private TextField searchField;
+    @FXML private Pane overlayBackground;
+    @FXML private ScrollPane contactsScroll;
+    @FXML private Button searchIcon;
+    @FXML private Label memberCountLabel;
+    @FXML private FlowPane selectedMembersPane;
+    @FXML private Button skipButton;
+    @FXML private Button addButton;
+
+    private UUID channelInternalId;
+    private String channelName;
+    private String channelDisplayId;
+    private File channelImageFile;
+    private String description;
+
+    private final Set<Contact> selected = new HashSet<>();
+    private final List<Contact> allContacts = new ArrayList<>();
+
+    @FXML
+    public void initialize() {
+        contactsScroll.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm()
+        );
+        contactsScroll.setPannable(true);
+        contactsScroll.setFitToWidth(true);
+        contactsScroll.setFitToHeight(false);
+        contactsScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            contactsScroll.setVvalue(contactsScroll.getVvalue() - deltaY);
+        });
+
+        Platform.runLater(() -> {
+            if (addMembersCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(addMembersCard.getScene());
+            }
+        });
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, ov, nv) -> updateSearchIcon(nv));
+        updateSearchIcon(ThemeManager.getInstance().isDarkMode());
+
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(addMembersCard.getParent()));
+        skipButton.setOnAction(e -> MainController.getInstance().closeOverlay(addMembersCard.getParent()));
+        addButton.setOnAction(e -> onAddSubscribers());
+
+        searchField.textProperty().addListener((obs, ov, nv) -> applyFilter(nv));
+        Platform.runLater(() -> searchField.requestFocus());
+
+        loadContactsFromSession();
+        updateCount();
+        renderContacts(allContacts);
+    }
+
+    public void setChannelInfo(UUID internalId, String name, String displayId, File imageFile, String description) {
+        this.channelInternalId = internalId;
+        this.channelName = name;
+        this.channelDisplayId = displayId;
+        this.channelImageFile = imageFile;
+        this.description = description;
+    }
+
+    public void setChannelInfo(String name, String id, String description, File image) {
+        this.channelName = name;
+        this.channelDisplayId = id;
+        this.channelImageFile = image;
+        this.description = description;
+    }
+
+    private void loadContactsFromSession() {
+        allContacts.clear();
+        var u = Session.currentUser;
+        var arr = (u == null) ? null : u.optJSONArray("contact_list");
+        if (arr != null) {
+            for (int i = 0; i < arr.length(); i++) {
+                var c = arr.optJSONObject(i);
+                if (c == null) continue;
+                String name = c.optString("profile_name", "");
+                String id   = c.optString("contact_id", ""); // internal_uuid
+                if (id.isBlank()) continue;
+                String imageUrl = c.optString("image_url", "").trim();
+                if (imageUrl.isEmpty() || imageUrl.equals("null")) {
+                    imageUrl = "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+                }
+                String status = Optional.ofNullable(c.optString("last_seen", ""))
+                        .filter(s -> !s.isBlank()).map(s -> "last seen " + s).orElse("");
+                allContacts.add(new Contact(id, name, status, imageUrl));
+            }
+        }
+        allContacts.sort(Comparator.comparing(Contact::getName, String.CASE_INSENSITIVE_ORDER));
+    }
+
+    private void applyFilter(String q) {
+        String f = (q == null) ? "" : q.trim().toLowerCase(Locale.ROOT);
+        List<Contact> filtered = allContacts.stream()
+                .filter(c -> c.getName().toLowerCase(Locale.ROOT).contains(f))
+                .collect(Collectors.toList());
+        renderContacts(filtered);
+    }
+
+    private void renderContacts(List<Contact> contacts) {
+        contactsList.getChildren().clear();
+
+        if (contacts.isEmpty()) {
+            StackPane emptyPane = new StackPane();
+            emptyPane.setPrefHeight(240);
+            emptyPane.setAlignment(Pos.CENTER);
+            Label emptyLabel = new Label("No contacts found");
+            emptyLabel.getStyleClass().add("no-contacts-label");
+            emptyPane.getChildren().add(emptyLabel);
+            contactsList.getChildren().add(emptyPane);
+            return;
+        }
+
+        for (Contact c : contacts) {
+            HBox item = new HBox(10);
+            item.getStyleClass().add("contact-item");
+
+            // Avatar
+            ImageView avatar = new ImageView(loadAvatar(c.getImageUrl()));
+            avatar.setFitWidth(48);
+            avatar.setFitHeight(48);
+            avatar.setPreserveRatio(true);
+
+            // Details
+            VBox details = new VBox(2);
+            Label nameLabel = new Label(c.getName());
+            nameLabel.getStyleClass().add("contact-name");
+            Label statusLabel = new Label(c.getStatus());
+            statusLabel.getStyleClass().add("contact-status");
+            details.getChildren().addAll(nameLabel, statusLabel);
+
+            Region spacer = new Region();
+            HBox.setHgrow(spacer, Priority.ALWAYS);
+
+            // Add elements (no checkbox)
+            item.getChildren().addAll(avatar, details, spacer);
+
+            // Highlight if already selected
+            if (selected.contains(c)) {
+                item.getStyleClass().add("contact-selected");
+            }
+
+            // Toggle selection by clicking the row
+            item.setOnMouseClicked(e -> {
+                if (selected.contains(c)) {
+                    selected.remove(c);
+                    item.getStyleClass().remove("contact-selected");
+                } else {
+                    selected.add(c);
+                    item.getStyleClass().add("contact-selected");
+                }
+                updateCount();
+                updateSelectedPane();
+            });
+
+            contactsList.getChildren().add(item);
+        }
+    }
+
+    private Image loadAvatar(String path) {
+        try {
+            var in = getClass().getResourceAsStream(path);
+            if (in != null) return new Image(in);
+            return new Image(path, true);
+        } catch (Exception e) {
+            return new Image(
+                    Objects.requireNonNull(
+                            getClass().getResourceAsStream("/org/to/telegramfinalproject/Avatars/default_user_profile.png")
+                    )
+            );
+        }
+    }
+
+    private void onAddSubscribers() {
+        if (channelInternalId == null) {
+            showToast("Channel internal_id is missing. Make sure setChannelInfo(UUID, ...) was called.");
+            return;
+        }
+        if (selected.isEmpty()) {
+            MainController.getInstance().closeOverlay(addMembersCard.getParent());
+            return;
+        }
+
+        List<String> ids = selected.stream().map(Contact::getId).toList();
+
+        JSONObject batchReq = new JSONObject()
+                .put("action", "add_subscribers_to_channel")
+                .put("channel_id", channelInternalId.toString())
+                .put("user_ids", new JSONArray(ids));
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(batchReq);
+            if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() -> {
+                    MainController.getInstance().closeOverlay(addMembersCard.getParent());
+                });
+                return;
+            }
+
+            boolean allOk = true;
+            for (String uid : ids) {
+                JSONObject single = new JSONObject()
+                        .put("action", "add_subscriber_to_channel")
+                        .put("channel_id", channelInternalId.toString())
+                        .put("user_id", uid);
+                JSONObject r = ActionHandler.sendWithResponse(single);
+                if (r == null || !"success".equalsIgnoreCase(r.optString("status"))) {
+                    allOk = false;
+                }
+            }
+            boolean finalAllOk = allOk;
+            Platform.runLater(() -> {
+                if (!finalAllOk) {
+                    showToast("Some subscribers failed.");
+                }
+                MainController.getInstance().closeOverlay(addMembersCard.getParent());
+            });
+        }).start();
+    }
+
+    private void updateSelectedPane() {
+        selectedMembersPane.getChildren().clear();
+        for (Contact c : selected) {
+            Label chip = new Label(c.getName());
+            chip.getStyleClass().add("member-chip");
+            selectedMembersPane.getChildren().add(chip);
+        }
+    }
+
+    private void updateCount() {
+        memberCountLabel.setText(selected.size() + " / 200000");
+    }
+
+    private void updateSearchIcon(boolean darkMode) {
+        String iconPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/search_light.png"
+                : "/org/to/telegramfinalproject/Icons/search_dark.png";
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(iconPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        searchIcon.setGraphic(icon);
+    }
+
+    private void showToast(String msg) {
+        Alert a = new Alert(Alert.AlertType.INFORMATION, msg, ButtonType.OK);
+        a.initOwner(addMembersCard.getScene().getWindow());
+        a.show();
+    }
+
+    public static class Contact {
+        private final String id;      // internal_uuid
+        private final String name;
+        private final String status;
+        private final String imageUrl;
+
+        public Contact(String id, String name, String status, String imageUrl) {
+            this.id = id; this.name = name; this.status = status; this.imageUrl = imageUrl;
+        }
+        public String getId() { return id; }
+        public String getName() { return name; }
+        public String getStatus() { return status; }
+        public String getImageUrl() { return imageUrl; }
+
+        @Override public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof Contact c)) return false;
+            return Objects.equals(id, c.id);
+        }
+        @Override public int hashCode() { return Objects.hash(id); }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/AppRouter.java b/src/main/java/org/to/telegramfinalproject/UI/AppRouter.java
new file mode 100644
index 0000000..4c8ae53
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/AppRouter.java
@@ -0,0 +1,37 @@
+// org.to.telegramfinalproject.UI.AppRouter
+package org.to.telegramfinalproject.UI;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+public final class AppRouter {
+    private static Stage stage;
+    private static Scene scene;
+
+    private AppRouter() {}
+
+    public static void init(Stage st, Scene sc) {
+        stage = st;
+        scene = sc;
+    }
+
+    public static void showIntro()  { setRoot("/org/to/telegramfinalproject/Fxml/intro.fxml"); }
+    public static void showLogin()  { setRoot("/org/to/telegramfinalproject/Fxml/login_view.fxml"); }
+    public static void showRegister(){ setRoot("/org/to/telegramfinalproject/Fxml/register_view.fxml"); }
+    public static void showMain()   { setRoot("/org/to/telegramfinalproject/Fxml/main.fxml"); }
+
+    private static void setRoot(String fxmlPath) {
+        try {
+            System.out.println("Router: setRoot -> " + fxmlPath);
+            FXMLLoader fx = new FXMLLoader(AppRouter.class.getResource(fxmlPath));
+            Parent root = fx.load();
+            if (scene != null) scene.setRoot(root);
+            else if (stage != null) stage.setScene(new Scene(root, 1480, 820));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/AvatarFX.java b/src/main/java/org/to/telegramfinalproject/UI/AvatarFX.java
new file mode 100644
index 0000000..c26d0f4
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/AvatarFX.java
@@ -0,0 +1,21 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.beans.binding.Bindings;
+import javafx.scene.image.ImageView;
+import javafx.scene.shape.Circle;
+
+public final class AvatarFX {
+
+    public static void circleClip(ImageView iv, double sizePx) {
+        iv.setFitWidth(sizePx);
+        iv.setFitHeight(sizePx);
+        iv.setPreserveRatio(true);
+        iv.setSmooth(true);
+
+        Circle c = new Circle();
+        c.radiusProperty().bind(Bindings.min(iv.fitWidthProperty(), iv.fitHeightProperty()).divide(2));
+        c.centerXProperty().bind(iv.fitWidthProperty().divide(2));
+        c.centerYProperty().bind(iv.fitHeightProperty().divide(2));
+        iv.setClip(c);
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/BlockedUsersController.java b/src/main/java/org/to/telegramfinalproject/UI/BlockedUsersController.java
new file mode 100644
index 0000000..631ab85
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/BlockedUsersController.java
@@ -0,0 +1,234 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Circle;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+
+import java.util.*;
+import java.util.stream.IntStream;
+
+public class BlockedUsersController {
+
+    @FXML private Pane overlayBackground;
+    @FXML private Button backButton;
+    @FXML private Button closeButton;
+    @FXML private Label countLabel;
+    @FXML private ListView<HBox> blockedList;
+    @FXML private VBox blockedCard;
+
+    private final Map<UUID, HBox> rowByUserId = new HashMap<>();
+
+    @FXML
+    public void initialize() {
+        backButton.setGraphic(makeIcon("/org/to/telegramfinalproject/Icons/back_button_dark.png"));
+
+        loadBlockedUsers();
+
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(overlayBackground.getParent()));
+        backButton.setOnAction(e -> MainController.getInstance().goBack((StackPane) overlayBackground.getParent()));
+
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(blockedCard.getParent()));
+
+        // Theme
+        Platform.runLater(() -> {
+            if (blockedCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(blockedCard.getScene());
+            }
+        });
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> updateBackIcon(newVal));
+        updateBackIcon(ThemeManager.getInstance().isDarkMode());
+
+        // Smooth scroll feel
+        blockedList.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm()
+        );
+        blockedList.skinProperty().addListener((obs, oldSkin, newSkin) -> {
+            if (newSkin != null) {
+                ScrollBar vBar = (ScrollBar) blockedList.lookup(".scroll-bar:vertical");
+                if (vBar != null) {
+                    blockedList.setOnScroll(event -> {
+                        double deltaY = event.getDeltaY() * 0.003;
+                        double newValue = vBar.getValue() - deltaY;
+                        vBar.setValue(Math.max(0, Math.min(newValue, 1)));
+                    });
+                }
+            }
+        });
+    }
+
+    /* ===================== Networking ===================== */
+
+    private void loadBlockedUsers() {
+        new Thread(() -> {
+            JSONObject req = new JSONObject().put("action", "get_blocked_users");
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                System.err.println("get_blocked_users failed: " + (resp != null ? resp.optString("message") : "no response"));
+                Platform.runLater(() -> {
+                    blockedList.getItems().clear();
+                    updateCount();
+                });
+                return;
+            }
+
+            JSONObject data = resp.optJSONObject("data");
+            JSONArray arr = data != null ? data.optJSONArray("blocked_users") : null;
+            if (arr == null) arr = new JSONArray();
+
+            final JSONArray finalArr = arr;
+            Platform.runLater(() -> renderBlockedUsers(finalArr));
+        }).start();
+    }
+
+    private void unblockUser(UUID targetId) {
+        String me = Session.currentUser != null ? Session.currentUser.optString("internal_uuid", "") : "";
+        if (me.isBlank() || targetId == null) return;
+
+        new Thread(() -> {
+            JSONObject req = new JSONObject()
+                    .put("action", "toggle_block")
+                    .put("user_id", me)              // UUID
+                    .put("target_id", targetId.toString()); // UUID
+
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            boolean ok = resp != null && "success".equalsIgnoreCase(resp.optString("status"));
+
+            Platform.runLater(() -> {
+                if (ok) {
+                    HBox row = rowByUserId.remove(targetId);
+                    if (row != null) blockedList.getItems().remove(row);
+                    updateCount();
+                } else {
+                    String msg = (resp != null ? resp.optString("message", "Failed to unblock.") : "Failed to unblock.");
+                    showToast(msg);
+                }
+            });
+        }).start();
+    }
+
+    /* ===================== UI build ===================== */
+
+    private void renderBlockedUsers(JSONArray list) {
+        blockedList.getItems().clear();
+        rowByUserId.clear();
+
+        IntStream.range(0, list.length()).forEach(i -> {
+            JSONObject o = list.optJSONObject(i);
+            if (o == null) return;
+
+            UUID uid = parseUUID(optS(o, "internal_uuid"));
+            if (uid == null) return;
+
+            String name = nz(optS(o, "profile_name", optS(o, "name", "User")));
+            String handle = firstNonEmpty(
+                    optS(o, "username"),
+                    optS(o, "display_id"),
+                    optS(o, "user_name"),
+                    ""
+            );
+            String avatarUrl = optS(o, "image_url");
+
+            HBox row = buildRow(uid, name, handle, avatarUrl);
+            rowByUserId.put(uid, row);
+            blockedList.getItems().add(row);
+        });
+
+        updateCount();
+    }
+
+    private HBox buildRow(UUID uid, String name, String id, String avatarUrl) {
+        // Avatar
+        Image img = null;
+        if (hasVal(avatarUrl)) {
+            try { img = org.to.telegramfinalproject.Client.AvatarLocalResolver.load(avatarUrl); } catch (Exception ignore) {}
+        }
+        if (img == null) {
+            img = new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Avatars/default_user_profile.png"));
+        }
+
+        ImageView avatar = new ImageView(img);
+        avatar.setFitWidth(60);
+        avatar.setFitHeight(60);
+        avatar.setPreserveRatio(true);
+        avatar.setSmooth(true);
+        avatar.setCache(true);
+        avatar.setClip(new Circle(20, 20, 40));
+
+        // Name + ID
+        VBox info = new VBox(2);
+        Label nameLabel = new Label(name);
+        nameLabel.getStyleClass().add("blocked-name");
+        Label idLabel = new Label(id);
+        idLabel.getStyleClass().add("blocked-id");
+        info.getChildren().addAll(nameLabel, idLabel);
+
+        // Unblock btn
+        Button unblockBtn = new Button("Unblock");
+        unblockBtn.getStyleClass().add("unblock-button");
+        unblockBtn.setOnAction(e -> unblockUser(uid));
+
+        HBox row = new HBox(12, avatar, info, unblockBtn);
+        row.getStyleClass().add("blocked-row");
+        HBox.setHgrow(info, javafx.scene.layout.Priority.ALWAYS);
+        return row;
+    }
+
+    private void updateCount() {
+        countLabel.setText(blockedList.getItems().size() + " blocked users");
+    }
+
+    /* ===================== Helpers ===================== */
+
+    private void updateBackIcon(boolean darkMode) {
+        String iconPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/back_button_light.png"
+                : "/org/to/telegramfinalproject/Icons/back_button_dark.png";
+
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(iconPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        backButton.setGraphic(icon);
+    }
+
+    private ImageView makeIcon(String path) {
+        ImageView iv = new ImageView(new Image(getClass().getResourceAsStream(path)));
+        iv.setFitWidth(20);
+        iv.setFitHeight(20);
+        return iv;
+    }
+
+    private static String nz(String s){ return s==null? "": s.trim(); }
+    private static boolean hasVal(String s){ return s!=null && !s.trim().isEmpty() && !"null".equalsIgnoreCase(s); }
+    private static String optS(JSONObject j, String k){ return j!=null ? nz(j.optString(k,"")) : ""; }
+    private static String optS(JSONObject j, String k, String fallback){
+        String v = optS(j,k);
+        return hasVal(v) ? v : fallback;
+    }
+    private static String firstNonEmpty(String... vals){
+        for (String v : vals) if (hasVal(v)) return v;
+        return "";
+    }
+    private static UUID parseUUID(String s){
+        try { return UUID.fromString(nz(s)); } catch (Exception e) { return null; }
+    }
+
+    private void showToast(String msg) {
+        Alert a = new Alert(Alert.AlertType.INFORMATION, msg, ButtonType.OK);
+        if (a.getDialogPane().getScene() != null) {
+            ThemeManager.getInstance().registerScene(a.getDialogPane().getScene());
+        }
+        a.showAndWait();
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ChangeCredentialsController.java b/src/main/java/org/to/telegramfinalproject/UI/ChangeCredentialsController.java
new file mode 100644
index 0000000..8f52bcb
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ChangeCredentialsController.java
@@ -0,0 +1,197 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+
+public class ChangeCredentialsController {
+
+    @FXML private VBox credentialsCard;
+    @FXML private Pane overlayBackground;
+
+    @FXML private TextField usernameField;
+    @FXML private Label usernameLabel;
+
+    @FXML private Label passwordLabel;
+    @FXML private PasswordField passwordField;
+    @FXML private TextField visiblePasswordField;
+    @FXML private Button togglePasswordBtn;
+
+    @FXML private Label confirmPasswordLabel;
+    @FXML private PasswordField confirmPasswordField;
+    @FXML private TextField visibleConfirmPasswordField;
+    @FXML private Button toggleConfirmBtn;
+
+    @FXML private Button cancelButton;
+    @FXML private Button saveButton;
+    @FXML private Button closeButton;
+
+    private boolean passwordVisible = false;
+    private boolean confirmVisible = false;
+
+    private String currentPassword;
+    public void setCurrentPassword(String p) { this.currentPassword = p; }
+
+    @FXML
+    private void initialize() {
+        // Toggle password visibility
+        togglePasswordBtn.setOnAction(e -> togglePasswordVisibility());
+        toggleConfirmBtn.setOnAction(e -> toggleConfirmVisibility());
+
+        saveButton.setOnAction(e -> saveAndClose());
+        closeButton.setOnAction(e -> saveAndClose());
+        cancelButton.setOnAction(e -> saveAndClose());
+        overlayBackground.setOnMouseClicked(e -> saveAndClose());
+
+        // Reset error when typing
+        usernameField.textProperty().addListener((obs, o, n) -> removeError(usernameField, usernameLabel));
+
+        passwordField.textProperty().addListener((obs, o, n) -> {
+            visiblePasswordField.setText(n); // keep synced
+            removeError(passwordField, passwordLabel);
+            removeError(visiblePasswordField, passwordLabel);
+        });
+        visiblePasswordField.textProperty().addListener((obs, o, n) -> {
+            passwordField.setText(n);
+            removeError(passwordField, passwordLabel);
+            removeError(visiblePasswordField, passwordLabel);
+        });
+
+        confirmPasswordField.textProperty().addListener((obs, o, n) -> {
+            visibleConfirmPasswordField.setText(n);
+            removeError(confirmPasswordField, confirmPasswordLabel);
+            removeError(visibleConfirmPasswordField, confirmPasswordLabel);
+        });
+        visibleConfirmPasswordField.textProperty().addListener((obs, o, n) -> {
+            confirmPasswordField.setText(n);
+            removeError(confirmPasswordField, confirmPasswordLabel);
+            removeError(visibleConfirmPasswordField, confirmPasswordLabel);
+        });
+
+        Platform.runLater(() -> usernameField.requestFocus());
+    }
+
+    public void prefillFromSession() {
+        var u = Session.currentUser;
+        if (u == null) return;
+        String handle = u.optString("user_id",
+                u.optString("username",
+                        u.optString("display_id","")));
+        usernameField.setText(handle);
+    }
+
+    private void togglePasswordVisibility() {
+        passwordVisible = !passwordVisible;
+        visiblePasswordField.setText(passwordField.getText());
+        visiblePasswordField.setVisible(passwordVisible);
+        visiblePasswordField.setManaged(passwordVisible);
+
+        passwordField.setVisible(!passwordVisible);
+        passwordField.setManaged(!passwordVisible);
+
+        togglePasswordBtn.setText(passwordVisible ? "👁" : "👁");
+    }
+
+    private void toggleConfirmVisibility() {
+        confirmVisible = !confirmVisible;
+        visibleConfirmPasswordField.setText(confirmPasswordField.getText());
+        visibleConfirmPasswordField.setVisible(confirmVisible);
+        visibleConfirmPasswordField.setManaged(confirmVisible);
+
+        confirmPasswordField.setVisible(!confirmVisible);
+        confirmPasswordField.setManaged(!confirmVisible);
+
+        toggleConfirmBtn.setText(confirmVisible ? "👁" : "👁");
+    }
+
+    private void saveAndClose() {
+        boolean anyError = false;
+        boolean sentSomething = false;
+
+        var cu = Session.currentUser;
+        String oldUsername = cu != null ? cu.optString("user_id",
+                cu.optString("username",
+                        cu.optString("display_id",""))) : "";
+
+        String newUsername = usernameField.getText().trim();
+        if (!newUsername.isEmpty() && !newUsername.equals(oldUsername)) {
+            sentSomething = true;
+
+            JSONObject req = new JSONObject()
+                    .put("action", "update_username")
+                    .put("current_password", currentPassword)
+                    .put("new_username", newUsername);
+
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                anyError = true;
+                showError("Changing username failed",
+                        resp != null ? resp.optString("message","Unknown error") : "No response");
+            } else {
+                if (cu != null) cu.put("user_id", newUsername);
+            }
+        }
+
+        // 2) پسورد
+        String newPwd = (passwordVisible ? visiblePasswordField.getText() : passwordField.getText()).trim();
+        String confirm = (confirmVisible ? visibleConfirmPasswordField.getText() : confirmPasswordField.getText()).trim();
+
+        if (!newPwd.isEmpty()) {
+            if (confirm.isEmpty() || !confirm.equals(newPwd)) {
+                addError(confirmPasswordField, confirmPasswordLabel);
+                addError(visibleConfirmPasswordField, confirmPasswordLabel);
+                return;
+            }
+
+            sentSomething = true;
+
+            JSONObject req = new JSONObject()
+                    .put("action", "update_password")
+                    .put("current_password", currentPassword)
+                    .put("new_password", newPwd);
+
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                anyError = true;
+                showError("Changing password failed",
+                        resp != null ? resp.optString("message","Unknown error") : "No response");
+            }
+        }
+
+        if (!sentSomething || !anyError) {
+            var sc = SettingsController.getInstance();
+            if (sc != null) sc.populateFromSession();
+            MainController.getInstance().closeOverlay(credentialsCard.getParent());
+        }
+    }
+
+    private void addError(TextField field, Label label) {
+        if (!field.getStyleClass().contains("error-input")) {
+            field.getStyleClass().add("error-input");
+        }
+        if (!label.getStyleClass().contains("error-label")) {
+            label.getStyleClass().add("error-label");
+        }
+    }
+
+    private void removeError(TextField field, Label label) {
+        field.getStyleClass().remove("error-input");
+        label.getStyleClass().remove("error-label");
+    }
+
+    private void showError(String title, String msg) {
+        Alert a = new Alert(Alert.AlertType.ERROR);
+        a.setTitle(title);
+        a.setHeaderText(null);
+        a.setContentText(msg);
+        if (a.getDialogPane().getScene()!=null) {
+            ThemeManager.getInstance().registerScene(a.getDialogPane().getScene());
+        }
+        a.showAndWait();
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ChannelInfoController.java b/src/main/java/org/to/telegramfinalproject/UI/ChannelInfoController.java
new file mode 100644
index 0000000..4a87d24
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ChannelInfoController.java
@@ -0,0 +1,355 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.UUID;
+
+public class ChannelInfoController {
+
+    @FXML private VBox channelCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+
+    @FXML private ImageView channelAvatar;
+    @FXML private Label channelName;
+    @FXML private Label subscriberCount;
+    @FXML private Label channelDescription;
+
+    @FXML private Button infoMoreButton;
+    @FXML private ContextMenu infoMoreMenu;
+    @FXML private MenuItem addMembersBtn;
+    @FXML private MenuItem manageChannelBtn;
+    @FXML private MenuItem deleteChannelBtn;
+    @FXML private ImageView moreIcon;
+    @FXML private ImageView manageChannelIcon;
+    @FXML private ImageView addMemberIcon;
+
+    @FXML private VBox subscribersList;
+    @FXML private Label subscribersHeader;
+    @FXML private Button addSubscriberButton;
+    @FXML private ImageView subscribersIcon;
+    @FXML private ScrollPane subscribersScroll;
+
+    private UUID channelId;
+    private String myRole;
+
+    private static final String ICON_PATH = "/org/to/telegramfinalproject/Icons/";
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e ->
+                MainController.getInstance().closeOverlay(channelCard.getParent()));
+        overlayBackground.setOnMouseClicked(e ->
+                MainController.getInstance().closeOverlay(channelCard.getParent()));
+
+        infoMoreButton.setOnAction(e -> {
+            if (infoMoreMenu != null) infoMoreMenu.show(infoMoreButton, javafx.geometry.Side.BOTTOM, 0, 0);
+        });
+
+        if (manageChannelBtn != null) {
+            manageChannelBtn.setOnAction(e -> openManageChannel());
+        }
+        deleteChannelBtn.setOnAction(e -> handleDeleteChannel());
+
+        Platform.runLater(() -> {
+            if (channelCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(channelCard.getScene());
+            }
+        });
+
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateIcons(newVal);
+        });
+
+        updateIcons(ThemeManager.getInstance().isDarkMode());
+
+        // Smooth scroll feel
+        subscribersScroll.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm()
+        );
+        subscribersScroll.skinProperty().addListener((obs, oldSkin, newSkin) -> {
+            if (newSkin != null) {
+                ScrollBar vBar = (ScrollBar) subscribersScroll.lookup(".scroll-bar:vertical");
+                if (vBar != null) {
+                    subscribersScroll.setOnScroll(event -> {
+                        double deltaY = event.getDeltaY() * 0.003;
+                        double newValue = vBar.getValue() - deltaY;
+                        vBar.setValue(Math.max(0, Math.min(newValue, 1)));
+                    });
+                }
+            }
+        });
+
+        if (addSubscriberButton != null) {
+            addSubscriberButton.setOnAction(e -> openAddSubscriberScene());
+        }
+        if (addMembersBtn != null) {
+            addMembersBtn.setOnAction(e -> openAddSubscriberScene());
+        }
+    }
+
+    public void setChannelDataFromJson(ChatEntry entry, JSONObject data) {
+        this.channelId = entry.getId();
+
+        channelName.setText(data.optString("channel_name", entry.getName()));
+        subscriberCount.setText(data.optInt("subscriber_count", 0) + " subscribers");
+        channelDescription.setText(data.optString("description", ""));
+
+        // --- Role-based UI ---
+        myRole = data.optString("my_role", "subscriber").toLowerCase();
+
+        deleteChannelBtn.setVisible("owner".equals(myRole));
+
+        boolean canAdd = "owner".equals(myRole) || "admin".equals(myRole);
+        addSubscriberButton.setVisible(canAdd);
+        addSubscriberButton.setManaged(canAdd);
+        if (addMembersBtn != null) {
+            addMembersBtn.setVisible(canAdd);
+        }
+
+        boolean showMore = "owner".equals(myRole) || "admin".equals(myRole);
+        infoMoreButton.setVisible(showMore);
+        infoMoreButton.setManaged(showMore);
+
+        // --- Avatar ---
+        String imgUrl = data.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            try {
+                Image img = AvatarLocalResolver.load(imgUrl);
+                if (img != null) channelAvatar.setImage(img);
+            } catch (Exception ignore) {}
+        } else {
+            channelAvatar.setImage(new Image(
+                    getClass().getResourceAsStream("/org/to/telegramfinalproject/Avatars/default_channel_profile.png")
+            ));
+        }
+
+        // --- Subscribers list ---
+        subscribersList.getChildren().clear();
+        var arr = data.optJSONArray("subscribers");
+        if (arr != null) {
+            subscribersHeader.setText(arr.length() + " SUBSCRIBERS");
+            for (int i = 0; i < arr.length(); i++) {
+                JSONObject s = arr.getJSONObject(i);
+                addSubscriberRow(s);
+            }
+        }
+    }
+
+    private void addSubscriberRow(JSONObject s) {
+        HBox row = new HBox(10);
+        row.getStyleClass().add("member-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        // Avatar
+        ImageView avatar = new ImageView();
+        avatar.setFitWidth(36);
+        avatar.setFitHeight(36);
+        avatar.setPreserveRatio(true);
+        AvatarFX.circleClip(avatar, 36);
+
+        String imgUrl = s.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imgUrl);
+            if (img != null) avatar.setImage(img);
+        } else {
+            avatar.setImage(new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"
+            )));
+        }
+
+        // Name + status
+        VBox nameBox = new VBox(2);
+        Label name = new Label(s.optString("profile_name", "Unknown"));
+        name.getStyleClass().add("member-name");
+
+        String status;
+        if (s.optBoolean("is_online", false)) {
+            status = "online";
+        } else {
+            status = ChatPageController.getInstance().userStatusText(
+                    false,
+                    s.optString("last_seen", null)
+            );
+        }
+        Label statusLbl = new Label(status);
+        statusLbl.getStyleClass().add("member-status");
+
+        nameBox.getChildren().addAll(name, statusLbl);
+
+        // Role
+        Label roleLbl = new Label();
+        String roleStr = s.optString("role", "");
+        if (!roleStr.isBlank()) {
+            roleLbl.setText(roleStr.toLowerCase());
+            roleLbl.getStyleClass().add("member-role");
+        }
+
+        Region spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+
+        row.getChildren().addAll(avatar, nameBox, spacer, roleLbl);
+        subscribersList.getChildren().add(row);
+    }
+
+    private void openManageChannel() {
+        new Thread(() -> {
+            try {
+                JSONObject req = new JSONObject()
+                        .put("action", "view_channel")
+                        .put("channel_id", channelId.toString()); // ✅ matches server case
+
+                JSONObject resp = ActionHandler.sendWithResponse(req);
+
+                if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                    Platform.runLater(() -> MainController.getInstance().showAlert(
+                            "Error",
+                            resp != null ? resp.optString("message") : "Server not responding.",
+                            Alert.AlertType.ERROR
+                    ));
+                    return;
+                }
+
+                JSONObject data = resp.optJSONObject("data");
+                if (data == null) {
+                    Platform.runLater(() -> MainController.getInstance().showAlert(
+                            "Error",
+                            "Malformed server response.",
+                            Alert.AlertType.ERROR
+                    ));
+                    return;
+                }
+
+                Platform.runLater(() -> {
+                    try {
+                        FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                                "/org/to/telegramfinalproject/Fxml/manage_channel.fxml"));
+                        Node overlay = loader.load();
+
+                        ManageChannelController controller = loader.getController();
+                        controller.setChannelData(data); // ✅ pass JSON to controller
+
+                        MainController.getInstance().showOverlay(overlay);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        MainController.getInstance().showAlert(
+                                "Error",
+                                "Could not load Manage Channel scene.",
+                                Alert.AlertType.ERROR
+                        );
+                    }
+                });
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                Platform.runLater(() -> MainController.getInstance().showAlert(
+                        "Error",
+                        "Error while fetching channel info: " + e.getMessage(),
+                        Alert.AlertType.ERROR
+                ));
+            }
+        }).start();
+    }
+
+    private void openAddSubscriberScene() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/add_subscriber.fxml")); // point to new fxml
+            Node overlay = loader.load();
+
+            AddSubscriberController controller = loader.getController();
+            controller.setChannelInfo(channelId, channelName.getText(), "", null, "");
+            // passing UUID + name, other fields optional
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error",
+                    "Could not load Add Subscribers scene.",
+                    Alert.AlertType.ERROR
+            );
+        }
+    }
+    private void handleDeleteChannel() {
+        ChatEntry entry = Session.currentChatEntry;
+
+        if (entry == null || !"channel".equalsIgnoreCase(entry.getType())) {
+            alert(Alert.AlertType.INFORMATION, "This action is only available for channels.");
+            return;
+        }
+
+        if (!confirm("Delete Channel",
+                "Are you sure you want to DELETE this channel?\nThis action cannot be undone.")) {
+            return;
+        }
+
+        JSONObject req = new JSONObject()
+                .put("action", "delete_channel")
+                .put("channel_id", entry.getId().toString());
+
+        JSONObject res = ActionHandler.sendWithResponse(req);
+
+        if (res != null && "success".equalsIgnoreCase(res.optString("status"))) {
+            alert(Alert.AlertType.INFORMATION, "✅ Channel deleted successfully.");
+            MainController.getInstance().refreshChatListUI();
+            AppRouter.showMain();
+        } else {
+            String msg = (res != null) ? res.optString("message", "Failed to delete channel.") : "null response";
+            alert(Alert.AlertType.ERROR, "❌ " + msg);
+        }
+    }
+
+    private boolean confirm(String title, String msg) {
+        Alert a = new Alert(Alert.AlertType.CONFIRMATION, msg, ButtonType.OK, ButtonType.CANCEL);
+        a.setTitle(title);
+        return a.showAndWait().filter(btn -> btn == ButtonType.OK).isPresent();
+    }
+
+    private void alert(Alert.AlertType type, String msg) {
+        new Alert(type, msg, ButtonType.OK).show();
+    }
+
+    private void updateIcons(boolean dark) {
+        String suffix = dark ? "_light.png" : "_dark.png";
+
+        moreIcon.setImage(loadImage(ICON_PATH + "more" + suffix));
+        subscribersIcon.setImage(loadImage(ICON_PATH + "channel_subscriber" + suffix));
+        addSubscriberButton.setGraphic(makeIcon(ICON_PATH + "add_member" + suffix));
+        manageChannelIcon.setImage(loadImage(ICON_PATH + "manage" + suffix));
+        addMemberIcon.setImage(loadImage(ICON_PATH + "add_member" + suffix));
+    }
+
+    private ImageView makeIcon(String path) {
+        ImageView iv = new ImageView();
+        Image img = loadImage(path);
+        if (img != null) {
+            iv.setImage(img);
+            iv.setFitWidth(22);
+            iv.setFitHeight(22);
+            iv.setPreserveRatio(true);
+        }
+        return iv;
+    }
+
+    private Image loadImage(String path) {
+        URL res = getClass().getResource(path);
+        if (res == null) return null;
+        return new Image(res.toExternalForm());
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ChatItemController.java b/src/main/java/org/to/telegramfinalproject/UI/ChatItemController.java
new file mode 100644
index 0000000..435a2c2
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ChatItemController.java
@@ -0,0 +1,150 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Circle;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+import java.util.Objects;
+
+public class ChatItemController {
+
+    @FXML private ImageView profileImage;
+    @FXML private Label chatName;
+    @FXML private Label lastMessage;
+    @FXML private Label chatTime;
+    @FXML private Label unreadCount;
+    @FXML private StackPane systemAvatar;
+    @FXML private ImageView profileImageUser;
+    @FXML private ImageView profileImageSystem;
+    @FXML private Circle systemCircle;
+
+    /**
+     * Set chat item data, including a profile image (or default).
+     *
+     * @param name    Chat name
+     * @param lastMsg Last message text
+     * @param time    Last message time
+     * @param unread  Unread message count
+     * @param imageUrl Path/URL of profile image (can be null/empty)
+     */
+    public void setChatData(String name, String lastMsg, String time, int unread, String imageUrl, String chatType) {
+        chatName.setText(name);
+        lastMessage.setText(lastMsg);
+        chatTime.setText(time);
+
+        // Unread count
+        if (unread > 0) {
+            unreadCount.setVisible(true);
+            unreadCount.setText(String.valueOf(unread));
+        } else {
+            unreadCount.setVisible(false);
+        }
+
+        // Reset all avatar states
+        profileImageUser.setVisible(false);
+        profileImageUser.setManaged(false);
+        systemAvatar.setVisible(false);
+        systemAvatar.setManaged(false);
+
+        if ("Saved Messages".equals(name)) {
+            systemCircle.setFill(javafx.scene.paint.Color.web("#2ca4ff")); // Telegram blue
+            profileImageSystem.setImage(new Image(
+                    Objects.requireNonNull(getClass().getResourceAsStream(
+                            "/org/to/telegramfinalproject/Icons/saved_messages_light.png"))
+            ));
+            systemAvatar.setVisible(true);
+            systemAvatar.setManaged(true);
+
+        } else if ("Archived Chats".equals(name)) {
+            systemCircle.setFill(javafx.scene.paint.Color.web("#808080")); // gray
+            profileImageSystem.setImage(new Image(
+                    Objects.requireNonNull(getClass().getResourceAsStream(
+                            "/org/to/telegramfinalproject/Icons/archived_chats_light.png"))
+            ));
+            systemAvatar.setVisible(true);
+            systemAvatar.setManaged(true);
+
+        } else if (imageUrl != null && !imageUrl.isEmpty()) {
+//            profileImageUser.setImage(new Image(imageUrl, true));
+//            profileImageUser.setVisible(true);
+//            profileImageUser.setManaged(true);
+
+            Image img = AvatarLocalResolver.load(imageUrl);
+            if (img != null) {
+                profileImageUser.setImage(img);
+                AvatarFX.circleClip(profileImageUser, 40);
+            } else {
+                String path;
+                if ("group".equalsIgnoreCase(chatType)) {
+                    path = "/org/to/telegramfinalproject/Avatars/default_group_profile.png";
+                } else if ("channel".equalsIgnoreCase(chatType)) {
+                    path = "/org/to/telegramfinalproject/Avatars/default_channel_profile.png";
+                } else {
+                    path = "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+                }
+                profileImageUser.setImage(new Image(
+                        java.util.Objects.requireNonNull(getClass().getResourceAsStream(path))
+                ));
+            }
+            profileImageUser.setVisible(true);
+            profileImageUser.setManaged(true);
+
+        } else {
+            String path;
+            if ("group".equalsIgnoreCase(chatType)) {
+                path = "/org/to/telegramfinalproject/Avatars/default_group_profile.png";
+            } else if ("channel".equalsIgnoreCase(chatType)) {
+                path = "/org/to/telegramfinalproject/Avatars/default_channel_profile.png";
+            } else {
+                path = "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+            }
+
+            profileImageUser.setImage(new Image(
+                    Objects.requireNonNull(getClass().getResourceAsStream(path))
+            ));
+            profileImageUser.setVisible(true);
+            profileImageUser.setManaged(true);
+        }
+    }
+
+    public void setUnread(int unread) {
+        boolean show = unread > 0;
+        unreadCount.setVisible(show);
+        unreadCount.setManaged(show);
+        if (show) unreadCount.setText(String.valueOf(unread));
+    }
+
+    // ChatItemController.java
+    @FXML private ImageView avatarImage;
+    private String chatType;
+
+    public void updateAvatar(String url) {
+        try {
+            if (url == null || url.isBlank()) {
+                String def = switch (chatType == null ? "" : chatType.toLowerCase()) {
+                    case "group"   -> "/org/to/telegramfinalproject/Avatars/default_group_profile.png";
+                    case "channel" -> "/org/to/telegramfinalproject/Avatars/default_channel_profile.png";
+                    default        -> "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+                };
+                avatarImage.setImage(new Image(Objects.requireNonNull(
+                        getClass().getResourceAsStream(def))));
+            } else {
+                avatarImage.setImage(new Image(url, true)); // true = لود غیرهمزمان
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String safeTitle(ChatEntry e) {
+        if (e.getName() != null && !e.getName().isBlank()) return e.getName();
+        if (e.getDisplayId() != null && !e.getDisplayId().isBlank()) return e.getDisplayId();
+        return "Unknown";
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ChatPageController.java b/src/main/java/org/to/telegramfinalproject/UI/ChatPageController.java
new file mode 100644
index 0000000..6acdcc0
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ChatPageController.java
@@ -0,0 +1,2985 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.VBox;
+import javafx.scene.media.Media;
+import javafx.scene.media.MediaPlayer;
+import javafx.scene.shape.Circle;
+import javafx.stage.FileChooser;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.util.Duration;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+
+public class ChatPageController {
+
+    // ===== messages area =====
+    @FXML
+    private VBox messageContainer;
+    @FXML
+    private ScrollPane messageScrollPane;
+
+    // ===== input area =====
+    @FXML
+    private TextArea messageInput;
+    @FXML
+    private Button sendButton;
+
+    @FXML
+    private Button attachmentButton;
+    @FXML
+    private ImageView attachmentIcon;   // <ImageView> inside the attachment button
+
+    // ===== header =====
+    @FXML
+    private ImageView userAvatar;       // 36x36 in the FXML
+    @FXML
+    private Label chatTitle;            // contact/group title
+    @FXML
+    private Label chatStatus;           // last seen / online
+    @FXML
+    private HBox chatHeader;            // Header
+
+    @FXML
+    private Button searchInChatButton;  // magnifier button
+    @FXML
+    private ImageView searchIcon;
+
+    @FXML
+    private VBox blockedPane;
+
+    @FXML
+    private Button chatMoreButton;          // 3-dots button
+    @FXML
+    private ImageView moreIcon;
+    @FXML
+    private ContextMenu chatMoreMenu;
+    @FXML
+    private MenuItem viewProfileItem;
+    @FXML
+    private MenuItem deleteChatItem;
+    @FXML
+    private MenuItem archiveItem;
+
+    // ===== Group & Channel more button =====
+    @FXML
+    private MenuItem viewGroupItem;
+    @FXML
+    private MenuItem leaveGroupItem;
+
+    @FXML
+    private MenuItem viewChannelItem;
+    @FXML
+    private MenuItem leaveChannelItem;
+
+    // ===== send icon =====
+    @FXML
+    private ImageView sendIcon;
+
+    // ===== For Searching System =====
+    @FXML
+    private VBox composerPane;
+    @FXML
+    private VBox joinPane;
+    @FXML
+    private VBox addContactPane;
+
+    // For search handling
+    @FXML
+    private Button joinButton;
+    @FXML
+    private Button addContactButton;
+
+    // Handle View chat
+    @FXML
+    private Button unblockBtn;
+    @FXML
+    private VBox readOnlyPane;
+    @FXML
+    private Label readOnlyLabel;
+
+
+    private ChatViewMode currentMode = ChatViewMode.NORMAL;
+
+
+    // --- state for interactions ---
+    private String pendingReplyToId = null;
+    private String pendingEditMsgId = null;
+    private final Map<String, Node> messageNodes = new HashMap<>();
+    private final Deque<HBox> pendingBubbles = new ArrayDeque<>();
+
+    private final Map<String, HBox> pendingById = new HashMap<>();
+
+
+    private static final String UPLOADS_DIR = "C:/Users/User/Desktop/Project/uploads";
+    private static final String HTTP_BASE = "http://localhost:8080";
+
+
+    private JSONObject lastHeaderData = null;
+
+
+    // ===== Time formatter for messages =====
+    private static final DateTimeFormatter FMT_HHMM = DateTimeFormatter.ofPattern("HH:mm");
+    private static final DateTimeFormatter FMT_DATE_TIME = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm");
+    private static final String YESTERDAY_LABEL = "Yesterday";
+
+    private boolean blockedByMeFlag = false;
+    private boolean blockedMeFlag = false;
+    private volatile boolean justJoinedThisChat = false;
+
+
+    // ===== state =====
+    private String chatName;
+    private final ThemeManager themeManager = ThemeManager.getInstance();
+    private final java.util.Set<String> pendingClientMsgIds =
+            java.util.Collections.newSetFromMap(new java.util.concurrent.ConcurrentHashMap<>());
+
+    // Where your icons live
+    private static final String ICON_BASE = "/org/to/telegramfinalproject/Icons/";
+    private static ChatPageController instance;
+    private ChatEntry currentChat;
+    private UUID me;
+
+    public ChatEntry current(){
+        return this.currentChat;
+    }
+
+    // ----- helpers for safe strings -----
+    private static String nz(String s) {
+        return s == null ? "" : s.trim();
+    }
+
+    private static boolean hasVal(String s) {
+        if (s == null) return false;
+        String t = s.trim();
+        return !t.isEmpty() && !"null".equalsIgnoreCase(t);
+    }
+
+
+    public static ChatPageController get() {
+        return instance;
+    }
+
+    private void initCurrentUserId() {
+        try {
+            String meStr = org.to.telegramfinalproject.Client.Session
+                    .currentUser.getString("internal_uuid");
+            me = UUID.fromString(meStr);
+        } catch (Exception ignore) {
+            me = null;
+        }
+    }
+
+    public ChatPageController() {
+        instance = this;
+    }
+
+    public static ChatPageController getInstance() {
+        return instance;
+    }
+
+    private static String str(org.json.JSONObject j, String k) {
+        try {
+            return (j.has(k) && !j.isNull(k)) ? j.getString(k) : "";
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    private static boolean bool(org.json.JSONObject j, String k) {
+        try {
+            return (j.has(k) && !j.isNull(k)) && j.getBoolean(k);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private static org.json.JSONArray arr(org.json.JSONObject j, String k) {
+        try {
+            return (j.has(k) && !j.isNull(k)) ? j.getJSONArray(k) : null;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+
+    private String formatWhen(LocalDateTime ts) {
+        if (ts == null) return "";
+        LocalDate today = LocalDate.now();
+        LocalDate d = ts.toLocalDate();
+
+        if (d.isEqual(today)) {
+            return FMT_HHMM.format(ts);
+        } else if (d.isEqual(today.minusDays(1))) {
+            return YESTERDAY_LABEL + " " + FMT_HHMM.format(ts);
+        } else {
+            return FMT_DATE_TIME.format(ts);
+        }
+    }
+
+    private LocalDateTime parseWhen(String iso) {
+        if (iso == null || iso.isEmpty()) return null;
+        try {
+            return OffsetDateTime.parse(iso).toLocalDateTime();
+        } catch (Exception ignore) {
+            try {
+                return LocalDateTime.parse(iso);
+            } catch (Exception e) {
+                return null;
+            }
+        }
+    }
+
+    @FXML
+    public void initialize() {
+        initCurrentUserId();
+
+        // Send button
+        if (sendButton != null) {
+            sendButton.setOnAction(e -> sendMessage());
+        }
+
+        // ENTER = send, SHIFT+ENTER = newline
+        messageInput.addEventFilter(javafx.scene.input.KeyEvent.KEY_PRESSED, e -> {
+            if (e.getCode() == javafx.scene.input.KeyCode.ENTER) {
+                if (e.isShiftDown()) {
+                    // let newline happen
+                } else {
+                    e.consume(); // block newline
+                    sendMessage();
+                }
+            }
+        });
+
+        // Enable/disable send button by content (ignore spaces/newlines)
+        messageInput.textProperty().addListener((obs, oldV, newV) -> {
+            boolean hasRealText = newV != null && !newV.trim().isEmpty();
+            sendButton.setDisable(!hasRealText);
+
+            // toggle style class for color state
+            var sc = sendButton.getStyleClass();
+            sc.removeAll("send-empty", "send-ready");
+            sc.add(hasRealText ? "send-ready" : "send-empty");
+        });
+
+        // Auto-resize input box like Telegram
+        messageInput.textProperty().addListener((obs, oldText, newText) -> {
+            Platform.runLater(() -> {
+                var textNode = messageInput.lookup(".text");
+                if (textNode != null) {
+                    double textHeight = textNode.getBoundsInLocal().getHeight();
+                    double padding = 20; // top + bottom padding
+                    double newHeight = textHeight + padding;
+
+                    if (newHeight < 40) newHeight = 40;   // min (1 row)
+                    if (newHeight > 120) newHeight = 120; // max (~5 rows)
+
+                    messageInput.setPrefHeight(newHeight);
+                }
+            });
+        });
+
+        // Start in "empty" state
+        sendButton.getStyleClass().add("send-empty");
+
+        // attach file
+        if (attachmentButton != null) {
+            attachmentButton.setOnAction(e -> openFileChooser());
+        }
+
+        // Hook "More" button → show menu under it
+        if (chatMoreButton != null) {
+            chatMoreButton.setOnAction(e -> {
+                if (!chatMoreMenu.isShowing()) {
+                    chatMoreMenu.show(chatMoreButton, Side.BOTTOM, 0, 0);
+                } else {
+                    chatMoreMenu.hide();
+                }
+            });
+        }
+
+        // Menu item actions
+        viewProfileItem.setOnAction(e -> {
+            System.out.println("Viewing profile of " + chatName);
+        });
+
+        deleteChatItem.setOnAction(e -> {
+            System.out.println("Deleting chat with " + chatName);
+        });
+
+        if (archiveItem != null) {
+            archiveItem.setOnAction(e -> {
+                ChatEntry entry = Session.currentChatEntry;
+                if (entry == null) return;
+                toggleArchive(entry);
+            });
+        }
+
+        // Initial icon sync once the Scene is ready (stylesheet applied)
+        Platform.runLater(this::syncIconsWithTheme);
+
+        // Auto-Scroll
+        messageContainer.heightProperty().addListener((obs, oldVal, newVal) -> {
+            Platform.runLater(() -> {
+                var timeline = new javafx.animation.Timeline();
+                var kv = new javafx.animation.KeyValue(
+                        messageScrollPane.vvalueProperty(), 1.0, javafx.animation.Interpolator.EASE_BOTH
+                );
+                var kf = new javafx.animation.KeyFrame(javafx.util.Duration.millis(200), kv);
+                timeline.getKeyFrames().add(kf);
+                timeline.play();
+            });
+        });
+
+        // Smooth scroll feel
+        messageScrollPane.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        messageScrollPane.setPannable(true);
+        messageScrollPane.setFitToWidth(true);
+        messageScrollPane.setFitToHeight(false);
+        messageScrollPane.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.00003; // smaller = smoother
+            messageScrollPane.setVvalue(messageScrollPane.getVvalue() - deltaY);
+        });
+
+        // React to theme changes everywhere
+        themeManager.darkModeProperty().addListener((o, oldVal, isDark) -> syncIconsWithTheme());
+    }
+
+
+    @FXML
+    private void openSearchPanel() {
+        MainController.getInstance().showSearchPanel();
+    }
+
+
+    private void sendMessage() {
+        String raw = messageInput.getText();
+        String text = (raw == null) ? "" : raw.trim();
+        if (text.isEmpty()) return;
+
+        if (currentChat == null) {
+            addSystemMessage("No chat is selected.");
+            return;
+        }
+
+        messageInput.clear();
+
+        final UUID chatId = currentChat.getId();
+        final String cType = currentChat.getType();
+
+
+        if (pendingEditMsgId != null) {
+            final String msgIdForEdit = pendingEditMsgId;
+            pendingEditMsgId = null;
+
+            JSONObject req = new JSONObject()
+                    .put("action", "edit_message")
+                    .put("message_id", msgIdForEdit)
+                    .put("new_content", text);
+
+            new Thread(() -> {
+                JSONObject resp = ActionHandler.sendWithResponse(req);
+                Platform.runLater(() -> {
+                    if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                        addSystemMessage("Edit failed: " + (resp == null ? "no response" : resp.optString("message", "")));
+                    } else {
+                        loadMessages(currentChat);
+                    }
+                });
+            }).start();
+            return;
+        }
+
+        if (pendingReplyToId != null) {
+            final String replyTo = pendingReplyToId;
+            pendingReplyToId = null;
+
+            if (!composerPane.getChildren().isEmpty()) {
+                composerPane.getChildren().remove(0);
+            }
+
+            JSONObject req = new JSONObject()
+                    .put("action", "send_reply_message")
+                    .put("receiver_type", cType)
+                    .put("receiver_id", chatId.toString())
+                    .put("content", text)
+                    .put("reply_to_id", replyTo);
+
+            new Thread(() -> {
+                JSONObject resp = ActionHandler.sendWithResponse(req);
+                Platform.runLater(() -> {
+                    if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                        addSystemMessage("Reply failed: " + (resp == null ? "no response" : resp.optString("message", "")));
+                    } else {
+
+                        loadMessages(currentChat);
+                    }
+                });
+            }).start();
+            return;
+        }
+
+
+        final String contentToSend = text;
+
+        JSONObject req = new JSONObject()
+                .put("action", "send_message")
+                .put("receiver_type", cType)
+                .put("receiver_id", chatId.toString())
+                .put("content", contentToSend)
+                .put("message_type", "TEXT");
+
+        new Thread(() -> {
+            JSONObject resp;
+            try {
+                resp = ActionHandler.sendWithResponse(req);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                Platform.runLater(() -> addSystemMessage("Send failed: " + ex.getMessage()));
+                return;
+            }
+
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                String err = (resp != null) ? resp.optString("message", "No response") : "No response";
+                Platform.runLater(() -> addSystemMessage("Send failed: " + err));
+                return;
+            }
+
+            JSONObject data = resp.optJSONObject("data");
+            String messageId = null;
+            String sendAtIso = null;
+            if (data != null) {
+                // { data: { message_id, send_at } }
+                messageId = data.optString("message_id", null);
+                sendAtIso = data.optString("send_at", null);
+
+                if (messageId == null) {
+                    JSONObject msgObj = data.optJSONObject("message");
+                    if (msgObj != null) {
+                        messageId = msgObj.optString("message_id", null);
+                        sendAtIso = msgObj.optString("send_at", null);
+                    }
+                }
+            }
+            if (messageId == null) messageId = UUID.randomUUID().toString();
+
+            final LocalDateTime ts =
+                    (sendAtIso != null && !sendAtIso.isBlank()) ? parseWhen(sendAtIso)
+                            : LocalDateTime.now();
+
+            final String fMessageId = messageId;
+            final LocalDateTime fTs = ts;
+
+            Platform.runLater(() -> {
+                if (currentChat == null || !currentChat.getId().equals(chatId)) return;
+
+                addBubble(
+                        true,                 // outgoing
+                        "You",                // display name
+                        "TEXT",               // message type
+                        contentToSend,        // content
+                        fTs,                  // timestamp
+                        fMessageId,           // message_id
+                        "", "", "",           // forwarded_from, forwarded_by, reply_to_id
+                        false,                // edited
+                        null,                  // reactions
+                        null,
+                        null
+
+                );
+
+                var mc = MainController.getInstance();
+                if (mc != null) {
+                    String preview = "You: " + (contentToSend.isBlank() ? "[Message]" : contentToSend);
+                    mc.onChatUpdated(chatId, cType, fTs, /*isIncoming*/ false, preview);
+                }
+
+                JSONObject idx = new JSONObject();
+                idx.put("message_id", fMessageId);
+                idx.put("message_type", "TEXT");
+                idx.put("content", contentToSend);
+                idx.put("sender_name", "You");
+                idx.put("sender_id", (me != null) ? me.toString() : "");
+                idx.put("send_at", fTs.toString());
+                msgIndex.put(fMessageId, idx);
+            });
+        }).start();
+    }
+
+    private void openFileChooser() {
+        FileChooser fc = new FileChooser();
+        fc.setTitle("Select image or audio");
+        fc.getExtensionFilters().addAll(
+                new FileChooser.ExtensionFilter("Images", "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp"),
+                new FileChooser.ExtensionFilter("Audio", "*.mp3", "*.wav", "*.m4a", "*.ogg", "*.aac")
+        );
+
+        File file = fc.showOpenDialog(attachmentButton.getScene().getWindow());
+        if (file == null) return;
+
+        String type = guessType(file);
+        if (type == null) {
+            toast("Only image or audio");
+            return;
+        }
+
+        if (currentChat == null) {
+            toast("Not available chat");
+            return;
+        }
+        UUID receiverId = currentChat.getId();
+        String receiverType = currentChat.getType();        // "private" | "group" | "channel"
+
+        String caption = (messageInput != null) ? messageInput.getText().trim() : "";
+        if (messageInput != null) messageInput.clear();
+
+        UUID messageId = UUID.randomUUID();
+
+        addPendingMediaBubble(messageId.toString(), file, type, caption);
+
+        new Thread(() -> {
+            ActionHandler ah = ActionHandler.getInstance();
+            ah.sendMediaMessage(messageId, receiverId, receiverType, type, file, caption);
+
+        }, "Media-Uploader").start();
+    }
+
+    private String guessType(File f) {
+        String name = f.getName().toLowerCase();
+        if (name.matches(".*\\.(png|jpg|jpeg|gif|bmp|webp)$")) return "IMAGE";
+        if (name.matches(".*\\.(mp3|wav|m4a|ogg|aac)$")) return "AUDIO";
+        return null;
+    }
+
+
+    private HBox addPendingMediaBubble(String messageId, File file, String type, String caption) {
+        HBox root = new HBox(8);
+        root.setFillHeight(true);
+        root.setAlignment(Pos.CENTER_RIGHT);
+
+        // preview
+        if ("IMAGE".equalsIgnoreCase(type)) {
+            ImageView iv = new ImageView(new Image(file.toURI().toString(), 240, 240, true, true, true));
+            iv.setPreserveRatio(true);
+            iv.setFitWidth(240);
+            iv.setFitHeight(240);
+            root.getChildren().add(iv);
+        } else if ("AUDIO".equalsIgnoreCase(type)) {
+            Label name = new Label(file.getName());
+            root.getChildren().add(new HBox(6, new Label("🎵"), name));
+        }
+
+        VBox right = new VBox(4);
+        if (caption != null && !caption.isBlank()) {
+            Label cap = new Label(caption);
+            cap.setWrapText(true);
+            right.getChildren().add(cap);
+        }
+
+        HBox statusRow = new HBox(6);
+        ProgressIndicator spinner = new ProgressIndicator();
+        spinner.setPrefSize(14, 14);
+        Label status = new Label("Sending...");
+        status.getProperties().put("role", "statusLabel");
+        statusRow.getChildren().addAll(spinner, status);
+        right.getChildren().add(statusRow);
+
+        root.getChildren().add(right);
+
+        if (messageId != null) root.getProperties().put("messageId", messageId);
+
+        messageContainer.getChildren().add(root);
+
+        if (messageId != null) pendingById.put(messageId, root);
+        pendingBubbles.addLast(root);
+
+        return root;
+    }
+
+
+    public void removePendingBubble(String messageId) {
+        if (messageId == null) return;
+        HBox node = pendingById.remove(messageId);
+        if (node != null) {
+            pendingBubbles.remove(node);
+            messageContainer.getChildren().remove(node);
+        }
+    }
+
+
+    private void toast(String msg) {
+        System.out.println("ℹ️ " + msg);
+        if (messageInput != null) {
+            messageInput.setTooltip(new Tooltip(msg));
+        }
+    }
+
+
+    public void addSystemMessage(String content) {
+        Label sys = new Label(content);
+        sys.setStyle("-fx-text-fill: gray; -fx-font-size: 11;");
+        messageContainer.getChildren().add(sys);
+        messageScrollPane.layout();
+        messageScrollPane.setVvalue(1.0);
+    }
+
+
+    private Image loadIcon(String filename) {
+        var url = getClass().getResource(ICON_BASE + filename);
+        if (url == null) {
+            System.err.println("Icon not found: " + ICON_BASE + filename);
+            return null;
+        }
+        return new Image(url.toExternalForm());
+    }
+
+
+    public void showChat(ChatEntry entry) {
+        this.currentChat = entry;
+        this.chatName = entry.getName();
+
+        chatTitle.setText(entry.getName());
+        if (entry.getImageUrl() != null && !entry.getImageUrl().isEmpty()) {
+            Image img = AvatarLocalResolver.load(entry.getImageUrl());
+            if (img != null) userAvatar.setImage(img);
+            else setDefaultHeaderAvatarByType(entry.getType());
+        } else {
+            setDefaultHeaderAvatarByType(entry.getType());
+        }
+        AvatarFX.circleClip(userAvatar, 36);
+
+
+        if ("channel".equalsIgnoreCase(entry.getType())) {
+            boolean canPostLocal = entry.isOwner() || entry.isAdmin()
+                    || (entry.getPermissions() != null && entry.getPermissions().optBoolean("can_post", false));
+            applyMode(canPostLocal ? ChatViewMode.NORMAL : ChatViewMode.READ_ONLY);
+        } else {
+            applyMode(ChatViewMode.NORMAL);
+        }
+
+        messageContainer.getChildren().clear();
+        loadMessages(entry);
+        markAsRead(entry);
+
+        fetchAndRenderHeader(entry);
+
+        // === (3-dot menu + header click) ===
+        configureHeaderActions(entry);
+
+        requestBlockStatusByChat(entry);
+    }
+
+
+    public void requestBlockStatusByChat(ChatEntry entry) {
+        if (entry == null || !"private".equalsIgnoreCase(entry.getType())) return;
+
+        String viewerId = Session.getUserUUID();
+        if (viewerId == null || viewerId.isBlank()) return;
+
+        JSONObject req = new JSONObject()
+                .put("action", "check_block_status_by_chat")
+                .put("viewer_id", viewerId)
+                .put("chat_id", entry.getId().toString());
+
+        new Thread(() -> {
+            JSONObject res = ActionHandler.sendWithResponse(req);
+            if (res == null || !"success".equalsIgnoreCase(res.optString("status"))) return;
+
+            JSONObject data = res.optJSONObject("data");
+            boolean blockedByMe = data != null && data.optBoolean("blocked_by_me", false);
+            boolean blockedMe = data != null && data.optBoolean("blocked_me", false);
+
+            Platform.runLater(() -> applyBlockUi(blockedByMe, blockedMe));
+        }).start();
+    }
+
+    public void applyBlockUi(boolean blockedByMe, boolean blockedMe) {
+        this.blockedByMeFlag = blockedByMe;
+        this.blockedMeFlag = blockedMe;
+
+        if (blockedByMe) {
+            if (readOnlyLabel != null) readOnlyLabel.setText("");
+            applyMode(ChatViewMode.BLOCKED);
+            return;
+        }
+
+        if (blockedMe) {
+            if (readOnlyLabel != null) readOnlyLabel.setText("YOU ARE BLOCKED");
+            applyMode(ChatViewMode.READ_ONLY);
+            return;
+        }
+
+        applyMode(ChatViewMode.NORMAL);
+    }
+
+
+    public void showChat(ChatEntry entry, ChatViewMode mode) {
+        this.currentChat = entry;
+
+        Session.currentChatEntry = entry;
+        // --- Header ---
+        chatTitle.setText(entry.getName());
+        if (entry.getImageUrl() != null && !entry.getImageUrl().isEmpty()) {
+            Image img = AvatarLocalResolver.load(entry.getImageUrl());
+            if (img != null) userAvatar.setImage(img);
+            else setDefaultHeaderAvatarByType(entry.getType());
+        } else {
+            setDefaultHeaderAvatarByType(entry.getType());
+        }
+        AvatarFX.circleClip(userAvatar, 36);
+
+        // Fetch live header info from server
+        fetchAndRenderHeader(entry);
+
+        // --- Messages ---
+        messageContainer.getChildren().clear();
+        loadMessages(entry);
+        markAsRead(entry);
+
+        // --- UI mode (Composer / Join / Add Contact) ---
+        applyMode(mode);
+
+        // Focus if normal mode
+        if (mode == ChatViewMode.NORMAL) {
+            Platform.runLater(() -> messageInput.requestFocus());
+        }
+
+        // Wire up menu + header click
+        configureHeaderActions(entry);
+
+        requestBlockStatusByChat(entry);
+    }
+
+    private void configureHeaderActions(ChatEntry entry) {
+        // Hide everything by default
+        archiveItem.setVisible(false);
+        viewProfileItem.setVisible(false);
+        deleteChatItem.setVisible(false);
+        viewGroupItem.setVisible(false);
+        leaveGroupItem.setVisible(false);
+        viewChannelItem.setVisible(false);
+        leaveChannelItem.setVisible(false);
+
+        switch (entry.getType().toLowerCase(Locale.ROOT)) {
+            case "private" -> {
+                archiveItem.setVisible(true);
+                viewProfileItem.setVisible(true);
+                deleteChatItem.setVisible(true);
+
+                archiveItem.setOnAction(e -> toggleArchive(entry));
+                viewProfileItem.setOnAction(e -> openInfoScene(entry));
+                deleteChatItem.setOnAction(e -> deleteChatButton(entry));
+            }
+            case "group" -> {
+                archiveItem.setVisible(true);
+                viewGroupItem.setVisible(true);
+                leaveGroupItem.setVisible(true);
+
+                archiveItem.setOnAction(e -> toggleArchive(entry));
+                viewGroupItem.setOnAction(e -> openInfoScene(entry));
+                leaveGroupItem.setOnAction(e -> onLeaveGroupMenuClicked(entry));
+            }
+            case "channel" -> {
+                archiveItem.setVisible(true);
+                viewChannelItem.setVisible(true);
+                leaveChannelItem.setVisible(true);
+
+                archiveItem.setOnAction(e -> toggleArchive(entry));
+                viewChannelItem.setOnAction(e -> openInfoScene(entry));
+                leaveChannelItem.setOnAction(e -> onLeaveChannelMenuClicked(entry));
+            }
+        }
+
+        // Header click opens info
+        chatHeader.setOnMouseClicked(e -> {
+            if (!chatMoreButton.equals(e.getTarget())) {
+                openInfoScene(entry);
+            }
+        });
+    }
+
+    private void openInfoScene(ChatEntry entry) {
+        JSONObject req = new JSONObject();
+        String targetId = null; // 👈 capture it here for the private case
+
+        switch (entry.getType().toLowerCase()) {
+            case "private" -> {
+                // First ask server for the target_id of this private chat
+                JSONObject targetReq = new JSONObject()
+                        .put("action", "get_private_chat_target")
+                        .put("chat_id", entry.getId().toString());
+
+                JSONObject targetResp = ActionHandler.sendWithResponse(targetReq);
+                if (targetResp == null || !"success".equalsIgnoreCase(targetResp.optString("status"))) {
+                    Platform.runLater(() ->
+                            MainController.getInstance().showAlert(
+                                    "Error",
+                                    targetResp != null ? targetResp.optString("message") : "Failed to fetch chat target.",
+                                    Alert.AlertType.ERROR
+                            )
+                    );
+                    return;
+                }
+
+                targetId = targetResp.optJSONObject("data").optString("target_id", null);
+                if (targetId == null || targetId.isBlank()) {
+                    Platform.runLater(() ->
+                            MainController.getInstance().showAlert(
+                                    "Error",
+                                    "No target user found for this chat.",
+                                    Alert.AlertType.ERROR
+                            )
+                    );
+                    return;
+                }
+
+                req.put("action", "view_profile")
+                        .put("target_id", targetId);
+            }
+            case "group" -> {
+                req.put("action", "view_group")
+                        .put("group_id", entry.getId().toString())
+                        .put("viewer_id", Session.getUserUUID());
+            }
+            case "channel" -> {
+                req.put("action", "view_channel")
+                        .put("channel_id", entry.getId().toString());
+            }
+            default -> {
+                Platform.runLater(() ->
+                        MainController.getInstance().showAlert(
+                                "Error",
+                                "Unsupported chat type: " + entry.getType(),
+                                Alert.AlertType.ERROR
+                        )
+                );
+                return;
+            }
+        }
+
+        final String finalTargetId = targetId;
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() ->
+                        MainController.getInstance().showAlert(
+                                "Error",
+                                resp != null ? resp.optString("message") : "Server not responding.",
+                                Alert.AlertType.ERROR
+                        )
+                );
+                return;
+            }
+
+            JSONObject data = resp.optJSONObject("data");
+            if (data == null) {
+                Platform.runLater(() ->
+                        MainController.getInstance().showAlert(
+                                "Error",
+                                "Malformed server response.",
+                                Alert.AlertType.ERROR
+                        )
+                );
+                return;
+            }
+
+            Platform.runLater(() -> {
+                try {
+                    FXMLLoader loader;
+                    Node overlay = null;
+
+                    switch (entry.getType().toLowerCase()) {
+                        case "private" -> {
+                            loader = new FXMLLoader(getClass().getResource(
+                                    "/org/to/telegramfinalproject/Fxml/user_info.fxml"));
+                            overlay = loader.load();
+                            UserInfoController c = loader.getController();
+                            // 👇 pass targetId so UserInfoController gets the real UUID
+                            c.setProfileDataFromJson(entry, data, finalTargetId);
+                        }
+                        case "group" -> {
+                            loader = new FXMLLoader(getClass().getResource(
+                                    "/org/to/telegramfinalproject/Fxml/group_info.fxml"));
+                            overlay = loader.load();
+                            GroupInfoController c = loader.getController();
+                            c.setGroupDataFromJson(entry, data);
+                        }
+                        case "channel" -> {
+                            loader = new FXMLLoader(getClass().getResource(
+                                    "/org/to/telegramfinalproject/Fxml/channel_info.fxml"));
+                            overlay = loader.load();
+                            ChannelInfoController c = loader.getController();
+                            c.setChannelDataFromJson(entry, data);
+                        }
+                    }
+
+                    if (overlay != null) {
+                        MainController.getInstance().showOverlay(overlay);
+                    }
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    MainController.getInstance().showAlert(
+                            "Error",
+                            "Could not load info scene.",
+                            Alert.AlertType.ERROR
+                    );
+                }
+            });
+        }).start();
+    }
+
+    private void deleteChatButton(ChatEntry entry) {
+        JSONObject req = new JSONObject()
+                .put("action", "delete_chat")
+                .put("receiver_id", entry.getId().toString())
+                .put("viewer_id", Session.getUserUUID());
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().refreshChatListUI();
+            AppRouter.showMain();
+            MainController.getInstance().closeCurrentChat();
+        }
+    }
+
+    private void leaveGroupButton(ChatEntry entry) {
+        JSONObject req = new JSONObject()
+                .put("action", "leave_group")
+                .put("group_id", entry.getId().toString())
+                .put("viewer_id", Session.getUserUUID());
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().closeCurrentChat();
+        }
+    }
+
+    private void leaveChannelButton(ChatEntry entry) {
+        JSONObject req = new JSONObject()
+                .put("action", "leave_channel")
+                .put("channel_id", entry.getId().toString())
+                .put("viewer_id", Session.getUserUUID());
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().closeCurrentChat();
+        }
+    }
+
+    private void toggleArchive(ChatEntry entry) {
+        boolean currentlyArchived = Session.isArchived(entry.getId());
+
+        // Disable UI source while processing
+        if (archiveItem != null) archiveItem.setDisable(true);
+
+        new Thread(() -> {
+            JSONObject req = new JSONObject()
+                    .put("chat_id", entry.getId().toString());
+
+            if (!currentlyArchived) {
+                // ARCHIVE
+                req.put("action", "archive_chat")
+                        .put("chat_type", entry.getType());
+            } else {
+                // UNARCHIVE
+                req.put("action", "unarchive_chat");
+            }
+
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+
+            Platform.runLater(() -> {
+                if (archiveItem != null) archiveItem.setDisable(false);
+
+                if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                    if (!currentlyArchived) {
+                        Session.moveToArchived(entry);
+                        if (archiveItem != null) archiveItem.setText("Unarchive chat");
+                    } else {
+                        Session.moveToActive(entry);
+                        if (archiveItem != null) archiveItem.setText("Archive chat");
+                    }
+                    Session.sortListsByLastMessage();
+
+                    try {
+                        MainController.getInstance().refreshChatListUI();
+                    } catch (Exception ignore) {
+                    }
+
+                    if (Session.inArchivedView && !Session.isArchived(entry.getId())) {
+                        try {
+                            MainController.getInstance().refreshArchivedListUI();
+                        } catch (Exception ignore) {
+                        }
+                    }
+
+                    try {
+                        MainController.getInstance().ensureArchivedHeaderRow();
+                    } catch (Exception ignore) {
+                    }
+
+                } else {
+                    String msg = (resp != null ? resp.optString("message", "Unknown error")
+                            : "No response from server.");
+                    new Alert(Alert.AlertType.ERROR, "Failed to toggle archive: " + msg).showAndWait();
+                }
+            });
+        }).start();
+    }
+
+
+    private void loadMessages(ChatEntry entry) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_messages_UI");
+        req.put("receiver_id", String.valueOf(entry.getId()));
+        req.put("receiver_type", entry.getType());
+        req.put("limit", 50);
+
+        new Thread(() -> {
+            JSONObject resp;
+            try {
+                resp = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                return;
+            }
+            if (resp == null) return;
+
+            String status = "";
+            try {
+                status = resp.getString("status");
+            } catch (Exception ignore) {
+            }
+            if (!"success".equals(status)) return;
+
+            JSONObject data = null;
+            try {
+                data = resp.getJSONObject("data");
+            } catch (Exception ignore) {
+            }
+            if (data == null) return;
+
+            JSONArray arr = null;
+            try {
+                arr = data.getJSONArray("messages");
+            } catch (Exception ignore) {
+            }
+            if (arr == null) return;
+
+            JSONArray finalArr = arr;
+            Platform.runLater(() -> renderMessages(finalArr));
+        }).start();
+    }
+
+
+    private final java.util.Map<String, org.json.JSONObject> msgIndex = new java.util.HashMap<>();
+
+
+    private void renderMessages(org.json.JSONArray list) {
+        messageContainer.getChildren().clear();
+
+        msgIndex.clear();
+        for (int i = 0; i < list.length(); i++) {
+            org.json.JSONObject m = list.getJSONObject(i);
+            String mid = str(m, "message_id");
+            if (!mid.isEmpty()) msgIndex.put(mid, m);
+        }
+
+        String myId = (Session.currentUser != null && Session.currentUser.has("internal_uuid"))
+                ? Session.currentUser.getString("internal_uuid") : "";
+
+        for (int i = 0; i < list.length(); i++) {
+            org.json.JSONObject m = list.getJSONObject(i);
+
+            String senderId = str(m, "sender_id");
+            String senderName = str(m, "sender_name");
+            String type = str(m, "message_type");
+            String content = str(m, "content");
+            String whenStr = str(m, "send_at");
+            String msgId = str(m, "message_id");
+
+            String fileUrl = str(m, "file_url");
+            String thumbUrl = str(m, "thumb_url");
+
+            String fwdFrom = nz(str(m, "forwarded_from"));
+            String fwdBy = nz(str(m, "forwarded_by"));
+            String replyToId = nz(str(m, "reply_to_id"));
+            boolean edited = bool(m, "is_edited");
+            org.json.JSONArray reactions = arr(m, "reactions");
+
+            boolean outgoing = senderId.equalsIgnoreCase(myId);
+            if (senderName == null || senderName.isBlank()) {
+                senderName = outgoing ? "You"
+                        : (senderId == null || senderId.isBlank()
+                        ? "Unknown"
+                        : senderId.substring(0, Math.min(8, senderId.length())));
+            }
+
+            java.time.LocalDateTime ts = parseWhen(whenStr);
+
+            addBubble(outgoing, senderName, type, content, ts, msgId,
+                    fwdFrom, fwdBy, replyToId, edited, reactions, fileUrl, thumbUrl);
+        }
+
+        messageContainer.setSpacing(8);
+        messageScrollPane.layout();
+        messageScrollPane.setVvalue(1.0);
+    }
+
+
+    private String shortId(String id) {
+        return (id == null || id.isEmpty()) ? "Unknown" : id.substring(0, Math.min(8, id.length()));
+    }
+
+    private void markAsRead(ChatEntry entry) {
+        JSONObject readReq = new JSONObject();
+        readReq.put("action", "mark_as_read");
+        readReq.put("receiver_id", entry.getId().toString()); // internal_id
+        readReq.put("receiver_type", entry.getType());
+        ActionHandler.sendWithResponse(readReq);
+    }
+
+
+    private void addBubble(
+            boolean outgoing,
+            String displayName,
+            String type,
+            String content,
+            java.time.LocalDateTime sentAt,
+            String messageId,
+            String forwardedFrom,
+            String forwardedBy,
+            String replyToId,
+            boolean edited,
+            org.json.JSONArray reactions,
+            String fileUrl,
+            String thumbUrl
+    ) {
+        String metaText = (displayName == null ? "" : displayName) + " • " + formatWhen(sentAt);
+        if (edited) metaText += " (edited)";
+        Label meta = new Label(metaText);
+        meta.setStyle("-fx-font-size: 11; -fx-text-fill: #7e8a97;");
+        meta.setWrapText(true);
+        meta.getProperties().put("role", "metaLabel");
+
+        String t = type == null ? "" : type.trim().toUpperCase();
+        boolean isText = t.isEmpty() ? (content != null && !content.isBlank()) : "TEXT".equals(t);
+
+        boolean dark = themeManager.isDarkMode();
+        String mine = dark ? "#2b7cff" : "#d8ecff";
+        String theirs = dark ? "#2c333a" : "#f2f4f7";
+
+        VBox bubble = new VBox(4);
+        bubble.getChildren().add(meta);
+        if (messageId != null && !messageId.isBlank()) {
+            bubble.getProperties().put("messageId", messageId);
+        }
+
+        if (hasVal(forwardedFrom) || hasVal(forwardedBy)) {
+            bubble.getChildren().add(buildForwardHeader(forwardedFrom, forwardedBy));
+        }
+        if (hasVal(replyToId)) {
+            bubble.getChildren().add(buildReplyBoxFromIndex(replyToId));
+        }
+
+        if (isText) {
+            // متن
+            String bodyText = content == null ? "" : content;
+            Label msg = new Label(bodyText);
+            msg.setWrapText(true);
+            msg.setMinHeight(Region.USE_PREF_SIZE);
+            msg.getProperties().put("role", "msgLabel");
+            String bg = outgoing ? mine : theirs;
+            msg.setStyle("-fx-background-color:" + bg + ";" +
+                    "-fx-padding:8 12;" +
+                    "-fx-background-radius:12;" +
+                    "-fx-max-width: 520;");
+            bubble.getChildren().add(msg);
+
+        } else if ("IMAGE".equals(t)) {
+            Node imageNode = buildImageNode(fileUrl, thumbUrl, content);
+            bubble.getChildren().add(imageNode);
+
+        } else if ("AUDIO".equals(t)) {
+            final MediaPathResolver resolver =
+                    new MediaPathResolver(Paths.get(System.getProperty("user.dir"), "uploads"));
+
+            String playable = resolver.toFileUri(fileUrl);
+
+            Node audioNode = buildAudioNodeLocal(playable, content);
+            bubble.getChildren().add(audioNode);
+        } else {
+            Label ph = new Label("[" + t + "]");
+            ph.setWrapText(true);
+            String bg = outgoing ? mine : theirs;
+            ph.setStyle("-fx-background-color:" + bg + ";" +
+                    "-fx-padding:8 12;" +
+                    "-fx-background-radius:12;" +
+                    "-fx-max-width: 520;");
+            bubble.getChildren().add(ph);
+        }
+
+        if (reactions != null && reactions.length() > 0) {
+            Node rxBar = buildReactionsBarFromJson(reactions, dark);
+            rxBar.getProperties().put("role", "reactionsBar");
+            bubble.getChildren().add(rxBar);
+        }
+
+        HBox row = new HBox(bubble);
+        row.setFillHeight(true);
+        row.setSpacing(4);
+        row.setAlignment(outgoing ? Pos.CENTER_RIGHT : Pos.CENTER_LEFT);
+        row.setPadding(new Insets(2, 6, 2, 6));
+
+        messageContainer.getChildren().add(row);
+        if (messageId != null && !messageId.isBlank()) {
+            messageNodes.put(messageId, row);
+        }
+
+        boolean isMine = outgoing;
+        ContextMenu menu = buildMessageMenu(isMine, messageId, type, content);
+        row.setOnContextMenuRequested(ev -> {
+            menu.show(row, ev.getScreenX(), ev.getScreenY());
+            ev.consume();
+        });
+        row.setOnMouseClicked(ev -> {
+            if (ev.getButton() == javafx.scene.input.MouseButton.PRIMARY && ev.getClickCount() == 1) {
+                menu.show(row, ev.getScreenX(), ev.getScreenY());
+            }
+        });
+    }
+
+    private Node buildImageNode(String fileUrl, String thumbUrl, String caption) {
+        String url = hasVal(fileUrl) ? absolute(fileUrl) : null;
+        if (!hasVal(url)) return new Label("❌ Image not available");
+
+        ImageView iv = new ImageView();
+        iv.setPreserveRatio(true);
+        iv.setSmooth(true);
+        iv.setFitWidth(360);
+        iv.setFitHeight(360);
+
+        Image img = new Image(url, 360, 360, true, true, true);
+        iv.setImage(img);
+
+        img.errorProperty().addListener((obs, wasErr, isErr) -> {
+            if (isErr) {
+                System.err.println("⚠️ Image load failed: " + url + " | ex=" + img.getException());
+                Label err = new Label("❌ Failed to load image");
+                VBox fallback = new VBox(4, err);
+                Platform.runLater(() -> {
+                    if (iv.getParent() instanceof VBox v) {
+                        int idx = v.getChildren().indexOf(iv);
+                        if (idx >= 0) v.getChildren().set(idx, fallback);
+                    }
+                });
+            }
+        });
+
+        iv.setOnMouseClicked(e -> openImagePreviewDialog(url));
+
+        VBox box = new VBox(6, iv);
+        if (hasVal(caption)) {
+            Label cap = new Label(caption);
+            cap.setWrapText(true);
+            cap.setStyle("-fx-padding:6 8; -fx-background-radius:10; -fx-background-color: transparent; -fx-max-width: 520;");
+            box.getChildren().add(cap);
+        }
+        return box;
+    }
+
+
+    private void openImagePreviewDialog(String fullUrl) {
+        if (fullUrl == null || fullUrl.isBlank()) return;
+
+        String url = fullUrl;
+
+        ImageView iv = new ImageView(new Image(url, true));
+        iv.setPreserveRatio(true);
+
+        ScrollPane sp = new ScrollPane(iv);
+        sp.setPannable(true);
+        sp.setFitToWidth(true);
+        sp.setFitToHeight(true);
+
+        Stage st = new Stage();
+        st.setTitle("Preview");
+        st.initOwner(attachmentButton.getScene().getWindow());
+        st.setScene(new Scene(sp, 900, 700));
+        st.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
+            if (e.getCode() == KeyCode.ESCAPE) st.close();
+        });
+        st.show();
+    }
+
+
+    private String absolute(String pathOrUrl) {
+        if (pathOrUrl == null || pathOrUrl.isBlank()) return null;
+        if (pathOrUrl.startsWith("http")) return pathOrUrl;
+
+        String rel = pathOrUrl.startsWith("/") ? pathOrUrl.substring(1) : pathOrUrl;
+
+        java.nio.file.Path p = java.nio.file.Paths.get(UPLOADS_DIR, rel.replace("/", java.io.File.separator));
+        java.net.URI uri = p.toUri();
+        return uri.toString();
+
+
+    }
+
+
+    private ContextMenu buildMessageMenu(boolean isMine, String messageId, String type, String content) {
+        ContextMenu menu = new ContextMenu();
+
+        HBox reactions = new HBox(8);
+        String[] emojis = {"👍", "👎", "😂", "😭", "⚡"};
+        for (String e : emojis) {
+            Button b = new Button(e);
+            b.getStyleClass().add("reaction-btn");
+            b.setOnAction(ae -> {
+                reactToMessage(messageId, e);
+                menu.hide();
+            });
+            reactions.getChildren().add(b);
+        }
+        CustomMenuItem reactionsItem = new CustomMenuItem(reactions, false);
+        reactionsItem.setHideOnClick(false);
+        menu.getItems().add(reactionsItem);
+        menu.getItems().add(new SeparatorMenuItem());
+
+        MenuItem reply = new MenuItem("Reply");
+        reply.setOnAction(ae -> startReply(messageId));
+        MenuItem forward = new MenuItem("Forward");
+        forward.setOnAction(ae -> startForward(messageId));
+
+        if ("TEXT".equalsIgnoreCase(nz(type)) && hasVal(content)) {
+            MenuItem copy = new MenuItem("Copy");
+            copy.setOnAction(ae -> {
+                var cb = javafx.scene.input.Clipboard.getSystemClipboard();
+                var contentCB = new javafx.scene.input.ClipboardContent();
+                contentCB.putString(content);
+                cb.setContent(contentCB);
+            });
+            menu.getItems().add(copy);
+        }
+
+        menu.getItems().addAll(reply, forward);
+        if (isMine) {
+            MenuItem edit = new MenuItem("Edit");
+            edit.setOnAction(ae -> startEdit(messageId, content));
+
+            MenuItem delete = new MenuItem("Delete");
+            delete.getStyleClass().add("danger-item");
+
+            delete.setOnAction(ae -> confirmDeleteDialog(messageId));
+
+            menu.getItems().addAll(edit, delete);
+        }
+
+
+        return menu;
+    }
+
+
+    private String bracketLabel(String t) {
+        String tt = (t == null) ? "" : t.trim().toUpperCase();
+        switch (tt) {
+            case "IMAGE":
+                return "[Image]";
+            case "AUDIO":
+                return "[Audio]";
+            case "VIDEO":
+                return "[Video]";
+            case "FILE":
+                return "[File]";
+            default:
+                return "[Message]";
+        }
+    }
+
+
+    private javafx.scene.Node buildForwardHeader(String forwardedFrom, String forwardedBy) {
+        String from = hasVal(forwardedFrom) ? forwardedFrom.trim() : null;
+        String by = hasVal(forwardedBy) ? forwardedBy.trim() : null;
+
+        String txt = (from != null && by != null) ? ("Forwarded from " + from + " by " + by)
+                : (from != null) ? ("Forwarded from " + from)
+                : (by != null) ? ("Forwarded by " + by)
+                : "Forwarded";
+
+        Label l = new Label(txt);
+        l.setStyle("-fx-font-size: 11; -fx-text-fill: #5b8bb1;");
+        l.setWrapText(true);
+        return l;
+    }
+
+    private javafx.scene.Node buildReplyBoxFromIndex(String replyToId) {
+        org.json.JSONObject r = msgIndex.get(replyToId);
+        String from = "Unknown";
+        String preview;
+
+        if (r != null) {
+            String rType = r.optString("message_type", "TEXT");
+            String rContent = r.optString("content", "");
+            String rSender = r.optString("sender_name", "");
+            if (hasVal(rSender)) from = rSender;
+
+            preview = "TEXT".equalsIgnoreCase(rType) ? rContent : bracketLabel(rType);
+        } else {
+            preview = "[Quoted message]";
+        }
+
+        Label t = new Label("Reply to " + from);
+        t.setStyle("-fx-font-size: 11; -fx-text-fill: #5b8bb1; -fx-font-weight: bold;");
+
+        Label p = new Label(ellipsize(preview == null ? "" : preview, 140));
+        p.setWrapText(true);
+        p.setStyle("-fx-font-size: 12; -fx-text-fill: #6b7c8a;");
+
+        VBox box = new VBox(2, t, p);
+        box.setStyle(
+                "-fx-background-color: rgba(125,150,175,0.10);" +
+                        "-fx-padding:6 8; -fx-background-radius:8;" +
+                        "-fx-border-color:#7da0b8; -fx-border-width:0 0 0 2;"
+        );
+        return box;
+    }
+
+
+    private Node buildReactionsBarFromJson(org.json.JSONArray reactions, boolean dark) {
+        HBox bar = new HBox(6);
+        for (int i = 0; i < reactions.length(); i++) {
+            var r = reactions.getJSONObject(i);
+            String emo = r.optString("emoji", "👍");
+            int cnt = r.optInt("count", 1);
+
+            Label chip = new Label(emo + " " + cnt);
+            chip.getStyleClass().add("emoji-label");
+            chip.setStyle("-fx-background-color:" + (dark ? "#39424a" : "#e9eef3") +
+                    "; -fx-padding:3 8; -fx-background-radius:12;");
+
+            bar.getChildren().add(chip);
+        }
+        return bar;
+    }
+
+
+    private static String ellipsize(String s, int max) {
+        return s.length() > max ? s.substring(0, max) + "…" : s;
+    }
+
+    public boolean isSameChat(UUID chatId, String type) {
+        return currentChat != null
+                && currentChat.getId().equals(chatId)
+                && currentChat.getType().equalsIgnoreCase(type);
+    }
+
+
+    public void onRealTimeNewMessage(org.json.JSONObject m) {
+        try {
+            String chatIdStr = nz(m.optString("receiver_id", m.optString("chat_id", "")));
+            String chatType = nz(m.optString("receiver_type", m.optString("chat_type", "")));
+            if (chatIdStr.isEmpty() || chatType.isEmpty()) return;
+
+            UUID chatId = UUID.fromString(chatIdStr);
+            boolean isCurrent = isSameChat(chatId, chatType);
+
+            if (!m.has("message_id") && m.has("id")) m.put("message_id", m.getString("id"));
+            String msgId = str(m, "message_id");
+            if (!hasVal(msgId)) return;
+
+            if (messageNodes.containsKey(msgId)) return;
+
+            String senderId = str(m, "sender_id");
+            String senderName = hasVal(str(m, "sender_name")) ? str(m, "sender_name")
+                    : (hasVal(senderId) ? shortId(senderId) : "Unknown");
+
+            String tRaw = nz(m.optString("message_type", "TEXT"));
+            String type = tRaw.trim().toUpperCase(java.util.Locale.ROOT);
+
+            String content = nz(m.optString("content", m.optString("text", "")));
+
+            String whenIso = nz(m.optString("send_at", m.optString("created_at", "")));
+            java.time.LocalDateTime ts = parseWhen(whenIso);
+            if (ts == null) ts = java.time.LocalDateTime.now();
+
+            String fileUrl = nz(m.optString("file_url", ""));
+            String thumbUrl = nz(m.optString("thumb_url", ""));
+            org.json.JSONObject media = m.optJSONObject("media");
+            if (media != null) {
+                if (!hasVal(fileUrl)) fileUrl = nz(media.optString("url", ""));
+                if (!hasVal(thumbUrl)) thumbUrl = nz(media.optString("thumbnail_url", ""));
+            }
+
+            String fwdFrom = str(m, "forwarded_from");
+            String fwdBy = str(m, "forwarded_by");
+            String replyTo = str(m, "reply_to_id");
+            boolean edited = bool(m, "is_edited");
+            org.json.JSONArray reacts = arr(m, "reactions");
+
+            String myId = (Session.currentUser != null && Session.currentUser.has("internal_uuid"))
+                    ? Session.currentUser.getString("internal_uuid") : "";
+            boolean outgoing = hasVal(senderId) && senderId.equalsIgnoreCase(myId);
+
+            msgIndex.put(msgId, m);
+
+            String previewText = switch (type) {
+                case "IMAGE" -> (hasVal(content) ? "🖼️ Photo — " + content : "🖼️ Photo");
+                case "AUDIO" -> "🎵 Audio";
+                default -> content;
+            };
+            updateChatListPreview(chatId, chatType, !outgoing, previewText, type);
+
+            if (!isCurrent) return;
+
+            addBubble(outgoing, senderName, type, content, ts, msgId,
+                    fwdFrom, fwdBy, replyTo, edited, reacts,
+                    fileUrl, thumbUrl);
+
+            if (currentChat != null) markAsRead(currentChat);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    private void updateChatListPreview(UUID chatId, String type, boolean incoming, String content, String messageType) {
+        var mc = MainController.getInstance();
+        if (mc == null) return;
+        String preview;
+        switch ((messageType == null ? "" : messageType.toUpperCase())) {
+            case "IMAGE" -> preview = (incoming ? "" : "You: ") + "[Image]";
+            case "AUDIO" -> preview = (incoming ? "" : "You: ") + "[Audio]";
+            case "VIDEO" -> preview = (incoming ? "" : "You: ") + "[Video]";
+            case "FILE" -> preview = (incoming ? "" : "You: ") + "[File]";
+            default ->
+                    preview = (incoming ? "" : "You: ") + (content == null || content.isBlank() ? "[Message]" : content);
+        }
+        mc.onChatUpdated(chatId, type, LocalDateTime.now(), incoming, preview);
+    }
+
+    public void onRealTimeReaction(JSONObject ev) {
+        String msgId = str(ev, "message_id");
+        if (!hasVal(msgId)) return;
+
+        JSONObject idx = msgIndex.getOrDefault(msgId, new JSONObject().put("message_id", msgId));
+
+        JSONArray reactions = ev.optJSONArray("reactions");
+        if (reactions == null) {
+            JSONObject counts = ev.optJSONObject("counts");
+            if (counts != null) {
+                reactions = new JSONArray();
+                for (String key : counts.keySet()) {
+                    reactions.put(new JSONObject()
+                            .put("emoji", key)
+                            .put("count", counts.optInt(key, 0))
+                    );
+                }
+            } else if (ev.has("emoji")) {
+                reactions = new JSONArray().put(new JSONObject()
+                        .put("emoji", ev.optString("emoji", "👍"))
+                        .put("count", ev.optInt("count", 1)));
+            }
+        }
+        if (reactions != null) {
+            idx.put("reactions", reactions);
+            msgIndex.put(msgId, idx);
+        }
+
+        Node row = messageNodes.get(msgId);
+        if (!(row instanceof HBox hbox)) return;
+
+        for (Node child : hbox.getChildren()) {
+            if (child instanceof VBox bubble && msgId.equals(bubble.getProperties().get("messageId"))) {
+                Node oldBar = null;
+                for (Node bch : bubble.getChildren()) {
+                    if ("reactionsBar".equals(bch.getProperties().get("role"))) {
+                        oldBar = bch;
+                        break;
+                    }
+                }
+                if (oldBar != null) bubble.getChildren().remove(oldBar);
+
+                JSONArray rx = reactions != null ? reactions : idx.optJSONArray("reactions");
+                if (rx != null && rx.length() > 0) {
+                    boolean dark = themeManager.isDarkMode();
+                    Node newBar = buildReactionsBarFromJson(rx, dark);
+                    newBar.getProperties().put("role", "reactionsBar");
+                    bubble.getChildren().add(newBar);
+                }
+                break;
+            }
+        }
+    }
+
+    public void onRealTimeMessageEdited(JSONObject ev) {
+        String msgId = str(ev, "message_id");
+        if (!hasVal(msgId)) return;
+
+        String newContent = str(ev, "new_content");
+
+        JSONObject idx = msgIndex.getOrDefault(msgId, new JSONObject().put("message_id", msgId));
+        if (hasVal(newContent)) idx.put("content", newContent);
+        idx.put("is_edited", true);
+        msgIndex.put(msgId, idx);
+
+        Node row = messageNodes.get(msgId);
+        if (!(row instanceof HBox hbox)) return;
+
+        for (Node child : hbox.getChildren()) {
+            if (child instanceof VBox bubble && msgId.equals(bubble.getProperties().get("messageId"))) {
+                for (Node bch : bubble.getChildren()) {
+                    Object role = bch.getProperties().get("role");
+                    if ("msgLabel".equals(role) && bch instanceof Label lbl && hasVal(newContent)) {
+                        lbl.setText(newContent);
+                    }
+                    if ("metaLabel".equals(role) && bch instanceof Label meta) {
+                        String t = meta.getText();
+                        if (t != null && !t.contains("(edited)")) meta.setText(t + " (edited)");
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+
+
+    private Node buildAudioNodeLocal(String localPathOrUri, String caption) {
+        HBox root = new HBox(8);
+        root.setAlignment(Pos.CENTER_LEFT);
+
+        Button btn = new Button("▶");
+        btn.setMinWidth(32);
+
+        Slider seek = new Slider(0, 1, 0);
+        seek.setPrefWidth(180);
+
+        Label time = new Label("0:00");
+        VBox right = new VBox(4, new HBox(8, btn, seek, time));
+        if (caption != null && !caption.isBlank()) {
+            Label cap = new Label(caption);
+            cap.setWrapText(true);
+            right.getChildren().add(cap);
+        }
+        root.getChildren().add(right);
+
+        String playable = toFileUri(localPathOrUri);
+        if (playable == null) {
+            btn.setDisable(true); seek.setDisable(true); time.setText("no audio");
+            return root;
+        }
+
+        try {
+            java.net.URI uri = java.net.URI.create(playable);
+            java.nio.file.Path p = java.nio.file.Paths.get(uri);
+            if (!java.nio.file.Files.exists(p)) {
+                btn.setDisable(true); seek.setDisable(true); time.setText("not found");
+                System.err.println("Audio file not found: " + p);
+                return root;
+            }
+        } catch (Exception ignore) {  }
+
+        MediaPlayer[] holder = new MediaPlayer[1];
+        try {
+            Media media = new Media(playable);
+            MediaPlayer player = new MediaPlayer(media);
+            holder[0] = player;
+
+            player.setOnReady(() -> {
+                double secs = player.getMedia().getDuration().toSeconds();
+                if (secs <= 0) secs = 1;
+                seek.setMax(secs);
+                time.setText(fmtClock(secs));
+            });
+
+            player.currentTimeProperty().addListener((o, ov, nv) -> {
+                if (!seek.isValueChanging()) seek.setValue(nv.toSeconds());
+            });
+
+            seek.valueChangingProperty().addListener((obs, was, is) -> {
+                if (!is && holder[0] != null) holder[0].seek(Duration.seconds(seek.getValue()));
+            });
+            seek.setOnMouseReleased(e -> {
+                if (holder[0] != null) holder[0].seek(Duration.seconds(seek.getValue()));
+            });
+
+            btn.setOnAction(e -> {
+                if (holder[0] == null) return;
+                if (holder[0].getStatus() == MediaPlayer.Status.PLAYING) {
+                    holder[0].pause(); btn.setText("▶");
+                } else {
+                    holder[0].play();  btn.setText("⏸");
+                }
+            });
+
+            player.setOnEndOfMedia(() -> { btn.setText("▶"); player.seek(Duration.ZERO); });
+
+            media.setOnError(() -> System.err.println("Media error: "  + media.getError()));
+            player.setOnError(() -> System.err.println("Player error: " + player.getError()));
+
+            root.sceneProperty().addListener((obs, old, nw) -> {
+                if (old != null && nw == null && holder[0] != null) { holder[0].dispose(); holder[0] = null; }
+            });
+
+        } catch (Exception ex) {
+            btn.setDisable(true); seek.setDisable(true); time.setText("error");
+            System.err.println("Build media failed: " + ex.getMessage() + " | uri=" + playable);
+        }
+
+        return root;
+    }
+
+
+    private String toFileUri(String pathOrUri) {
+        if (pathOrUri == null || pathOrUri.isBlank()) return null;
+        if (pathOrUri.startsWith("file:/")) return pathOrUri;
+
+        java.io.File f = new java.io.File(pathOrUri);
+        return f.toURI().toString();
+    }
+
+
+    private String fmtClock(double secsD) {
+        int secs = (int)Math.round(secsD);
+        return (secs/60) + ":" + String.format("%02d", secs%60);
+    }
+
+
+    public void onRealTimeMessageDeleted(JSONObject ev) {
+        String msgId = str(ev, "message_id");
+        if (!hasVal(msgId)) return;
+
+        Node n = messageNodes.remove(msgId);
+        if (n != null) messageContainer.getChildren().remove(n);
+
+        msgIndex.remove(msgId);
+    }
+
+
+    private void fetchAndRenderHeader(ChatEntry entry) {
+        JSONObject req = new JSONObject();
+        req.put("action", "get_header_info");
+        req.put("receiver_id", entry.getId().toString());
+        req.put("receiver_type", entry.getType());
+
+        String viewer = Session.getUserUUID();
+        if (viewer != null && !viewer.isBlank()) {
+            req.put("viewer_id", viewer);
+        }
+
+
+        new Thread(() -> {
+            JSONObject resp;
+            try {
+                resp = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                return;
+            }
+
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                System.err.println("get_header_info failed: " + (resp != null ? resp.optString("message") : "null resp"));
+                return;
+            }
+            JSONObject data = resp.optJSONObject("data");
+            if (data == null) return;
+
+            Platform.runLater(() -> renderHeaderFromData(entry, data));
+        }).start();
+    }
+
+    private void renderHeaderFromData(ChatEntry entry, JSONObject data) {
+        String t = entry.getType() == null ? "" : entry.getType().toLowerCase();
+        switch (t) {
+            case "private" -> updatePrivateHeader(entry, data);
+            case "group" -> updateGroupHeader(entry, data);
+            case "channel" -> updateChannelHeader(entry, data);
+            default -> chatStatus.setText("");
+        }
+    }
+
+
+    private void updatePrivateHeader(ChatEntry entry, JSONObject data) {
+        String name = nz(data.optString("profile_name", entry.getName()));
+        chatTitle.setText(name);
+
+        String other = data.optString("other_user_id", "");
+        if (!other.isBlank()) {
+            try {
+                entry.setOtherUserId(UUID.fromString(other));
+            } catch (Exception ignore) {
+            }
+        }
+
+        String img = data.optString("image_url", "");
+        if (hasVal(img)) {
+            try {
+                Image im = AvatarLocalResolver.load(img);
+                if (im != null) userAvatar.setImage(im);
+                userAvatar.setClip(new Circle(20, 20, 20));
+            } catch (Exception ignore) {
+            }
+        }
+
+        chatStatus.setText(userStatusText(
+                data.optBoolean("online", false),
+                data.optString("last_seen", null)
+        ));
+
+
+    }
+
+
+    private void updateGroupHeader(ChatEntry entry, JSONObject data) {
+        chatTitle.setText(nz(data.optString("group_name", entry.getName())));
+
+        String img = data.optString("image_url", "");
+        if (hasVal(img)) {
+            try {
+                Image im = AvatarLocalResolver.load(img);
+                if (im != null) userAvatar.setImage(im);
+                userAvatar.setClip(new Circle(20, 20, 20));
+            } catch (Exception ignore) {
+            }
+        }
+
+        int members = data.optInt("member_count", 0);
+        int online = data.optInt("online_count", -1);
+        chatStatus.setText(online >= 0 ? (members + " members, " + online + " online")
+                : (members + " members"));
+
+
+    }
+
+
+    private void updateChannelHeader(ChatEntry entry, JSONObject data) {
+        chatTitle.setText(nz(data.optString("channel_name", entry.getName())));
+
+        String img = data.optString("image_url", "");
+        if (hasVal(img)) {
+            try {
+                Image im = AvatarLocalResolver.load(img);
+                if (im != null) userAvatar.setImage(im);
+                userAvatar.setClip(new Circle(20, 20, 20));
+            } catch (Exception ignore) {
+            }
+        }
+
+        int subs = data.optInt("member_count", 0);
+        chatStatus.setText(subs + " subscribers");
+
+
+    }
+
+
+    public void onUserStatusChanged(String userUuid, String status, String lastSeenIso) {
+        if (currentChat == null || !"private".equalsIgnoreCase(currentChat.getType())) return;
+        var other = currentChat.getOtherUserId();
+        if (other == null || !other.toString().equalsIgnoreCase(userUuid)) return;
+
+        if ("online".equalsIgnoreCase(status)) {
+            chatStatus.setText("online");
+        } else {
+            if (hasVal(lastSeenIso)) {
+                var ts = parseWhen(lastSeenIso);
+                chatStatus.setText(ts != null ? ("last seen " + formatWhen(ts)) : "last seen recently");
+            } else {
+                chatStatus.setText("last seen recently");
+            }
+        }
+    }
+
+
+    public String userStatusText(boolean online, String lastSeenIso) {
+        if (online) return "online";
+
+        LocalDateTime ts = parseWhen(lastSeenIso);
+        if (ts == null) return "last seen recently";
+
+        LocalDate today = LocalDate.now();
+        LocalDate d = ts.toLocalDate();
+
+        if (d.isEqual(today)) {
+            return FMT_HHMM.format(ts);
+        }
+
+        long days = ChronoUnit.DAYS.between(d, today);
+        if (days > 30) {
+            return "Last seen long time ago";
+        }
+        return "last seen recently";
+    }
+
+    private void setDefaultHeaderAvatarByType(String type) {
+        String path = switch (type == null ? "" : type.toLowerCase()) {
+            case "channel" -> "/org/to/telegramfinalproject/Avatars/default_channel_profile.png";
+            case "group" -> "/org/to/telegramfinalproject/Avatars/default_group_profile.png";
+            default -> "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+        };
+        userAvatar.setImage(new Image(
+                java.util.Objects.requireNonNull(getClass().getResourceAsStream(path))
+        ));
+    }
+
+
+    @FXML
+    private void onJoinClicked() {
+        if (currentChat == null) return;
+
+        String myInternalUuid = Session.currentUser != null
+                ? Session.currentUser.optString("internal_uuid", "")
+                : "";
+        if (myInternalUuid.isBlank()) {
+            addSystemMessage("Join failed: missing current user internal_uuid.");
+            return;
+        }
+
+        final String targetId = currentChat.getId().toString();
+        final String t = currentChat.getType();
+        final String action = "group".equalsIgnoreCase(t) ? "join_group" : "join_channel";
+
+        JSONObject req = new JSONObject()
+                .put("action", action)
+                .put("user_id", myInternalUuid)
+                .put("id", targetId);
+
+        new Thread(() -> {
+            JSONObject res = ActionHandler.sendWithResponse(req);
+            boolean ok = (res != null && "success".equalsIgnoreCase(res.optString("status")));
+
+            Platform.runLater(() -> {
+                if (!ok) {
+                    addSystemMessage("Join failed: " + (res != null ? res.optString("message", "") : "no response"));
+                    return;
+                }
+
+                justJoinedThisChat = true;
+
+                var mc = MainController.getInstance();
+                if (mc != null) {
+                    mc.onJoinedOrAdded(currentChat);
+                }
+
+
+                if ("group".equalsIgnoreCase(t)) {
+                    applyMode(ChatViewMode.NORMAL);
+                } else if ("channel".equalsIgnoreCase(t)) {
+                    applyMode(ChatViewMode.READ_ONLY);
+                }
+
+                fetchAndRenderHeader(currentChat);
+            });
+        }).start();
+    }
+
+    @FXML
+    private void onAddContactClicked() {
+        if (currentChat == null) return;
+
+        String myUserId = Session.currentUser != null
+                ? Session.currentUser.optString("user_id", "")
+                : "";
+        if (myUserId.isBlank()) {
+            addSystemMessage("Add contact failed: missing user_id.");
+            return;
+        }
+
+        UUID other = currentChat.getOtherUserId();
+        if (other == null) {
+            addSystemMessage("Cannot add: other user UUID is missing.");
+            return;
+        }
+
+        JSONObject req = new JSONObject()
+                .put("action", "add_contact")
+                .put("user_id", myUserId)
+                .put("contact_id", other.toString());
+
+        new Thread(() -> {
+            JSONObject res = ActionHandler.sendWithResponse(req);
+            boolean ok = (res != null && "success".equalsIgnoreCase(res.optString("status")));
+
+            Platform.runLater(() -> {
+                if (!ok) {
+                    addSystemMessage("Add contact failed: " + (res != null ? res.optString("message", "") : "no response"));
+                    return;
+                }
+
+                try {
+
+                    org.to.telegramfinalproject.Models.ContactEntry ce =
+                            new org.to.telegramfinalproject.Models.ContactEntry(
+                                    other,                                 // contact_id (UUID)
+                                    currentChat.getDisplayId(),            // contact_display_id / user_id
+                                    currentChat.getDisplayId(),
+                                    nz(chatTitle.getText()),
+                                    currentChat.getImageUrl(),
+                                    false,                                 // is_blocked
+                                    null                                   // last_seen
+                            );
+
+                    if (Session.contactEntries == null)
+                        Session.contactEntries = new java.util.ArrayList<>();
+
+                    boolean exists = Session.contactEntries.stream()
+                            .anyMatch(c -> other.equals(c.getContactId()));
+                    if (!exists) Session.contactEntries.add(ce);
+                } catch (Exception ignore) {
+                }
+
+
+                showOpenFromContactsHint();
+            });
+        }).start();
+    }
+
+
+    private void applyMode(ChatViewMode mode) {
+        currentMode = mode;
+
+        boolean normal = (mode == ChatViewMode.NORMAL);
+        boolean needsJoin = (mode == ChatViewMode.NEEDS_JOIN);
+        boolean needsAdd = (mode == ChatViewMode.NEEDS_ADD_CONTACT);
+        boolean readOnly = (mode == ChatViewMode.READ_ONLY);
+        boolean blocked = (mode == ChatViewMode.BLOCKED);
+
+        composerPane.setVisible(normal);
+        composerPane.setManaged(normal);
+
+        joinPane.setVisible(needsJoin);
+        joinPane.setManaged(needsJoin);
+        addContactPane.setVisible(needsAdd);
+        addContactPane.setManaged(needsAdd);
+
+        if (readOnlyPane != null) {
+            readOnlyPane.setVisible(readOnly);
+            readOnlyPane.setManaged(readOnly);
+        }
+        if (blockedPane != null) {
+            blockedPane.setVisible(blocked);
+            blockedPane.setManaged(blocked);
+        }
+
+        if (needsJoin && joinButton != null && currentChat != null) {
+            String what = "channel".equalsIgnoreCase(currentChat.getType()) ? "CHANNEL" : "GROUP";
+            joinButton.setText(("Join " + what).toUpperCase());
+        }
+        if (needsAdd && addContactButton != null) {
+            addContactButton.setText("ADD CONTACT");
+        }
+    }
+
+
+    @FXML
+    private void onUnblockClicked() {
+        if (currentChat == null) return;
+
+        final String viewerUuid = org.to.telegramfinalproject.Client.Session.getUserUUID(); // internal_uuid
+        if (viewerUuid == null || viewerUuid.isBlank()) {
+            addSystemMessage("Missing viewer UUID");
+            return;
+        }
+
+        new Thread(() -> {
+            java.util.UUID other = currentChat.getOtherUserId();
+            if (other == null) {
+                other = resolvePeerUuidFromServer(currentChat);
+            }
+            if (other == null) {
+                Platform.runLater(() -> addSystemMessage("Could not resolve peer UUID."));
+                return;
+            }
+
+            org.json.JSONObject req = new org.json.JSONObject()
+                    .put("action", "toggle_block")
+                    .put("user_id", viewerUuid)
+                    .put("target_id", other.toString());
+
+            org.json.JSONObject res = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+            boolean ok = res != null && "success".equalsIgnoreCase(res.optString("status"));
+
+            Platform.runLater(() -> {
+                if (ok) {
+                    applyMode(ChatViewMode.NORMAL);
+                    messageInput.requestFocus();
+                } else {
+                    addSystemMessage("Unblock failed: " + (res != null ? res.optString("message", "") : ""));
+                }
+            });
+        }).start();
+    }
+
+
+    private boolean canPostToChannel(ChatEntry entry, JSONObject headerData) {
+        if (headerData != null && headerData.has("can_post")) {
+            return headerData.optBoolean("can_post", false);
+        }
+        if (headerData != null && (headerData.has("is_owner") || headerData.has("is_admin"))) {
+            return headerData.optBoolean("is_owner", false) || headerData.optBoolean("is_admin", false);
+        }
+        if (entry != null) {
+            if (entry.isOwner() || entry.isAdmin()) return true;
+            if (entry.getPermissions() != null && entry.getPermissions().optBoolean("can_post", false)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    private void reactToMessage(String msgId, String emoji) {
+        JSONObject req = new JSONObject()
+                .put("action", "react_to_message")
+                .put("message_id", msgId)
+                .put("reaction", emoji);
+
+        new Thread(() -> {
+            JSONObject res = ActionHandler.sendWithResponse(req);
+            Platform.runLater(() -> {
+                if (res == null || !"success".equalsIgnoreCase(res.optString("status"))) {
+                    addSystemMessage("Failed to react.");
+                } else {
+                    loadMessages(currentChat);
+                }
+            });
+        }).start();
+    }
+
+    private void startReply(String msgId) {
+        pendingReplyToId = msgId;
+        var preview = buildReplyBoxFromIndex(msgId);
+        if (!composerPane.getChildren().contains(preview)) {
+            composerPane.getChildren().add(0, preview);
+        }
+        messageInput.requestFocus();
+    }
+
+    private void startForward(String originalMsgId) {
+        openForwardPickerFromSession(originalMsgId);
+    }
+
+    private void openForwardPickerFromSession(String originalMsgId) {
+        java.util.List<ForwardTarget> targets = fetchForwardTargetsFromSession();
+
+        if (currentChat != null) {
+            targets.removeIf(t ->
+                    t.id.equals(currentChat.getId()) &&
+                            t.type.equalsIgnoreCase(currentChat.getType())
+            );
+        }
+
+        Dialog<ForwardTarget> dialog = new Dialog<>();
+        dialog.setTitle("Forward message");
+        if (messageContainer != null && messageContainer.getScene() != null) {
+            dialog.initOwner(messageContainer.getScene().getWindow());
+        }
+
+        ButtonType btnSend = new ButtonType("Send", ButtonBar.ButtonData.OK_DONE);
+        ButtonType btnCancel = new ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        dialog.getDialogPane().getButtonTypes().setAll(btnSend, btnCancel);
+
+        try {
+            var iv = new ImageView(new Image(
+                    getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/ic_forward.png")
+            ));
+            iv.setFitWidth(18);
+            iv.setFitHeight(18);
+            dialog.getDialogPane().setGraphic(iv);
+        } catch (Exception ignore) {
+        }
+
+        TextField search = new TextField();
+        search.setPromptText("Search chats…");
+
+        var base = javafx.collections.FXCollections.observableArrayList(targets);
+        var filtered = new javafx.collections.transformation.FilteredList<>(base, _x -> true);
+
+        search.textProperty().addListener((obs, ov, nv) -> {
+            String q = nv == null ? "" : nv.trim().toLowerCase();
+            filtered.setPredicate(t -> {
+                if (q.isEmpty()) return true;
+                return t.name.toLowerCase().contains(q) || t.type.toLowerCase().contains(q);
+            });
+        });
+
+        ListView<ForwardTarget> listView = new ListView<>(filtered);
+        listView.setPrefHeight(360);
+        listView.setCellFactory(lv -> new ListCell<>() {
+            private final HBox root = new HBox(10);
+            private final ImageView avatar = new ImageView();
+            private final VBox texts = new VBox(2);
+            private final Label title = new Label();
+            private final Label subtitle = new Label();
+
+            {
+                avatar.setFitWidth(28);
+                avatar.setFitHeight(28);
+                root.setAlignment(Pos.CENTER_LEFT);
+                subtitle.setStyle("-fx-font-size: 11; -fx-text-fill: #7e8a97;");
+                texts.getChildren().addAll(title, subtitle);
+                root.getChildren().addAll(avatar, texts);
+            }
+
+            @Override
+            protected void updateItem(ForwardTarget item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || item == null) {
+                    setGraphic(null);
+                } else {
+                    Image img = null;
+                    if (item.imageUrl != null && !item.imageUrl.isEmpty()) {
+                        img = org.to.telegramfinalproject.Client.AvatarLocalResolver.load(item.imageUrl);
+                    }
+                    if (img == null) {
+                        String fallback = switch (item.type.toLowerCase()) {
+                            case "channel" -> "/org/to/telegramfinalproject/Avatars/default_channel_profile.png";
+                            case "group" -> "/org/to/telegramfinalproject/Avatars/default_group_profile.png";
+                            default -> "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+                        };
+                        img = new Image(getClass().getResourceAsStream(fallback));
+                    }
+                    avatar.setImage(img);
+
+                    title.setText(item.name.isBlank() ? item.id.toString() : item.name);
+                    subtitle.setText(item.type.toUpperCase());
+
+                    setGraphic(root);
+                }
+            }
+        });
+
+        dialog.setOnShown(ev -> {
+            Button sendBtn = (Button) dialog.getDialogPane().lookupButton(btnSend);
+            sendBtn.setDisable(true);
+            listView.getSelectionModel().selectedItemProperty().addListener((o, ov, nv) -> {
+                sendBtn.setDisable(nv == null);
+            });
+            listView.setOnMouseClicked(me -> {
+                if (me.getClickCount() == 2 && listView.getSelectionModel().getSelectedItem() != null) {
+                    sendBtn.fire();
+                }
+            });
+        });
+
+        VBox content = new VBox(10, search, listView);
+        content.setPadding(new Insets(12));
+        dialog.getDialogPane().setContent(content);
+
+        dialog.setResultConverter(bt -> {
+            if (bt == btnSend) return listView.getSelectionModel().getSelectedItem();
+            return null;
+        });
+
+        var result = dialog.showAndWait();
+        result.ifPresent(target -> forwardToTarget(originalMsgId, target));
+    }
+
+
+    private void forwardToTarget(String originalMsgId, ForwardTarget target) {
+        if (target == null) return;
+
+
+        JSONObject req = new JSONObject()
+                .put("action", "forward_message")
+                .put("original_message_id", originalMsgId)
+                .put("target_chat_id", target.id.toString())
+                .put("target_chat_type", target.type);
+
+        new Thread(() -> {
+            JSONObject res = ActionHandler.sendWithResponse(req);
+            Platform.runLater(() -> {
+                if (res == null || !"success".equalsIgnoreCase(res.optString("status"))) {
+                    addSystemMessage("Forward failed: " + (res == null ? "" : res.optString("message", "")));
+                } else {
+                    if (currentChat != null &&
+                            currentChat.getId().equals(target.id) &&
+                            currentChat.getType().equalsIgnoreCase(target.type)) {
+                        loadMessages(currentChat);
+                    } else {
+//                        addSystemMessage("Forwarded to " + (target.name.isBlank() ? target.id : target.name));
+                    }
+                }
+            });
+        }).start();
+    }
+
+
+    private void startEdit(String msgId, String currentText) {
+        pendingEditMsgId = msgId;
+        messageInput.setText(currentText == null ? "" : currentText);
+        messageInput.requestFocus();
+        messageInput.positionCaret(messageInput.getText().length());
+    }
+
+    private void confirmDelete(String msgId) {
+        Alert a = new Alert(Alert.AlertType.CONFIRMATION);
+        a.setHeaderText("Delete message?");
+        ButtonType onlyMe = new ButtonType("Delete for me");
+        ButtonType everyone = new ButtonType("Delete for everyone");
+        ButtonType cancel = ButtonType.CANCEL;
+
+        boolean showGlobal = true;
+        if (showGlobal) a.getButtonTypes().setAll(onlyMe, everyone, cancel);
+        else a.getButtonTypes().setAll(onlyMe, cancel);
+
+        a.showAndWait().ifPresent(btn -> {
+            if (btn == onlyMe) deleteMessage(msgId, "one-sided");
+            else if (btn == everyone) deleteMessage(msgId, "global");
+        });
+    }
+
+    private void deleteMessage(String msgId, String deleteType) {
+        JSONObject req = new JSONObject()
+                .put("action", "delete_message")
+                .put("message_id", msgId)
+                .put("delete_type", deleteType);
+
+        new Thread(() -> {
+            JSONObject res = ActionHandler.sendWithResponse(req);
+            Platform.runLater(() -> {
+                if (res == null || !"success".equalsIgnoreCase(res.optString("status"))) {
+                    addSystemMessage("Delete failed: " + (res == null ? "" : res.optString("message")));
+                    return;
+                }
+                if ("one-sided".equals(deleteType)) {
+                    Node n = messageNodes.remove(msgId);
+                    if (n != null) messageContainer.getChildren().remove(n);
+                } else {
+                    loadMessages(currentChat);
+                }
+            });
+        }).start();
+    }
+
+
+    private boolean isOutgoingMessage(String messageId) {
+        if (Session.currentUser == null || !Session.currentUser.has("internal_uuid")) return false;
+        String meId = Session.currentUser.optString("internal_uuid", "");
+        JSONObject m = msgIndex.get(messageId);
+        if (m == null) return false;
+        return meId.equalsIgnoreCase(m.optString("sender_id", ""));
+    }
+
+    private boolean canDeleteInChannel() {
+        if (currentChat == null) return false;
+        if (currentChat.isOwner() || currentChat.isAdmin()) return true;
+        return currentChat.getPermissions() != null &&
+                currentChat.getPermissions().optBoolean("can_delete", false);
+    }
+
+
+    private void confirmDeleteDialog(String messageId) {
+        boolean outgoing = isOutgoingMessage(messageId);
+        String t = currentChat != null ? currentChat.getType() : "";
+        boolean canGlobal =
+                "private".equalsIgnoreCase(t) || "group".equalsIgnoreCase(t) ? outgoing
+                        : "channel".equalsIgnoreCase(t) ? canDeleteInChannel()
+                        : false;
+
+        String peerName = (currentChat != null && currentChat.getName() != null)
+                ? currentChat.getName()
+                : "everyone";
+
+        Dialog<ButtonType> dialog = new Dialog<>();
+        dialog.setTitle("Delete message");
+
+        if (messageContainer != null && messageContainer.getScene() != null) {
+            dialog.initOwner(messageContainer.getScene().getWindow());
+        }
+
+        ButtonType btnCancel = new ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        ButtonType btnDelete = new ButtonType("Delete", ButtonBar.ButtonData.OK_DONE);
+        dialog.getDialogPane().getButtonTypes().setAll(btnDelete, btnCancel);
+
+        Label title = new Label("Do you want to delete this message?");
+        title.setStyle("-fx-font-size: 14; -fx-font-weight: bold; -fx-text-fill: -fx-text-base-color;");
+
+        CheckBox alsoDelete = new CheckBox("Also delete for " + peerName);
+        alsoDelete.setSelected(false);
+        alsoDelete.setVisible(canGlobal);
+        alsoDelete.setManaged(canGlobal);
+
+        VBox box = new VBox(10, title, alsoDelete);
+        box.setPadding(new Insets(12, 12, 6, 12));
+        dialog.getDialogPane().setContent(box);
+
+        Image trashImg = new Image(getClass().getResourceAsStream(
+                "/org/to/telegramfinalproject/Icons/ic_delete_danger.png"
+        ));
+        ImageView trashIv = new ImageView(trashImg);
+        trashIv.setFitWidth(18);
+        trashIv.setFitHeight(18);
+        dialog.getDialogPane().setGraphic(trashIv);
+
+        dialog.getDialogPane().sceneProperty().addListener((obs, oldScene, newScene) -> {
+            if (newScene != null) {
+                Stage stage = (Stage) newScene.getWindow();
+                stage.getIcons().setAll(trashImg);
+            }
+        });
+
+        dialog.getDialogPane().setStyle("""
+                    -fx-background-radius: 12;
+                    -fx-background-insets: 0;
+                    -fx-padding: 8;
+                """);
+
+
+        dialog.setOnShown(ev -> {
+            Button btnDel = (Button) dialog.getDialogPane().lookupButton(btnDelete);
+            if (btnDel != null) {
+                btnDel.getStyleClass().add("tg-btn-danger");
+            }
+            Button btnCan = (Button) dialog.getDialogPane().lookupButton(btnCancel);
+            if (btnCan != null) {
+                btnCan.getStyleClass().add("tg-btn-secondary");
+            }
+        });
+
+        var res = dialog.showAndWait();
+        if (res.isPresent() && res.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+            String deleteType = (alsoDelete.isSelected() && canGlobal) ? "global" : "one-sided";
+            deleteMessage(messageId, deleteType);
+        }
+    }
+
+
+    public void onChatAvatarUpdated(UUID chatId, String newUrl) {
+        if (currentChat == null || chatId == null || newUrl == null || newUrl.isBlank()) return;
+        if (!currentChat.getId().equals(chatId)) return;
+
+        if (!Platform.isFxApplicationThread()) {
+            Platform.runLater(() -> onChatAvatarUpdated(chatId, newUrl));
+            return;
+        }
+
+        currentChat.setImageUrl(newUrl);
+
+        try {
+            Image im = org.to.telegramfinalproject.Client.AvatarLocalResolver.load(newUrl);
+            if (im != null) {
+                userAvatar.setImage(im);
+            } else {
+                setDefaultHeaderAvatarByType(currentChat.getType());
+            }
+        } catch (Exception ignore) {
+            setDefaultHeaderAvatarByType(currentChat.getType());
+        }
+
+        try {
+            AvatarFX.circleClip(userAvatar, 36);
+        } catch (Throwable ignored) {
+        }
+    }
+
+
+    private static final class ForwardTarget {
+        final UUID id;            // internal_id
+        final String type;        // private | group | channel
+        final String name;        // title
+        final String imageUrl;    // optional
+
+        ForwardTarget(UUID id, String type, String name, String imageUrl) {
+            this.id = id;
+            this.type = type == null ? "" : type;
+            this.name = name == null ? "" : name;
+            this.imageUrl = imageUrl == null ? "" : imageUrl;
+        }
+
+        @Override
+        public String toString() {
+            return name + " (" + type + ")";
+        }
+    }
+
+
+    private java.util.List<ForwardTarget> fetchForwardTargetsFromSession() {
+        java.util.LinkedHashMap<String, ForwardTarget> map = new java.util.LinkedHashMap<>();
+
+        org.json.JSONObject cu = org.to.telegramfinalproject.Client.Session.currentUser;
+        if (cu == null) return new java.util.ArrayList<>();
+
+        org.json.JSONArray[] sources = new org.json.JSONArray[]{
+                cu.optJSONArray("chat_list"),
+                cu.optJSONArray("active_chat_list")
+        };
+
+        for (org.json.JSONArray arr : sources) {
+            if (arr == null) continue;
+            for (int i = 0; i < arr.length(); i++) {
+                org.json.JSONObject o = arr.optJSONObject(i);
+                if (o == null) continue;
+                String internalId = o.optString("internal_id", "");
+                String type = o.optString("type", "");
+                String name = o.optString("name", "");
+                String imageUrl = o.optString("image_url", "");
+
+                if (internalId.isBlank() || type.isBlank()) continue;
+
+                UUID id;
+                try {
+                    id = java.util.UUID.fromString(internalId);
+                } catch (Exception ignore) {
+                    continue;
+                }
+
+                ForwardTarget ft = new ForwardTarget(id, type, name, imageUrl);
+                map.put(id.toString() + "|" + type.toLowerCase(), ft);
+            }
+        }
+
+
+        return new java.util.ArrayList<>(map.values());
+    }
+
+
+    private void showOpenFromContactsHint() {
+        if (addContactPane == null) return;
+
+        addContactPane.getChildren().clear();
+
+        Label hint = new Label("you should open chat from contact list for first time");
+        hint.getStyleClass().add("footer-link-btn");
+        hint.setUnderline(true);
+
+        addContactPane.getChildren().add(hint);
+
+        composerPane.setVisible(false);
+        composerPane.setManaged(false);
+        joinPane.setVisible(false);
+        joinPane.setManaged(false);
+        addContactPane.setVisible(true);
+        addContactPane.setManaged(true);
+    }
+
+
+    private void syncIconsWithTheme() {
+        boolean dark = themeManager.isDarkMode();
+        String suffix = dark ? "_light.png" : "_dark.png";
+
+        if (attachmentIcon != null) attachmentIcon.setImage(loadIcon("attachment" + suffix));
+        if (sendIcon != null) sendIcon.setImage(loadIcon("send_cyan2.png")); // always cyan
+        if (searchIcon != null) searchIcon.setImage(loadIcon("search" + suffix));
+        if (moreIcon != null) moreIcon.setImage(loadIcon("more" + suffix));
+
+        if (chatTitle != null) chatTitle.setStyle(dark ? "-fx-text-fill:#e8f1f8;" : "-fx-text-fill:#0f141a;");
+        if (chatStatus != null) chatStatus.setStyle(dark ? "-fx-text-fill:#8ea1b2;" : "-fx-text-fill:#7e8a97;");
+
+        // === Context menu icons ===
+        if (archiveItem != null && archiveItem.getGraphic() instanceof ImageView iv) {
+            iv.setImage(loadIcon("archived_chats" + suffix));
+        }
+        if (viewProfileItem != null && viewProfileItem.getGraphic() instanceof ImageView iv) {
+            iv.setImage(loadIcon("view_profile" + suffix));
+        }
+        if (deleteChatItem != null && deleteChatItem.getGraphic() instanceof ImageView iv) {
+            iv.setImage(loadIcon("delete_red.png")); // stays red in both themes
+        }
+
+        if (viewGroupItem != null && viewGroupItem.getGraphic() instanceof ImageView iv) {
+            iv.setImage(loadIcon("group" + suffix));
+        }
+
+        if (viewChannelItem != null && viewChannelItem.getGraphic() instanceof ImageView iv) {
+            iv.setImage(loadIcon("group" + suffix));
+        }
+    }
+
+    // ChatPageController
+
+    private UUID resolvePeerUuidFromServer(ChatEntry chat) {
+        if (chat == null || !"private".equalsIgnoreCase(chat.getType())) return null;
+
+        try {
+            UUID cached = chat.getOtherUserId();
+            if (cached != null) return cached;
+        } catch (Exception ignore) {
+        }
+
+        org.json.JSONObject req = new org.json.JSONObject()
+                .put("action", "get_private_chat_target")
+                .put("chat_id", chat.getId().toString());
+
+
+        org.json.JSONObject res = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+        if (res == null || !"success".equalsIgnoreCase(res.optString("status"))) return null;
+
+        org.json.JSONObject data = res.optJSONObject("data");
+        if (data == null) return null;
+
+        String tid = data.optString("target_id", "");
+        if (tid == null || tid.isBlank()) return null;
+
+        try {
+            java.util.UUID target = java.util.UUID.fromString(tid);
+            chat.setOtherUserId(target);
+            return target;
+        } catch (Exception ignore) {
+            return null;
+        }
+    }
+
+
+    public void updatePendingStatus(String messageId, String text) {
+        HBox node = pendingById.get(messageId);
+        if (node == null) return;
+        if (node.getChildren().size() >= 2 && node.getChildren().get(1) instanceof VBox v) {
+            for (Node n : v.getChildren()) {
+                if (n instanceof HBox row) {
+                    for (Node c : row.getChildren()) {
+                        if (c instanceof Label l && "statusLabel".equals(l.getProperties().get("role"))) {
+                            l.setText(text);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    // Put this inside your controller class (or as a top-level small class)
+    private static final class AdminVM {
+        final UUID internalId;     // internal_uuid (preferred for server calls)
+        final String userId;       // display user_id (fallback if server still expects it)
+        final String profileName;
+
+        AdminVM(UUID internalId, String userId, String profileName) {
+            this.internalId = internalId;
+            this.userId = userId;
+            this.profileName = profileName;
+        }
+
+        @Override
+        public String toString() {
+            // This is what shows in the ChoiceDialog list:
+            return profileName + (userId != null && !userId.isBlank() ? "  [" + userId + "]" : "");
+        }
+    }
+
+
+    private void onLeaveGroupMenuClicked(ChatEntry entry) {
+        if (entry == null || !"group".equalsIgnoreCase(entry.getType())) {
+            alert(Alert.AlertType.INFORMATION, "This action is only available for groups.");
+            return;
+        }
+
+        String myUuidStr = Session.getUserUUID();
+        if (myUuidStr == null || myUuidStr.isBlank()) {
+            alert(Alert.AlertType.ERROR, "Cannot determine your identity.");
+            return;
+        }
+
+        if (!entry.isOwner()) {
+            if (confirm("Leave Group", "Are you sure you want to leave this group?")) {
+                sendLeaveRequest(entry.getId(), myUuidStr);
+            }
+            return;
+        }
+
+
+        JSONObject req = new JSONObject()
+                .put("action", "view_group_admins")
+                .put("group_id", entry.getId().toString());
+
+        JSONObject res = ActionHandler.sendWithResponse(req);
+        if (res == null || !"success".equalsIgnoreCase(res.optString("status"))) {
+            alert(Alert.AlertType.ERROR, "Failed to fetch admins.");
+            return;
+        }
+
+        JSONArray admins = res.getJSONObject("data").optJSONArray("admins");
+        if (admins == null || admins.isEmpty()) {
+            alert(Alert.AlertType.WARNING, "No other admins available. Promote someone first.");
+            return;
+        }
+
+        List<JSONObject> candidates = new ArrayList<>();
+        for (int i = 0; i < admins.length(); i++) {
+            JSONObject a = admins.getJSONObject(i);
+            if (a == null) continue;
+            String uuid = a.optString("internal_uuid");
+            if (uuid != null && uuid.equals(Session.getUserUUID())) continue;
+            candidates.add(a);
+        }
+
+        if (candidates.isEmpty()) {
+            alert(Alert.AlertType.WARNING, "No other admins available.");
+            return;
+        }
+
+        Dialog<JSONObject> dialog = new Dialog<>();
+        dialog.setTitle("Transfer Ownership");
+        dialog.setHeaderText("Select a new owner before leaving");
+        dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+        ListView<JSONObject> listView = new ListView<>();
+        listView.getItems().addAll(candidates);
+        listView.setCellFactory(v -> new ListCell<>() {
+            @Override protected void updateItem(JSONObject item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || item == null) {
+                    setText(null);
+                } else {
+                    setText(item.optString("profile_name", "Unknown")
+                            + " (" + item.optString("user_id") + ")");
+                }
+            }
+        });
+
+        dialog.getDialogPane().setContent(listView);
+        Node okBtn = dialog.getDialogPane().lookupButton(ButtonType.OK);
+        okBtn.setDisable(true);
+
+        listView.getSelectionModel().selectedItemProperty().addListener((obs, old, sel) -> {
+            okBtn.setDisable(sel == null);
+        });
+
+        dialog.setResultConverter(bt ->
+                bt == ButtonType.OK ? listView.getSelectionModel().getSelectedItem() : null);
+
+        Optional<JSONObject> pick = dialog.showAndWait();
+        if (pick.isEmpty()) return;
+
+        JSONObject selected = pick.get();
+
+        String newOwnerUuid = selected.optString("internal_uuid", "").trim();
+        String newOwnerUserId = selected.optString("user_id", "").trim();
+
+        if (newOwnerUuid.isEmpty() && newOwnerUserId.isEmpty()) {
+            alert(Alert.AlertType.ERROR, "Selected admin has no valid id.");
+            return;
+        }
+
+        JSONObject promoteReq = new JSONObject()
+                .put("action", "transfer_group_ownership")
+                .put("group_id", entry.getId().toString());
+
+        if (!newOwnerUuid.isEmpty()) {
+            promoteReq.put("new_owner_id", newOwnerUuid);
+        }
+        if (!newOwnerUserId.isEmpty()) {
+            promoteReq.put("new_owner_user_id", newOwnerUserId);
+        }
+
+        JSONObject promoteRes = ActionHandler.sendWithResponse(promoteReq);
+        if (promoteRes == null || !"success".equalsIgnoreCase(promoteRes.optString("status"))) {
+            alert(Alert.AlertType.ERROR, "Ownership transfer failed.");
+            return;
+        }
+
+        sendLeaveRequest(entry.getId(), myUuidStr);
+    }
+
+    private void sendLeaveRequest(UUID groupId, String myUuidStr) {
+        JSONObject req = new JSONObject()
+                .put("action", "leave_chat")
+                .put("user_id", myUuidStr)
+                .put("chat_id", groupId.toString())
+                .put("chat_type", "group");
+
+        JSONObject res = ActionHandler.sendWithResponse(req);
+        if (res != null && "success".equalsIgnoreCase(res.optString("status"))) {
+            alert(Alert.AlertType.INFORMATION, "You left the group.");
+            MainController.getInstance().refreshChatListUI();
+            AppRouter.showMain();
+        } else {
+            String msg = (res != null) ? res.optString("message", "Leave failed.") : "null response";
+            alert(Alert.AlertType.ERROR, msg);
+        }
+    }
+
+
+
+    private boolean confirm(String title, String msg) {
+        Alert a = new Alert(Alert.AlertType.CONFIRMATION, msg, ButtonType.OK, ButtonType.CANCEL);
+        a.setTitle(title);
+        Optional<ButtonType> r = a.showAndWait();
+        return r.isPresent() && r.get() == ButtonType.OK;
+    }
+
+    private void alert(Alert.AlertType type, String msg) {
+        new Alert(type, msg, ButtonType.OK).show();
+    }
+
+
+
+
+    // === CHANNEL: Leave/Transfer logic ===
+    private void onLeaveChannelMenuClicked(ChatEntry entry) {
+        if (entry == null || !"channel".equalsIgnoreCase(entry.getType())) {
+            alert(Alert.AlertType.INFORMATION, "This action is only available for channels.");
+            return;
+        }
+
+        String myUuidStr = Session.getUserUUID();
+        if (myUuidStr == null || myUuidStr.isBlank()) {
+            alert(Alert.AlertType.ERROR, "Cannot determine your identity.");
+            return;
+        }
+
+        // If I'm not the owner → simple leave
+        if (!entry.isOwner()) {
+            if (confirm("Leave Channel", "Are you sure you want to leave this channel?")) {
+                sendLeaveChannelRequest(entry.getId(), myUuidStr);
+            }
+            return;
+        }
+
+        // I'm the owner → must pick a new owner among existing admins
+        JSONObject req = new JSONObject()
+                .put("action", "view_channel_admins")
+                .put("channel_id", entry.getId().toString()); // server expects channel_id here
+
+        JSONObject res = ActionHandler.sendWithResponse(req);
+        if (res == null || !"success".equalsIgnoreCase(res.optString("status"))) {
+            alert(Alert.AlertType.ERROR, "Failed to fetch channel admins.");
+            return;
+        }
+
+        JSONArray admins = res.getJSONObject("data").optJSONArray("admins");
+        if (admins == null || admins.isEmpty()) {
+            alert(Alert.AlertType.WARNING, "No other admins available. Promote someone first.");
+            return;
+        }
+
+        // Build candidate list (exclude myself)
+        List<JSONObject> candidates = new ArrayList<>();
+        for (int i = 0; i < admins.length(); i++) {
+            JSONObject a = admins.optJSONObject(i);
+            if (a == null) continue;
+            String uuid = a.optString("internal_uuid", "");
+            if (!uuid.isBlank() && uuid.equals(myUuidStr)) continue; // skip myself
+            candidates.add(a);
+        }
+
+        if (candidates.isEmpty()) {
+            alert(Alert.AlertType.WARNING, "No other admins available.");
+            return;
+        }
+
+        // Dialog to choose the new owner
+        Dialog<JSONObject> dialog = new Dialog<>();
+        dialog.setTitle("Transfer Ownership");
+        dialog.setHeaderText("Select a new owner before leaving the channel");
+        dialog.getDialogPane().getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+        ListView<JSONObject> listView = new ListView<>();
+        listView.getItems().addAll(candidates);
+        listView.setCellFactory(v -> new ListCell<>() {
+            @Override protected void updateItem(JSONObject item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || item == null) {
+                    setText(null);
+                } else {
+                    String displayName = item.optString("profile_name", "Unknown");
+                    String displayId   = item.optString("user_id", "");
+                    setText(displayName + (displayId.isBlank() ? "" : " (" + displayId + ")"));
+                }
+            }
+        });
+
+        dialog.getDialogPane().setContent(listView);
+        Node okBtn = dialog.getDialogPane().lookupButton(ButtonType.OK);
+        okBtn.setDisable(true);
+
+        listView.getSelectionModel().selectedItemProperty().addListener((obs, oldV, sel) -> {
+            okBtn.setDisable(sel == null);
+        });
+
+        dialog.setResultConverter(bt ->
+                bt == ButtonType.OK ? listView.getSelectionModel().getSelectedItem() : null);
+
+        Optional<JSONObject> pick = dialog.showAndWait();
+        if (pick.isEmpty()) return;
+
+        JSONObject selected = pick.get();
+        String newOwnerUuid   = selected.optString("internal_uuid", "").trim();
+        String newOwnerUserId = selected.optString("user_id", "").trim();
+
+        if (newOwnerUuid.isEmpty() && newOwnerUserId.isEmpty()) {
+            alert(Alert.AlertType.ERROR, "Selected admin has no valid id.");
+            return;
+        }
+
+        // Transfer ownership
+        JSONObject promoteReq = new JSONObject()
+                .put("action", "transfer_channel_ownership")
+                .put("channel_id", entry.getId().toString());
+
+        // Prefer internal UUID; include user_id only if UUID missing (server quirks!)
+        if (!newOwnerUuid.isEmpty()) {
+            promoteReq.put("new_owner_id", newOwnerUuid);
+        } else {
+            promoteReq.put("new_owner_user_id", newOwnerUserId);
+        }
+
+        JSONObject promoteRes = ActionHandler.sendWithResponse(promoteReq);
+        if (promoteRes == null || !"success".equalsIgnoreCase(promoteRes.optString("status"))) {
+            String msg = (promoteRes != null) ? promoteRes.optString("message", "Ownership transfer failed.") : "null response";
+            alert(Alert.AlertType.ERROR, msg);
+            return;
+        }
+
+        // After successful transfer, leave the channel myself
+        sendLeaveChannelRequest(entry.getId(), myUuidStr);
+    }
+
+    private void sendLeaveChannelRequest(UUID channelId, String myUuidStr) {
+        JSONObject req = new JSONObject()
+                .put("action", "leave_chat")
+                .put("user_id", myUuidStr)
+                .put("chat_id", channelId.toString())
+                .put("chat_type", "channel");
+
+        JSONObject res = ActionHandler.sendWithResponse(req);
+        if (res != null && "success".equalsIgnoreCase(res.optString("status"))) {
+            alert(Alert.AlertType.INFORMATION, "You left the channel.");
+            MainController.getInstance().refreshChatListUI();
+            AppRouter.showMain();
+        } else {
+            String msg = (res != null) ? res.optString("message", "Leave failed.") : "null response";
+            alert(Alert.AlertType.ERROR, msg);
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ChatViewMode.java b/src/main/java/org/to/telegramfinalproject/UI/ChatViewMode.java
new file mode 100644
index 0000000..459dbdd
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ChatViewMode.java
@@ -0,0 +1,12 @@
+package org.to.telegramfinalproject.UI;
+
+
+//For search handling
+public enum ChatViewMode {
+    NORMAL,                 // member/contact; can send messages
+    NEEDS_JOIN,             // group/channel preview; show Join button
+    NEEDS_ADD_CONTACT,      // private preview; show Add Contact button
+    READ_ONLY,
+    BLOCKED
+    }
+
diff --git a/src/main/java/org/to/telegramfinalproject/UI/CheckPasswordController.java b/src/main/java/org/to/telegramfinalproject/UI/CheckPasswordController.java
new file mode 100644
index 0000000..849eafa
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/CheckPasswordController.java
@@ -0,0 +1,173 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+
+import java.io.IOException;
+
+public class CheckPasswordController {
+
+    @FXML private VBox checkPasswordCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button backButton;
+    @FXML private Button closeButton;
+    @FXML private Button cancelButton;
+    @FXML private Button confirmButton;
+    @FXML private PasswordField passwordField;
+    @FXML private TextField visiblePasswordField;
+    @FXML private Button toggleVisibilityBtn;
+    @FXML private Label passwordLabel;
+
+    private boolean passwordVisible = false;
+
+
+    @FXML
+    public void initialize() {
+        // Set back button icon
+        ImageView backIcon = new ImageView(
+                new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/back_button_dark.png"))
+        );
+        backIcon.setFitWidth(18);
+        backIcon.setFitHeight(18);
+        backButton.setGraphic(backIcon);
+
+        cancelButton.setOnAction(e ->
+                MainController.getInstance().closeOverlay(checkPasswordCard.getParent())
+        );
+
+        closeButton.setOnAction(e ->
+                MainController.getInstance().closeOverlay(checkPasswordCard.getParent())
+        );
+
+        backButton.setOnAction(e ->
+                MainController.getInstance().goBack(checkPasswordCard)
+        );
+
+        overlayBackground.setOnMouseClicked(e ->
+                MainController.getInstance().closeOverlay(checkPasswordCard.getParent())
+        );
+
+        confirmButton.setOnAction(e -> validatePassword());
+
+        // Reset error state when user starts typing again
+        passwordField.textProperty().addListener((obs, oldVal, newVal) -> {
+            if (!newVal.trim().isEmpty()) {
+                passwordField.getStyleClass().remove("error");
+                passwordLabel.getStyleClass().remove("error");
+            }
+        });
+
+        // Reset error state when user starts typing again
+        visiblePasswordField.textProperty().addListener((obs, oldVal, newVal) -> {
+            if (!newVal.trim().isEmpty()) {
+                visiblePasswordField.getStyleClass().remove("error");
+                passwordLabel.getStyleClass().remove("error");
+            }
+        });
+
+        // Auto_focus password field when overlay opens
+        Platform.runLater(() -> passwordField.requestFocus());
+
+        // Keep fields in sync
+        visiblePasswordField.textProperty().bindBidirectional(passwordField.textProperty());
+
+        // Toggle button action
+        toggleVisibilityBtn.setOnAction(e -> togglePasswordVisibility());
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (checkPasswordCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(checkPasswordCard.getScene());
+            }
+        });
+
+        // Listener for theme change
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateBackIcon(newVal);
+        });
+
+        // Set initial state
+        updateBackIcon(ThemeManager.getInstance().isDarkMode());
+    }
+
+    private void validatePassword() {
+        String entered = (passwordVisible ? visiblePasswordField.getText() : passwordField.getText()).trim();
+        if (entered.isEmpty()) {
+            if (!passwordField.getStyleClass().contains("error"))
+                passwordField.getStyleClass().add("error");
+            if (!visiblePasswordField.getStyleClass().contains("error"))
+                visiblePasswordField.getStyleClass().add("error");
+            if (!passwordLabel.getStyleClass().contains("error"))
+                passwordLabel.getStyleClass().add("error");
+            return;
+        }
+
+        org.json.JSONObject req = new org.json.JSONObject()
+                .put("action", "verify_password")
+                .put("current_password", entered);
+
+        org.json.JSONObject resp = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+        boolean ok = (resp != null && "success".equalsIgnoreCase(resp.optString("status")));
+
+        if (ok) {
+            passwordField.getStyleClass().remove("error");
+            visiblePasswordField.getStyleClass().remove("error");
+            passwordLabel.getStyleClass().remove("error");
+
+            openChangeCredentials(entered);
+        } else {
+            if (!passwordField.getStyleClass().contains("error"))
+                passwordField.getStyleClass().add("error");
+            if (!visiblePasswordField.getStyleClass().contains("error"))
+                visiblePasswordField.getStyleClass().add("error");
+            if (!passwordLabel.getStyleClass().contains("error"))
+                passwordLabel.getStyleClass().add("error");
+        }
+    }
+
+    private void togglePasswordVisibility() {
+        passwordVisible = !passwordVisible;
+
+        visiblePasswordField.setVisible(passwordVisible);
+        visiblePasswordField.setManaged(passwordVisible);
+
+        passwordField.setVisible(!passwordVisible);
+        passwordField.setManaged(!passwordVisible);
+
+        toggleVisibilityBtn.setText(passwordVisible ? "👁" : "👁");
+    }
+
+    private void updateBackIcon(boolean darkMode) {
+        String iconPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/back_button_light.png"
+                : "/org/to/telegramfinalproject/Icons/back_button_dark.png";
+
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(iconPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        backButton.setGraphic(icon);
+    }
+
+    private void openChangeCredentials(String currentPassword) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/change_credentials.fxml"));
+            Node overlay = loader.load();
+
+            ChangeCredentialsController c = loader.getController();
+            c.setCurrentPassword(currentPassword);
+            c.prefillFromSession();
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ContactsController.java b/src/main/java/org/to/telegramfinalproject/UI/ContactsController.java
new file mode 100644
index 0000000..2c6101a
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ContactsController.java
@@ -0,0 +1,299 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.Cursor;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Models.ChatEntry;
+import org.to.telegramfinalproject.Models.ContactEntry;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+public class ContactsController {
+
+    @FXML private VBox contactsList;
+    @FXML private VBox contactsCard;
+    @FXML private TextField searchField;
+    @FXML private Button closeFooterButton;
+    @FXML private Pane overlayBackground;
+    @FXML private ScrollPane contactsScroll;
+    @FXML private Button searchIcon;
+
+    private final List<ContactVM> allContacts = new ArrayList<>();
+
+    @FXML
+    public void initialize() {
+        loadContactsAndRender();
+
+        searchField.textProperty().addListener((obs, ov, nv) -> {
+            String f = nv == null ? "" : nv.trim().toLowerCase();
+            List<ContactVM> filtered = allContacts.stream()
+                    .filter(c -> c.profileName.toLowerCase().contains(f)
+                            || (c.userId != null && c.userId.toLowerCase().contains(f)))
+                    .sorted(Comparator.comparing(c -> c.profileName.toLowerCase()))
+                    .collect(Collectors.toList());
+            renderContacts(filtered);
+        });
+
+        Platform.runLater(() -> searchField.requestFocus());
+
+        closeFooterButton.setOnAction(e -> MainController.getInstance().closeOverlay(contactsCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(contactsCard.getParent()));
+
+        contactsScroll.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        contactsScroll.setPannable(true);
+        contactsScroll.setFitToWidth(true);
+        contactsScroll.setFitToHeight(false);
+        contactsScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            contactsScroll.setVvalue(contactsScroll.getVvalue() - deltaY);
+        });
+
+        Platform.runLater(() -> {
+            if (contactsCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(contactsCard.getScene());
+            }
+        });
+
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> updateSearchIcon(newVal));
+        updateSearchIcon(ThemeManager.getInstance().isDarkMode());
+    }
+
+
+    private void loadContactsAndRender() {
+        CompletableFuture
+                .supplyAsync(() -> {
+                    try {
+                        if (Session.contactEntries != null && !Session.contactEntries.isEmpty()) {
+                            return new ArrayList<>(Session.contactEntries);
+                        }
+
+
+                        JSONObject req = new JSONObject()
+                                .put("action", "view_contacts")
+                                .put("user_id", Session.getUserUUID());
+
+                        JSONObject res = ActionHandler.sendWithResponse(req);
+                        if (res == null || !"success".equals(res.optString("status"))) {
+                            return Collections.emptyList();
+                        }
+                        JSONObject data = res.optJSONObject("data");
+                        JSONArray arr = data != null ? data.optJSONArray("contacts") : null;
+                        if (arr == null) return Collections.emptyList();
+
+                        List<ContactEntry> fetched = new ArrayList<>();
+                        for (int i = 0; i < arr.length(); i++) {
+                            JSONObject c = arr.getJSONObject(i);
+                            UUID contactId        = UUID.fromString(c.getString("contact_id"));
+                            String userId         = c.optString("user_id", null);
+                            String contactDisplay = c.optString("contact_display_id", userId);
+                            String profileName    = c.optString("profile_name", contactDisplay);
+                            String imageUrl       = c.optString("image_url", "/org/to/telegramfinalproject/Avatars/default_user_profile.png");
+                            boolean isBlocked     = c.optBoolean("is_blocked", false);
+                            String lastSeenStr    = c.optString("last_seen", null);
+
+                            LocalDateTime lastSeen = null;
+                            if (lastSeenStr != null && !lastSeenStr.isEmpty()) {
+                                try { lastSeen = LocalDateTime.parse(lastSeenStr); } catch (Exception ignore) {}
+                            }
+
+                            fetched.add(new ContactEntry(contactId, userId, contactDisplay, profileName, imageUrl, isBlocked, lastSeen));
+                        }
+                        if (Session.contactEntries == null) Session.contactEntries = new ArrayList<>();
+                        Session.contactEntries.clear();
+                        Session.contactEntries.addAll(fetched);
+                        return fetched;
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        return Collections.<ContactEntry>emptyList();
+                    }
+                })
+                .thenAccept(entries -> Platform.runLater(() -> {
+                    allContacts.clear();
+                    for (Object ce : entries) {
+                        allContacts.add(ContactVM.from((ContactEntry) ce));
+                    }
+                    allContacts.sort(Comparator.comparing(vm -> vm.profileName.toLowerCase()));
+                    renderContacts(allContacts);
+                }));
+    }
+
+    private void renderContacts(List<ContactVM> contacts) {
+        contactsList.getChildren().clear();
+
+        if (contacts.isEmpty()) {
+            StackPane emptyPane = new StackPane();
+            emptyPane.setPrefHeight(300);
+            emptyPane.setAlignment(Pos.CENTER);
+            Label emptyLabel = new Label("No contacts found");
+            emptyLabel.getStyleClass().add("no-contacts-label");
+            emptyPane.getChildren().add(emptyLabel);
+            contactsList.getChildren().add(emptyPane);
+            return;
+        }
+
+        for (ContactVM c : contacts) {
+            HBox item = new HBox(10);
+            item.getStyleClass().add("contact-item");
+            item.setCursor(Cursor.HAND);
+
+            ImageView avatar = new ImageView(loadAvatarSafe(c.imageUrl));
+            avatar.setFitWidth(58);
+            avatar.setFitHeight(58);
+            avatar.setPreserveRatio(true);
+
+            VBox details = new VBox(2);
+            Label nameLabel = new Label(c.profileName);
+            nameLabel.getStyleClass().add("contact-name");
+
+
+            details.getChildren().addAll(nameLabel);
+            item.getChildren().addAll(avatar, details);
+
+            item.setOnMouseClicked(e -> openOrStartPrivateChat(c));
+
+            contactsList.getChildren().add(item);
+        }
+    }
+
+    private Image loadAvatarSafe(String urlOrResource) {
+        try {
+            if (urlOrResource != null) {
+                if (urlOrResource.startsWith("/")) {
+                    return new Image(Objects.requireNonNull(
+                            getClass().getResourceAsStream(urlOrResource)));
+                }
+                if (urlOrResource.startsWith("http://") ||
+                        urlOrResource.startsWith("https://") ||
+                        urlOrResource.startsWith("file:")) {
+                    return new Image(urlOrResource, true); // true = لود async
+                }
+            }
+            return new Image(Objects.requireNonNull(
+                    getClass().getResourceAsStream("/org/to/telegramfinalproject/Avatars/default_user_profile.png")));
+        } catch (Exception e) {
+            return new Image(Objects.requireNonNull(
+                    getClass().getResourceAsStream("/org/to/telegramfinalproject/Avatars/default_user_profile.png")));
+        }
+    }
+
+    private void updateSearchIcon(boolean darkMode) {
+        String iconPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/search_light.png"
+                : "/org/to/telegramfinalproject/Icons/search_dark.png";
+
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(iconPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        searchIcon.setGraphic(icon);
+    }
+
+
+    private void openOrStartPrivateChat(ContactVM contact) {
+        ChatEntry existing = findExistingPrivateChatWith(contact.contactId);
+        if (existing != null) {
+            MainController.getInstance().openChat(existing);
+            MainController.getInstance().closeOverlay(contactsCard.getParent());
+            return;
+        }
+
+        CompletableFuture
+                .supplyAsync(() -> {
+                    try {
+                        UUID myId = UUID.fromString(Session.currentUser.getString("internal_uuid"));
+                        JSONObject req = new JSONObject()
+                                .put("action", "get_or_create_private_chat")
+                                .put("user1", myId.toString())
+                                .put("user2", contact.contactId.toString());
+
+                        JSONObject res = ActionHandler.sendWithResponse(req);
+                        if (res == null || !"success".equals(res.optString("status"))) {
+                            throw new RuntimeException(res != null ? res.optString("message", "Unknown error")
+                                    : "null response");
+                        }
+                        JSONObject data = res.getJSONObject("data");
+                        UUID chatId = UUID.fromString(data.getString("chat_id"));
+
+                        ChatEntry entry = new ChatEntry(
+                                chatId,
+                                contact.userId,
+                                contact.profileName,
+                                contact.imageUrl,
+                                "private",
+                                null,
+                                false,
+                                false
+                        );
+                        entry.setOtherUserId(contact.contactId);
+
+                        return entry;
+                    } catch (Exception ex) {
+                        throw new RuntimeException(ex);
+                    }
+                })
+                .thenAccept(entry -> Platform.runLater(() -> {
+                    MainController.getInstance().onJoinedOrAdded(entry);
+                    MainController.getInstance().openChat(entry);
+                    MainController.getInstance().closeOverlay(contactsCard.getParent());
+                }))
+                .exceptionally(err -> {
+                    Platform.runLater(() -> {
+                        Alert a = new Alert(Alert.AlertType.ERROR, "Failed to start chat: " + err.getMessage(), ButtonType.OK);
+                        a.showAndWait();
+                    });
+                    return null;
+                });
+    }
+
+
+    private ChatEntry findExistingPrivateChatWith(UUID otherUserUuid) {
+        if (Session.chatList != null) {
+            for (ChatEntry ce : Session.chatList) {
+                if (!"private".equalsIgnoreCase(ce.getType())) continue;
+                UUID stored = ce.getOtherUserId();
+                if (stored != null && stored.equals(otherUserUuid)) return ce;
+            }
+        }
+        if (Session.activeChats != null) {
+            for (ChatEntry ce : Session.activeChats) {
+                if (!"private".equalsIgnoreCase(ce.getType())) continue;
+                UUID stored = ce.getOtherUserId();
+                if (stored != null && stored.equals(otherUserUuid)) return ce;
+            }
+        }
+        return null;
+    }
+
+
+
+    private static class ContactVM {
+        final UUID contactId;      // internal UUID
+        final String userId;       // @id
+        final String profileName;
+        final String imageUrl;
+
+        static ContactVM from(ContactEntry ce) {
+            return new ContactVM(ce.getContactId(), ce.getUserId(), ce.getProfileName(), ce.getImageUrl());
+        }
+
+        ContactVM(UUID contactId, String userId, String profileName, String imageUrl) {
+            this.contactId = contactId;
+            this.userId = userId;
+            this.profileName = profileName != null ? profileName : (userId != null ? userId : "Unknown");
+            this.imageUrl = imageUrl != null ? imageUrl : "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/UI/EditProfileController.java b/src/main/java/org/to/telegramfinalproject/UI/EditProfileController.java
new file mode 100644
index 0000000..043054a
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/EditProfileController.java
@@ -0,0 +1,333 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.animation.PauseTransition;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.util.Duration;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Objects;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+import org.json.JSONObject;
+
+import java.io.File;
+
+public class EditProfileController {
+
+    private File pickedAvatarFile;
+
+    @FXML private Pane overlayBackground;
+    @FXML private VBox editCard;
+
+    @FXML private Button backButton;
+    @FXML private Button closeButton;
+
+    @FXML private ImageView profileImageView;
+    @FXML private ImageView cameraIcon;
+    @FXML private Button cameraButton;
+    @FXML private Label profileName;
+    @FXML private Label profileStatus;
+
+    @FXML private TextField nameField;
+    @FXML private TextField bioField;
+    @FXML private TextField usernameField;
+
+    // EditProfileController.java
+    private SettingsController parentSettings;
+    public void setParentSettings(SettingsController sc) {
+        this.parentSettings = sc;
+    }
+
+
+    @FXML
+    private void initialize() {
+        backButton.setGraphic(new ImageView(
+                new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/back_button_dark.png"))
+        ));
+
+        // close on background click
+//        overlayBackground.setOnMouseClicked(e -> {
+//            saveChangesAndClose();
+//            closeEdit();
+//        });
+//
+//        closeButton.setOnAction(e -> {
+//            saveChangesAndClose();
+//            closeEdit();
+//        });
+//
+//        backButton.setOnAction(e -> {
+//            saveChangesAndClose();
+//            MainController.getInstance().goBack(overlayBackground);
+//        });
+
+        overlayBackground.setOnMouseClicked(e -> {
+            saveChangesAndClose();
+            closeEdit(); // ← همینه
+        });
+
+        closeButton.setOnAction(e -> {
+            saveChangesAndClose();
+            closeEdit(); // ← همینه
+        });
+
+        backButton.setOnAction(e -> {
+            saveChangesAndClose();
+            MainController.getInstance().goBack(overlayBackground);
+        });
+
+        // Load your camera icon image (white camera icon for visibility)
+        cameraIcon.setImage(new Image(
+                Objects.requireNonNull(getClass().getResourceAsStream(
+                        "/org/to/telegramfinalproject/Icons/camera.png"))
+        ));
+
+        // Handle click to open file chooser
+        cameraButton.setOnMouseClicked(e -> openImageChooser());
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (editCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(editCard.getScene());
+            }
+        });
+
+        // Listener for theme change
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateBackIcon(newVal);
+        });
+
+        // Set initial state
+        updateBackIcon(ThemeManager.getInstance().isDarkMode());
+    }
+
+    private void updateBackIcon(boolean darkMode) {
+        String iconPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/back_button_light.png"
+                : "/org/to/telegramfinalproject/Icons/back_button_dark.png";
+
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(iconPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        backButton.setGraphic(icon);
+    }
+
+    private void openImageChooser() {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.getExtensionFilters().addAll(
+                new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg", "*.jpeg")
+        );
+        File file = fileChooser.showOpenDialog(profileImageView.getScene().getWindow());
+
+        if (file != null) {
+            pickedAvatarFile = file;
+            profileImageView.setImage(new Image(file.toURI().toString()));
+        }
+    }
+
+    private void closeEdit() {
+//        MainController.getInstance().goBack(overlayBackground);
+        MainController.getInstance().closeOverlay(editCard.getParent());
+
+
+    }
+
+    public void setProfileData(String name, String status, String bio, String userId, Image profileImage) {
+        profileStatus.setText(status);
+        profileName.setText(name);
+        nameField.setText(name);
+        bioField.setText(bio != null ? bio : "");
+        usernameField.setText(userId);
+        profileImageView.setImage(profileImage);
+    }
+
+    private void saveChangesAndClose() {
+        JSONObject currentUser = Session.currentUser;
+
+        String newBio = bioField.getText().trim();
+        String newName = nameField.getText().trim();
+        String newUserId = usernameField.getText().trim();
+
+        boolean anyError = false;
+
+//        if (pickedAvatarFile != null) {
+//            ActionHandler.instance.uploadAvatarFor("user", null, pickedAvatarFile);
+//
+//            if (ActionHandler.instance.wasSuccess()) {
+//                String url = ActionHandler.instance.getLastMessage();
+//                if (url != null && !url.isBlank()) {
+//                    currentUser.put("image_url", url);
+//                }
+//            } else {
+//                anyError = true;
+//                showAlert(
+//                        "Avatar upload failed",
+//                        ActionHandler.instance.getLastMessage() == null ? "Unknown error" : ActionHandler.instance.getLastMessage(),
+//                        Alert.AlertType.ERROR
+//                );
+//            }
+//        }
+
+
+        if (pickedAvatarFile != null) {
+            ActionHandler.instance.uploadAvatarFor("user", null, pickedAvatarFile);
+
+            if (ActionHandler.instance.wasSuccess()) {
+                String url = ActionHandler.instance.getLastMessage();
+                if (url != null && !url.isBlank()) {
+
+
+                    String extracted = extractImageUrl(url);
+                    if (isLikelyImageUrl(extracted)) {
+                        String finalUrl = addCacheBusterIfHttp(extracted);
+                        Session.currentUser.put("image_url", finalUrl);
+                    } else {
+                        System.out.println("Upload avatar returned a non-image value: " + url);
+                    }
+                }
+            } else {
+                anyError = true;
+                showAlert(
+                        "Avatar upload failed",
+                        ActionHandler.instance.getLastMessage() == null ? "Unknown error" : ActionHandler.instance.getLastMessage(),
+                        Alert.AlertType.ERROR
+                );
+            }
+        }
+
+
+        // --- Update bio ---
+        String oldBio = currentUser.optString("bio", "");
+        if (!newBio.equals(oldBio)) {
+            JSONObject req = new JSONObject().put("action", "edit_bio").put("new_bio", newBio);
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp == null || !"success".equals(resp.optString("status"))) {
+                anyError = true;
+                showAlert("Error", resp != null ? resp.optString("message", "Unknown error") : "Unknown error", Alert.AlertType.ERROR);
+            } else {
+                currentUser.put("bio", newBio);
+            }
+        }
+
+        // --- Update profile name ---
+        String oldName = currentUser.optString("profile_name", "");
+        if (!newName.equals(oldName)) {
+            JSONObject req = new JSONObject().put("action", "edit_profile_name").put("new_profile_name", newName);
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp == null || !"success".equals(resp.optString("status"))) {
+                anyError = true;
+                showAlert("Error", resp != null ? resp.optString("message", "Unknown error") : "Unknown error", Alert.AlertType.ERROR);
+            } else {
+                currentUser.put("profile_name", newName);
+            }
+        }
+
+        // --- Update user ID (username) ---
+        String oldUserId = currentUser.optString("user_id", "");
+        if (!newUserId.equals(oldUserId)) {
+            JSONObject req = new JSONObject().put("action", "edit_user_id").put("new_user_id", newUserId);
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp == null || !"success".equals(resp.optString("status"))) {
+                anyError = true;
+                showAlert("Error", resp != null ? resp.optString("message", "Unknown error") : "Unknown error", Alert.AlertType.ERROR);
+            } else {
+                currentUser.put("user_id", newUserId);
+            }
+        }
+
+        if (!anyError) {
+            var mp = MyProfileController.getInstance();
+            if (mp != null) {
+                mp.setProfileData(
+                        currentUser.optString("profile_name"),
+                        "online",
+                        currentUser.optString("bio"),
+                        currentUser.optString("user_id"),
+                        currentUser.optString("image_url", "/org/to/telegramfinalproject/Avatars/default_user_profile.png")
+                );
+            }
+
+            if (parentSettings != null) {
+                parentSettings.populateFromSession();
+            }
+
+            MainController.getInstance().refreshSidebarUserFromSession();
+
+//            MainController.getInstance().goBack(overlayBackground);
+            MainController.getInstance().closeOverlay(editCard.getParent());
+
+        }
+
+
+    }
+
+    private void showAlert(String title, String message, Alert.AlertType type) {
+        Alert alert = new Alert(type);
+        alert.setTitle(title);
+        alert.setHeaderText(null); // no big header, just the message
+        alert.setContentText(message);
+
+        // optional: style it to fit your dark/light theme
+        if (alert.getDialogPane().getScene() != null) {
+            ThemeManager.getInstance().registerScene(alert.getDialogPane().getScene());
+        }
+
+        alert.showAndWait();
+    }
+
+
+
+    private boolean isLikelyImageUrl(String s) {
+        if (s == null || s.isBlank()) return false;
+        return s.startsWith("http://") || s.startsWith("https://")
+                || s.startsWith("file:")
+                || s.startsWith("/")
+                || s.matches("(?i).+\\.(png|jpe?g|gif|webp)$");
+    }
+
+    private String addCacheBusterIfHttp(String url) {
+        if (url == null) return null;
+        if (url.startsWith("http://") || url.startsWith("https://")) {
+            return url + (url.contains("?") ? "&" : "?") + "v=" + System.currentTimeMillis();
+        }
+        return url;
+    }
+
+    private String extractImageUrl(String raw) {
+        if (raw == null) return null;
+        String s = raw.trim();
+        if (s.startsWith("{") && s.endsWith("}")) {
+            try {
+                org.json.JSONObject j = new org.json.JSONObject(s);
+                if (j.has("display_url")) return j.optString("display_url", null);
+                if (j.has("url"))         return j.optString("url", null);
+                if (j.has("data")) {
+                    var d = j.optJSONObject("data");
+                    if (d != null) {
+                        if (d.has("display_url")) return d.optString("display_url", null);
+                        if (d.has("url"))         return d.optString("url", null);
+                    }
+                }
+            } catch (Exception ignore) {}
+        }
+        return s;
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/GroupInfoController.java b/src/main/java/org/to/telegramfinalproject/UI/GroupInfoController.java
new file mode 100644
index 0000000..3632849
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/GroupInfoController.java
@@ -0,0 +1,363 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.UUID;
+
+public class GroupInfoController {
+
+    @FXML private VBox groupCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+
+    @FXML private ImageView groupImage;
+    @FXML private Label groupName;
+    @FXML private Label memberCount;
+
+    @FXML private Button infoMoreButton;
+    @FXML private ContextMenu infoMoreMenu;
+    @FXML private MenuItem addMemberItem;
+    @FXML private MenuItem manageGroupItem;
+    @FXML private MenuItem deleteGroupItem;
+    @FXML private ImageView moreIcon;
+    @FXML private ImageView manageChannelIcon;
+    @FXML private ImageView addMemberIcon;
+
+    @FXML private VBox membersList;
+    @FXML private Label membersHeader;
+    @FXML private Button addMemberButton;
+    @FXML private ImageView membersIcon;
+    @FXML private ScrollPane membersScroll;
+
+    private String groupId; // the UUID of this group
+
+    private static final String ICON_PATH = "/org/to/telegramfinalproject/Icons/";
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e ->
+                MainController.getInstance().closeOverlay(groupCard.getParent()));
+        overlayBackground.setOnMouseClicked(e ->
+                MainController.getInstance().closeOverlay(groupCard.getParent()));
+
+        infoMoreButton.setOnAction(e -> {
+            if (infoMoreMenu != null) infoMoreMenu.show(infoMoreButton, javafx.geometry.Side.BOTTOM, 0, 0);
+        });
+
+        if (manageGroupItem != null) {
+            manageGroupItem.setOnAction(e -> openManageGroupScene());
+        }
+
+        deleteGroupItem.setOnAction(e -> handleDeleteGroup());
+
+        Platform.runLater(() -> {
+            if (groupCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(groupCard.getScene());
+            }
+        });
+
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateIcons(newVal);
+        });
+
+        updateIcons(ThemeManager.getInstance().isDarkMode());
+
+        // Smooth scroll feel
+        membersScroll.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm()
+        );
+        membersScroll.skinProperty().addListener((obs, oldSkin, newSkin) -> {
+            if (newSkin != null) {
+                ScrollBar vBar = (ScrollBar) membersScroll.lookup(".scroll-bar:vertical");
+                if (vBar != null) {
+                    membersScroll.setOnScroll(event -> {
+                        double deltaY = event.getDeltaY() * 0.003;
+                        double newValue = vBar.getValue() - deltaY;
+                        vBar.setValue(Math.max(0, Math.min(newValue, 1)));
+                    });
+                }
+            }
+        });
+
+        if (addMemberButton != null) {
+            addMemberButton.setOnAction(e -> openAddMemberScene());
+        }
+        if (addMemberItem != null) {
+            addMemberItem.setOnAction(e -> openAddMemberScene());
+        }
+    }
+
+    public void setGroupDataFromJson(ChatEntry entry, JSONObject data) {
+        this.groupId = data.optString("internal_uuid", entry.getId().toString());
+
+        groupName.setText(data.optString("group_name", entry.getName()));
+        memberCount.setText(data.optInt("member_count", 0) + " members");
+
+        // --- Role-based UI ---
+        String myRole = data.optString("my_role", "member").toLowerCase();
+
+        // Delete group → only owner
+        deleteGroupItem.setVisible("owner".equals(myRole));
+
+        // Add member (button + menu item) → owner or admin
+        boolean canAdd = "owner".equals(myRole) || "admin".equals(myRole);
+        addMemberButton.setVisible(canAdd);
+        addMemberButton.setManaged(canAdd);
+        if (addMemberItem != null) {
+            addMemberItem.setVisible(canAdd);
+        }
+
+        // More menu (3-dot) → hide entirely for plain members
+        boolean showMore = "owner".equals(myRole) || "admin".equals(myRole);
+        infoMoreButton.setVisible(showMore);
+        infoMoreButton.setManaged(showMore);
+
+        // --- Group picture ---
+        String imgUrl = data.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            try {
+                Image img = AvatarLocalResolver.load(imgUrl);
+                if (img != null) groupImage.setImage(img);
+            } catch (Exception ignore) {}
+        } else {
+            groupImage.setImage(
+                    new Image(getClass().getResourceAsStream(
+                            "/org/to/telegramfinalproject/Avatars/default_group_profile.png"))
+            );
+        }
+
+        // --- Members list ---
+        membersList.getChildren().clear();
+        var arr = data.optJSONArray("members");
+        if (arr != null) {
+            membersHeader.setText(arr.length() + " MEMBERS");
+            for (int i = 0; i < arr.length(); i++) {
+                JSONObject m = arr.getJSONObject(i);
+                addMemberRow(m);
+            }
+        }
+    }
+
+    private void addMemberRow(JSONObject m) {
+        HBox row = new HBox(10);
+        row.getStyleClass().add("member-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        // === Avatar ===
+        ImageView avatar = new ImageView();
+        avatar.setFitWidth(36);
+        avatar.setFitHeight(36);
+        avatar.setPreserveRatio(true);
+        AvatarFX.circleClip(avatar, 36);
+
+        String imgUrl = m.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imgUrl);
+            if (img != null) avatar.setImage(img);
+        } else {
+            avatar.setImage(new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"
+            )));
+        }
+
+        // === Name + Status ===
+        VBox nameBox = new VBox(2);
+        Label name = new Label(m.optString("profile_name", "Unknown"));
+        name.getStyleClass().add("member-name");
+
+        // Status = online / last seen recently
+        String status;
+        if (m.optBoolean("is_online", false)) {
+            status = "online";
+        } else {
+            status = ChatPageController.getInstance().userStatusText(
+                    false,
+                    m.optString("last_seen", null)
+            );
+        }
+        Label statusLbl = new Label(status);
+        statusLbl.getStyleClass().add("member-status");
+
+        nameBox.getChildren().addAll(name, statusLbl);
+
+        // === Role (owner/admin/member) ===
+        Label role = new Label();
+        String roleStr = m.optString("role", "");
+        if (!roleStr.isBlank()) {
+            role.setText(roleStr.toLowerCase());
+            role.getStyleClass().add("member-role");
+        }
+
+        Region spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+
+        row.getChildren().addAll(avatar, nameBox, spacer, role);
+        membersList.getChildren().add(row);
+    }
+
+    private void openManageGroupScene() {
+        new Thread(() -> {
+            try {
+                JSONObject req = new JSONObject()
+                        .put("action", "view_group")
+                        .put("group_id", groupId)
+                        .put("viewer_id", Session.getUserUUID());
+
+                JSONObject resp = ActionHandler.sendWithResponse(req);
+
+                if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                    Platform.runLater(() -> MainController.getInstance().showAlert(
+                            "Error",
+                            resp != null ? resp.optString("message") : "Server not responding.",
+                            Alert.AlertType.ERROR
+                    ));
+                    return;
+                }
+
+                JSONObject data = resp.optJSONObject("data");
+                if (data == null) {
+                    Platform.runLater(() -> MainController.getInstance().showAlert(
+                            "Error",
+                            "Malformed server response.",
+                            Alert.AlertType.ERROR
+                    ));
+                    return;
+                }
+
+                Platform.runLater(() -> {
+                    try {
+                        FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                                "/org/to/telegramfinalproject/Fxml/manage_group.fxml"));
+                        Node overlay = loader.load();
+
+                        ManageGroupController controller = loader.getController();
+                        controller.setGroupData(data); // pass the full JSON
+
+                        MainController.getInstance().showOverlay(overlay);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        MainController.getInstance().showAlert(
+                                "Error",
+                                "Could not load Manage Group scene.",
+                                Alert.AlertType.ERROR
+                        );
+                    }
+                });
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                Platform.runLater(() -> MainController.getInstance().showAlert(
+                        "Error",
+                        "Error while fetching group info: " + e.getMessage(),
+                        Alert.AlertType.ERROR
+                ));
+            }
+        }).start();
+    }
+
+    private void openAddMemberScene() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/add_member.fxml"));
+            Node overlay = loader.load();
+
+            AddMembersController controller = loader.getController();
+            controller.setGroupForAdd(UUID.fromString(groupId), String.valueOf(groupName));
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error",
+                    "Could not load Add Member scene.",
+                    Alert.AlertType.ERROR
+            );
+        }
+    }
+
+    private void handleDeleteGroup() {
+        ChatEntry entry = Session.currentChatEntry;
+
+//        if (entry == null || !"group".equalsIgnoreCase(entry.getType())) {
+//            alert(Alert.AlertType.INFORMATION, "This action is only available for groups.");
+//            return;
+//        }
+
+        if (!confirm("Delete Group",
+                "Are you sure you want to DELETE this group?\nThis action cannot be undone.")) {
+            return;
+        }
+
+        JSONObject req = new JSONObject()
+                .put("action", "delete_group")
+                .put("group_id", entry.getId().toString());
+
+        JSONObject res = ActionHandler.sendWithResponse(req);
+
+        if (res != null && "success".equalsIgnoreCase(res.optString("status"))) {
+            alert(Alert.AlertType.INFORMATION, "✅ Group deleted successfully.");
+            MainController.getInstance().refreshChatListUI();
+            AppRouter.showMain();
+        } else {
+            String msg = (res != null) ? res.optString("message", "Failed to delete group.") : "null response";
+            alert(Alert.AlertType.ERROR, "❌ " + msg);
+        }
+    }
+
+    private boolean confirm(String title, String msg) {
+        Alert a = new Alert(Alert.AlertType.CONFIRMATION, msg, ButtonType.OK, ButtonType.CANCEL);
+        a.setTitle(title);
+        return a.showAndWait().filter(btn -> btn == ButtonType.OK).isPresent();
+    }
+    private void alert(Alert.AlertType type, String msg) {
+        new Alert(type, msg, ButtonType.OK).show();
+    }
+
+
+
+    private void updateIcons(boolean dark) {
+        String suffix = dark ? "_light.png" : "_dark.png";
+
+        moreIcon.setImage(loadImage(ICON_PATH + "more" + suffix));
+        membersIcon.setImage(loadImage(ICON_PATH + "group" + suffix));
+        addMemberButton.setGraphic(makeIcon(ICON_PATH + "add_member" + suffix));
+        membersIcon.setImage(loadImage(ICON_PATH + "group_member" + suffix));
+        manageChannelIcon.setImage(loadImage(ICON_PATH + "manage" + suffix));
+        addMemberIcon.setImage(loadImage(ICON_PATH + "add_member" + suffix));
+    }
+
+    // --- helpers -------------------------------------------------------------
+
+    private ImageView makeIcon(String path) {
+        ImageView iv = new ImageView();
+        Image img = loadImage(path);
+        if (img != null) {
+            iv.setImage(img);
+            iv.setFitWidth(22);
+            iv.setFitHeight(22);
+            iv.setPreserveRatio(true);
+        }
+        return iv;
+    }
+
+    private Image loadImage(String path) {
+        URL res = getClass().getResource(path);
+        if (res == null) return null;
+        return new Image(res.toExternalForm());
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/IntroController.java b/src/main/java/org/to/telegramfinalproject/UI/IntroController.java
new file mode 100644
index 0000000..7aee43e
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/IntroController.java
@@ -0,0 +1,151 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Circle;
+import javafx.scene.paint.Color;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class IntroController {
+    @FXML private StackPane imagePane;
+    @FXML private Label caption;
+    @FXML private HBox dotContainer;
+    @FXML private Button startButton;
+
+    private List<Image> images = new ArrayList<>();
+    private List<String> captions = new ArrayList<>();
+    private int currentIndex = 0;
+
+    private final int width = 200;
+    private final int height = 200;
+
+    @FXML
+    public void initialize() {
+        loadSlides();
+        setupDots();
+        showSlide(currentIndex);
+
+        startAutoSlide();
+    }
+
+    private void loadSlides() {
+        images.add(new Image(getClass().getResource("/org/to/telegramfinalproject/Images/telegram_icon.png").toExternalForm()));
+        captions.add("🚀 The world's fastest messaging app.\nIt is free and secure.");
+
+        images.add(new Image(getClass().getResource("/org/to/telegramfinalproject/Images/fast.png").toExternalForm()));
+        captions.add("🚀 Telegram delivers messages \nfastest than any other application.");
+
+        images.add(new Image(getClass().getResource("/org/to/telegramfinalproject/Images/free.png").toExternalForm()));
+        captions.add("🎁 Telegram is free forever. No ads.\nNo subscription fees.");
+
+        images.add(new Image(getClass().getResource("/org/to/telegramfinalproject/Images/secure.png").toExternalForm()));
+        captions.add("🔒 Telegram keeps your messages \nsafe from hacker attacks.");
+    }
+
+    private void setupDots() {
+        dotContainer.getChildren().clear();
+        for (int i = 0; i < images.size(); i++) {
+            Circle dot = new Circle(5, Color.LIGHTGRAY);
+            dotContainer.getChildren().add(dot);
+        }
+    }
+
+    private void updateDots() {
+        for (int i = 0; i < dotContainer.getChildren().size(); i++) {
+            Circle dot = (Circle) dotContainer.getChildren().get(i);
+            if (i == currentIndex) {
+                dot.setFill(getSlideColor(i));
+            } else {
+                dot.setFill(Color.LIGHTGRAY);
+            }
+        }
+    }
+
+    private Color getSlideColor(int index) {
+        return switch (index) {
+            case 0 -> Color.DODGERBLUE;  // Blue for Telegram logo
+            case 1 -> Color.FIREBRICK;   // Red slide
+            case 2 -> Color.GOLDENROD;   // Yellow slide
+            case 3 -> Color.SEAGREEN;    // Green slide
+            default -> Color.GRAY;
+        };
+    }
+
+    private void showSlide(int index) {
+        imagePane.getChildren().clear();
+
+        ImageView imageView = new ImageView(images.get(index));
+        imageView.setFitWidth(180);
+        imageView.setFitHeight(180);
+        imageView.setPreserveRatio(true);
+
+        // Clip the image into a circle
+        Circle clip = new Circle(90, 90, 80); // centerX, centerY, radius
+        imageView.setClip(clip);
+
+        imagePane.getChildren().add(imageView);
+        caption.setText(captions.get(index));
+        updateDots();
+    }
+
+
+    private void startAutoSlide() {
+        Thread slider = new Thread(() -> {
+            while (true) {
+                try {
+                    Thread.sleep(3000);
+                } catch (InterruptedException ignored) {}
+
+                javafx.application.Platform.runLater(() -> {
+                    currentIndex = (currentIndex + 1) % images.size();
+                    showSlide(currentIndex);
+                });
+            }
+        });
+        slider.setDaemon(true);
+        slider.start();
+    }
+//
+//    @FXML
+//    private void handleStartMessaging(ActionEvent event) {
+//        try {
+//            FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/Fxml/login_view.fxml"));
+//            Scene loginScene = new Scene(loader.load());
+//
+//            // Get the current stage and its dimensions
+//            Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
+//            double currentWidth = stage.getWidth();
+//            double currentHeight = stage.getHeight();
+//
+//            // Set the new scene and apply the previous size
+//            stage.setScene(loginScene);
+//            stage.setWidth(currentWidth);
+//            stage.setHeight(currentHeight);
+//            stage.show();
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
+
+    @FXML
+    private void handleStartMessaging(ActionEvent event) {
+        AppRouter.showLogin();
+    }
+
+    @FXML private void goRegister() { AppRouter.showRegister(); }
+
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/LoginController.java b/src/main/java/org/to/telegramfinalproject/UI/LoginController.java
new file mode 100644
index 0000000..446e245
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/LoginController.java
@@ -0,0 +1,208 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.animation.PauseTransition;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.Parent;
+import javafx.scene.control.*;
+import javafx.stage.Stage;
+import javafx.util.Duration;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.ClientConnection;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Client.TelegramClient;
+import org.to.telegramfinalproject.Database.userDatabase;
+import org.to.telegramfinalproject.Models.User;
+import org.to.telegramfinalproject.Security.PasswordHashing;
+
+import java.io.IOException;
+
+import static org.to.telegramfinalproject.UI.AppRouter.showRegister;
+
+public class LoginController {
+
+    @FXML private TextField usernameField;
+
+    @FXML private PasswordField passwordField;
+    @FXML private TextField visiblePasswordField;
+
+    @FXML private Button toggleVisibilityBtn;
+    @FXML private Label errorLabel;
+
+    private ClientConnection connection;
+    private boolean passwordVisible = false;
+
+    @FXML
+    public void initialize() {
+        // Sync hidden and visible password fields
+        visiblePasswordField.textProperty().bindBidirectional(passwordField.textProperty());
+
+        try {
+            connection = new ClientConnection("localhost", 8080);
+        } catch (Exception e) {
+            System.out.println("Could not connect to server: " + e.getMessage());
+        }
+    }
+
+    @FXML
+    private void togglePasswordVisibility() {
+        passwordVisible = !passwordVisible;
+        visiblePasswordField.setVisible(passwordVisible);
+        visiblePasswordField.setManaged(passwordVisible);
+        passwordField.setVisible(!passwordVisible);
+        passwordField.setManaged(!passwordVisible);
+        toggleVisibilityBtn.setText(passwordVisible ? "👁" : "👁");
+    }
+
+//    @FXML
+//    private void handleLogin() {
+//        String username = usernameField.getText();
+//        String password = passwordField.getText();
+//
+//        // 1. Check for empty fields
+//        if (username.isEmpty() || password.isEmpty()) {
+//            showError("Please fill in all required fields.");
+//            return;
+//        }
+//
+//        // 2. Check if username exists
+//        userDatabase userDb = new userDatabase();
+//        if (!userDb.existsByUsername(username)) {
+//            showError("This username doesn’t exist.");
+//            return;
+//        }
+//
+//        // 3. Check if password is correct
+//        User user = userDb.findByUsername(username);
+//        if (!PasswordHashing.verify(password, user.getPassword())) {
+//            showError("Incorrect password.");
+//            return;
+//        }
+//
+//        // 4. Attempt to send to server
+//        try {
+//            JSONObject request = new JSONObject();
+//            request.put("action", "login");
+//            request.put("user_id", JSONObject.NULL);
+//            request.put("username", username);
+//            request.put("password", password);
+//            request.put("profile_name", JSONObject.NULL);
+//
+//            if (connection != null) {
+//                connection.send(request.toString());
+//                String responseStr = connection.receive();
+//                JSONObject response = new JSONObject(responseStr);
+//                System.out.println("Status: " + response.getString("status"));
+//                System.out.println("Message: " + response.getString("message"));
+//
+//                // Simulate successful login (since main.fxml isn’t ready)
+//                Alert alert = new Alert(Alert.AlertType.INFORMATION, "Login successful!");
+//                alert.show();
+//            }
+//
+//        } catch (Exception ex) {
+//            showError("Unable to connect to server. Please try again later.");
+//        }
+//    }
+
+
+
+    @FXML
+    private void handleLogin() {
+        String u = usernameField.getText().trim();
+        String p = passwordField.getText();
+        // 1. Check for empty fields
+        if (u.isEmpty() || p.isEmpty()) {
+            showError("Please fill in all required fields.");
+            return;
+        }
+
+        // 2. Check if username exists
+        userDatabase userDb = new userDatabase();
+        if (!userDb.existsByUsername(u)) {
+            showError("This username doesn’t exist.");
+            return;
+        }
+
+        // 3. Check if password is correct
+        User user = userDb.findByUsername(u);
+        if (!PasswordHashing.verify(p, user.getPassword())) {
+            showError("Incorrect password.");
+            return;
+        }
+
+        setUiBusy(true);
+
+        new Thread(() -> {
+            try {
+                var cli     = org.to.telegramfinalproject.Client.TelegramClient.getOrInitForUI();
+                var handler = cli.getHandler();
+
+
+                handler.login(u,p);
+
+                javafx.application.Platform.runLater(() -> {
+                    setUiBusy(false);
+
+                    if (!handler.wasSuccess() || Session.currentUser == null) {
+                        showError(handler.getLastMessage().isEmpty() ? "Login failed." : handler.getLastMessage());
+                        return;
+                    }
+
+
+                    goMain();
+                });
+
+            } catch (Exception ex) {
+                javafx.application.Platform.runLater(() -> {
+                    setUiBusy(false);
+                    showError("Connection error.");
+                });
+            }
+        }, "login-thread").start();
+    }
+
+    private void goMain() {
+        AppRouter.showMain();
+    }
+
+
+    private void setUiBusy(boolean b) {
+        usernameField.setDisable(b);
+        passwordField.setDisable(b);
+    }
+
+
+    @FXML
+    private void switchToRegister() throws IOException {
+        showRegister();
+    }
+
+    private void switchScene(String fxmlFile) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/" + fxmlFile));
+            Parent root = loader.load();
+            Stage stage = (Stage) usernameField.getScene().getWindow();
+            stage.setScene(new Scene(root, 500, 700));
+            stage.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+            showError("Could not load scene: " + fxmlFile);
+        }
+    }
+
+    private void showError(String message) {
+        errorLabel.setVisible(false);
+        errorLabel.setText("");  // Clear the label text
+
+        PauseTransition pause = new PauseTransition(Duration.millis(50));
+        pause.setOnFinished(event -> {
+            errorLabel.setText(message);
+            errorLabel.setStyle("-fx-text-fill: red;");
+            errorLabel.setVisible(true);
+        });
+        pause.play();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/UI/MainController.java b/src/main/java/org/to/telegramfinalproject/UI/MainController.java
new file mode 100644
index 0000000..6d2c8f9
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/MainController.java
@@ -0,0 +1,1408 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.animation.PauseTransition;
+import javafx.animation.TranslateTransition;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import javafx.scene.shape.Circle;
+import javafx.util.Duration;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Models.ChatEntry;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.*;
+
+public class MainController {
+
+    // === LEFT PANE ===
+    @FXML private VBox chatListContainer;     // inside the scrollPane
+    @FXML private ScrollPane scrollPane;      // chat list scroll
+
+    // === Global Search ===
+    @FXML private TextField searchBar;
+    @FXML private VBox globalSearchPane;
+    @FXML private VBox noResultsBox;
+    @FXML private ImageView noResultIcon;
+    @FXML private ScrollPane globalSearchScroll;
+    @FXML private VBox globalSearchResultsContainer;
+
+    //Archives
+    @FXML private VBox chatListVBox;
+    @FXML private Label chatListHeader;
+
+    private boolean blockedByMeFlag = false;
+    private boolean blockedMeFlag   = false;
+
+    private enum SearchMode {
+        GLOBAL,
+        CHAT
+    }
+    private ChatViewMode currentMode = ChatViewMode.NORMAL; // حالت فعلی: NORMAL/NEEDS_JOIN/NEEDS_ADD_CONTACT
+    private SearchMode currentSearchMode = SearchMode.GLOBAL;
+    private UUID currentChatId; // if in CHAT mode, which chat to search in
+
+    // === Search In Chat ===
+    @FXML private VBox chatSearchPane;        // search results panel
+    @FXML private ListView<String> chatSearchResults;
+
+    // === RIGHT PANE ===
+    @FXML private VBox leftPane;
+    @FXML private javafx.scene.layout.StackPane chatDisplayArea;
+    @FXML private Label placeholderLabel;
+
+    // === Main root ===
+    @FXML private StackPane mainRoot;
+    @FXML private SplitPane mainSplitPane;
+
+    // === Sidebar ===
+    @FXML private Pane overlay;
+    @FXML private ImageView menuIcon;
+    private SidebarMenuController sidebarController; //save sidebar controller
+
+    // === Overlay ===
+    @FXML private StackPane overlayLayer;
+
+    // === Time formatter for messages ===
+    private static final java.time.format.DateTimeFormatter FMT_HHMM =
+            java.time.format.DateTimeFormatter.ofPattern("HH:mm");
+    private static final java.time.format.DateTimeFormatter FMT_DATE_TIME =
+            java.time.format.DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm");
+    private static final String YESTERDAY_LABEL = "Yesterday";
+
+    // === STATE ===
+    private static MainController instance;
+    private Node sidebarRoot;
+    private boolean isSidebarOpen = false;
+
+    // Add ThemeManager handle
+    private final ThemeManager themeManager = ThemeManager.getInstance();
+
+    public MainController() {
+        instance = this;
+    }
+
+    public static MainController getInstance() {
+        return instance;
+    }
+
+    // Keep track of the scene user comes from
+    private final Deque<Node> navigationStack = new ArrayDeque<>();
+    private final Map<UUID, ChatItemController> itemControllers = new HashMap<>();
+    private final java.util.Set<UUID> enrichInFlight = java.util.Collections.newSetFromMap(new java.util.concurrent.ConcurrentHashMap<>());
+
+
+    private static final String SAVED_TITLE  = "Saved Messages";
+    private static final String SAVED_AVATAR = "/org/to/telegramfinalproject/Avatars/saved_messages.png";
+
+    //For realtime handling
+    public void onChatUpdated(UUID chatId, String chatType, LocalDateTime lastTs,
+                              boolean isIncoming, String lastPreview) {
+
+        boolean exists =
+                (Session.chatList != null && Session.chatList.stream().anyMatch(c -> chatId.equals(c.getId()))) ||
+                        (Session.activeChats != null && Session.activeChats.stream().anyMatch(c -> chatId.equals(c.getId()))) ||
+                        (Session.archivedChats != null && Session.archivedChats.stream().anyMatch(c -> chatId.equals(c.getId())));
+        if (!exists) return;
+
+        boolean isOpen = Session.currentChatId != null &&
+                Session.currentChatId.equals(chatId.toString());
+
+        forEachChat(chatId, chat -> {
+            chat.setLastMessageTime(lastTs);
+            if (lastPreview != null) chat.setLastMessagePreview(lastPreview);
+            if (isIncoming && !isOpen) chat.setUnreadCount(chat.getUnreadCount() + 1); // ✅ یکدست با unreadCount
+        });
+
+        java.util.Comparator<ChatEntry> byTimeDesc = (c1, c2) -> {
+            var t1 = c1.getLastMessageTime();
+            var t2 = c2.getLastMessageTime();
+            if (t1 == null && t2 == null) return 0;
+            if (t1 == null) return 1;
+            if (t2 == null) return -1;
+            return t2.compareTo(t1);
+        };
+        if (Session.chatList != null) Session.chatList.sort(byTimeDesc);
+        if (Session.activeChats != null) Session.activeChats.sort(byTimeDesc);
+        if (Session.archivedChats != null) Session.archivedChats.sort(byTimeDesc);
+
+        refreshChatListUI();
+        refreshBadgesIfAny();
+    }
+
+
+
+
+    // MainController
+    private void forEachChat(UUID chatId, java.util.function.Consumer<ChatEntry> fn) {
+        java.util.List<java.util.List<ChatEntry>> lists = java.util.List.of(
+                Session.chatList != null ? Session.chatList : java.util.List.of(),
+                Session.activeChats != null ? Session.activeChats : java.util.List.of(),
+                Session.archivedChats != null ? Session.archivedChats : java.util.List.of()
+        );
+        for (var lst : lists) {
+            for (var c : lst) {
+                if (chatId.equals(c.getId())) {
+                    fn.accept(c);
+                }
+            }
+        }
+    }
+
+
+//    public void refreshChatListUI() {
+//        Platform.runLater(() -> {
+//            chatListContainer.getChildren().clear();
+//            itemControllers.clear();
+//            populateChatListFromSession(); // همون متدی که نودها رو می‌سازه و می‌چسبونه
+//        });
+//    }
+
+
+    public void refreshChatListUI() {
+        Platform.runLater(() -> {
+            chatListContainer.getChildren().clear();
+            itemControllers.clear();
+
+            if (Session.inArchivedView) {
+                refreshArchivedListUI(); // ⬅️ همین ظرف chatListContainer را پر می‌کند
+            } else {
+                ensureArchivedHeaderRow();   // ⬅️ اول هدر را در chatListContainer بگذار
+                populateChatListFromSession();
+            }
+        });
+    }
+
+
+    private void refreshBadgesIfAny() {
+        // آپدیت نشان‌ها اگر لازم است
+    }
+
+
+    @FXML
+    public void initialize() {
+        // Populate chat list
+//        populateChatListFromSession();
+        refreshChatListUI();
+
+        // Register the scene for automatic CSS updates
+        Platform.runLater(() -> {
+            ThemeManager.getInstance().registerScene(mainRoot.getScene());
+        });
+
+        // Listen for theme changes to update icons & labels manually
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            if (newVal) {
+                updateIconsForDarkMode();
+                updateLabelsForDarkMode();
+            } else {
+                updateIconsForLightMode();
+                updateLabelsForLightMode();
+            }
+        });
+
+        // Smooth scroll feel for chat list
+        scrollPane.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        scrollPane.setPannable(true);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(false);
+        scrollPane.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003; // smaller = smoother
+            scrollPane.setVvalue(scrollPane.getVvalue() - deltaY);
+        });
+
+        // ---------- SplitPane limits so panes can't fully collapse ----------
+        leftPane.setMinWidth(72);           // avatars-only collapse
+        chatDisplayArea.setMinWidth(360);   // chat area never fully collapses
+
+        mainSplitPane.widthProperty().addListener((o, ov, nv) -> clampDivider());
+        if (!mainSplitPane.getDividers().isEmpty()) {
+            mainSplitPane.getDividers().get(0).positionProperty().addListener((o, ov, nv) -> clampDivider());
+        }
+
+        // Search bar enter action
+        searchBar.setOnAction(e -> {
+            String keyword = searchBar.getText().trim();
+            if (keyword.isEmpty()) return;
+
+            if (currentSearchMode == SearchMode.GLOBAL) {
+                performGlobalSearch(keyword);
+            } else if (currentSearchMode == SearchMode.CHAT && currentChatId != null) {
+                performChatSearch(keyword, currentChatId);
+            }
+        });
+
+        // Typing in search bar shows global search panel
+        searchBar.textProperty().addListener((obs, o, n) -> {
+            if (n != null && !n.isBlank()) {
+                if (currentSearchMode == SearchMode.GLOBAL) {
+                    showGlobalSearchPanel();
+                } else if (currentSearchMode == SearchMode.CHAT) {
+                    showSearchPanel();
+                }
+            }
+        });
+
+        chatSearchResults.setOnMouseClicked(e -> {
+            int idx = chatSearchResults.getSelectionModel().getSelectedIndex();
+            if (idx >= 0 && idx < searchBacking.size()) {
+                openSearchResult(searchBacking.get(idx));
+            }
+        });
+
+        // Smooth scroll feel for global search results
+        globalSearchScroll.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm()
+        );
+        globalSearchScroll.setPannable(true);
+        globalSearchScroll.setFitToWidth(true);
+        globalSearchScroll.setFitToHeight(false);
+        globalSearchScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003; // match chat list smoothness
+            globalSearchScroll.setVvalue(globalSearchScroll.getVvalue() - deltaY);
+        });
+    }
+
+    // Called from ChatPageController when user clicks search button
+    public void showSearchPanel() {
+        scrollPane.setVisible(false);
+        scrollPane.setManaged(false);
+
+        currentSearchMode = SearchMode.CHAT;
+
+        chatSearchPane.setVisible(true);
+        chatSearchPane.setManaged(true);
+
+        searchBar.requestFocus();
+    }
+
+    @FXML
+    public void closeSearchPanel() {
+        chatSearchPane.setVisible(false);
+        chatSearchPane.setManaged(false);
+
+        currentSearchMode = SearchMode.GLOBAL;
+        currentChatId = null;
+
+        scrollPane.setVisible(true);
+        scrollPane.setManaged(true);
+
+        searchBar.clear();
+    }
+
+    public void showGlobalSearchPanel() {
+        scrollPane.setVisible(false);
+        scrollPane.setManaged(false);
+
+        chatSearchPane.setVisible(false);
+        chatSearchPane.setManaged(false);
+
+        globalSearchPane.setVisible(true);
+        globalSearchPane.setManaged(true);
+    }
+
+    @FXML
+    public void closeGlobalSearch() {
+        globalSearchPane.setVisible(false);
+        globalSearchPane.setManaged(false);
+
+        scrollPane.setVisible(true);
+        scrollPane.setManaged(true);
+
+        searchBar.clear();
+    }
+
+    private String formatChatTime(java.time.LocalDateTime ts) {
+        if (ts == null) return "";
+        var today = java.time.LocalDate.now();
+        var d = ts.toLocalDate();
+
+        if (d.isEqual(today)) {
+            //today
+            return FMT_HHMM.format(ts);
+            //yesterday
+        } else if (d.isEqual(today.minusDays(1))) {
+            return YESTERDAY_LABEL;
+        } else {
+            return FMT_DATE_TIME.format(ts);
+        }
+    }
+
+    private void populateChatListFromSession() {
+//        chatListContainer.getChildren().clear();
+
+        var list = (org.to.telegramfinalproject.Client.Session.activeChats != null
+                && !org.to.telegramfinalproject.Client.Session.activeChats.isEmpty())
+                ? org.to.telegramfinalproject.Client.Session.activeChats
+                : org.to.telegramfinalproject.Client.Session.chatList;
+
+        if (list == null || list.isEmpty()) return;
+
+        ChatEntry saved = null;
+        java.util.List<ChatEntry> others = new java.util.ArrayList<>();
+        for (ChatEntry c : list) {
+            if (saved == null && isSavedMessages(c)) {
+                saved = c;
+            } else {
+                others.add(c);
+            }
+        }
+
+//         addArchivedHeaderIfYouHaveOne();
+
+        if (saved != null) {
+            addChatNode(saved);
+        }
+
+        for (ChatEntry c : others) {
+            addChatNode(c);
+        }
+    }
+
+
+//    private void addChatNode(ChatEntry chat ) {
+//        try {
+//            FXMLLoader fx = new FXMLLoader(getClass().getResource(
+//                    "/org/to/telegramfinalproject/Fxml/chat_item.fxml"));
+//            Node item = fx.load();
+//            ChatItemController cc = fx.getController();
+//
+//            String lastPreview = "";
+//            String time = (chat.getLastMessageTime() != null)
+//                    ? timeFmt.format(chat.getLastMessageTime()) : "";
+//
+//            cc.setChatData(chat.getName(), lastPreview, time, 0);
+//
+//            item.setOnMouseClicked(e -> openChat(String.valueOf(chat)));
+//            chatListContainer.getChildren().add(item);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+
+//    private void addChatNode(ChatEntry chat) {
+//        try {
+//            FXMLLoader fx = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/Fxml/chat_item.fxml"));
+//            Node item = fx.load();
+//            ChatItemController cc = fx.getController();
+//
+//            String preview = chat.getLastMessagePreview() == null ? "" : chat.getLastMessagePreview();
+//            String timeText = formatChatTime(chat.getLastMessageTime());
+//            FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/Fxml/chat_item.fxml"));
+//            Node chatItem = loader.load();
+//            ChatItemController controller = loader.getController();
+//
+//            cc.setChatData(chat.getName(), preview, timeText, chat.getUnreadCount(), "/org/to/telegramfinalproject/Avatars/default_profile.png");
+//            item.setOnMouseClicked(e -> openChat(chat));
+//            chatListContainer.getChildren().add(item);
+//
+//            itemControllers.put(chat.getId(), cc);
+//
+//        } catch (Exception ex) {
+//            ex.printStackTrace();
+//        }
+//    }
+
+    private void addChatNode(ChatEntry chat) {
+        try {
+            FXMLLoader fx = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/Fxml/chat_item.fxml"));
+            Node item = fx.load();
+            ChatItemController cc = fx.getController();
+
+            // --- saved detection
+            boolean saved = isSaved(chat);
+
+            String title    = safeTitle(chat);
+            String preview  = chat.getLastMessagePreview() == null ? "" : chat.getLastMessagePreview();
+            String timeText = chat.getLastMessageTime() == null ? "" : formatChatTime(chat.getLastMessageTime());
+            String imageUrl = safeImage(chat.getImageUrl());
+
+            // --- force Saved Messages title & avatar
+            if (saved) {
+                title    = SAVED_TITLE;
+                imageUrl = SAVED_AVATAR;
+            }
+
+            cc.setChatData(title, preview, timeText, chat.getUnreadCount(), imageUrl, chat.getType());
+            item.setOnMouseClicked(e -> openChat(chat));
+            chatListContainer.getChildren().add(item);
+
+            itemControllers.put(chat.getId(), cc);
+
+            // --- no enrich for Saved
+            boolean needName  = (chat.getName() == null || chat.getName().isBlank());
+            boolean needImage = (chat.getImageUrl() == null || chat.getImageUrl().isBlank());
+            if (!saved && (needName || needImage)) {
+                enrichChatEntryAsync(chat);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+    private boolean isSaved(ChatEntry e) {
+        if (e == null) return false;
+        if (e.isSavedMessages()) return true;
+        return "saved".equalsIgnoreCase(e.getType()); // اگر type اختصاصی داری
+    }
+
+
+    public void updateSingleChatCell(ChatEntry entry) {
+        ChatItemController cc = itemControllers.get(entry.getId());
+        if (cc != null) {
+            Platform.runLater(() -> cc.setChatData(
+                    safeTitle(entry),
+                    entry.getLastMessagePreview() == null ? "" : entry.getLastMessagePreview(),
+                    entry.getLastMessageTime() == null ? "" : formatChatTime(entry.getLastMessageTime()),
+                    entry.getUnreadCount(),
+                    safeImage(entry.getImageUrl()),
+                    entry.getType()
+            ));
+        } else {
+            refreshChatListUI(); // اگر پیدا نشد، کل لیست را رفرش کن
+        }
+    }
+
+    public void enrichChatEntryAsync(ChatEntry entry) {
+        if (entry == null) return;
+        // اگر در حال دریافت هستیم، تکراری نفرست
+        if (!enrichInFlight.add(entry.getId())) return;
+
+        new Thread(() -> {
+            try {
+                JSONObject req = new JSONObject()
+                        .put("action", "get_header_info")
+                        .put("receiver_id", entry.getId().toString())
+                        .put("receiver_type", entry.getType())
+                        .put("viewer_id", Session.getUserUUID());
+
+                JSONObject res = ActionHandler.sendWithResponse(req);
+                if (res != null && "success".equalsIgnoreCase(res.optString("status"))) {
+                    JSONObject d = res.optJSONObject("data");
+                    if (d != null) {
+                        String name  = d.optString("name", "");
+                        String image = d.optString("image_url", "");
+                        Platform.runLater(() -> {
+                            if (!name.isBlank())  entry.setName(name);
+                            if (!image.isBlank()) entry.setImageUrl(image);
+                            updateSingleChatCell(entry); // فقط همان آیتم را نوسازی کن
+                        });
+                    }
+                }
+            } catch (Exception ignored) {
+            } finally {
+                enrichInFlight.remove(entry.getId());
+            }
+        }).start();
+    }
+
+
+    private String mapTypeToLabel(String t) {
+        switch (t.toUpperCase()) {
+            case "IMAGE": return "[Image]";
+            case "AUDIO": return "[Audio]";
+            case "VIDEO": return "[Video]";
+            case "FILE":  return "[File]";
+            default:      return "[Message]";
+        }
+    }
+
+//    void openChat(ChatEntry chat) {
+//        try {
+//            FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/Fxml/chat_page.fxml"));
+//            Node chatPage = loader.load();
+//
+//
+//
+//
+//
+//
+//
+//            ChatPageController controller = loader.getController();
+//            controller.showChat(chat);
+//
+//            this.chatPageController = controller;
+//            Session.currentChatId = chat.getId().toString();
+//
+//            chatDisplayArea.getChildren().setAll(chatPage);
+//            chat.setUnreadCount(0);
+//            ChatItemController item = itemControllers.get(chat.getId());
+//            if (item != null) item.setUnread(0);
+//
+//        } catch (IOException ex) {
+//            ex.printStackTrace();
+//        }
+//    }
+
+    void openChat(ChatEntry chat) {
+        // فقط برای پرایوت: اول بلاک/بلاک‌شدن را چک کن، بعد مود را تعیین کن
+        if ("private".equalsIgnoreCase(chat.getType())) {
+            final String viewerId = org.to.telegramfinalproject.Client.Session.getUserUUID(); // internal_uuid کاربر فعلی
+            if (viewerId != null && !viewerId.isBlank()) {
+                new Thread(() -> {
+                    org.json.JSONObject req = new org.json.JSONObject()
+                            .put("action", "check_block_status_by_chat")
+                            .put("viewer_id", viewerId)
+                            .put("chat_id", chat.getId().toString());
+
+                    org.json.JSONObject res = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+
+                    boolean blockedByMe = false;
+                    boolean blockedMe   = false;
+                    if (res != null && "success".equalsIgnoreCase(res.optString("status"))) {
+                        org.json.JSONObject data = res.optJSONObject("data");
+                        if (data != null) {
+                            // اسم فیلدها را با سرور خودت یکی کن
+                            blockedByMe = data.optBoolean("blocked_by_me", false) || data.optBoolean("is_blocked", false);
+                            blockedMe   = data.optBoolean("blocked_me", false);
+                        }
+                    }
+
+                    final ChatViewMode mode = blockedByMe
+                            ? ChatViewMode.BLOCKED
+                            : (blockedMe ? ChatViewMode.READ_ONLY : ChatViewMode.NORMAL);
+
+                    Platform.runLater(() -> openChatWithMode(chat, mode));
+                }).start();
+                return; // نذار پایین دوباره باز شود
+            }
+        }
+
+        if ("channel".equalsIgnoreCase(chat.getType())) {
+            boolean canPost =
+                    chat.isOwner() || chat.isAdmin() ||
+                            (chat.getPermissions() != null &&
+                                    chat.getPermissions().optBoolean("can_post", false));
+            // اگر فقط owner/admin ملاک توست، خط بالا را به این تغییر بده:
+            // boolean canPost = chat.isOwner() || chat.isAdmin();
+
+            openChatWithMode(chat, canPost ? ChatViewMode.NORMAL : ChatViewMode.READ_ONLY);
+            return;
+        }
+
+        // غیرپرایوت یا اگر viewerId نبود → نرمال
+        openChatWithMode(chat, ChatViewMode.NORMAL);
+    }
+
+
+    private void openChatWithMode(ChatEntry chat, ChatViewMode mode) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/Fxml/chat_page.fxml"));
+            Node chatPage = loader.load();
+
+            ChatPageController controller = loader.getController();
+            controller.showChat(chat, mode); // ⬅️ متد جدید در ChatPageController
+
+            this.chatPageController = controller;
+            Session.currentChatId = chat.getId().toString();
+
+            chatDisplayArea.getChildren().setAll(chatPage);
+
+            chat.setUnreadCount(0);
+            ChatItemController item = itemControllers.get(chat.getId());
+            if (item != null) item.setUnread(0);
+
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+
+    @FXML
+    private void toggleSidebar() {
+        if (isSidebarOpen) {
+            closeSidebar();
+        } else {
+            openSidebar();
+        }
+    }
+
+//    @FXML
+//    private void openSidebar() {
+//        try {
+//            if (sidebarRoot == null) {
+//                sidebarRoot = FXMLLoader.load(getClass().getResource("/org/to/telegramfinalproject/Fxml/Sidebar_menu.fxml"));
+//                StackPane.setAlignment(sidebarRoot, Pos.CENTER_LEFT);
+//                sidebarRoot.setTranslateX(-getSidebarWidth());
+//                mainRoot.getChildren().add(sidebarRoot);
+//            }
+//
+//            TranslateTransition slideIn = new TranslateTransition(Duration.millis(250), sidebarRoot);
+//            slideIn.setToX(0);
+//            slideIn.play();
+//
+//            overlay.setVisible(true);
+//            overlay.setMouseTransparent(false);
+//
+//            isSidebarOpen = true;
+//
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
+
+    @FXML
+    private void openSidebar() {
+        try {
+            if (sidebarRoot == null) {
+                FXMLLoader loader = new FXMLLoader(
+                        getClass().getResource("/org/to/telegramfinalproject/Fxml/Sidebar_menu.fxml"));
+                sidebarRoot = loader.load();
+                sidebarController = loader.getController();
+
+                StackPane.setAlignment(sidebarRoot, Pos.CENTER_LEFT);
+                sidebarRoot.setTranslateX(-getSidebarWidth());
+                mainRoot.getChildren().add(sidebarRoot);
+            }
+
+            if (sidebarController != null && org.to.telegramfinalproject.Client.Session.currentUser != null) {
+                sidebarController.setUserFromSession(
+                        org.to.telegramfinalproject.Client.Session.currentUser);
+            }
+
+            TranslateTransition slideIn = new TranslateTransition(Duration.millis(250), sidebarRoot);
+            slideIn.setToX(0);
+            slideIn.play();
+
+            overlay.setVisible(true);
+            overlay.setMouseTransparent(false);
+            isSidebarOpen = true;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @FXML
+    public void closeSidebar() {
+        if (sidebarRoot != null && isSidebarOpen) {
+            TranslateTransition slideOut = new TranslateTransition(Duration.millis(250), sidebarRoot);
+            slideOut.setToX(-getSidebarWidth());
+            slideOut.setOnFinished(e -> {
+                overlay.setVisible(false);
+                overlay.setMouseTransparent(true);
+                isSidebarOpen = false;
+            });
+            slideOut.play();
+        }
+    }
+
+    private double getSidebarWidth() {
+        return 250; // Sidebar width in px
+    }
+
+    private void clampDivider() {
+        if (mainSplitPane.getDividers().isEmpty()) return;
+
+        double totalW = mainSplitPane.getWidth();
+        if (totalW <= 0) return;
+
+        double leftMinRatio  = leftPane.getMinWidth() / totalW;
+        double rightMinRatio = chatDisplayArea.getMinWidth() / totalW;
+        double maxLeftRatio  = 1.0 - rightMinRatio;
+
+        SplitPane.Divider d = mainSplitPane.getDividers().get(0);
+        double p = d.getPosition();
+        if (p < leftMinRatio) {
+            d.setPosition(leftMinRatio);
+        } else if (p > maxLeftRatio) {
+            d.setPosition(maxLeftRatio);
+        }
+    }
+
+    private void updateIconsForDarkMode() {
+        // Example: switch images to white versions
+        menuIcon.setImage(new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/menu_light.png")));
+        noResultIcon.setImage(new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/no_result_light.png")));
+    }
+
+    private void updateIconsForLightMode() {
+        // Example: switch images to black versions
+        menuIcon.setImage(new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/menu_dark.png")));
+        noResultIcon.setImage(new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/no_result_dark.png")));
+    }
+
+    private void updateLabelsForDarkMode() {
+        //myLabel.setStyle("-fx-text-fill: white;");
+    }
+
+    private void updateLabelsForLightMode() {
+        //myLabel.setStyle("-fx-text-fill: black;");
+    }
+
+    // === Overlay Handling ===
+    public void showOverlay(Node overlayNode) {
+        if (!overlayLayer.getChildren().isEmpty()) {
+            Node current = overlayLayer.getChildren().get(overlayLayer.getChildren().size() - 1);
+            navigationStack.push(current);
+            overlayLayer.getChildren().remove(current);
+        }
+        overlayLayer.getChildren().add(overlayNode);
+
+        // Automatically close sidebar
+        closeSidebar();
+    }
+
+    public void closeOverlay(Node overlayNode) {
+        overlayLayer.getChildren().remove(overlayNode);
+    }
+
+    public void goBack(Pane currentOverlay) {
+        // Remove the current overlay
+        closeOverlay(currentOverlay);
+
+        if (!navigationStack.isEmpty()) {
+            Node previous = navigationStack.pop();
+
+            // Clear existing overlays before showing previous
+            overlayLayer.getChildren().clear();
+            overlayLayer.getChildren().add(previous);
+        }
+    }
+
+    public void closeCurrentChat() {
+        // 1. Clear the chat area
+        chatDisplayArea.getChildren().clear();
+
+        // 2. Re-add the placeholder label
+        placeholderLabel.setVisible(true);
+        placeholderLabel.setManaged(true);
+        placeholderLabel.setText("Select a chat to start messaging");
+
+        chatDisplayArea.getChildren().add(placeholderLabel);
+
+        // 3. Ask the chat list to refresh
+        MainController.getInstance().refreshChatListUI();
+    }
+
+    public void showAlert(String title, String message, Alert.AlertType type) {
+        Platform.runLater(() -> {
+            Alert alert = new Alert(type);
+            alert.setTitle(title);
+            alert.setHeaderText(null);
+            alert.setContentText(message);
+
+            // Tie it to the main window so it centers nicely
+            if (mainRoot.getScene() != null && mainRoot.getScene().getWindow() != null) {
+                alert.initOwner(mainRoot.getScene().getWindow());
+            }
+
+            alert.showAndWait();
+        });
+    }
+
+    // ===== Search UI state =====
+    private final java.util.List<SearchResult> searchBacking = new java.util.ArrayList<>();
+
+    @FXML private AnchorPane chatHost; // کانتینر مناسب در مین برای قرار دادن ChatPage
+
+    private ChatPageController chatPageController;
+
+
+
+    public ChatPageController getChatPageController() {
+        return chatPageController;
+    }
+
+
+    private enum SRType { USER, GROUP, CHANNEL, MESSAGE }
+
+    // Inner class
+    private static class SearchResult {
+        final SRType type;
+        final String title;         // name / sender_name / ...
+        final String subtitle;      // @"id" / context string / time
+        final String receiverType;  // برای MESSAGE/GROUP/CHANNEL: private|group|channel, برای USER: null
+        final java.util.UUID uuid;  // uuid آن موجودیت (user/group/channel/chat holder) یا receiver_id پیام
+        final String displayId;     // id قابل نمایش (مثل username یا group_id/channel_id)
+        final String messageId;     // فقط برای MESSAGE
+        final String time;          // نمایش
+
+        SearchResult(SRType t, String title, String subtitle, String receiverType,
+                     java.util.UUID uuid, String displayId, String messageId, String time) {
+            this.type = t; this.title = title; this.subtitle = subtitle;
+            this.receiverType = receiverType; this.uuid = uuid;
+            this.displayId = displayId; this.messageId = messageId; this.time = time;
+        }
+
+        String toDisplay() {
+            switch (type) {
+                case MESSAGE:
+                    String left = (title == null || title.isBlank()) ? "Message" : title;
+                    String right = (time == null ? "" : (" • " + time));
+                    return "🗨 " + left + right + (subtitle==null?"":(" — " + subtitle));
+                case USER:    return "👤 " + title + (subtitle==null?"":(" — " + subtitle));
+                case GROUP:   return "👥 " + title + (subtitle==null?"":(" — " + subtitle));
+                case CHANNEL: return "📣 " + title + (subtitle==null?"":(" — " + subtitle));
+            }
+            return title;
+        }
+    }
+
+    private void performChatSearch(String keyword, UUID chatId) {
+        if (keyword == null || keyword.isBlank()) {
+            chatSearchResults.getItems().clear();
+            return;
+        }
+
+        showSearchPanel();
+
+        org.json.JSONObject req = new org.json.JSONObject();
+        req.put("action", "search_in_chat");
+        req.put("keyword", keyword);
+        req.put("chat_id", chatId.toString());
+        req.put("user_id", org.to.telegramfinalproject.Client.Session.currentUser.getString("user_id"));
+
+        new Thread(() -> {
+            org.json.JSONObject resp;
+            try {
+                resp = ActionHandler.sendWithResponse(req);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                return;
+            }
+
+            if (resp == null || !"success".equals(resp.optString("status"))) return;
+            org.json.JSONArray arr = resp.optJSONObject("data").optJSONArray("results");
+            if (arr == null) arr = new org.json.JSONArray();
+
+            java.util.List<String> tmp = new java.util.ArrayList<>();
+            for (int i = 0; i < arr.length(); i++) {
+                org.json.JSONObject it = arr.getJSONObject(i);
+                String time = it.optString("time", "");
+                String content = it.optString("content", "[No content]");
+                tmp.add("🗨 " + content + (time.isEmpty() ? "" : " • " + time));
+            }
+
+            Platform.runLater(() -> {
+                chatSearchResults.getItems().setAll(tmp);
+                chatSearchResults.setVisible(true);
+                chatSearchResults.setManaged(true);
+            });
+        }).start();
+    }
+
+
+    public void performGlobalSearch(String keyword) {
+        if (keyword == null || keyword.isBlank()) {
+            chatSearchResults.getItems().clear();
+            searchBacking.clear();
+            return;
+        }
+        if (org.to.telegramfinalproject.Client.Session.currentUser == null ||
+                !org.to.telegramfinalproject.Client.Session.currentUser.has("user_id")) {
+            System.out.println("You must be logged in to search.");
+            return;
+        }
+
+        showGlobalSearchPanel();
+
+        // Request to server
+        org.json.JSONObject req = new org.json.JSONObject();
+        req.put("action", "search");
+        req.put("keyword", keyword);
+        req.put("user_id", org.to.telegramfinalproject.Client.Session.currentUser.getString("user_id"));
+
+        new Thread(() -> {
+            org.json.JSONObject resp;
+            try {
+                resp = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                return;
+            }
+            if (resp == null || !"success".equals(resp.optString("status"))) return;
+
+            org.json.JSONArray arr = resp.optJSONObject("data").optJSONArray("results");
+            if (arr == null) arr = new org.json.JSONArray();
+
+            final java.util.List<SearchResult> tmp = new java.util.ArrayList<>();
+            for (int i = 0; i < arr.length(); i++) {
+                org.json.JSONObject it = arr.getJSONObject(i);
+                String type = it.optString("type","");
+
+                switch (type) {
+                    case "user": {
+                        java.util.UUID uuid = java.util.UUID.fromString(it.getString("uuid"));
+                        String name = it.optString("name","Unknown");
+                        String id   = it.optString("id", "");
+                        tmp.add(new SearchResult(
+                                SRType.USER, name,
+                                id.isBlank()? null : "@"+id,
+                                null, uuid, id, null, null
+                        ));
+                        break;
+                    }
+                    case "group": {
+                        java.util.UUID uuid = java.util.UUID.fromString(it.getString("uuid"));
+                        String name = it.optString("name","Unknown group");
+                        String id   = it.optString("id", "");
+                        tmp.add(new SearchResult(
+                                SRType.GROUP, name,
+                                id.isBlank()? null : id,
+                                "group", uuid, id, null, null
+                        ));
+                        break;
+                    }
+                    case "channel": {
+                        java.util.UUID uuid = java.util.UUID.fromString(it.getString("uuid"));
+                        String name = it.optString("name","Unknown channel");
+                        String id   = it.optString("id", "");
+                        tmp.add(new SearchResult(
+                                SRType.CHANNEL, name,
+                                id.isBlank()? null : id,
+                                "channel", uuid, id, null, null
+                        ));
+                        break;
+                    }
+                    case "message": {
+                        String senderName = it.optString("sender_name", it.optString("sender","Unknown"));
+                        String time = it.optString("time", "");
+                        String content = it.optString("content","[No content]");
+                        String rType = it.optString("receiver_type","");        // private|group|channel
+                        java.util.UUID rUuid = java.util.UUID.fromString(it.getString("receiver_id"));
+                        String ctx = "";
+                        if ("group".equals(rType))   ctx = it.optString("group_name","");
+                        if ("channel".equals(rType)) ctx = it.optString("channel_name","");
+                        String subtitle = (ctx.isBlank()? "" : ctx) + (content.isBlank()? "" : (subtitleSep(ctx)+content));
+                        tmp.add(new SearchResult(
+                                SRType.MESSAGE, senderName, subtitle, rType, rUuid,
+                                it.optString("receiver_display_id", ""),
+                                it.optString("message_id", null),
+                                time
+                        ));
+                        break;
+                    }
+                }
+            }
+
+            Platform.runLater(() -> renderSearchResults(tmp));
+        }).start();
+    }
+
+    private String subtitleSep(String s){ return s==null || s.isBlank()? "" : " — "; }
+
+//    private void renderSearchResults(java.util.List<SearchResult> results) {
+//        searchBacking.clear();
+//        searchBacking.addAll(results);
+//
+//        javafx.collections.ObservableList<SearchResult> view =
+//                javafx.collections.FXCollections.observableArrayList(results);
+//        globalSearchResults.setItems(view);
+//        globalSearchResults.setVisible(true);
+//        globalSearchResults.setManaged(true);
+//    }
+
+    private void renderSearchResults(List<SearchResult> results) {
+        globalSearchResultsContainer.getChildren().clear();
+
+        if (results.isEmpty()) {
+            noResultsBox.setVisible(true);
+            noResultsBox.setManaged(true);
+            globalSearchScroll.setVisible(false);
+            globalSearchScroll.setManaged(false);
+            return;
+        }
+
+        noResultsBox.setVisible(false);
+        noResultsBox.setManaged(false);
+        globalSearchScroll.setVisible(true);
+        globalSearchScroll.setManaged(true);
+
+        for (SearchResult r : results) {
+            HBox container = new HBox(10);
+            ImageView avatar = new ImageView();
+            avatar.setFitWidth(40);
+            avatar.setFitHeight(40);
+            avatar.setSmooth(true);
+            avatar.setPreserveRatio(true);
+
+            // 🔑 Clip it into a circle
+            Circle clip = new Circle(20, 20, 20); // x,y = center, radius = 20
+            avatar.setClip(clip);
+
+            Label title = new Label(r.title);
+            title.getStyleClass().add("global-search-title");
+
+            Label subtitle = new Label(
+                    r.type == SRType.MESSAGE
+                            ? (r.subtitle != null ? r.subtitle : "")
+                            : "Press to see messages"
+            );
+            subtitle.getStyleClass().add("global-search-subtitle");
+
+            VBox texts = new VBox(2, title, subtitle);
+            container.getChildren().addAll(avatar, texts);
+
+            // Default profile per type
+            switch (r.type) {
+                case USER -> avatar.setImage(new Image(Objects.requireNonNull(getClass().getResourceAsStream(
+                        "/org/to/telegramfinalproject/Avatars/default_user_profile.png"))));
+                case GROUP -> avatar.setImage(new Image(Objects.requireNonNull(getClass().getResourceAsStream(
+                        "/org/to/telegramfinalproject/Avatars/default_group_profile.png"))));
+                case CHANNEL -> avatar.setImage(new Image(Objects.requireNonNull(getClass().getResourceAsStream(
+                        "/org/to/telegramfinalproject/Avatars/default_channel_profile.png"))));
+                case MESSAGE -> avatar.setImage(new Image(Objects.requireNonNull(getClass().getResourceAsStream(
+                        "/org/to/telegramfinalproject/Avatars/default_user_profile.png"))));
+            }
+
+            container.setOnMouseClicked(e -> openSearchResult(r));
+            globalSearchResultsContainer.getChildren().add(container);
+        }
+    }
+
+    private void openSearchResult(SearchResult r) {
+        switch (r.type) {
+            case USER: {
+                UUID existingChatId = findExistingPrivateChatId(r.uuid);
+
+                ChatEntry ce = new ChatEntry();
+                ce.setType("private");
+                ce.setName(r.title);
+                ce.setDisplayId(r.displayId);
+                try { ce.setOtherUserId(r.uuid); } catch (Exception ignore) {}
+
+                ChatViewMode mode;
+                if (existingChatId != null) {
+                    ce.setId(existingChatId.toString());
+                    mode = ChatViewMode.NORMAL;
+                } else {
+
+                    ce.setId(r.uuid.toString());
+                    mode = isContact(r.uuid) ? ChatViewMode.NORMAL : ChatViewMode.NEEDS_ADD_CONTACT;
+                }
+
+                openChatWithMode(ce, mode);
+                break;
+            }
+
+
+            case GROUP:
+            case CHANNEL: {
+                org.to.telegramfinalproject.Models.ChatEntry existing =
+                        findExistingChat(r.uuid, r.receiverType);
+                if (existing != null) {
+                    openChatWithMode(existing, ChatViewMode.NORMAL);
+                } else {
+                    org.to.telegramfinalproject.Models.ChatEntry ce = new org.to.telegramfinalproject.Models.ChatEntry();
+                    ce.setId(r.uuid.toString());          // internal_uuid group/channel
+                    ce.setDisplayId(r.displayId);         // group_id/channel_id
+                    ce.setName(r.title);
+                    ce.setType(r.receiverType);
+                    //openChat(ce);
+                    ChatViewMode mode;
+                    try {
+                        mode = isInAnyChatList(r.uuid) ? ChatViewMode.NORMAL : ChatViewMode.NEEDS_JOIN;
+                    } catch (Exception e) {
+                        mode = ChatViewMode.NEEDS_JOIN;
+                    }
+                    openChatWithMode(ce, mode);
+
+                }
+                break;
+            }
+
+            case MESSAGE: {
+                org.to.telegramfinalproject.Models.ChatEntry existing =
+                        findExistingChat(r.uuid, r.receiverType);
+                if (existing != null) {
+                    openChat(existing);
+                } else {
+                    org.to.telegramfinalproject.Models.ChatEntry ce = new org.to.telegramfinalproject.Models.ChatEntry();
+                    ce.setId(r.uuid.toString());         // receiver internal_uuid
+                    ce.setType(r.receiverType);
+                    ce.setName(guessNameForReceiver(r));
+                    ce.setDisplayId(r.displayId);
+                    openChat(ce);
+                }
+                break;
+            }
+        }
+    }
+
+    private org.to.telegramfinalproject.Models.ChatEntry findExistingChat(java.util.UUID internalId, String type) {
+        var list = (org.to.telegramfinalproject.Client.Session.chatList==null)
+                ? java.util.Collections.<org.to.telegramfinalproject.Models.ChatEntry>emptyList()
+                : org.to.telegramfinalproject.Client.Session.chatList;
+        for (var c : list) {
+            if (internalId.toString().equals(c.getId().toString())
+                    && type.equalsIgnoreCase(c.getType())) {
+                return c;
+            }
+        }
+        return null;
+    }
+
+    private java.util.UUID findExistingPrivateChatId(java.util.UUID otherUserUuid) {
+        var list = (org.to.telegramfinalproject.Client.Session.chatList==null)
+                ? java.util.Collections.<org.to.telegramfinalproject.Models.ChatEntry>emptyList()
+                : org.to.telegramfinalproject.Client.Session.chatList;
+
+        for (var c : list) {
+            if ("private".equalsIgnoreCase(c.getType())) {
+                if (otherUserUuid.equals(c.getOtherUserId())) {
+                    try { return java.util.UUID.fromString(c.getId().toString()); } catch (Exception ignored) {}
+                }
+            }
+        }
+        return null;
+    }
+
+    private java.util.UUID fetchOrCreatePrivateChat(java.util.UUID otherUserUuid) {
+        try {
+            org.json.JSONObject req = new org.json.JSONObject();
+            req.put("action", "get_or_create_private_chat");
+            req.put("user1", org.to.telegramfinalproject.Client.Session.currentUser.getString("internal_uuid"));
+            req.put("user2", otherUserUuid.toString());
+            org.json.JSONObject resp = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(req);
+            if (resp != null && "success".equals(resp.optString("status"))) {
+                String chatId = resp.getJSONObject("data").getString("chat_id");
+                return java.util.UUID.fromString(chatId);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private String guessNameForReceiver(SearchResult r) {
+        if (r.title != null && !r.title.isBlank()) return r.title;
+        if (r.receiverType != null) {
+            switch (r.receiverType) {
+                case "group": return "Group";
+                case "channel": return "Channel";
+                case "private": return "Private Chat";
+            }
+        }
+        return "Chat";
+    }
+
+    private boolean isSavedMessages(ChatEntry c) {
+        if (c == null) return false;
+
+        if ("saved".equalsIgnoreCase(c.getType())) return true;
+
+        String n = c.getName();
+        if (n != null && n.equalsIgnoreCase("Saved Messages")) return true;
+
+        String me = (org.to.telegramfinalproject.Client.Session.currentUser != null)
+                ? org.to.telegramfinalproject.Client.Session.currentUser.optString("internal_uuid", "")
+                : "";
+        try {
+            UUID other = c.getOtherUserId();
+            if ("private".equalsIgnoreCase(c.getType()) &&
+                    other != null && other.toString().equalsIgnoreCase(me)) {
+                return true;
+            }
+        } catch (Exception ignore) {}
+
+        return false;
+    }
+
+
+    //Search
+    private boolean isInAnyChatList(UUID chatId) {
+        var lists = List.of(
+                Session.chatList != null ? Session.chatList : List.<ChatEntry>of(),
+                Session.activeChats != null ? Session.activeChats : List.<ChatEntry>of(),
+                Session.archivedChats != null ? Session.archivedChats : List.<ChatEntry>of()
+        );
+        for (var lst : lists) {
+            for (var c : lst) {
+                try {
+                    if (chatId.equals(UUID.fromString(c.getId().toString()))) return true;
+                } catch (Exception ignore) {}
+            }
+        }
+        return false;
+    }
+
+
+    private boolean isContact(UUID userUuid) {
+        if (Session.contactEntries == null) return false;
+        try {
+            for (var c : Session.contactEntries) {
+                UUID id = c.getContactId();
+                if (userUuid.equals(id)) return true;
+            }
+        } catch (Exception ignore) {}
+        return false;
+    }
+
+
+
+    private ChatViewMode computeMode(ChatEntry ce) {
+        try {
+            UUID id = UUID.fromString(ce.getId().toString());
+            if (isInAnyChatList(id)) return ChatViewMode.NORMAL;
+        } catch (Exception ignore) {}
+
+        String t = ce.getType();
+        if ("group".equalsIgnoreCase(t) || "channel".equalsIgnoreCase(t)) {
+            return ChatViewMode.NEEDS_JOIN;
+        }
+        if ("private".equalsIgnoreCase(t)) {
+            UUID other = null;
+            try { other = ce.getOtherUserId(); } catch (Exception ignore) {}
+            return (other != null && isContact(other))
+                    ? ChatViewMode.NORMAL
+                    : ChatViewMode.NEEDS_ADD_CONTACT;
+        }
+        return ChatViewMode.NORMAL;
+    }
+
+    public void onJoinedOrAdded(ChatEntry ce) {
+        try {
+            UUID id = UUID.fromString(ce.getId().toString());
+            if (!isInAnyChatList(id)) {
+                if (Session.chatList == null) Session.chatList = new ArrayList<>();
+                Session.chatList.add(ce);
+            }
+            if (Session.activeChats != null && Session.activeChats.stream().noneMatch(c -> id.equals(c.getId()))) {
+                Session.activeChats.add(ce);
+            }
+        } catch (Exception ignore) {}
+
+        Comparator<ChatEntry> byTimeDesc = (a,b) -> {
+            LocalDateTime t1 = a.getLastMessageTime(), t2 = b.getLastMessageTime();
+            if (t1 == null && t2 == null) return 0;
+            if (t1 == null) return 1;
+            if (t2 == null) return -1;
+            return t2.compareTo(t1);
+        };
+        if (Session.chatList != null) Session.chatList.sort(byTimeDesc);
+        if (Session.activeChats != null) Session.activeChats.sort(byTimeDesc);
+
+        refreshChatListUI();
+    }
+
+
+    public void addChatAndSelect(org.to.telegramfinalproject.Models.ChatEntry entry) {
+        if (org.to.telegramfinalproject.Client.Session.chatList.stream()
+                .noneMatch(c -> c.getId().equals(entry.getId()))) {
+            org.to.telegramfinalproject.Client.Session.chatList.add(0, entry);
+            org.to.telegramfinalproject.Client.Session.activeChats.add(0, entry);
+        }
+        try {
+            this.refreshChatListUI();
+        } catch (Exception ignore) {}
+
+        if (getChatPageController() != null) {
+            getChatPageController().showChat(entry);
+        }
+    }
+
+
+    public void refreshSidebarUserFromSession() {
+        if (sidebarController != null && Session.currentUser != null) {
+            Platform.runLater(() -> sidebarController.setUserFromSession(Session.currentUser));
+        }
+    }
+
+
+
+
+    private static final String ARCHIVED_ROW_KEY = "ARCHIVED_HEADER_ROW";
+
+    public void ensureArchivedHeaderRow() {
+        boolean hasArchived = Session.archivedChats != null && !Session.archivedChats.isEmpty();
+
+        if (!hasArchived) {
+            chatListContainer.getChildren().removeIf(n -> ARCHIVED_ROW_KEY.equals(n.getUserData()));
+            return;
+        }
+
+        boolean exists = chatListContainer.getChildren().stream()
+                .anyMatch(n -> ARCHIVED_ROW_KEY.equals(n.getUserData()));
+        if (exists) return;
+
+        HBox headerRow = new HBox(8);
+        headerRow.setUserData(ARCHIVED_ROW_KEY);
+        headerRow.getStyleClass().add("archived-header-row");
+
+        Label title = new Label("Archived Chats");
+        Region spacer = new Region(); HBox.setHgrow(spacer, Priority.ALWAYS);
+        Button openBtn = new Button("Open");
+        openBtn.setOnAction(e -> showArchivedListUI());
+
+        headerRow.getChildren().addAll(title, spacer, openBtn);
+        headerRow.setMinHeight(36); headerRow.setPrefHeight(36);
+
+        chatListContainer.getChildren().add(0, headerRow);
+    }
+
+    public void showArchivedListUI() {
+        Session.inArchivedView = true;
+        refreshChatListUI();
+    }
+
+    public void refreshArchivedListUI() {
+        chatListContainer.getChildren().clear();
+
+        HBox backRow = new HBox();
+        Label back = new Label("← Back to Active");
+        back.getStyleClass().add("archived-back");
+        back.setOnMouseClicked(e -> {
+            Session.inArchivedView = false;
+            refreshChatListUI();
+        });
+        backRow.getChildren().add(back);
+        backRow.setStyle("-fx-padding: 6 10 8 10;");
+        chatListContainer.getChildren().add(backRow);
+
+        if (Session.archivedChats != null && !Session.archivedChats.isEmpty()) {
+            for (ChatEntry e : Session.archivedChats) {
+                addChatNode(e);
+            }
+        } else {
+            Label empty = new Label("No archived chats");
+            empty.getStyleClass().add("muted");
+            chatListContainer.getChildren().add(empty);
+        }
+    }
+
+
+
+    private HBox buildChatCell(ChatEntry e, boolean archivedView) {
+        HBox row = new HBox(8);
+        ImageView avatar = new ImageView(); avatar.setFitWidth(36); avatar.setFitHeight(36);
+        Label name = new Label(e.getName());
+        Region spacer = new Region(); HBox.setHgrow(spacer, javafx.scene.layout.Priority.ALWAYS);
+        Label last = new Label(safeLastLine(e));
+
+        row.getChildren().addAll(avatar, name, spacer, last);
+        row.getStyleClass().add("chat-row");
+
+        row.setOnMouseClicked(ev -> openChat(e));
+
+        return row;
+    }
+
+    private String safeLastLine(ChatEntry e) {
+        String s = e.getLastMessagePreview();
+        return s != null ? s : "";
+    }
+
+
+    private String safeTitle(ChatEntry e) {
+        if (e.getName() != null && !e.getName().isBlank()) return e.getName();
+        if (e.getDisplayId() != null && !e.getDisplayId().isBlank()) return e.getDisplayId();
+        if ("saved".equalsIgnoreCase(e.getType()) || e.isSavedMessages()) return "Saved Messages";
+        return "Unknown";
+    }
+
+    private String safeImage(String img) {
+        return (img != null && !img.isBlank())
+                ? img
+                : "/org/to/telegramfinalproject/Avatars/default_user_profile.png";
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ManageAdminsController.java b/src/main/java/org/to/telegramfinalproject/UI/ManageAdminsController.java
new file mode 100644
index 0000000..f0de29e
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ManageAdminsController.java
@@ -0,0 +1,228 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class ManageAdminsController {
+
+    @FXML private VBox adminsCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button closeFooterButton;
+    @FXML private Button addAdminButton;
+
+    @FXML private ScrollPane adminsScroll;
+    @FXML private VBox adminsList;
+
+    private String groupId;
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(adminsCard.getParent()));
+        closeFooterButton.setOnAction(e -> MainController.getInstance().closeOverlay(adminsCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(adminsCard.getParent()));
+
+        addAdminButton.setOnAction(e -> openAddAdminOverlay());
+
+        // Smooth scroll feel
+        adminsScroll.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        adminsScroll.setPannable(true);
+        adminsScroll.setFitToWidth(true);
+        adminsScroll.setFitToHeight(false);
+        adminsScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            adminsScroll.setVvalue(adminsScroll.getVvalue() - deltaY);
+        });
+    }
+
+    public void setGroupData(String groupId, JSONArray admins) {
+        this.groupId = groupId;
+
+        adminsList.getChildren().clear();
+
+        // Convert to list for sorting
+        List<JSONObject> adminList = new ArrayList<>();
+        for (int i = 0; i < admins.length(); i++) {
+            adminList.add(admins.getJSONObject(i));
+        }
+
+        // Sort: owner first, then admins
+        adminList.sort((a, b) -> {
+            String roleA = a.optString("role", "member");
+            String roleB = b.optString("role", "member");
+            if ("owner".equalsIgnoreCase(roleA) && !"owner".equalsIgnoreCase(roleB)) return -1;
+            if ("owner".equalsIgnoreCase(roleB) && !"owner".equalsIgnoreCase(roleA)) return 1;
+            return 0; // keep relative order for admins
+        });
+
+        // Add rows
+        for (JSONObject a : adminList) {
+            addAdminRow(a);
+        }
+    }
+
+    private void addAdminRow(JSONObject a) {
+        HBox row = new HBox(10);
+        row.getStyleClass().add("member-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        // Avatar
+        ImageView avatar = new ImageView();
+        avatar.setFitWidth(36);
+        avatar.setFitHeight(36);
+        avatar.setPreserveRatio(true);
+
+        String imgUrl = a.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imgUrl);
+            if (img != null) avatar.setImage(img);
+        } else {
+            avatar.setImage(new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"
+            )));
+        }
+
+        // Name + Status
+        VBox details = new VBox(2);
+        Label name = new Label(a.optString("profile_name", "Unknown"));
+        name.getStyleClass().add("member-name");
+
+        Label status = new Label(
+                a.optBoolean("is_online", false) ? "online"
+                        : "last seen recently"
+        );
+        status.getStyleClass().add("member-status");
+
+        details.getChildren().addAll(name, status);
+
+        Region spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+
+        row.getChildren().addAll(avatar, details, spacer);
+
+        // Remove admin (cannot remove owner)
+        String role = a.optString("role", "admin");
+        if (!"owner".equalsIgnoreCase(role)) {
+            Button removeBtn = new Button("Remove");
+            removeBtn.getStyleClass().add("link-btn");
+            removeBtn.setOnAction(e -> removeAdmin(a.optString("user_id"), row));
+            row.getChildren().add(removeBtn);
+        }
+
+        adminsList.getChildren().add(row);
+
+        // User clicks on a admin --> open set admin permission's scene
+        row.setOnMouseClicked(e -> {
+            if (!"owner".equalsIgnoreCase(role)) {
+                try {
+                    // request current permissions from server
+                    JSONObject req = new JSONObject()
+                            .put("action", "get_group_admin_permissions")
+                            .put("group_id", groupId)
+                            .put("admin_id", a.optString("user_id"));
+
+                    JSONObject resp = ActionHandler.sendWithResponse(req);
+                    JSONObject oldPerms = (resp != null) ? resp.optJSONObject("permissions") : null;
+
+                    FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                            "/org/to/telegramfinalproject/Fxml/set_group_admin_permissions.fxml"));
+                    Node overlay = loader.load();
+
+                    SetGroupAdminPermissionsController controller = loader.getController();
+                    controller.setTarget(
+                            UUID.fromString(groupId),
+                            UUID.fromString(a.optString("user_id")),
+                            true,
+                            oldPerms
+                    );
+
+                    MainController.getInstance().showOverlay(overlay);
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                    MainController.getInstance().showAlert("Error", "Could not open permissions scene.", Alert.AlertType.ERROR);
+                }
+            }
+        });
+    }
+
+    private void removeAdmin(String userId, HBox row) {
+        JSONObject req = new JSONObject()
+                .put("action", "remove_admin_from_group")
+                .put("group_id", groupId)
+                .put("target_user_id", userId);
+
+        System.out.println("Sending remove_admin_from_group request: " + req.toString(2));
+
+        row.setDisable(true);
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() -> adminsList.getChildren().remove(row));
+            } else {
+                Platform.runLater(() -> {
+                    row.setDisable(false);
+                    Alert a = new Alert(Alert.AlertType.ERROR,
+                            resp != null ? resp.optString("message", "Failed to remove admin.") : "No response from server.",
+                            ButtonType.OK);
+                    a.show();
+                });
+            }
+        }).start();
+    }
+
+    private void openAddAdminOverlay() {
+        try {
+            // === Query the server for full members list ===
+            JSONObject req = new JSONObject()
+                    .put("action", "view_group_members")
+                    .put("group_id", groupId);
+
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                MainController.getInstance().showAlert(
+                        "Error",
+                        "Could not fetch members.",
+                        Alert.AlertType.ERROR
+                );
+                return;
+            }
+
+            JSONObject data = resp.optJSONObject("data");
+            JSONArray members = (data != null) ? data.optJSONArray("members") : new JSONArray();
+
+            // === Load Add Admins FXML ===
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/add_admins.fxml"));
+            Node overlay = loader.load();
+
+            AddAdminsController controller = loader.getController();
+            controller.setGroupData(groupId, members);  // send raw members, filtering is done in AddAdminsController
+
+            MainController.getInstance().showOverlay(overlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error", "Could not load Add Admins scene.", Alert.AlertType.ERROR
+            );
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ManageChannelAdminsController.java b/src/main/java/org/to/telegramfinalproject/UI/ManageChannelAdminsController.java
new file mode 100644
index 0000000..85bec1a
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ManageChannelAdminsController.java
@@ -0,0 +1,228 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class ManageChannelAdminsController {
+
+    @FXML private VBox adminsCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button closeFooterButton;
+    @FXML private Button addAdminButton;
+
+    @FXML private ScrollPane adminsScroll;
+    @FXML private VBox adminsList;
+
+    private String channelId; // internal_uuid of channel
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(adminsCard.getParent()));
+        closeFooterButton.setOnAction(e -> MainController.getInstance().closeOverlay(adminsCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(adminsCard.getParent()));
+
+        //addAdminButton.setOnAction(e -> openAddAdminOverlay());
+
+        // Smooth scroll feel
+        adminsScroll.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        adminsScroll.setPannable(true);
+        adminsScroll.setFitToWidth(true);
+        adminsScroll.setFitToHeight(false);
+        adminsScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            adminsScroll.setVvalue(adminsScroll.getVvalue() - deltaY);
+        });
+    }
+
+    public void setChannelData(String channelId, JSONArray admins) {
+        this.channelId = channelId;
+
+        adminsList.getChildren().clear();
+
+        // Convert to list for sorting
+        List<JSONObject> adminList = new ArrayList<>();
+        for (int i = 0; i < admins.length(); i++) {
+            adminList.add(admins.getJSONObject(i));
+        }
+
+        // Sort: owner first, then admins
+        adminList.sort((a, b) -> {
+            String roleA = a.optString("role", "subscriber");
+            String roleB = b.optString("role", "subscriber");
+            if ("owner".equalsIgnoreCase(roleA) && !"owner".equalsIgnoreCase(roleB)) return -1;
+            if ("owner".equalsIgnoreCase(roleB) && !"owner".equalsIgnoreCase(roleA)) return 1;
+            return 0; // keep relative order for admins
+        });
+
+        // Add rows
+        for (JSONObject a : adminList) {
+            addAdminRow(a);
+        }
+    }
+
+    private void addAdminRow(JSONObject a) {
+        HBox row = new HBox(10);
+        row.getStyleClass().add("member-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        // Avatar
+        ImageView avatar = new ImageView();
+        avatar.setFitWidth(36);
+        avatar.setFitHeight(36);
+        avatar.setPreserveRatio(true);
+
+        String imgUrl = a.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imgUrl);
+            if (img != null) avatar.setImage(img);
+        } else {
+            avatar.setImage(new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"
+            )));
+        }
+
+        // Name + Status
+        VBox details = new VBox(2);
+        Label name = new Label(a.optString("profile_name", "Unknown"));
+        name.getStyleClass().add("member-name");
+
+        Label status = new Label(
+                a.optBoolean("is_online", false) ? "online"
+                        : "last seen recently"
+        );
+        status.getStyleClass().add("member-status");
+
+        details.getChildren().addAll(name, status);
+
+        Region spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+
+        row.getChildren().addAll(avatar, details, spacer);
+
+        // Remove admin (cannot remove owner)
+        String role = a.optString("role", "admin");
+        if (!"owner".equalsIgnoreCase(role)) {
+            Button removeBtn = new Button("Remove");
+            removeBtn.getStyleClass().add("link-btn");
+            removeBtn.setOnAction(e -> removeAdmin(a.optString("user_id"), row));
+            row.getChildren().add(removeBtn);
+        }
+
+        adminsList.getChildren().add(row);
+
+        // User clicks an admin → open set channel admin permissions scene
+        row.setOnMouseClicked(e -> {
+            if (!"owner".equalsIgnoreCase(role)) {
+                try {
+                    // request current permissions from server
+                    JSONObject req = new JSONObject()
+                            .put("action", "get_channel_admin_permissions")
+                            .put("channel_id", channelId)
+                            .put("admin_id", a.optString("user_id"));
+
+                    JSONObject resp = ActionHandler.sendWithResponse(req);
+                    JSONObject oldPerms = (resp != null) ? resp.optJSONObject("permissions") : null;
+
+                    FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                            "/org/to/telegramfinalproject/Fxml/set_channel_admin_permissions.fxml"));
+                    Node overlay = loader.load();
+
+//                    SetChannelAdminPermissionsController controller = loader.getController();
+//                    controller.setTarget(
+//                            UUID.fromString(channelId),
+//                            UUID.fromString(a.optString("user_id")),
+//                            true,
+//                            oldPerms
+//                    );
+
+                    MainController.getInstance().showOverlay(overlay);
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                    MainController.getInstance().showAlert("Error", "Could not open permissions scene.", Alert.AlertType.ERROR);
+                }
+            }
+        });
+    }
+
+    private void removeAdmin(String userId, HBox row) {
+        JSONObject req = new JSONObject()
+                .put("action", "remove_admin_from_channel")
+                .put("channel_id", channelId)
+                .put("target_user_id", userId);
+
+        System.out.println("Sending remove_admin_from_channel request: " + req.toString(2));
+
+        row.setDisable(true);
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() -> adminsList.getChildren().remove(row));
+            } else {
+                Platform.runLater(() -> {
+                    row.setDisable(false);
+                    Alert a = new Alert(Alert.AlertType.ERROR,
+                            resp != null ? resp.optString("message", "Failed to remove admin.") : "No response from server.",
+                            ButtonType.OK);
+                    a.show();
+                });
+            }
+        }).start();
+    }
+
+//    private void openAddAdminOverlay() {
+//        try {
+//            // === Query the server for full subscribers list ===
+//            JSONObject req = new JSONObject()
+//                    .put("action", "view_channel_subscribers")
+//                    .put("channel_id", channelId);
+//
+//            JSONObject resp = ActionHandler.sendWithResponse(req);
+//
+//            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+//                MainController.getInstance().showAlert(
+//                        "Error",
+//                        "Could not fetch subscribers.",
+//                        Alert.AlertType.ERROR
+//                );
+//                return;
+//            }
+//
+//            JSONObject data = resp.optJSONObject("data");
+//            JSONArray subscribers = (data != null) ? data.optJSONArray("subscribers") : new JSONArray();
+//
+//            // === Load Add Admins FXML (same FXML reused) ===
+//            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+//                    "/org/to/telegramfinalproject/Fxml/add_admins.fxml"));
+//            Node overlay = loader.load();
+//
+//            AddChannelAdminsController controller = loader.getController();
+//            controller.setChannelData(channelId, subscribers);  // send raw subscribers, filtering is done in AddChannelAdminsController
+//
+//            MainController.getInstance().showOverlay(overlay);
+//
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//            MainController.getInstance().showAlert(
+//                    "Error", "Could not load Add Admins scene.", Alert.AlertType.ERROR
+//            );
+//        }
+//    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ManageChannelController.java b/src/main/java/org/to/telegramfinalproject/UI/ManageChannelController.java
new file mode 100644
index 0000000..18f731a
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ManageChannelController.java
@@ -0,0 +1,180 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import javafx.stage.FileChooser;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Objects;
+import java.util.UUID;
+
+public class ManageChannelController {
+
+    @FXML private VBox manageChannelCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton, changePicButton, cancelButton, saveButton;
+    @FXML private ImageView channelImage;
+    @FXML private TextField channelNameField;
+    @FXML private TextField channelIdField;
+    @FXML private TextArea channelDescriptionField;
+    @FXML private Label adminCount, subscriberCount;
+    @FXML private Button manageAdminsButton;
+    @FXML private Button manageSubscribersButton;
+
+    private String channelId; // Internal UUID of the channel
+    private String originalName;
+    private String originalDisplayId;
+    private String originalImageUrl;
+    private String originalDescription;
+    private File selectedImageFile;
+
+    private JSONObject data;
+
+    @FXML
+    public void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(manageChannelCard.getParent()));
+        cancelButton.setOnAction(e -> MainController.getInstance().closeOverlay(manageChannelCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(manageChannelCard.getParent()));
+
+        changePicButton.setOnAction(e -> choosePicture());
+        saveButton.setOnAction(e -> saveChanges());
+
+        manageAdminsButton.setOnAction(e -> openManageAdminsScene(data));
+        manageSubscribersButton.setOnAction(e -> openManageSubscribersScene(data));
+    }
+
+    public void setChannelData(JSONObject data) {
+        this.data = data;
+        this.channelId = data.optString("internal_uuid");
+
+        originalName = data.optString("channel_name", "");
+        originalDisplayId = data.optString("channel_id", "");
+        originalImageUrl = data.optString("image_url", "");
+        originalDescription = data.optString("description", "");
+
+        channelNameField.setText(originalName);
+        channelIdField.setText(originalDisplayId);
+        channelDescriptionField.setText(originalDescription);
+
+        if (!originalImageUrl.isBlank()) {
+            channelImage.setImage(new Image(originalImageUrl, true));
+        }
+        adminCount.setText(String.valueOf(countRole(data, "admin") + 1)); // owner + admins
+        subscriberCount.setText(String.valueOf(countRole(data, "subscriber") + Integer.parseInt(adminCount.getText())));
+    }
+
+    private int countRole(JSONObject channelData, String role) {
+        var arr = channelData.optJSONArray("subscribers");
+        if (arr == null) return 0;
+        int count = 0;
+        for (int i = 0; i < arr.length(); i++) {
+            if (role.equalsIgnoreCase(arr.getJSONObject(i).optString("role"))) count++;
+        }
+        return count;
+    }
+
+    private void choosePicture() {
+        FileChooser fc = new FileChooser();
+        fc.setTitle("Select channel picture");
+        selectedImageFile = fc.showOpenDialog(manageChannelCard.getScene().getWindow());
+        if (selectedImageFile != null) {
+            channelImage.setImage(new Image(selectedImageFile.toURI().toString()));
+        }
+    }
+
+    private void saveChanges() {
+        String newName = channelNameField.getText().trim();
+        String newChannelId = channelIdField.getText().trim();
+        String newDescription = channelDescriptionField.getText().trim();
+        String newImageUrl = (selectedImageFile != null)
+                ? selectedImageFile.toURI().toString()
+                : originalImageUrl;
+
+        boolean changed =
+                !Objects.equals(originalName, newName) ||
+                        !Objects.equals(originalDisplayId, newChannelId) ||
+                        !Objects.equals(originalDescription, newDescription) ||
+                        !Objects.equals(originalImageUrl, newImageUrl);
+
+        if (!changed) {
+            MainController.getInstance().closeOverlay(manageChannelCard.getParent());
+            return;
+        }
+
+        JSONObject req = new JSONObject()
+                .put("action", "edit_channel_info")
+                .put("channel_id", channelId) // internal UUID
+                .put("new_channel_id", newChannelId)
+                .put("name", newName)
+                .put("description", newDescription);
+
+        if (newImageUrl != null && !newImageUrl.isBlank()) {
+            req.put("image_url", newImageUrl);
+        } else {
+            req.put("image_url", JSONObject.NULL);
+        }
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().closeOverlay(manageChannelCard.getParent());
+        } else {
+            String msg = (resp != null)
+                    ? resp.optString("message", "Failed to update channel")
+                    : "No response from server";
+            Alert a = new Alert(Alert.AlertType.ERROR, msg, ButtonType.OK);
+            a.show();
+        }
+    }
+
+    private void openManageAdminsScene(JSONObject data) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/manage_channel_admins.fxml"));
+            Node overlay = loader.load();
+
+            ManageChannelAdminsController controller = loader.getController();
+            // Pass channelId and subscribers list from JSON
+            controller.setChannelData(
+                    data.optString("internal_uuid"),
+                    data.optJSONArray("subscribers")
+            );
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error", "Could not load Manage Channel Admins scene.", Alert.AlertType.ERROR
+            );
+        }
+    }
+
+    private void openManageSubscribersScene(JSONObject data) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/manage_subscribers.fxml"));
+            Node overlay = loader.load();
+
+            ManageSubscribersController controller = loader.getController();
+            // Pass channelId and subscribers list from the JSON data
+            controller.setChannelData(
+                    data.optString("internal_uuid"),
+                    data.optJSONArray("subscribers")
+            );
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error", "Could not load Manage Subscribers scene.", Alert.AlertType.ERROR);
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ManageGroupController.java b/src/main/java/org/to/telegramfinalproject/UI/ManageGroupController.java
new file mode 100644
index 0000000..82195b0
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ManageGroupController.java
@@ -0,0 +1,204 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import javafx.stage.FileChooser;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+import java.util.UUID;
+
+public class ManageGroupController {
+
+    @FXML private VBox manageGroupCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton, changePicButton, cancelButton, saveButton;
+    @FXML private ImageView groupImage;
+    @FXML private TextField groupNameField;
+    @FXML private Label adminCount, memberCount;
+    @FXML private TextField groupIdField;
+    @FXML private Button manageAdminsButton;
+    @FXML private Button manageMembersButton;
+
+    private String groupId; // Internal UUID of the current group
+    private String originalName;
+    private String originalGroupId;
+    private String originalImageUrl;
+    private File selectedImageFile;
+
+    private JSONObject data;
+
+    @FXML
+    public void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(manageGroupCard.getParent()));
+        cancelButton.setOnAction(e -> MainController.getInstance().closeOverlay(manageGroupCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(manageGroupCard.getParent()));
+
+        changePicButton.setOnAction(e -> choosePicture());
+        saveButton.setOnAction(e -> saveChanges());
+
+        manageAdminsButton.setOnAction(e -> openManageAdminsScene(data));
+        manageMembersButton.setOnAction(e -> openManageMembersScene(data));
+    }
+
+    private void openManageAdminsScene(JSONObject data) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/manage_admins.fxml"));
+            Node overlay = loader.load();
+
+            ManageAdminsController controller = loader.getController();
+
+            String gid = data.optString("internal_uuid");
+            JSONArray members = data.optJSONArray("members");
+            JSONArray admins = new JSONArray();
+
+            // filter only admins
+            if (members != null) {
+                for (int i = 0; i < members.length(); i++) {
+                    JSONObject m = members.getJSONObject(i);
+                    String role = m.optString("role", "member");
+                    if ("admin".equalsIgnoreCase(role) || "owner".equalsIgnoreCase(role)) {
+                        admins.put(m);
+                    }
+                }
+            }
+
+            controller.setGroupData(gid, admins);
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error", "Could not load Manage Admins scene.", Alert.AlertType.ERROR);
+        }
+    }
+
+    private void openManageMembersScene(JSONObject data) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/manage_members.fxml"));
+            Node overlay = loader.load();
+
+            ManageMembersController controller = loader.getController();
+            // Pass groupId and members list from the JSON data
+            controller.setGroupData(
+                    data.optString("internal_uuid"),
+                    data.optJSONArray("members")
+            );
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error", "Could not load Manage Members scene.", Alert.AlertType.ERROR);
+        }
+    }
+
+    public void setGroupData(JSONObject data) {
+        this.data = data;
+        this.groupId = data.optString("internal_uuid");
+
+        originalName = data.optString("group_name", "");
+        originalGroupId = data.optString("group_id", "");
+        originalImageUrl = data.optString("image_url", "");
+
+        groupNameField.setText(originalName);
+        groupIdField.setText(originalGroupId);
+
+        if (!originalImageUrl.isBlank()) {
+            String uri = resolveLocalUri(originalImageUrl);
+            if (uri != null) {
+                groupImage.setImage(new Image(uri, true));
+            }
+        }
+
+
+        adminCount.setText(String.valueOf(countRole(data, "admin") + 1));
+        memberCount.setText(String.valueOf(countRole(data, "member") + Integer.parseInt(adminCount.getText())));
+    }
+
+    private String resolveLocalUri(String raw) {
+        if (raw == null || raw.isBlank()) return null;
+        if (raw.startsWith("file:/") || raw.startsWith("http")) return raw;
+
+        Path base = Paths.get(System.getProperty("user.dir"), "uploads");
+        Path resolved = base.resolve(raw.startsWith("/") ? raw.substring(1) : raw)
+                .normalize();
+        return resolved.toUri().toString(); // file:///C:/.../uploads/avatars/2025-09-05/...
+    }
+
+    private int countRole(JSONObject groupData, String role) {
+        var arr = groupData.optJSONArray("members");
+        if (arr == null) return 0;
+        int count = 0;
+        for (int i = 0; i < arr.length(); i++) {
+            if (role.equalsIgnoreCase(arr.getJSONObject(i).optString("role"))) count++;
+        }
+        return count;
+    }
+
+    private void choosePicture() {
+        FileChooser fc = new FileChooser();
+        fc.setTitle("Select group picture");
+        selectedImageFile = fc.showOpenDialog(manageGroupCard.getScene().getWindow());
+        if (selectedImageFile != null) {
+            groupImage.setImage(new Image(selectedImageFile.toURI().toString()));
+        }
+    }
+
+    private void saveChanges() {
+        String newName = groupNameField.getText().trim();
+        String newGroupId = groupIdField.getText().trim(); // make sure you added this field
+        String newImageUrl = (selectedImageFile != null)
+                ? selectedImageFile.toURI().toString()
+                : originalImageUrl;
+
+        // Check if anything actually changed
+        boolean changed =
+                !Objects.equals(originalName, newName) ||
+                        !Objects.equals(originalGroupId, newGroupId) ||
+                        !Objects.equals(originalImageUrl, newImageUrl);
+
+        if (!changed) {
+            // Nothing changed → just close overlay
+            MainController.getInstance().closeOverlay(manageGroupCard.getParent());
+            return;
+        }
+
+        // Build request with all fields (server expects them)
+        JSONObject req = new JSONObject()
+                .put("action", "edit_group_info")
+                .put("group_id", groupId)        // internal_uuid
+                .put("new_group_id", newGroupId) // display id
+                .put("name", newName);
+
+        if (newImageUrl != null && !newImageUrl.isBlank()) {
+            req.put("image_url", newImageUrl);
+        } else {
+            req.put("image_url", JSONObject.NULL);
+        }
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().closeOverlay(manageGroupCard.getParent());
+        } else {
+            String msg = (resp != null)
+                    ? resp.optString("message", "Failed to update group")
+                    : "No response from server";
+            Alert a = new Alert(Alert.AlertType.ERROR, msg, ButtonType.OK);
+            a.show();
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ManageMembersController.java b/src/main/java/org/to/telegramfinalproject/UI/ManageMembersController.java
new file mode 100644
index 0000000..bb50218
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ManageMembersController.java
@@ -0,0 +1,188 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.UUID;
+
+public class ManageMembersController {
+
+    @FXML private VBox membersCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button closeFooterButton;
+    @FXML private Button addMembersButton;
+    @FXML private ScrollPane membersScroll;
+    @FXML private VBox membersList;
+
+    private String groupId;
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(membersCard.getParent()));
+        closeFooterButton.setOnAction(e -> MainController.getInstance().closeOverlay(membersCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(membersCard.getParent()));
+
+        addMembersButton.setOnAction(e -> {
+            // open add members overlay
+            openAddMembersOverlay(groupId);
+        });
+
+        // Smooth scroll feel
+        membersScroll.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        membersScroll.setPannable(true);
+        membersScroll.setFitToWidth(true);
+        membersScroll.setFitToHeight(false);
+        membersScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            membersScroll.setVvalue(membersScroll.getVvalue() - deltaY);
+        });
+
+    }
+
+    public void setGroupData(String groupId, JSONArray members) {
+        this.groupId = groupId;
+        membersList.getChildren().clear();
+
+        // Convert safely into JSONObject list
+        java.util.List<JSONObject> parsed = new java.util.ArrayList<>();
+
+        for (int i = 0; i < members.length(); i++) {
+            Object raw = members.get(i);
+
+            if (raw instanceof JSONObject obj) {
+                parsed.add(obj);
+            } else if (raw instanceof java.util.Map<?, ?> map) {
+                parsed.add(new JSONObject(map));
+            } else {
+                System.err.println("Skipping invalid member element at index " + i + ": " + raw);
+            }
+        }
+
+        // Sort: owners first, then others
+        parsed.sort((a, b) -> {
+            boolean aOwner = "owner".equalsIgnoreCase(a.optString("role"));
+            boolean bOwner = "owner".equalsIgnoreCase(b.optString("role"));
+            return Boolean.compare(!aOwner, !bOwner); // false < true → owner first
+        });
+
+        // Add rows
+        for (JSONObject m : parsed) {
+            addMemberRow(m);
+        }
+    }
+
+    private void addMemberRow(JSONObject m) {
+        HBox row = new HBox(10);
+        row.getStyleClass().add("member-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        // Avatar
+        ImageView avatar = new ImageView();
+        avatar.setFitWidth(36);
+        avatar.setFitHeight(36);
+        avatar.setPreserveRatio(true);
+
+        String imgUrl = m.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imgUrl);
+            if (img != null) avatar.setImage(img);
+        } else {
+            avatar.setImage(new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"
+            )));
+        }
+
+        // Name + Status
+        VBox details = new VBox(2);
+        Label name = new Label(m.optString("profile_name", "Unknown"));
+        name.getStyleClass().add("member-name");
+
+        Label status = new Label(
+                m.optBoolean("is_online", false) ? "online"
+                        : "last seen recently"
+        );
+        status.getStyleClass().add("member-status");
+
+        details.getChildren().addAll(name, status);
+
+        Region spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+
+        row.getChildren().addAll(avatar, details, spacer);
+
+        // Only non-owners can be removed
+        String role = m.optString("role", "member");
+        if (!"owner".equalsIgnoreCase(role)) {
+            Button removeBtn = new Button("Remove");
+            removeBtn.getStyleClass().add("link-btn");
+            removeBtn.setOnAction(e -> removeMember(m.optString("user_id"), row));
+            row.getChildren().add(removeBtn);
+        }
+
+        membersList.getChildren().add(row);
+    }
+
+    private void removeMember(String userId, HBox row) {
+        JSONObject req = new JSONObject()
+                .put("action", "remove_member_from_group")
+                .put("group_id", groupId)   // must be the group's internal_uuid
+                .put("user_id", userId);    // target user's internal_uuid
+
+        // Disable the button while request is in progress
+        row.setDisable(true);
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+
+            if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() -> {
+                    membersList.getChildren().remove(row);
+                });
+            } else {
+                Platform.runLater(() -> {
+                    row.setDisable(false); // re-enable on error
+                    Alert a = new Alert(Alert.AlertType.ERROR,
+                            resp != null ? resp.optString("message", "Failed to remove member.")
+                                    : "No response from server.",
+                            ButtonType.OK);
+                    a.show();
+                });
+            }
+        }).start();
+    }
+
+    public void openAddMembersOverlay(String groupId) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/add_member.fxml"));
+            Node overlay = loader.load();
+
+            AddMembersController controller = loader.getController();
+            // Pass the groupId as UUID
+            controller.setGroupForAdd(UUID.fromString(groupId), "");
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error",
+                    "Could not load Add Members scene.",
+                    Alert.AlertType.ERROR
+            );
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ManageSubscribersController.java b/src/main/java/org/to/telegramfinalproject/UI/ManageSubscribersController.java
new file mode 100644
index 0000000..e0b6661
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ManageSubscribersController.java
@@ -0,0 +1,160 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public class ManageSubscribersController {
+
+    @FXML private VBox subscribersCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button closeFooterButton;
+    @FXML private Button addSubscribersButton;
+    @FXML private ScrollPane subscribersScroll;
+    @FXML private VBox subscribersList;
+
+    private String channelId; // internal UUID
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(subscribersCard.getParent()));
+        closeFooterButton.setOnAction(e -> MainController.getInstance().closeOverlay(subscribersCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(subscribersCard.getParent()));
+
+        addSubscribersButton.setOnAction(e -> openAddSubscribersOverlay(channelId));
+
+        // Smooth scroll
+        subscribersScroll.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm()
+        );
+        subscribersScroll.setPannable(true);
+        subscribersScroll.setFitToWidth(true);
+        subscribersScroll.setFitToHeight(false);
+        subscribersScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            subscribersScroll.setVvalue(subscribersScroll.getVvalue() - deltaY);
+        });
+    }
+
+    public void setChannelData(String channelId, JSONArray subscribers) {
+        this.channelId = channelId;
+        subscribersList.getChildren().clear();
+
+        for (int i = 0; i < subscribers.length(); i++) {
+            Object raw = subscribers.get(i);
+            JSONObject sub = (raw instanceof JSONObject)
+                    ? (JSONObject) raw
+                    : new JSONObject((java.util.Map<?, ?>) raw);
+
+            addSubscriberRow(sub);
+        }
+    }
+
+    private void addSubscriberRow(JSONObject sub) {
+        HBox row = new HBox(10);
+        row.getStyleClass().add("member-row");
+        row.setAlignment(Pos.CENTER_LEFT);
+
+        // Avatar
+        ImageView avatar = new ImageView();
+        avatar.setFitWidth(36);
+        avatar.setFitHeight(36);
+        avatar.setPreserveRatio(true);
+
+        String imgUrl = sub.optString("image_url", "");
+        if (!imgUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imgUrl);
+            if (img != null) avatar.setImage(img);
+        } else {
+            avatar.setImage(new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"
+            )));
+        }
+
+        // Name + Status
+        VBox details = new VBox(2);
+        Label name = new Label(sub.optString("profile_name", "Unknown"));
+        name.getStyleClass().add("member-name");
+
+        Label status = new Label(
+                sub.optBoolean("is_online", false) ? "online" : "last seen recently"
+        );
+        status.getStyleClass().add("member-status");
+
+        details.getChildren().addAll(name, status);
+
+        Region spacer = new Region();
+        HBox.setHgrow(spacer, Priority.ALWAYS);
+
+        row.getChildren().addAll(avatar, details, spacer);
+
+        // Only non-owners can be removed
+        String role = sub.optString("role", "subscriber");
+        if (!"owner".equalsIgnoreCase(role)) {
+            Button removeBtn = new Button("Remove");
+            removeBtn.getStyleClass().add("link-btn");
+            removeBtn.setOnAction(e -> removeSubscriber(sub.optString("user_id"), row));
+            row.getChildren().add(removeBtn);
+        }
+
+        subscribersList.getChildren().add(row);
+    }
+
+    private void removeSubscriber(String userId, HBox row) {
+        JSONObject req = new JSONObject()
+                .put("action", "remove_subscriber_from_channel")
+                .put("channel_id", channelId)
+                .put("user_id", userId);
+
+        row.setDisable(true);
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+
+            if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() -> subscribersList.getChildren().remove(row));
+            } else {
+                Platform.runLater(() -> {
+                    row.setDisable(false);
+                    Alert a = new Alert(Alert.AlertType.ERROR,
+                            resp != null ? resp.optString("message", "Failed to remove subscriber.")
+                                    : "No response from server.",
+                            ButtonType.OK);
+                    a.show();
+                });
+            }
+        }).start();
+    }
+
+    private void openAddSubscribersOverlay(String channelId) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/add_subscriber.fxml"));
+            Node overlay = loader.load();
+
+            AddSubscriberController controller = loader.getController();
+            controller.setChannelInfo(UUID.fromString(channelId), "", "", null, "");
+
+            MainController.getInstance().showOverlay(overlay);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainController.getInstance().showAlert(
+                    "Error", "Could not load Add Subscribers scene.", Alert.AlertType.ERROR
+            );
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/MediaPathResolver.java b/src/main/java/org/to/telegramfinalproject/UI/MediaPathResolver.java
new file mode 100644
index 0000000..a013384
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/MediaPathResolver.java
@@ -0,0 +1,27 @@
+package org.to.telegramfinalproject.UI;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public final class MediaPathResolver {
+    private final Path uploadsRoot;
+
+    public MediaPathResolver(Path uploadsRoot) {
+        this.uploadsRoot = uploadsRoot;
+    }
+
+    public String toFileUri(String raw) {
+        if (raw == null || raw.isBlank()) return null;
+        if (raw.startsWith("file:/")) return raw;
+
+        Path p;
+        if (raw.startsWith("/")) {
+            String sub = raw.substring(1).replace("/", File.separator);
+            p = uploadsRoot.resolve(sub).normalize();
+        } else {
+            p = Paths.get(raw).normalize();
+        }
+        return p.toUri().toString();
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/MyProfileController.java b/src/main/java/org/to/telegramfinalproject/UI/MyProfileController.java
new file mode 100644
index 0000000..5c74f58
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/MyProfileController.java
@@ -0,0 +1,153 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Circle;
+
+import java.io.IOException;
+import java.util.Objects;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+import org.to.telegramfinalproject.Client.Session;
+
+import java.io.File;
+
+public class MyProfileController {
+
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button editButton;
+    @FXML private ImageView profileImage;
+    @FXML private Label profileName;
+    @FXML private Label profileStatus;
+    @FXML private Label userBio;
+    @FXML private Label userId;
+    @FXML private VBox profileCard;
+    @FXML private VBox bioBlock;
+
+    private String userID;
+    private static MyProfileController instance;
+
+    public MyProfileController() {
+        instance = this;
+    }
+
+    public static MyProfileController getInstance() { return instance;}
+
+    @FXML
+    private void initialize() {
+        overlayBackground.setOnMouseClicked(e -> closeProfile());
+        closeButton.setOnAction(e -> closeProfile());
+
+        // Round profile picture
+        profileImage.setClip(new Circle(40, 40, 40));
+
+        // Default avatar
+        profileImage.setImage(new Image(
+                Objects.requireNonNull(getClass().getResourceAsStream(
+                        "/org/to/telegramfinalproject/Avatars/default_user_profile.png"))
+        ));
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (profileCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(profileCard.getScene());
+            }
+        });
+
+        // Listener for theme change
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateEditIcon(newVal);
+        });
+
+        // Set initial state
+        updateEditIcon(ThemeManager.getInstance().isDarkMode());
+
+        // === Open edit profile ===
+        editButton.setOnAction(e -> openEditProfile());
+
+    }
+
+    private void closeProfile() {
+        MainController.getInstance().closeOverlay(profileCard.getParent());
+    }
+
+    // Populate user data from DB or active session
+    public void setProfileData(String name, String status, String bio, String userId, String imageUrl) {
+        profileName.setText(name);
+        profileStatus.setText(status);
+
+        if (bio == null || bio.isBlank()) {
+            bioBlock.setVisible(false);
+            bioBlock.setManaged(false);
+        } else {
+            userBio.setText(bio);
+            bioBlock.setVisible(true);
+            bioBlock.setManaged(true);
+        }
+
+        this.userId.setText("@" + userId);
+        userID = userId;
+
+        if (imageUrl != null && !imageUrl.isBlank()) {
+            Image img = AvatarLocalResolver.load(imageUrl);
+            if (img != null) {
+                profileImage.setImage(img);
+            } else {
+                profileImage.setImage(new Image(
+                        Objects.requireNonNull(getClass().getResourceAsStream(
+                                "/org/to/telegramfinalproject/Avatars/default_user_profile.png"))
+                ));
+            }
+        }
+
+    }
+
+    // === Theme-specific updates ===
+    private void updateEditIcon(boolean darkMode) {
+        String iconPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/edit_light.png"
+                : "/org/to/telegramfinalproject/Icons/edit_dark.png";
+
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(iconPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        editButton.setGraphic(icon);
+    }
+
+    private void openEditProfile() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/edit_profile.fxml"));
+            Node editOverlay = loader.load();
+
+            EditProfileController controller = loader.getController();
+            // Pass current data (so fields are pre-filled)
+            controller.setProfileData(
+                    profileName.getText(),
+                    profileStatus.getText(),
+                    bioBlock.isVisible() ? userBio.getText() : null,
+                    userID,
+                    profileImage.getImage()
+            );
+
+            // Show new overlay
+            MainController.getInstance().showOverlay(editOverlay);
+
+            // Close the current My Profile overlay
+            closeProfile();
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/NewChannelController.java b/src/main/java/org/to/telegramfinalproject/UI/NewChannelController.java
new file mode 100644
index 0000000..7ebe0ca
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/NewChannelController.java
@@ -0,0 +1,216 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.scene.layout.Pane;
+
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.UUID;
+
+public class NewChannelController {
+
+    @FXML private VBox newChannelCard;
+    @FXML private Pane overlayBackground;
+    @FXML private TextField channelNameField;
+    @FXML private Label channelNameLabel;
+    @FXML private TextArea channelDescField;
+    @FXML private Label channelDescLabel;
+    @FXML private Button cameraButton;
+    @FXML private ImageView cameraIcon;
+    @FXML private Button cancelButton;
+    @FXML private Button createButton;
+    @FXML private StackPane overlayRoot;
+    @FXML private Label descCounter;
+    @FXML private Label channelIdLabel;
+    @FXML private TextField channelIdField;
+
+    private File channelImageFile;
+
+    @FXML
+    public void initialize() {
+        cameraIcon.setImage(new Image(
+                getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/camera.png")
+        ));
+
+        cameraButton.setOnAction(e -> {
+            FileChooser chooser = new FileChooser();
+            chooser.setTitle("Choose Channel Picture");
+            chooser.getExtensionFilters().addAll(
+                    new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg", "*.jpeg")
+            );
+            File file = chooser.showOpenDialog(cameraButton.getScene().getWindow());
+            if (file != null) {
+                channelImageFile = file;
+                cameraIcon.setImage(new Image(file.toURI().toString()));
+            }
+        });
+
+        cancelButton.setOnAction(e -> MainController.getInstance().closeOverlay(overlayRoot));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(overlayRoot));
+
+        createButton.setOnAction(e -> onCreateChannel());
+
+        // Limit description
+        final int MAX_LENGTH = 255;
+        channelDescField.addEventFilter(javafx.scene.input.KeyEvent.KEY_TYPED, e -> {
+            if (channelDescField.getText().length() >= MAX_LENGTH) e.consume();
+        });
+        channelDescField.textProperty().addListener((obs, oldText, newText) -> {
+            if (newText.length() > MAX_LENGTH) {
+                channelDescField.setText(newText.substring(0, MAX_LENGTH));
+                channelDescField.positionCaret(MAX_LENGTH);
+            }
+            int current = channelDescField.getText().length();
+            descCounter.setText(current + " / " + MAX_LENGTH);
+            descCounter.setStyle(current == MAX_LENGTH ? "-fx-text-fill: red;" : "");
+        });
+        descCounter.setText("0 / 255");
+
+        // Reset error when user types again
+        channelNameField.textProperty().addListener((obs, ov, nv) -> {
+            if (!nv.trim().isEmpty()) {
+                channelNameField.getStyleClass().remove("error");
+                channelNameLabel.getStyleClass().remove("error");
+            }
+        });
+        channelIdField.textProperty().addListener((obs, ov, nv) -> {
+            if (!nv.trim().isEmpty()) {
+                channelIdField.getStyleClass().remove("error");
+                channelIdLabel.getStyleClass().remove("error");
+            }
+        });
+
+        Platform.runLater(() -> channelNameField.requestFocus());
+
+        Platform.runLater(() -> {
+            if (newChannelCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(newChannelCard.getScene());
+            }
+        });
+    }
+
+    private void onCreateChannel() {
+        String name        = nz(channelNameField.getText()).trim();
+        String dispId      = nz(channelIdField.getText()).trim();
+        String description = nz(channelDescField.getText()).trim();
+
+        boolean ok = true;
+        if (name.isEmpty())   { channelNameField.getStyleClass().add("error"); channelNameLabel.getStyleClass().add("error"); ok = false; }
+        if (dispId.isEmpty()) { channelIdField.getStyleClass().add("error"); channelIdLabel.getStyleClass().add("error"); ok = false; }
+        if (!ok) return;
+
+        final String me = Session.getUserUUID();
+        if (me == null || me.isBlank()) {
+            showToast("Cannot create channel: current user UUID missing.");
+            return;
+        }
+
+        // در مرحله ساخت، image_url را خالی بفرست؛ بعداً آپلود می‌کنیم
+        JSONObject req = new JSONObject()
+                .put("action", "create_channel")
+                .put("channel_id", dispId)
+                .put("channel_name", name)
+                .put("user_id", me)
+                .put("image_url", (Object) null)
+                .put("description", description);
+
+        createButton.setDisable(true);
+
+        new Thread(() -> {
+            try {
+                JSONObject resp = ActionHandler.sendWithResponse(req);
+                if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                    Platform.runLater(() -> {
+                        createButton.setDisable(false);
+                        channelIdField.getStyleClass().add("error");
+                        channelIdLabel.getStyleClass().add("error");
+                    });
+                    return;
+                }
+
+                JSONObject data = resp.optJSONObject("data");
+                if (data == null) {
+                    Platform.runLater(() -> {
+                        createButton.setDisable(false);
+                        showToast("Create failed: empty data.");
+                    });
+                    return;
+                }
+
+                UUID internalId     = UUID.fromString(data.optString("internal_id"));
+                String returnedName = data.optString("name", name);
+                String returnedDisp = data.optString("id", dispId);
+                String returnedImg  = data.optString("image_url", "");
+
+                // ✅ اگر کاربر عکس انتخاب کرده بود: الان آپلود کن (target_type=channel)
+                if (channelImageFile != null) {
+                    ActionHandler.instance.uploadAvatarFor("channel", internalId, channelImageFile);
+                    if (ActionHandler.instance.wasSuccess()) {
+                        String url = ActionHandler.instance.getLastMessage(); // display_url
+                        if (url != null && !url.isBlank()) {
+                            returnedImg = url;
+                        }
+                    } else {
+                        // اختیاری: پیام خطا را نشان بده
+                        System.out.println("Channel avatar upload failed: " + ActionHandler.instance.getLastMessage());
+                    }
+                }
+
+                String finalImg = returnedImg;
+                Platform.runLater(() -> {
+                    // 1) کانال را به سایدبار اضافه و انتخاب کن
+                    ChatEntry entry = ChatEntry.fromServer(
+                            internalId, "channel", returnedName, returnedDisp, finalImg,
+                            /*isOwner*/ true, /*isAdmin*/ true
+                    );
+                    MainController.getInstance().addChatAndSelect(entry);
+
+                    // 2) باز کردن Overlay افزودن سابسکرایبر و بستن این Overlay
+                    try {
+                        FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                                "/org/to/telegramfinalproject/Fxml/add_subscriber.fxml"));
+                        StackPane addSubsOverlay = loader.load();
+                        AddSubscriberController controller = loader.getController();
+                        controller.setChannelInfo(internalId, returnedName, returnedDisp, channelImageFile, description);
+
+                        MainController.getInstance().showOverlay(addSubsOverlay);
+                        MainController.getInstance().closeOverlay(overlayRoot);
+                    } catch (IOException ex) {
+                        ex.printStackTrace();
+                        showToast("Failed to open Add Subscribers.");
+                    }
+
+                    createButton.setDisable(false);
+                });
+
+            } catch (Exception ex) {
+                Platform.runLater(() -> {
+                    createButton.setDisable(false);
+                    showToast("Create failed: " + ex.getMessage());
+                });
+            }
+        }).start();
+    }
+
+
+    private void showToast(String msg) {
+        Alert a = new Alert(Alert.AlertType.INFORMATION, msg, ButtonType.OK);
+        a.initOwner(overlayRoot.getScene().getWindow());
+        a.show();
+    }
+
+    private static String nz(String s){ return s==null? "": s; }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/NewGroupController.java b/src/main/java/org/to/telegramfinalproject/UI/NewGroupController.java
new file mode 100644
index 0000000..6363cb2
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/NewGroupController.java
@@ -0,0 +1,187 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.scene.layout.Pane;
+
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Client.TelegramClient;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+import java.io.*;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import static org.to.telegramfinalproject.Client.ActionHandler.detectMime;
+
+public class NewGroupController {
+
+    @FXML private VBox newGroupCard;
+    @FXML private Pane overlayBackground;
+    @FXML private TextField groupNameField;
+    @FXML private Label groupNameLabel;
+    @FXML private Button cameraButton;
+    @FXML private ImageView cameraIcon;
+    @FXML private Button cancelButton;
+    @FXML private Button nextButton;
+    @FXML private StackPane overlayRoot;   // the root
+    @FXML private TextField groupIdField;
+    @FXML private Label groupIdLabel;
+
+    private File groupImageFile;
+
+    @FXML
+    public void initialize() {
+        cameraIcon.setImage(new Image(
+                getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/camera.png")
+        ));
+
+        cameraButton.setOnAction(e -> {
+            FileChooser chooser = new FileChooser();
+            chooser.setTitle("Choose Group Picture");
+            chooser.getExtensionFilters().addAll(
+                    new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg", "*.jpeg")
+            );
+            File file = chooser.showOpenDialog(cameraButton.getScene().getWindow());
+            if (file != null) {
+                groupImageFile = file;
+                cameraIcon.setImage(new Image(file.toURI().toString()));
+            }
+        });
+
+        cancelButton.setOnAction(e -> MainController.getInstance().closeOverlay(overlayRoot));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(overlayRoot));
+
+        nextButton.setOnAction(e -> onNext());
+
+        // clear errors on typing
+        groupNameField.textProperty().addListener((obs, ov, nv) -> {
+            if (!nv.trim().isEmpty()) {
+                groupNameField.getStyleClass().remove("error");
+                groupNameLabel.getStyleClass().remove("error");
+            }
+        });
+        groupIdField.textProperty().addListener((obs, ov, nv) -> {
+            if (!nv.trim().isEmpty()) {
+                groupIdField.getStyleClass().remove("error");
+                groupIdLabel.getStyleClass().remove("error");
+            }
+        });
+
+        Platform.runLater(() -> groupNameField.requestFocus());
+    }
+
+    private void onNext() {
+        String groupName = groupNameField.getText() == null ? "" : groupNameField.getText().trim();
+        String groupId   = groupIdField.getText()   == null ? "" : groupIdField.getText().trim();
+
+        boolean ok = true;
+        if (groupName.isEmpty()) { groupNameField.getStyleClass().add("error"); groupNameLabel.getStyleClass().add("error"); ok = false; }
+        if (groupId.isEmpty())   { groupIdField.getStyleClass().add("error"); groupIdLabel.getStyleClass().add("error"); ok = false; }
+        if (!ok) return;
+
+        final String me = Session.getUserUUID();
+        if (me == null || me.isBlank()) {
+            showToast("Cannot create group: current user UUID missing.");
+            return;
+        }
+
+        // در مرحلهٔ ساخت، image_url را خالی بفرست (بعداً آپلود می‌کنیم)
+        final String imageUrl = null;
+
+        JSONObject req = new JSONObject()
+                .put("action", "create_group")
+                .put("group_id", groupId)
+                .put("group_name", groupName)
+                .put("user_id", me)
+                .put("image_url", imageUrl);
+
+        new Thread(() -> {
+            JSONObject resp = ActionHandler.sendWithResponse(req);
+            if (resp == null || !"success".equalsIgnoreCase(resp.optString("status"))) {
+                Platform.runLater(() -> {
+                    groupIdField.getStyleClass().add("error");
+                    groupIdLabel.getStyleClass().add("error");
+                });
+                return;
+            }
+
+            JSONObject data = resp.optJSONObject("data");
+            if (data == null) {
+                Platform.runLater(() -> showToast("Create failed: empty data."));
+                return;
+            }
+
+            UUID internalId = UUID.fromString(data.optString("internal_id"));
+            String returnedName = data.optString("name", groupName);
+            String returnedDisp = data.optString("id", groupId);
+            String returnedImg  = data.optString("image_url", "");
+
+            // اگر عکس انتخاب شده، حالا آپلود کن (target_type=group, target_id=internalId)
+            String finalImageUrl = returnedImg;
+            if (groupImageFile != null) {
+                ActionHandler.instance.uploadAvatarFor("group", internalId, groupImageFile);
+                if (ActionHandler.instance.wasSuccess()) {
+                    String url = ActionHandler.instance.getLastMessage(); // display_url
+                    if (url != null && !url.isBlank()) {
+                        finalImageUrl = url;
+                    }
+                }
+            }
+
+            // 1) به سایدبار اضافه و انتخاب کن
+            String imageUrlToUse = finalImageUrl; // برای استفاده داخل lambda
+            Platform.runLater(() -> {
+                ChatEntry entry = ChatEntry.fromServer(
+                        internalId,
+                        "group",
+                        returnedName,
+                        returnedDisp,
+                        imageUrlToUse,
+                        /*isOwner*/ true,
+                        /*isAdmin*/ true
+                );
+                MainController.getInstance().addChatAndSelect(entry);
+
+                // اگر URL جدید داریم، می‌تونی یک bust-cache بزنی:
+                // MainController.getInstance().refreshChatAvatar(internalId, imageUrlToUse + "?v=" + System.currentTimeMillis());
+            });
+
+            // 2) پنجره Add Members
+            Platform.runLater(() -> {
+                try {
+                    FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                            "/org/to/telegramfinalproject/Fxml/add_member.fxml"));
+                    StackPane addMembersOverlay = loader.load();
+                    AddMembersController controller = loader.getController();
+                    controller.setGroupInfo(internalId, returnedName, returnedDisp, groupImageFile);
+
+                    MainController.getInstance().showOverlay(addMembersOverlay);
+                    MainController.getInstance().closeOverlay(overlayRoot);
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                    showToast("Failed to open Add Members.");
+                }
+            });
+        }).start();
+    }
+
+
+    private void showToast(String msg) {
+        // جایگزینش کن با سیستم نوتی شما
+        Alert a = new Alert(Alert.AlertType.INFORMATION, msg, ButtonType.OK);
+        a.initOwner(overlayRoot.getScene().getWindow());
+        a.show();
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/PrivacySecurityController.java b/src/main/java/org/to/telegramfinalproject/UI/PrivacySecurityController.java
new file mode 100644
index 0000000..13b3229
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/PrivacySecurityController.java
@@ -0,0 +1,124 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class PrivacySecurityController {
+
+    @FXML private VBox privacyCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button backButton;
+    @FXML private Button blockedUsersButton;
+    @FXML private Button changeCredentialsButton;
+    @FXML private ImageView blockIcon;
+    @FXML private ImageView usernameIcon;
+
+    private static final String ICON_PATH = "/org/to/telegramfinalproject/Icons/";
+
+    @FXML
+    public void initialize() {
+        // Set back button icon
+        ImageView backIcon = new ImageView(
+                new Image(getClass().getResourceAsStream("/org/to/telegramfinalproject/Icons/back_button_dark.png"))
+        );
+        backIcon.setFitWidth(18);
+        backIcon.setFitHeight(18);
+        backButton.setGraphic(backIcon);
+
+        changeCredentialsButton.setOnAction(e -> openPasswordCheckOverlay());
+
+        // Blocked users management
+        blockedUsersButton.setOnAction(e -> {
+            try {
+                FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                        "/org/to/telegramfinalproject/Fxml/blocked_users.fxml"));
+                Node overlay = loader.load();
+
+                // Show new overlay
+                MainController.getInstance().showOverlay(overlay);
+
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        });
+
+        // Close
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(privacyCard.getParent()));
+
+        // Back
+        backButton.setOnAction(e -> MainController.getInstance().goBack(privacyCard));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(privacyCard.getParent()));
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (privacyCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(privacyCard.getScene());
+            }
+        });
+
+        // Listener for theme change
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateIcons(newVal);
+        });
+
+        // Set initial state
+        updateIcons(ThemeManager.getInstance().isDarkMode());
+    }
+
+    private void openPasswordCheckOverlay() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/check_password.fxml"));
+            Node overlay = loader.load();
+
+            // Show new overlay
+            MainController.getInstance().showOverlay(overlay);
+
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    private void updateIcons(boolean darkMode) {
+        String suffix = darkMode ? "_light.png" : "_dark.png";
+
+        backButton.setGraphic(makeIcon(ICON_PATH + "back_button" + suffix));
+        blockIcon.setImage(loadImage(ICON_PATH + "hand" + suffix));
+        usernameIcon.setImage(loadImage(ICON_PATH + "username" + suffix));
+    }
+
+    // --- helpers -------------------------------------------------------------
+
+    private ImageView makeIcon(String path) {
+        ImageView iv = new ImageView();
+        Image img = loadImage(path);
+        if (img != null) {
+            iv.setImage(img);
+            iv.setFitWidth(22);
+            iv.setFitHeight(22);
+            iv.setPreserveRatio(true);
+        }
+        return iv;
+    }
+
+    private Image loadImage(String path) {
+        URL res = getClass().getResource(path);
+        if (res == null) {
+            System.err.println("Resource not found: " + path);
+            return null;
+        }
+        return new Image(res.toExternalForm());
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/RegisterController.java b/src/main/java/org/to/telegramfinalproject/UI/RegisterController.java
new file mode 100644
index 0000000..1bd6791
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/RegisterController.java
@@ -0,0 +1,245 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.animation.PauseTransition;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.*;
+import javafx.stage.Stage;
+import javafx.util.Duration;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ClientConnection;
+import org.to.telegramfinalproject.Database.userDatabase;
+
+import java.io.IOException;
+
+import static org.to.telegramfinalproject.UI.AppRouter.showLogin;
+
+public class RegisterController {
+
+    @FXML private TextField userIdField;
+    @FXML private TextField usernameField;
+    @FXML private TextField profileNameField;
+
+    @FXML private PasswordField passwordField;
+    @FXML private TextField visiblePasswordField;
+
+    @FXML private PasswordField confirmPasswordField;
+    @FXML private TextField visibleConfirmPasswordField;
+
+    @FXML private Button togglePasswordBtn;
+    @FXML private Button toggleConfirmBtn;
+
+    @FXML private Label errorLabel;
+
+    private ClientConnection connection;
+
+    private boolean passwordVisible = false;
+    private boolean confirmVisible = false;
+
+    @FXML
+    public void initialize() {
+
+        try {
+            org.to.telegramfinalproject.Client.TelegramClient.getOrInitForUI();
+        } catch (Exception ignored) {
+        }
+        visiblePasswordField.textProperty().bindBidirectional(passwordField.textProperty());
+        visibleConfirmPasswordField.textProperty().bindBidirectional(confirmPasswordField.textProperty());
+    }
+
+        @FXML
+    private void togglePasswordVisibility() {
+        passwordVisible = !passwordVisible;
+        visiblePasswordField.setVisible(passwordVisible);
+        visiblePasswordField.setManaged(passwordVisible);
+        passwordField.setVisible(!passwordVisible);
+        passwordField.setManaged(!passwordVisible);
+        togglePasswordBtn.setText(passwordVisible ? "👁" : "👁");
+    }
+
+    @FXML
+    private void toggleConfirmPasswordVisibility() {
+        confirmVisible = !confirmVisible;
+        visibleConfirmPasswordField.setVisible(confirmVisible);
+        visibleConfirmPasswordField.setManaged(confirmVisible);
+        confirmPasswordField.setVisible(!confirmVisible);
+        confirmPasswordField.setManaged(!confirmVisible);
+        toggleConfirmBtn.setText(confirmVisible ? "👁" : "👁");
+    }
+
+//    @FXML
+//    private void handleRegister() {
+//        String userID = userIdField.getText().trim();
+//        String username = usernameField.getText().trim();
+//        String profileName = profileNameField.getText().trim();
+//        String password = passwordField.getText();
+//        String confirmPass = confirmPasswordField.getText();
+//
+//        userDatabase userDb = new userDatabase();
+//        String passwordRegex = "\\b(?=[^\\s]*[A-Z])(?=[^\\s]*[a-z])(?=[^\\s]*\\d)(?=[^\\s]*[!@#$%^&*])[^\\s]{8,}\\b";
+//
+//        // 1. Empty fields
+//        if (userID.isEmpty() || username.isEmpty() || profileName.isEmpty() || password.isEmpty() || confirmPass.isEmpty()) {
+//            showError("Please fill in all required fields.");
+//            return;
+//        }
+//
+//        // 2. Username exists
+//        if (userDb.existsByUsername(username)) {
+//            showError("This username is already taken.");
+//            return;
+//        }
+//
+//        // 3. User ID exists
+//        if (userDb.existsByUserId(userID)) {
+//            showError("This user ID is already taken.");
+//            return;
+//        }
+//
+//        // 4. Password mismatch
+//        if (!password.equals(confirmPass)) {
+//            showError("Passwords do not match.");
+//            return;
+//        }
+//
+//        // 5. Weak password
+//        if (!password.matches(passwordRegex)) {
+//            showError("Password must be at least 8 characters, include a capital letter, a number, and a special character.");
+//            return;
+//        }
+//
+//        // 6. Attempt registration
+//        try {
+//            JSONObject request = new JSONObject();
+//            request.put("action", "register");
+//            request.put("user_id", userID);
+//            request.put("username", username);
+//            request.put("password", password);
+//            request.put("profile_name", profileName);
+//            connection.send(request.toString());
+//
+//            // Simulate successful registration (since main.fxml isn’t ready)
+//            Alert alert = new Alert(Alert.AlertType.INFORMATION, "Registration successful!");
+//            alert.show();
+//
+//        } catch (Exception ex) {
+//            showError("Failed to register. Please try again later.");
+//        }
+//    }
+
+
+
+    @FXML
+    private void handleRegister() {
+        String userID      = userIdField.getText().trim();
+        String username    = usernameField.getText().trim();
+        String profileName = profileNameField.getText().trim();
+        String password    = passwordField.getText();
+        String confirmPass = confirmPasswordField.getText();
+
+        userDatabase userDb = new userDatabase();
+        String passwordRegex = "\\b(?=[^\\s]*[A-Z])(?=[^\\s]*[a-z])(?=[^\\s]*\\d)(?=[^\\s]*[!@#$%^&*])[^\\s]{8,}\\b";
+
+        // اعتبارسنجی‌ها
+        if (userID.isEmpty() || username.isEmpty() || profileName.isEmpty() || password.isEmpty() || confirmPass.isEmpty()) {
+            showError("Please fill in all required fields."); return;
+        }
+        if (userDb.existsByUsername(username)) { showError("This username is already taken."); return; }
+        if (userDb.existsByUserId(userID))     { showError("This user ID is already taken."); return; }
+        if (!password.equals(confirmPass))     { showError("Passwords do not match."); return; }
+        if (!password.matches(passwordRegex))  { showError("Password must be at least 8 characters, include a capital letter, a number, and a special character."); return; }
+
+        // UI را موقتاً disable کن (اختیاری)
+        setBusy(true);
+
+        new Thread(() -> {
+            try {
+                // 1) مطمئن شو کانکشن/لیسنر روشن است
+                var cli     = org.to.telegramfinalproject.Client.TelegramClient.getOrInitForUI();
+                var handler = cli.getHandler();
+
+                // 2) Register
+                var regReq = new org.json.JSONObject()
+                        .put("action", "register")
+                        .put("user_id", userID)
+                        .put("username", username)
+                        .put("password", password)
+                        .put("profile_name", profileName);
+
+                var regResp = org.to.telegramfinalproject.Client.ActionHandler.sendWithResponse(regReq);
+                if (regResp == null || !"success".equalsIgnoreCase(regResp.optString("status"))) {
+                    javafx.application.Platform.runLater(() -> {
+                        setBusy(false);
+                        showError(regResp != null ? regResp.optString("message","Register failed.") : "Register failed.");
+                    });
+                    return;
+                }
+
+                // 3) Auto-Login با همان کانکشن
+                handler.login(username, password);
+
+                javafx.application.Platform.runLater(() -> {
+                    setBusy(false);
+                    if (org.to.telegramfinalproject.Client.Session.currentUser == null || !handler.wasSuccess()) {
+                        showError(handler.getLastMessage().isEmpty() ? "Login failed." : handler.getLastMessage());
+                        return;
+                    }
+                    org.to.telegramfinalproject.UI.AppRouter.showMain();
+                });
+
+            } catch (Exception ex) {
+                javafx.application.Platform.runLater(() -> {
+                    setBusy(false);
+                    showError("Failed to register/login: " + ex.getMessage());
+                });
+            }
+        }, "register-thread").start();
+    }
+
+    private void setBusy(boolean b){
+        userIdField.setDisable(b);
+        usernameField.setDisable(b);
+        profileNameField.setDisable(b);
+        passwordField.setDisable(b);
+        visiblePasswordField.setDisable(b);
+        confirmPasswordField.setDisable(b);
+        visibleConfirmPasswordField.setDisable(b);
+        togglePasswordBtn.setDisable(b);
+        toggleConfirmBtn.setDisable(b);
+    }
+
+
+
+    @FXML
+    private void switchToLogin() throws IOException {
+        showLogin();
+    }
+
+    private void switchScene(String fxmlFile) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/to/telegramfinalproject/" + fxmlFile));
+            Parent root = loader.load();
+            Stage stage = (Stage) usernameField.getScene().getWindow();
+            stage.setScene(new Scene(root, 500, 700));
+            stage.show();
+        } catch (IOException e) {
+            e.printStackTrace();
+            showError("Could not load scene: " + fxmlFile);
+        }
+    }
+
+    private void showError(String message) {
+        errorLabel.setVisible(false);
+        errorLabel.setText("");  // Clear the label text
+
+        PauseTransition pause = new PauseTransition(Duration.millis(50));
+        pause.setOnFinished(event -> {
+            errorLabel.setText(message);
+            errorLabel.setStyle("-fx-text-fill: red;"); // 🔴 force red
+            errorLabel.setVisible(true);
+        });
+        pause.play();
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/SetGroupAdminPermissionsController.java b/src/main/java/org/to/telegramfinalproject/UI/SetGroupAdminPermissionsController.java
new file mode 100644
index 0000000..3f1aba9
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/SetGroupAdminPermissionsController.java
@@ -0,0 +1,148 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+
+import java.util.UUID;
+
+public class SetGroupAdminPermissionsController {
+
+    @FXML private VBox permissionsCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+    @FXML private Button cancelButton;
+    @FXML private Button saveButton;
+
+    @FXML private CheckBox canAddMember;
+    @FXML private CheckBox canRemoveMember;
+    @FXML private CheckBox canAddAdmin;
+    @FXML private CheckBox canRemoveAdmin;
+    @FXML private CheckBox canEditGroup;
+
+    private UUID groupId;
+    private UUID userId;
+    private Runnable onSuccess;
+
+    private JSONObject oldPermissions; // store existing permissions
+    private boolean isEditMode = false; // true if editing existing admin
+
+    public void setTarget(UUID groupId, UUID userId, boolean isEditMode) {
+        this.groupId = groupId;
+        this.userId = userId;
+        this.isEditMode = isEditMode;
+
+        if (isEditMode) {
+            loadCurrentPermissions();
+        }
+    }
+
+    public void setTarget(UUID groupId, UUID userId, boolean isEditMode, JSONObject oldPermissions) {
+        this.groupId = groupId;
+        this.userId = userId;
+        this.isEditMode = isEditMode;
+        this.oldPermissions = oldPermissions;
+    }
+
+    public void setOnSuccess(Runnable r) {
+        this.onSuccess = r;
+    }
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e -> MainController.getInstance().closeOverlay(permissionsCard.getParent()));
+        cancelButton.setOnAction(e -> MainController.getInstance().closeOverlay(permissionsCard.getParent()));
+        overlayBackground.setOnMouseClicked(e -> MainController.getInstance().closeOverlay(permissionsCard.getParent()));
+
+        saveButton.setOnAction(e -> savePermissions());
+
+        // Register for dark mode updates
+        Platform.runLater(() -> {
+            if (permissionsCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(permissionsCard.getScene());
+            }
+        });
+    }
+
+    private void loadCurrentPermissions() {
+        JSONObject req = new JSONObject()
+                .put("action", "get_group_admin_permissions")
+                .put("group_id", groupId.toString())
+                .put("admin_id", userId.toString());
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        System.out.println("Permissions response: " + resp); // full server response
+
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            // "data" is an object containing { "permissions": { ... } }
+            JSONObject data = resp.optJSONObject("data");
+            System.out.println("Data object: " + data);
+
+            if (data != null) {
+                JSONObject perms = data.optJSONObject("permissions");
+                System.out.println("Extracted permissions object: " + perms);
+
+                if (perms != null) {
+                    oldPermissions = perms;
+
+                    // Update checkboxes safely on FX thread
+                    Platform.runLater(() -> {
+                        canAddMember.setSelected(perms.optBoolean("can_add_member", false));
+                        canRemoveMember.setSelected(perms.optBoolean("can_remove_member", false));
+                        canAddAdmin.setSelected(perms.optBoolean("can_add_admin", false));
+                        canRemoveAdmin.setSelected(perms.optBoolean("can_remove_admin", false));
+                        canEditGroup.setSelected(perms.optBoolean("can_edit_group", false));
+                    });
+                } else {
+                    System.out.println("⚠️ Permissions object was null inside data.");
+                }
+            } else {
+                System.out.println("⚠️ Data object was null in response.");
+            }
+        } else {
+            System.out.println("⚠️ Response was null or status != success");
+        }
+    }
+
+    private void savePermissions() {
+        JSONObject newPermissions = new JSONObject()
+                .put("can_add_member", canAddMember.isSelected())
+                .put("can_remove_member", canRemoveMember.isSelected())
+                .put("can_add_admin", canAddAdmin.isSelected())
+                .put("can_remove_admin", canRemoveAdmin.isSelected())
+                .put("can_edit_group", canEditGroup.isSelected());
+
+        JSONObject req;
+        if (isEditMode) {
+            // --- Editing existing admin permissions ---
+            req = new JSONObject()
+                    .put("action", "edit_admin_permissions")
+                    .put("chat_id", groupId.toString())
+                    .put("chat_type", "group") // since this controller is only for groups
+                    .put("admin_id", userId.toString())
+                    .put("permissions", newPermissions);
+        } else {
+            // --- Adding a new admin ---
+            req = new JSONObject()
+                    .put("action", "add_admin_to_group")
+                    .put("group_id", groupId.toString())
+                    .put("user_id", userId.toString())
+                    .put("permissions", newPermissions);
+        }
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().closeOverlay(permissionsCard.getParent());
+            if (onSuccess != null) onSuccess.run(); // update UI after success
+        } else {
+            Alert a = new Alert(Alert.AlertType.ERROR,
+                    resp != null ? resp.optString("message") : "Failed to save admin permissions.",
+                    ButtonType.OK);
+            a.show();
+        }
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/SettingsController.java b/src/main/java/org/to/telegramfinalproject/UI/SettingsController.java
new file mode 100644
index 0000000..005c699
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/SettingsController.java
@@ -0,0 +1,265 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Circle;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.Session;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class SettingsController {
+
+    @FXML private VBox settingsCard;
+    @FXML private ImageView profileImage;
+    @FXML private Label profileName;
+    @FXML private Label profileId;
+    @FXML private MenuButton menuButton;
+    @FXML private MenuItem editProfileItem;
+    @FXML private MenuItem logoutItem;
+    @FXML private Button myAccountButton;
+    @FXML private Button privacyButton;
+    @FXML private Button faqButton;
+    @FXML private Button featuresButton;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+
+    private static final String ICON_PATH = "/org/to/telegramfinalproject/Icons/";
+
+    private Image cachedAvatar;
+    private String cachedName = "";
+    private String cachedUsername = "";
+    private String cachedStatus = "";
+    private String cachedBio = "";
+
+    private static String nz(String s){ return s==null? "": s.trim(); }
+    private static boolean hasVal(String s){ return s!=null && !s.trim().isEmpty() && !"null".equalsIgnoreCase(s); }
+
+    private static SettingsController instance;
+    public static SettingsController getInstance() { return instance; }
+    @FXML
+    public void initialize() {
+        instance = this;
+
+        editProfileItem.setOnAction(e -> openEditProfile());
+        logoutItem.setOnAction(e -> onLogoutClicked());
+
+        populateFromSession();
+
+        // Make it circular
+        Circle clip = new Circle(40, 30, 38); // centerX, centerY, radius
+        profileImage.setClip(clip);
+
+        // Buttons
+        myAccountButton.setOnAction(e -> openEditProfile());
+
+        privacyButton.setOnAction(e ->
+        {
+            try {
+                FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                        "/org/to/telegramfinalproject/Fxml/privacy_security.fxml"));
+                Node privacyOverlay = loader.load();
+
+                MainController.getInstance().showOverlay(privacyOverlay);
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        });
+
+        faqButton.setOnAction(e -> System.out.println("Telegram Q&A"));
+        featuresButton.setOnAction(e -> System.out.println("Telegram Features"));
+
+        // Close overlay on background click
+        overlayBackground.setOnMouseClicked(e ->
+                MainController.getInstance().closeOverlay(settingsCard.getParent()));
+
+        closeButton.setOnAction(e ->
+                MainController.getInstance().closeOverlay(settingsCard.getParent())
+        );
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (settingsCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(settingsCard.getScene());
+            }
+        });
+
+        // Listener for theme change
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateEditIcon(newVal);
+            updateMoreIcon(newVal);
+            updateButtonsIcons(newVal);
+        });
+
+        // Set initial state
+        updateEditIcon(ThemeManager.getInstance().isDarkMode());
+        updateMoreIcon(ThemeManager.getInstance().isDarkMode());
+        updateButtonsIcons(ThemeManager.getInstance().isDarkMode());
+    }
+
+    private void openEditProfile() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/edit_profile.fxml"));
+            Node editOverlay = loader.load();
+
+            EditProfileController controller = loader.getController();
+            controller.setProfileData(
+                    cachedName,
+                    cachedStatus,
+                    cachedBio,
+                    cachedUsername,
+                    cachedAvatar
+            );
+            controller.setParentSettings(this);
+            MainController.getInstance().showOverlay(editOverlay);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+
+    private void updateEditIcon(boolean darkMode) {
+        String editPath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/edit_light.png"
+                : "/org/to/telegramfinalproject/Icons/edit_dark.png";
+
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(editPath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        editProfileItem.setGraphic(icon);
+    }
+
+    private void updateMoreIcon(boolean darkMode) {
+        String morePath = darkMode
+                ? "/org/to/telegramfinalproject/Icons/more_light.png"
+                : "/org/to/telegramfinalproject/Icons/more_dark.png";
+
+        ImageView icon = new ImageView(new Image(getClass().getResourceAsStream(morePath)));
+        icon.setFitWidth(16);
+        icon.setFitHeight(16);
+        menuButton.setGraphic(icon);
+    }
+
+    private void updateButtonsIcons(boolean darkMode) {
+        String suffix = darkMode ? "_light.png" : "_dark.png";
+        myAccountButton.setGraphic(makeIcon(ICON_PATH + "my_profile" + suffix));
+        privacyButton.setGraphic(makeIcon(ICON_PATH + "lock" + suffix));
+        faqButton.setGraphic(makeIcon(ICON_PATH + "telegram_features" + suffix));
+        featuresButton.setGraphic(makeIcon(ICON_PATH + "telegram_qna" + suffix));
+    }
+
+    // --- helpers -------------------------------------------------------------
+
+    private ImageView makeIcon(String path) {
+        ImageView iv = new ImageView();
+        Image img = loadImage(path);
+        if (img != null) {
+            iv.setImage(img);
+            iv.setFitWidth(22);
+            iv.setFitHeight(22);
+            iv.setPreserveRatio(true);
+        }
+        return iv;
+    }
+
+    private Image loadImage(String path) {
+        URL res = getClass().getResource(path);
+        if (res == null) {
+            System.err.println("Resource not found: " + path);
+            return null;
+        }
+        return new Image(res.toExternalForm());
+    }
+
+
+
+
+    void populateFromSession() {
+        var u = org.to.telegramfinalproject.Client.Session.currentUser;
+        if (u == null) return;
+
+        // نام
+        String name = nz(u.optString("profile_name",
+                u.optString("name",
+                        u.optString("first_name",""))));
+
+        // یوزرنیم/آی‌دی نمایشی
+        String handle = nz(u.optString("username",
+                u.optString("display_id",
+                        u.optString("user_name",""))));
+        // وضعیت
+        String status = u.optBoolean("online", false) ? "online" : "online";
+        String lastSeen = nz(u.optString("last_seen", ""));
+        if (!u.optBoolean("online", false) && hasVal(lastSeen)) status = "online"; // ساده
+
+        // بیو (اگر داری)
+        String bio = nz(u.optString("bio",""));
+
+        // آواتار
+        Image avatar = null;
+        String imageUrl = nz(u.optString("image_url",""));
+        if (hasVal(imageUrl)) {
+            try { avatar = org.to.telegramfinalproject.Client.AvatarLocalResolver.load(imageUrl); }
+            catch (Exception ignore) {}
+        }
+        if (avatar == null) {
+            avatar = new Image(getClass().getResourceAsStream(
+                    "/org/to/telegramfinalproject/Avatars/default_user_profile.png"));
+        }
+
+        // کش محلی برای استفاده در صفحه‌ی ویرایش
+        cachedName = hasVal(name) ? name : "User";
+        cachedUsername = hasVal(handle) ? handle : "";
+        cachedStatus = status;
+        cachedBio = bio;
+        cachedAvatar = avatar;
+
+        // ست کردن در UI
+        profileName.setText(cachedName);
+        profileId.setText("@" + cachedUsername);
+        profileImage.setImage(cachedAvatar);
+
+        // گرد کردن تصویر (با توجه به اندازه‌ی واقعی)
+        Circle clip = new Circle(40, 30, 38); // centerX, centerY, radius
+        profileImage.setClip(clip);
+    }
+
+    // جایی مثل SidebarMenuController یا MainController
+    private void onLogoutClicked() {
+        new Thread(() -> {
+            JSONObject req = new JSONObject().put("action","logout"); // user_id لازم نیست
+             req.put("user_id",Session.getUserUUID()); // user_id لازم نیست
+
+            JSONObject res = ActionHandler.sendWithResponse(req);
+
+            Platform.runLater(() -> {
+                if (res != null && "success".equalsIgnoreCase(res.optString("status"))) {
+                    try {
+                        // قطع ارتباط/لیسنر (اگر متد داری)
+                        // TelegramClient.disconnect();
+                    } catch (Exception ignore) {}
+
+                    // پاک‌سازی امن سشن (ترجیحاً clear به‌جای null)
+                    Session.currentUser = null;
+                    Session.chatList = null;
+                    AppRouter.showIntro();   // intro.fxml
+                } else {
+                    new Alert(Alert.AlertType.ERROR,
+                            "Logout not successful: " + (res != null ? res.optString("message") : "No response")
+                    ).showAndWait();
+                }
+            });
+        }).start();
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/SidebarMenuController.java b/src/main/java/org/to/telegramfinalproject/UI/SidebarMenuController.java
new file mode 100644
index 0000000..9d25297
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/SidebarMenuController.java
@@ -0,0 +1,444 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.animation.PauseTransition;
+import javafx.animation.TranslateTransition;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.UUID;
+
+public class SidebarMenuController {
+
+    private static final String ICON_PATH = "/org/to/telegramfinalproject/Icons/";
+
+
+
+
+    @FXML private VBox sidebarRoot;
+    @FXML private ImageView profileImage;
+    @FXML private Label usernameLabel;
+
+    @FXML private Button myProfileButton;
+    @FXML private Button newGroupButton;
+    @FXML private Button newChannelButton;
+    @FXML private Button contactsButton;
+    @FXML private Button savedMessagesButton;
+    @FXML private Button settingsButton;
+    @FXML private Button telegramFeaturesButton;
+    @FXML private Button telegramQnAButton;
+
+    // Custom Telegram-style toggle
+    @FXML private HBox nightModeToggle;
+    @FXML private Region toggleThumb;
+    @FXML private ImageView nightModeIcon;
+
+    // convenience handle
+    private final ThemeManager themeManager = ThemeManager.getInstance();
+
+    @FXML
+    public void initialize() {
+        // Load default profile image
+        Image profile = loadImage("/org/to/telegramfinalproject/Avatars/default_user_profile.png");
+        if (profile != null) profileImage.setImage(profile);
+        AvatarFX.circleClip(profileImage, 56);
+
+
+        setupButtonActions();
+        setupToggleAction();
+
+        // When the Scene is ready:
+        sidebarRoot.sceneProperty().addListener((obs, oldScene, newScene) -> {
+            if (newScene != null) {
+                // 1) Register with ThemeManager so this scene auto-updates on theme changes
+                themeManager.registerScene(newScene);
+
+                // 2) Make sure we start in LIGHT mode
+                themeManager.setDarkMode(false);
+
+                // 3) Sync icons & toggle with current mode
+                boolean dark = themeManager.isDarkMode();
+                updateIcons(dark);
+                syncToggleVisual(dark, /*animate=*/true);
+
+                // Ensure the thumb is correctly positioned after layout pass
+                Platform.runLater(() -> syncToggleVisual(themeManager.isDarkMode(), false));
+            }
+        });
+
+        // If theme is changed from somewhere else (another screen), keep sidebar in sync
+        themeManager.darkModeProperty().addListener((o, wasDark, isDark) -> {
+            updateIcons(isDark);
+            syncToggleVisual(isDark, /*animate=*/true);
+        });
+    }
+
+    private void setupButtonActions() {
+        myProfileButton.setOnAction(e -> openMyProfile());
+        newGroupButton.setOnAction(e -> createNewGroup());
+        newChannelButton.setOnAction(e -> createNewChannel());
+        contactsButton.setOnAction(e -> openContacts());
+        savedMessagesButton.setOnAction(e -> openSavedMessages());
+        settingsButton.setOnAction(e -> openSettings());
+        telegramFeaturesButton.setOnAction(e -> openTelegramFeatures());
+        telegramQnAButton.setOnAction(e -> openTelegramQnA());
+    }
+
+    private void setupToggleAction() {
+        nightModeToggle.setOnMouseClicked(e -> {
+            boolean newDark = !themeManager.isDarkMode();
+
+            // Update the global theme via ThemeManager
+            themeManager.setDarkMode(newDark);
+            themeManager.applyThemeToAll();
+
+            // Animate the thumb to its new position (listener will handle icons & final position sync)
+            syncToggleVisual(newDark, /*animate=*/true);
+        });
+    }
+
+    /** Update all button icons to match theme.
+     *  darkMode == true  => white icons => use *_light.png
+     *  darkMode == false => dark icons  => use *_dark.png
+     */
+    private void updateIcons(boolean darkMode) {
+        String suffix = darkMode ? "_light.png" : "_dark.png";
+        myProfileButton.setGraphic(makeIcon(ICON_PATH + "my_profile" + suffix));
+        newGroupButton.setGraphic(makeIcon(ICON_PATH + "new_group" + suffix));
+        newChannelButton.setGraphic(makeIcon(ICON_PATH + "new_channel" + suffix));
+        contactsButton.setGraphic(makeIcon(ICON_PATH + "contacts" + suffix));
+        savedMessagesButton.setGraphic(makeIcon(ICON_PATH + "saved_messages" + suffix));
+        settingsButton.setGraphic(makeIcon(ICON_PATH + "settings" + suffix));
+        telegramFeaturesButton.setGraphic(makeIcon(ICON_PATH + "telegram_features" + suffix));
+        telegramQnAButton.setGraphic(makeIcon(ICON_PATH + "telegram_qna" + suffix));
+
+        // Night-mode moon icon
+        Image moon = loadImage(ICON_PATH + "night_mode" + suffix);
+        if (moon != null) nightModeIcon.setImage(moon);
+    }
+
+    /** Keep the toggle’s CSS class and thumb position in sync with the current mode. */
+    private void syncToggleVisual(boolean darkMode, boolean animate) {
+        // CSS class "on" on the track
+        if (darkMode) {
+            if (!nightModeToggle.getStyleClass().contains("on")) {
+                nightModeToggle.getStyleClass().add("on");
+            }
+        } else {
+            nightModeToggle.getStyleClass().remove("on");
+        }
+
+        // Compute target X for the thumb
+        double offX = 2;
+        double onX  = Math.max(2, nightModeToggle.getWidth() - toggleThumb.getWidth() - 4);
+        double targetX = darkMode ? onX : offX;
+
+        if (animate) {
+            TranslateTransition tt = new TranslateTransition(Duration.millis(200), toggleThumb);
+            tt.setToX(targetX);
+            tt.play();
+        } else {
+            toggleThumb.setTranslateX(targetX);
+        }
+    }
+
+
+    // --- helpers -------------------------------------------------------------
+
+    private Image loadImage(String path) {
+        URL res = getClass().getResource(path);
+        if (res == null) {
+            System.err.println("Resource not found: " + path);
+            return null;
+        }
+        return new Image(res.toExternalForm());
+    }
+
+    private ImageView makeIcon(String path) {
+        ImageView iv = new ImageView();
+        Image img = loadImage(path);
+        if (img != null) {
+            iv.setImage(img);
+            iv.setFitWidth(22);
+            iv.setFitHeight(22);
+            iv.setPreserveRatio(true);
+        }
+        return iv;
+    }
+
+    // Sidebar actions
+    private void openMyProfile() {
+        try {
+            // 1. Ask server for profile info
+            JSONObject request = new JSONObject().put("action", "get_user_profile");
+            JSONObject response = ActionHandler.sendWithResponse(request);
+
+            if (response == null || !"success".equals(response.optString("status"))) {
+                showAlert("Error", "Failed to load profile", Alert.AlertType.ERROR);
+                return;
+            }
+
+            JSONObject profile = response.optJSONObject("data");
+            if (profile == null) {
+                showAlert("Error", "Malformed profile data", Alert.AlertType.ERROR);
+                return;
+            }
+
+            // Extract fields
+            String profileName = profile.optString("profile_name", "Unknown");
+            String bio = profile.optString("bio", "");
+            String userId = profile.optString("user_id", "");
+            String imageUrl = profile.optString("profile_picture_url", null);
+
+            // 2. Load overlay FXML
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/my_profile.fxml"));
+            Node profileOverlay = loader.load();
+
+            // 3. Pass real data to controller
+            MyProfileController controller = loader.getController();
+            controller.setProfileData(profileName, "online", bio, userId, imageUrl);
+
+            // 4. Show overlay
+            MainController.getInstance().showOverlay(profileOverlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            showAlert("Error",  "Error opening profile", Alert.AlertType.ERROR);
+        }
+    }
+
+    private void createNewGroup() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/new_group.fxml"));
+            Node groupOverlay = loader.load();
+
+            // Show overlay (like MyProfile, Contacts, etc.)
+            MainController.getInstance().showOverlay(groupOverlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void createNewChannel() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/new_channel.fxml"));
+            Node channelOverlay = loader.load();
+
+            // Show overlay (like MyProfile, Contacts, etc.)
+            MainController.getInstance().showOverlay(channelOverlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void openContacts() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/contacts.fxml"));
+            Node contactsOverlay = loader.load();
+
+            // Show overlay on top of everything
+            MainController.getInstance().showOverlay(contactsOverlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+
+    private void openSavedMessages() {
+        try {
+            // 1) درخواست به سرور
+            JSONObject req = new JSONObject().put("action", "get_or_create_saved_messages");
+            JSONObject res = ActionHandler.sendWithResponse(req);
+
+            if (res == null || !"success".equals(res.optString("status"))) {
+                String msg = (res != null) ? res.optString("message", "Unknown error") : "No response";
+                showAlert("Saved Messages", "Failed: " + msg, Alert.AlertType.ERROR);
+                return;
+            }
+
+            JSONObject data = res.optJSONObject("data");
+            if (data == null) {
+                showAlert("Saved Messages", "Malformed response.", Alert.AlertType.ERROR);
+                return;
+            }
+
+            // 2) داده‌ها
+            String chatIdStr = data.optString("chat_id", null);
+            if (chatIdStr == null || chatIdStr.isBlank()) {
+                showAlert("Saved Messages", "Missing chat_id.", Alert.AlertType.ERROR);
+                return;
+            }
+            UUID chatId = UUID.fromString(chatIdStr);
+            String name = data.optString("name", "Saved Messages");
+            String chatType = data.optString("chat_type", "private");
+            boolean isSaved = data.optBoolean("is_saved_messages", true);
+
+            // اگر آیکن اختصاصی برای Saved داری، این مسیر رو بده؛ وگرنه null بذار:
+            String savedIcon = ICON_PATH + (themeManager.isDarkMode() ? "saved_messages_light.png" : "saved_messages_dark.png");
+            // اگر چنین آیکنی نداری، می‌تونی null بدی تا همان image_url خالی بماند:
+            // String savedIcon = null;
+
+            // 3) درج/به‌روزرسانی در Session و بیاور اول لیست
+            ChatEntry entry = org.to.telegramfinalproject.Client.Session
+                    .upsertSavedMessages(chatId, name, chatType, savedIcon);
+
+            // 4) وضعیت‌های فعلی سشن برای ناوبری
+            org.to.telegramfinalproject.Client.Session.currentChatId = chatId.toString();
+            org.to.telegramfinalproject.Client.Session.currentChatType = chatType;
+            org.to.telegramfinalproject.Client.Session.currentChatEntry = entry;
+            org.to.telegramfinalproject.Client.Session.backToChatList = false;
+
+            // 5) ریفِرش ظاهری لیست چت‌ها (اگر متدی برای این داری، صدا بزن)
+            try {
+                MainController.getInstance().refreshChatListUI(); // اگر متد دیگری داری عوضش کن
+            } catch (Throwable ignore) { }
+
+            // 6) باز کردن چت
+            // --- مسیر اول: اگر متدی داری که با ChatEntry باز می‌کند:
+            boolean opened = false;
+            try {
+                MainController.getInstance().openChat(entry);
+                MainController.getInstance().closeSidebar();
+                opened = true;
+            } catch (Throwable t) {
+                // مسیر دوم: اگر با id/type باز می‌کنی، یا اول info می‌گیری:
+                try {
+                    ActionHandler.requestChatInfo(String.valueOf(chatId), chatType);
+                    // اگر متد آشکار برای باز کردن با id داری، اینجا صدا بزن:
+                    // MainController.getInstance().openChatById(chatId, chatType);
+                    opened = true;
+                } catch (Throwable t2) {
+                    t2.printStackTrace();
+                }
+            }
+
+            if (!opened) {
+                // اگر هیچ‌کدام نداشت، حداقل پیغام بده که چت ساخته و آماده است:
+                System.out.println("Saved Messages ready. Open manually with currentChatId/currentChatType.");
+            }
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            showAlert("Saved Messages", "Error: " + ex.getMessage(), Alert.AlertType.ERROR);
+        }
+    }
+
+
+    private void openSettings() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/settings.fxml"));
+            Node settingsOverlay = loader.load();
+
+            // Show overlay on top of everything
+            MainController.getInstance().showOverlay(settingsOverlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void openTelegramFeatures() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/telegram_features.fxml"));
+            Node featuresOverlay = loader.load();
+
+            MainController.getInstance().showOverlay(featuresOverlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void openTelegramQnA() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource(
+                    "/org/to/telegramfinalproject/Fxml/telegram_qna.fxml"));
+            Node qnaOverlay = loader.load();
+
+            MainController.getInstance().showOverlay(qnaOverlay);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setUserFromSession(JSONObject user) {
+        if (user == null) return;
+
+        // نام نمایشی (اول profile_name بعد username)
+        String displayName = user.optString("profile_name",
+                user.optString("username", ""));
+        usernameLabel.setText(displayName);
+
+        // عکس پروفایل: هم URL اینترنتی هم مسیر ریسورس را پشتیبانی کن
+        String img = user.optString("image_url", "");
+        Image pic = tryLoadImage(img);
+        if (pic == null) {
+            pic = loadImage("/org/to/telegramfinalproject/Avatars/default_user_profile.png");
+        }
+        if (pic != null) profileImage.setImage(pic);
+    }
+
+
+
+
+    private Image tryLoadImage(String src) {
+        if (src == null || src.isBlank()) return null;
+        try {
+            // اگر مسیر داخل resources است
+            var res = getClass().getResource(src);
+            if (res != null) return new Image(res.toExternalForm(), true);
+
+            // اگر مسیر نسبی سرور (مثل /avatars/...) است
+            String fileUri = AvatarLocalResolver.resolve(src);
+            if (fileUri != null) return new Image(fileUri, true);
+
+            // در غیر این صورت، فرض URL کامل
+            return new Image(src, true);
+        } catch (Exception ignored) {
+            return null;
+        }
+    }
+
+    private void showAlert(String title, String message, Alert.AlertType type) {
+        Alert alert = new Alert(type);
+        alert.setTitle(title);
+        alert.setHeaderText(null); // no big header, just the message
+        alert.setContentText(message);
+
+        // optional: style it to fit your dark/light theme
+        if (alert.getDialogPane().getScene() != null) {
+            ThemeManager.getInstance().registerScene(alert.getDialogPane().getScene());
+        }
+
+        alert.showAndWait();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/UI/TelegramApplication.java b/src/main/java/org/to/telegramfinalproject/UI/TelegramApplication.java
new file mode 100644
index 0000000..e13a0be
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/TelegramApplication.java
@@ -0,0 +1,68 @@
+package org.to.telegramfinalproject.UI;//package org.to.telegramfinalproject.UI;
+//
+//
+//import javafx.application.Application;
+//import javafx.fxml.FXMLLoader;
+//import javafx.scene.Scene;
+//import javafx.scene.image.Image;
+//import javafx.stage.Stage;
+//
+//import java.io.IOException;
+//
+//public class TelegramApplication extends Application {
+//    @Override
+//    public void start(Stage stage) throws IOException {
+//        FXMLLoader fxmlLoader = new FXMLLoader(TelegramApplication.class.getResource("/org/to/telegramfinalproject/Fxml/main.fxml"));
+//        Scene scene = new Scene(fxmlLoader.load(), 1480, 820);
+//
+//        scene.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/light_theme.css").toExternalForm());
+//
+//        stage.setTitle("Telegram");
+//        stage.setScene(scene);
+//
+//        // Add icon to the stage
+//        Image icon = new Image(TelegramApplication.class.getResourceAsStream("/org/to/telegramfinalproject/Images/telegram_icon.png"));
+//        stage.getIcons().add(icon);
+//
+//        stage.show();
+//    }
+//    public static void main(String[] args) {
+//        launch();
+//    }
+//
+//}
+
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.image.Image;
+import javafx.stage.Stage;
+import org.to.telegramfinalproject.UI.AppRouter;
+
+import java.io.IOException;
+
+public class TelegramApplication extends Application {
+    @Override
+    public void start(Stage stage) throws IOException {
+        // First: intro.fxml
+        FXMLLoader fx = new FXMLLoader(
+                TelegramApplication.class.getResource("/org/to/telegramfinalproject/Fxml/intro.fxml"));
+        Scene scene = new Scene(fx.load(), 1480, 820);
+
+        scene.getStylesheets().add(
+                getClass().getResource("/org/to/telegramfinalproject/CSS/light_theme.css").toExternalForm()
+        );
+
+        stage.setTitle("Telegram");
+        stage.getIcons().add(new Image(
+                TelegramApplication.class.getResourceAsStream("/org/to/telegramfinalproject/Images/telegram_icon.png")
+        ));
+        stage.setScene(scene);
+        stage.show();
+
+        AppRouter.init(stage, scene);
+    }
+
+    public static void main(String[] args) { launch(); }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/TelegramFeaturesController.java b/src/main/java/org/to/telegramfinalproject/UI/TelegramFeaturesController.java
new file mode 100644
index 0000000..a3d4c1c
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/TelegramFeaturesController.java
@@ -0,0 +1,42 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+
+public class TelegramFeaturesController {
+
+    @FXML private Pane overlayBackground;
+    @FXML private ScrollPane featureScroll;
+    @FXML private StackPane rootOverlay;
+    @FXML private BorderPane contentCard;
+
+    @FXML
+    public void initialize() {
+        // Clicking background closes overlay
+        overlayBackground.setOnMouseClicked( e -> {
+            MainController.getInstance().closeOverlay(rootOverlay);
+        });
+
+        // Smooth scroll feel
+        featureScroll.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        featureScroll.setPannable(true);
+        featureScroll.setFitToWidth(true);
+        featureScroll.setFitToHeight(false);
+        featureScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            featureScroll.setVvalue(featureScroll.getVvalue() - deltaY);
+        });
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (contentCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(contentCard.getScene());
+            }
+        });
+    }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/UI/TelegramQnAController.java b/src/main/java/org/to/telegramfinalproject/UI/TelegramQnAController.java
new file mode 100644
index 0000000..c98bcfe
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/TelegramQnAController.java
@@ -0,0 +1,41 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+
+public class TelegramQnAController {
+
+    @FXML private StackPane rootOverlay;
+    @FXML private Pane overlayBackground;
+    @FXML private ScrollPane qnaScroll;
+    @FXML private BorderPane contentCard;
+
+    @FXML
+    private void initialize() {
+        // Clicking outside closes overlay
+        overlayBackground.setOnMouseClicked(e ->
+                MainController.getInstance().closeOverlay(rootOverlay)
+        );
+
+        // Smooth scroll feel
+        qnaScroll.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/scrollpane.css").toExternalForm());
+        qnaScroll.setPannable(true);
+        qnaScroll.setFitToWidth(true);
+        qnaScroll.setFitToHeight(false);
+        qnaScroll.getContent().setOnScroll(event -> {
+            double deltaY = event.getDeltaY() * 0.003;
+            qnaScroll.setVvalue(qnaScroll.getVvalue() - deltaY);
+        });
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (contentCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(contentCard.getScene());
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/UI/ThemeManager.java b/src/main/java/org/to/telegramfinalproject/UI/ThemeManager.java
new file mode 100644
index 0000000..43b6425
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/ThemeManager.java
@@ -0,0 +1,58 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.Scene;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ThemeManager {
+    private static final ThemeManager instance = new ThemeManager();
+
+    private final BooleanProperty darkMode = new SimpleBooleanProperty(false);
+    private final List<Scene> registeredScenes = new ArrayList<>();
+
+    private ThemeManager() {
+        // Whenever darkMode changes, update all registered scenes
+        darkMode.addListener((obs, oldVal, newVal) -> applyThemeToAll());
+    }
+
+    public static ThemeManager getInstance() {
+        return instance;
+    }
+
+    public BooleanProperty darkModeProperty() {
+        return darkMode;
+    }
+
+    public boolean isDarkMode() {
+        return darkMode.get();
+    }
+
+    public void setDarkMode(boolean dark) {
+        darkMode.set(dark);
+    }
+
+    public void registerScene(Scene scene) {
+        if (!registeredScenes.contains(scene)) {
+            registeredScenes.add(scene);
+            applyTheme(scene); // Apply current theme immediately
+        }
+    }
+
+    public void applyThemeToAll() {
+        for (Scene scene : registeredScenes) {
+            applyTheme(scene);
+        }
+    }
+
+    private void applyTheme(Scene scene) {
+        scene.getStylesheets().clear();
+        if (isDarkMode()) {
+            scene.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/dark_theme.css").toExternalForm());
+        } else {
+            scene.getStylesheets().add(getClass().getResource("/org/to/telegramfinalproject/CSS/light_theme.css").toExternalForm());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/to/telegramfinalproject/UI/UserInfoController.java b/src/main/java/org/to/telegramfinalproject/UI/UserInfoController.java
new file mode 100644
index 0000000..59fa778
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/UI/UserInfoController.java
@@ -0,0 +1,343 @@
+package org.to.telegramfinalproject.UI;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Client.ActionHandler;
+import org.to.telegramfinalproject.Client.AvatarLocalResolver;
+import org.to.telegramfinalproject.Client.Session;
+import org.to.telegramfinalproject.Models.ChatEntry;
+
+import java.net.URL;
+import java.util.Optional;
+import java.util.UUID;
+
+public class UserInfoController {
+
+    @FXML private VBox profileCard;
+    @FXML private Pane overlayBackground;
+    @FXML private Button closeButton;
+
+    @FXML private ImageView profileImage;
+    @FXML private Label profileName;
+    @FXML private Label profileStatus;
+    @FXML private HBox bioBlock;
+    @FXML private Label userBio;
+    @FXML private HBox usernameBlock;
+    @FXML private Label userId;
+
+    @FXML private Button infoMoreButton;
+    @FXML private ContextMenu infoMoreMenu;
+    @FXML private MenuItem deleteChatItem;
+    @FXML private MenuItem blockItem;
+    @FXML private MenuItem unblockItem;
+    @FXML private ImageView moreIcon;
+    @FXML private ImageView bioIcon;
+    @FXML private ImageView usernameIcon;
+    @FXML private Button deleteChatButton;
+
+
+    private String otherUserId; // internal_uuid of the other user
+    private ChatEntry entry;
+
+    private static final String ICON_PATH = "/org/to/telegramfinalproject/Icons/";
+
+    @FXML
+    private void initialize() {
+        closeButton.setOnAction(e ->
+                MainController.getInstance().closeOverlay(profileCard.getParent()));
+        overlayBackground.setOnMouseClicked(e ->
+                MainController.getInstance().closeOverlay(profileCard.getParent()));
+
+        // Show menu manually
+        infoMoreButton.setOnAction(e -> {
+            if (infoMoreMenu != null) {
+                infoMoreMenu.show(infoMoreButton, javafx.geometry.Side.BOTTOM, 0, 0);
+            }
+        });
+
+        // Hide menu when clicking outside
+        Platform.runLater(() -> {
+            if (infoMoreButton.getScene() != null) {
+                infoMoreButton.getScene().addEventFilter(
+                        javafx.scene.input.MouseEvent.MOUSE_PRESSED, ev -> {
+                            if (infoMoreMenu.isShowing()
+                                    && !infoMoreButton.localToScreen(infoMoreButton.getBoundsInLocal())
+                                    .contains(ev.getScreenX(), ev.getScreenY())) {
+                                infoMoreMenu.hide();
+                            }
+                        }
+                );
+            }
+        });
+
+        deleteChatItem.setOnAction(e -> onDeleteChatClicked());
+        blockItem.setOnAction(e -> handleToggleBlock(entry));
+        unblockItem.setOnAction(e -> handleToggleBlock(entry));
+
+        // Register scene for ThemeManager → stylesheet swap will handle colors/icons
+        Platform.runLater(() -> {
+            if (profileCard.getScene() != null) {
+                ThemeManager.getInstance().registerScene(profileCard.getScene());
+            }
+        });
+
+        // Listener for theme change
+        ThemeManager.getInstance().darkModeProperty().addListener((obs, oldVal, newVal) -> {
+            updateIcons(newVal);
+        });
+
+        // Set initial state
+        updateIcons(ThemeManager.getInstance().isDarkMode());
+    }
+
+    /** Backend JSON → UI */
+    public void setProfileDataFromJson(ChatEntry entry, JSONObject data, String targetUuid) {
+        // save the correct UUID
+        this.otherUserId = targetUuid;
+        this.entry = entry;
+
+        // --- Profile name ---
+        String name = data.optString("profile_name", entry.getName());
+        profileName.setText(name);
+
+        // --- Status ---
+        String status = ChatPageController.getInstance().userStatusText(
+                data.optBoolean("is_online", false),
+                data.optString("last_seen", null)
+        );
+        profileStatus.setText(status);
+
+        // --- Bio ---
+        String bio = data.optString("bio", "");
+        if (bio != null && !bio.isBlank()) {
+            userBio.setText(bio);
+            bioBlock.setVisible(true);
+            bioBlock.setManaged(true);
+        } else {
+            bioBlock.setVisible(false);
+            bioBlock.setManaged(false);
+        }
+
+        // --- Username ---
+        String username = data.optString("user_id", "");
+        if (username != null && !username.isBlank()) {
+            userId.setText("@" + username);
+            usernameBlock.setVisible(true);
+            usernameBlock.setManaged(true);
+        } else {
+            usernameBlock.setVisible(false);
+            usernameBlock.setManaged(false);
+        }
+
+        // --- Profile picture ---
+        String imgUrl = data.optString("image_url", "");
+        if (imgUrl != null && !imgUrl.isBlank()) {
+            try {
+                Image img = AvatarLocalResolver.load(imgUrl);
+                if (img != null) profileImage.setImage(img);
+            } catch (Exception ignore) {}
+        } else {
+            profileImage.setImage(
+                    new Image(getClass().getResourceAsStream(
+                            "/org/to/telegramfinalproject/Avatars/default_user_profile.png"))
+            );
+        }
+
+        // --- Block/Unblock ---
+        boolean blocked = data.optBoolean("blocked", false)
+                || data.optBoolean("is_blocked", false)
+                || data.optBoolean("blocked_by_me", false);
+        updateBlockMenu(blocked);
+    }
+
+    private void handleDeleteChat() {
+        JSONObject req = new JSONObject()
+                .put("action", "delete_chat")
+                .put("receiver_id", otherUserId)
+                .put("viewer_id", Session.getUserUUID());
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().closeOverlay(profileCard.getParent());
+        }
+    }
+
+    private void handleToggleBlock(ChatEntry entry) {
+        if (otherUserId == null) return;
+
+        // 1) Send toggle request
+        JSONObject req = new JSONObject()
+                .put("action", "toggle_block")
+                .put("user_id", Session.getUserUUID())
+                .put("target_id", otherUserId);
+
+        JSONObject resp = ActionHandler.sendWithResponse(req);
+        if (resp == null) {
+            MainController.getInstance().showAlert("Error", "No response from server.", Alert.AlertType.ERROR);
+            return;
+        }
+
+        if (!"success".equalsIgnoreCase(resp.optString("status"))) {
+            MainController.getInstance().showAlert("Error",
+                    resp.optString("message", "Failed to toggle block"),
+                    Alert.AlertType.ERROR);
+            return;
+        }
+
+        // 2) Immediately re-check block state from server
+        JSONObject checkReq = new JSONObject()
+                .put("action", "check_block_status_by_chat")
+                .put("viewer_id", Session.getUserUUID())
+                .put("chat_id", entry.getId().toString());
+
+        JSONObject checkResp = ActionHandler.sendWithResponse(checkReq);
+        if (checkResp == null || !"success".equalsIgnoreCase(checkResp.optString("status"))) {
+            System.err.println("⚠️ Failed to refresh block status after toggle.");
+            return;
+        }
+
+        JSONObject data = checkResp.optJSONObject("data");
+        boolean blockedByMe = data != null && data.optBoolean("blocked_by_me", false);
+        boolean blockedMe   = data != null && data.optBoolean("blocked_me", false);
+
+        // 3) Update UI on FX thread
+        Platform.runLater(() -> {
+            // update overlay (block/unblock menu)
+            updateBlockMenu(blockedByMe);
+
+            // update chat page input bar
+            ChatPageController c = ChatPageController.getInstance();
+            if (c != null) {
+                c.applyBlockUi(blockedByMe, blockedMe);
+            }
+        });
+    }
+
+    private void updateBlockMenu(boolean isBlocked) {
+        blockItem.setVisible(!isBlocked);
+        unblockItem.setVisible(isBlocked);
+    }
+
+    private void updateIcons(boolean darkMode) {
+        String suffix = darkMode ? "_light.png" : "_dark.png";
+
+        moreIcon.setImage(loadImage(ICON_PATH + "more" + suffix));
+        bioIcon.setImage(loadImage(ICON_PATH + "bio" + suffix));
+        usernameIcon.setImage(loadImage(ICON_PATH + "username" + suffix));
+    }
+
+    // --- helpers -------------------------------------------------------------
+
+    private Image loadImage(String path) {
+        URL res = getClass().getResource(path);
+        if (res == null) {
+            System.err.println("Resource not found: " + path);
+            return null;
+        }
+        return new Image(res.toExternalForm());
+    }
+
+        @FXML
+        private void onDeleteChatClicked() {
+//        if (!"private".equalsIgnoreCase(Session.currentChatType)) {
+//            new Alert(Alert.AlertType.INFORMATION, "This action is available only for private chats.").showAndWait();
+//            return;
+//        }
+
+            UUID chatId = Session.currentChatEntry != null
+                    ? Session.currentChatEntry.getId()
+                    : (Session.currentChatId != null ? UUID.fromString(Session.currentChatId) : null);
+
+            if (chatId == null) {
+                new Alert(Alert.AlertType.ERROR, "Invalid chat id.").showAndWait();
+                return;
+            }
+
+            ButtonType oneSide  = new ButtonType("Delete one-sided", ButtonBar.ButtonData.LEFT);
+            ButtonType bothSide = new ButtonType("Delete both-sided", ButtonBar.ButtonData.OK_DONE);
+            ButtonType cancel   = ButtonType.CANCEL;
+
+            Alert dlg = new Alert(
+                    Alert.AlertType.CONFIRMATION,
+                    "Choose how you want to delete this private chat:",
+                    oneSide, bothSide, cancel
+            );
+            dlg.setHeaderText("Delete Private Chat");
+
+            Optional<ButtonType> res = dlg.showAndWait();
+            if (res.isEmpty() || res.get() == cancel) return;
+
+            boolean both = (res.get() == bothSide);
+            performDeletePrivateChat(chatId, both);
+        }
+
+
+        private void performDeletePrivateChat(UUID chatId, boolean both) {
+            // نال‌سیف: هر کدوم هست disable کن
+            if (deleteChatButton != null) deleteChatButton.setDisable(true);
+            if (deleteChatItem   != null) deleteChatItem.setDisable(true);
+            if (infoMoreMenu != null && infoMoreMenu.isShowing()) infoMoreMenu.hide();
+            if (infoMoreButton != null) infoMoreButton.setDisable(true);
+
+            new Thread(() -> {
+                JSONObject req = new JSONObject()
+                        .put("action", "delete_private_chat")
+                        .put("chat_id", chatId.toString())
+                        .put("both", both);
+
+                JSONObject resp = ActionHandler.sendWithResponse(req);
+
+                Platform.runLater(() -> {
+                    // re-enable نال‌سیف
+                    if (deleteChatButton != null) deleteChatButton.setDisable(false);
+                    if (deleteChatItem   != null) deleteChatItem.setDisable(false);
+                    if (infoMoreButton   != null) infoMoreButton.setDisable(false);
+
+                    if (resp != null && "success".equalsIgnoreCase(resp.optString("status"))) {
+                        removeChatFromSessionAndGoBack(chatId);
+                        MainController.getInstance().closeOverlay(profileCard.getParent());
+
+//                    new Alert(Alert.AlertType.INFORMATION,
+//                            "Chat deleted " + (both ? "for both sides." : "only for you.")
+//                    ).showAndWait();
+                    } else {
+                        String msg = (resp != null ? resp.optString("message", "Unknown error")
+                                : "No response from server.");
+                        new Alert(Alert.AlertType.ERROR, "Failed to delete chat: " + msg).showAndWait();
+                    }
+                });
+            }).start();
+        }
+
+
+        private void removeChatFromSessionAndGoBack(UUID chatId) {
+//        if (Session.chatList != null)      Session.chatList.removeIf(e -> chatId.equals(e.getId()));
+//        if (Session.activeChats != null)   Session.activeChats.removeIf(e -> chatId.equals(e.getId()));
+//        if (Session.archivedChats != null) Session.archivedChats.removeIf(e -> chatId.equals(e.getId()));
+
+            if (Session.currentChatId != null && Session.currentChatId.equals(chatId.toString())) {
+                Session.currentChatId = null;
+                Session.currentChatType = null;
+                Session.currentChatEntry = null;
+                Session.inChatMenu = false;
+
+                MainController.getInstance().closeOverlay(profileCard.getParent());
+
+                AppRouter.showMain();
+                return;
+            }
+
+            try {
+                MainController.getInstance().refreshChatListUI();
+            } catch (Exception ignore) {
+                AppRouter.showMain();
+            }
+        }
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Utils/ChannelPermissionUtil.java b/src/main/java/org/to/telegramfinalproject/Utils/ChannelPermissionUtil.java
new file mode 100644
index 0000000..0b82779
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Utils/ChannelPermissionUtil.java
@@ -0,0 +1,101 @@
+package org.to.telegramfinalproject.Utils;
+
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Database.ChannelDatabase;
+import org.to.telegramfinalproject.Database.ConnectionDb;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+
+public class ChannelPermissionUtil {
+
+    public static boolean canAddSubscribers(UUID channelId, UUID userId) {
+        if (ChannelDatabase.isOwner(channelId, userId)) return true;
+        if (ChannelDatabase.isAdmin(channelId, userId)) {
+            JSONObject perms = ChannelDatabase.getChannelPermissions(channelId, userId);
+            return perms.optBoolean("can_add_members", false);
+        }
+        return false;
+    }
+
+    public static boolean canAddAdmins(UUID channelId, UUID userId) {
+        if (ChannelDatabase.isOwner(channelId, userId)) return true;
+        if (ChannelDatabase.isAdmin(channelId, userId)) {
+            JSONObject perms = ChannelDatabase.getChannelPermissions(channelId, userId);
+            return perms.optBoolean("can_add_admins", false);
+        }
+        return false;
+    }
+
+    public static boolean canEditChannel(UUID channelId, UUID userId) {
+        if (ChannelDatabase.isOwner(channelId, userId)) return true;
+        if (ChannelDatabase.isAdmin(channelId, userId)) {
+            JSONObject perms = ChannelDatabase.getChannelPermissions(channelId, userId);
+            return perms.optBoolean("can_edit_channel", false);
+        }
+        return false;
+    }
+
+    public static boolean canRemoveAdmins(UUID channelId, UUID userId) {
+        if (ChannelDatabase.isOwner(channelId, userId)) return true;
+        if (ChannelDatabase.isAdmin(channelId, userId)) {
+            JSONObject perms = ChannelDatabase.getChannelPermissions(channelId, userId);
+            return perms.optBoolean("can_remove_admins", false);
+        }
+        return false;
+    }
+
+    public static boolean canRemoveSubscribers(UUID channelId, UUID userId) {
+        if (ChannelDatabase.isOwner(channelId, userId)) return true;
+        if (ChannelDatabase.isAdmin(channelId, userId)) {
+            JSONObject perms = ChannelDatabase.getChannelPermissions(channelId, userId);
+            return perms.optBoolean("can_remove_members", false);
+        }
+        return false;
+    }
+
+    public static boolean canDeleteMessage(UUID channelId, UUID userId) {
+        String roleSql = "SELECT role FROM channel_subscribers WHERE channel_id = ? AND user_id = ?";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(roleSql)) {
+            ps.setObject(1, channelId);
+            ps.setObject(2, userId);
+            ResultSet rs = ps.executeQuery();
+            if (rs.next()) {
+                String role = rs.getString("role");
+                return role.equalsIgnoreCase("owner") || role.equalsIgnoreCase("admin");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+
+    public static boolean isUserInChannel(UUID userId, UUID channelId) {
+        final String SQL = "SELECT 1 FROM channel_subscribers WHERE channel_id = ? AND user_id = ? LIMIT 1";
+        try (Connection conn = ConnectionDb.connect();
+             PreparedStatement ps = conn.prepareStatement(SQL)) {
+
+            ps.setObject(1, channelId, java.sql.Types.OTHER); // 👈 مهم برای Postgres UUID
+            ps.setObject(2, userId,    java.sql.Types.OTHER);
+
+            System.out.println("[SQL] isUserInChannel ch=" + channelId + " user=" + userId
+                    + " db=" + conn.getMetaData().getURL());
+
+            try (ResultSet rs = ps.executeQuery()) {
+                boolean ok = rs.next();
+                System.out.println("[SQL] isUserInChannel -> " + ok);
+                return ok;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+}
diff --git a/src/main/java/org/to/telegramfinalproject/Utils/GroupPermissionUtil.java b/src/main/java/org/to/telegramfinalproject/Utils/GroupPermissionUtil.java
new file mode 100644
index 0000000..8bcb3f5
--- /dev/null
+++ b/src/main/java/org/to/telegramfinalproject/Utils/GroupPermissionUtil.java
@@ -0,0 +1,59 @@
+package org.to.telegramfinalproject.Utils;
+
+import org.json.JSONObject;
+import org.to.telegramfinalproject.Database.GroupDatabase;
+
+import java.util.UUID;
+
+public class GroupPermissionUtil {
+
+    public static boolean canAddMembers(UUID groupId, UUID userId) {
+        String role = GroupDatabase.getGroupRole(groupId, userId);
+        if (role.equals("owner")) return true;
+        if (role.equals("admin")) {
+            JSONObject permissions = GroupDatabase.getGroupPermissions(groupId, userId);
+            return permissions.optBoolean("can_add_members", false);
+        }
+        return false;
+    }
+
+    public static boolean canRemoveMembers(UUID groupId, UUID userId) {
+        String role = GroupDatabase.getGroupRole(groupId, userId);
+        if (role.equals("owner")) return true;
+        if (role.equals("admin")) {
+            JSONObject permissions = GroupDatabase.getGroupPermissions(groupId, userId);
+            return permissions.optBoolean("can_remove_members", false);
+        }
+        return false;
+    }
+
+    public static boolean canAddAdmins(UUID groupId, UUID userId) {
+        String role = GroupDatabase.getGroupRole(groupId, userId);
+        if (role.equals("owner")) return true;
+        if (role.equals("admin")) {
+            JSONObject permissions = GroupDatabase.getGroupPermissions(groupId, userId);
+            return permissions.optBoolean("can_add_admins", false);
+        }
+        return false;
+    }
+
+    public static boolean canRemoveAdmins(UUID groupId, UUID userId) {
+        String role = GroupDatabase.getGroupRole(groupId, userId);
+        if (role.equals("owner")) return true;
+        if (role.equals("admin")) {
+            JSONObject permissions = GroupDatabase.getGroupPermissions(groupId, userId);
+            return permissions.optBoolean("can_remove_admins", false);
+        }
+        return false;
+    }
+
+    public static boolean canEditGroup(UUID groupId, UUID userId) {
+        String role = GroupDatabase.getGroupRole(groupId, userId);
+        if (role.equals("owner")) return true;
+        if (role.equals("admin")) {
+            JSONObject permissions = GroupDatabase.getGroupPermissions(groupId, userId);
+            return permissions.optBoolean("can_edit_group", false);
+        }
+        return false;
+    }
+}
diff --git a/src/main/resources/init.sql b/src/main/resources/init.sql
new file mode 100644
index 0000000..5325bc0
--- /dev/null
+++ b/src/main/resources/init.sql
@@ -0,0 +1,169 @@
+CREATE TABLE IF NOT EXISTS users(
+    user_id VARCHAR(70) UNIQUE NOT NULL,
+    internal_uuid UUID PRIMARY KEY,
+    username VARCHAR(50) UNIQUE NOT NULL,
+    password TEXT NOT NULL,
+    profile_name VARCHAR(100) NOT NULL,
+    bio TEXT,                               --(Bonus)
+    image_url TEXT,
+    status VARCHAR(20) DEFAULT 'offline',
+    last_seen TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    );
+
+
+CREATE TABLE IF NOT EXISTS contacts (
+    user_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
+    contact_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
+    added_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    is_blocked BOOLEAN DEFAULT FALSE,
+    PRIMARY KEY (user_id, contact_id)
+    );
+
+
+CREATE TABLE IF NOT EXISTS messages (
+    message_id UUID PRIMARY KEY,
+    sender_id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
+    receiver_type VARCHAR(20) NOT NULL CHECK (receiver_type IN ('private','group','channel')),
+    receiver_id UUID NOT NULL ,
+    content TEXT,
+    message_type VARCHAR(20) DEFAULT 'TEXT' CHECK (message_type IN ('TEXT','IMAGE','FILE','VIDEO','AUDIO','STICKER','GIF')),
+    send_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    status VARCHAR(20) DEFAULT 'SEND',                       -- SEND,DELIVERED,READ
+    reply_to_id UUID REFERENCES messages(message_id) ON DELETE SET NULL,        --(Bouns)
+    is_edited BOOLEAN DEFAULT FALSE,                                            --(Bonus)
+    edited_at TIMESTAMP  DEFAULT CURRENT_TIMESTAMP,
+    original_message_id UUID REFERENCES messages(message_id) ON DELETE SET NULL,              --(Bonus)
+    forwarded_by UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,              --(Bouns)
+    forwarded_from UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,            --(Bouns)
+    is_deleted_globally BOOLEAN DEFAULT FALSE
+    );
+
+CREATE TABLE IF NOT EXISTS private_chat (
+     chat_id UUID PRIMARY KEY,
+    user1_id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
+    user2_id UUID REFERENCES users(internal_uuid) ON DELETE SET NULL,
+    user1_deleted BOOLEAN DEFAULT FALSE,
+    user2_deleted BOOLEAN DEFAULT FALSE,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    CONSTRAINT unique_users UNIQUE (user1_id, user2_id)
+    );
+
+
+CREATE TABLE IF NOT EXISTS groups (
+    internal_uuid UUID PRIMARY KEY,
+    group_id VARCHAR(70) UNIQUE,
+    group_name VARCHAR(100),
+    creator_id UUID REFERENCES users(internal_uuid),
+    image_url TEXT,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    description TEXT
+);
+
+CREATE TABLE group_members (
+    group_id UUID NOT NULL,
+    user_id UUID NOT NULL,
+    role TEXT CHECK (role IN ('owner', 'admin', 'member')) DEFAULT 'member',
+    permissions JSONB DEFAULT '{}'::jsonb, -- مخصوص adminها
+    joined_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (group_id, user_id)
+);
+
+
+CREATE TABLE IF NOT EXISTS channels (
+    channel_id VARCHAR(70) UNIQUE,
+    internal_uuid UUID PRIMARY KEY,
+    channel_name VARCHAR(100),
+    creator_id UUID REFERENCES users(internal_uuid),
+    image_url TEXT,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    description TEXT
+    
+    );
+
+
+CREATE TABLE channel_subscribers (
+    channel_id UUID NOT NULL,
+    user_id UUID NOT NULL,
+    role TEXT CHECK (role IN ('owner', 'admin', 'subscriber')) DEFAULT 'subscriber',
+    permissions JSONB DEFAULT '{}'::jsonb,
+    subscribed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (channel_id, user_id)
+);
+
+
+--(Bouns)
+CREATE TABLE IF NOT EXISTS channel_admins (
+    channel_id VARCHAR(70) REFERENCES channels(channel_id),
+    user_id UUID REFERENCES users(internal_uuid),
+    added_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    added_by UUID REFERENCES users(internal_uuid),
+    role VARCHAR(20) DEFAULT 'admin',              --owner, admin
+    can_post_messages BOOLEAN DEFAULT TRUE,
+    can_edit_setting BOOLEAN DEFAULT FALSE,          -- profile, bio, name, etc.
+    can_delete_messages BOOLEAN DEFAULT FALSE,
+    can_delete_members BOOLEAN DEFAULT FALSE,
+    can_add_members BOOLEAN DEFAULT TRUE,
+    PRIMARY KEY (channel_id, user_id)
+    );
+
+CREATE TABLE IF NOT EXISTS message_receipts (
+    message_id UUID REFERENCES messages(message_id) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
+    read_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (message_id, user_id)
+);
+
+--(Bouns)
+CREATE TABLE archived_chats (
+    user_id UUID NOT NULL REFERENCES users(internal_uuid) ON DELETE CASCADE,
+    chat_id UUID NOT NULL,
+    chat_type TEXT NOT NULL CHECK (chat_type IN ('private', 'group', 'channel')),
+    archived_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (user_id, chat_id)
+);
+
+
+CREATE TABLE deleted_messages (
+    message_id UUID REFERENCES messages(message_id) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
+    deleted_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (message_id, user_id)
+);
+
+
+CREATE TABLE IF NOT EXISTS message_reactions (
+    message_id UUID REFERENCES messages(message_id) ON DELETE CASCADE,
+    user_id UUID REFERENCES users(internal_uuid) ON DELETE CASCADE,
+    emoji TEXT NOT NULL,  
+    reacted_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (message_id, user_id)
+);
+
+--Multi attachments
+CREATE TABLE IF NOT EXISTS message_attachments (
+    attachment_id UUID PRIMARY KEY,
+    message_id UUID REFERENCES messages(message_id) ON DELETE CASCADE,
+    file_url TEXT NOT NULL,
+    file_type VARCHAR(20) CHECK (file_type IN ('IMAGE','VIDEO','AUDIO','FILE','GIF','STICKER')),
+    uploaded_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    file_name TEXT,
+    file_size BIGINT,
+    mime_type TEXT,
+    width INT,
+    height INT,
+    duration_seconds INT,
+    thumbnail_url TEXT
+
+);
+
+--Run this part in your pg
+ALTER TABLE message_attachments
+  ADD COLUMN IF NOT EXISTS media_key UUID;
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
+
+UPDATE message_attachments
+SET media_key = gen_random_uuid()
+WHERE media_key IS NULL;
+
+
+
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/default_channel_profile.png b/src/main/resources/org/to/telegramfinalproject/Avatars/default_channel_profile.png
new file mode 100644
index 0000000..8a7c5b0
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Avatars/default_channel_profile.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/default_group_profile.png b/src/main/resources/org/to/telegramfinalproject/Avatars/default_group_profile.png
new file mode 100644
index 0000000..9166ae6
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Avatars/default_group_profile.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/default_user_profile.png b/src/main/resources/org/to/telegramfinalproject/Avatars/default_user_profile.png
new file mode 100644
index 0000000..6aa1089
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Avatars/default_user_profile.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/user1.png b/src/main/resources/org/to/telegramfinalproject/Avatars/user1.png
new file mode 100644
index 0000000..575ea2a
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Avatars/user1.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/user2.png b/src/main/resources/org/to/telegramfinalproject/Avatars/user2.png
new file mode 100644
index 0000000..89fa6b1
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Avatars/user2.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/user3.png b/src/main/resources/org/to/telegramfinalproject/Avatars/user3.png
new file mode 100644
index 0000000..ceb5329
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Avatars/user3.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Avatars/user4.png b/src/main/resources/org/to/telegramfinalproject/Avatars/user4.png
new file mode 100644
index 0000000..0a281db
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Avatars/user4.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/CSS/chat.css b/src/main/resources/org/to/telegramfinalproject/CSS/chat.css
new file mode 100644
index 0000000..3a71f2b
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/CSS/chat.css
@@ -0,0 +1,96 @@
+#joinAction, #addContactAction {
+    -fx-background-color: transparent, transparent, transparent, transparent;
+    -fx-background-insets: 0,0,0,0;
+    -fx-background-radius: 0,0,0,0;
+    -fx-border-color: transparent;
+    -fx-border-width: 0;
+    -fx-text-fill: #1e88e5;   /* آبی لینک */
+    -fx-font-weight: 700;
+    -fx-font-size: 12px;
+    -fx-padding: 12 0 12 0;
+    -fx-cursor: hand;
+    -fx-effect: null;
+}
+
+#joinAction:hover, #addContactAction:hover {
+    -fx-underline: true;
+}
+
+#joinAction:focused, #addContactAction:focused {
+    -fx-underline: true;
+    -fx-focus-color: transparent;
+    -fx-faint-focus-color: transparent;
+}
+
+#joinAction:armed, #addContactAction:armed {
+    -fx-opacity: .85;
+}
+
+/* ظرف بنر پایین */
+.chat-footer-banner {
+    -fx-background-color: transparent;
+}
+
+/* دکمهٔ لینک‌مانند (مشترک) */
+.footer-link-btn {
+    -fx-background-color: transparent;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
+    -fx-padding: 6 0 6 0;          /* نازک مثل لینک */
+    -fx-border-color: transparent;
+    -fx-font-size: 14px;
+    -fx-font-weight: 700;
+    -fx-text-fill: #1a73e8;        /* پیش‌فرض آبی (برای Join/Add) */
+}
+
+/* کانتینر بنر پایین چت */
+.chat-footer-banner {
+    -fx-background-color: transparent;
+    -fx-alignment: center;
+}
+
+/* متن آبی برای حالت Read-only */
+.chat-footer-banner .banner-text-blue {
+    -fx-text-fill: #1E88E5; /* آبی */
+    -fx-font-weight: 700;
+    -fx-background-color: transparent;
+}
+
+
+
+.button.footer-link-btn {
+    -fx-background-color: transparent;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
+    -fx-border-color: transparent;
+    -fx-border-width: 0;
+    -fx-padding: 6 12;
+    -fx-font-weight: 700;
+    -fx-cursor: hand;
+    -fx-effect: null;
+    -fx-text-fill: #1E88E5; /* پیش‌فرض آبی */
+}
+.button.footer-link-btn:hover {
+    -fx-underline: true;
+}
+
+/* نسخه‌ی قرمز برای UNBLOCK */
+.button.footer-link-btn.danger {
+    -fx-text-fill: #D32F2F;
+}
+
+
+/* فونت‌های ایموجی روی همهٔ سیستم‌ها */
+.emoji-label {
+    -fx-font-family: "Segoe UI Emoji", "Segoe UI Symbol",
+                     "Apple Color Emoji", "Noto Color Emoji",
+                     "Arial Unicode MS";
+    -fx-font-size: 13px;
+}
+
+/* اگر بخواهی فقط داخل صفحهٔ چت اعمال شود */
+.chat-root .emoji-label {
+    -fx-font-family: "Segoe UI Emoji", "Segoe UI Symbol",
+                     "Apple Color Emoji", "Noto Color Emoji",
+                     "Arial Unicode MS";
+}
diff --git a/src/main/resources/org/to/telegramfinalproject/CSS/dark_theme.css b/src/main/resources/org/to/telegramfinalproject/CSS/dark_theme.css
new file mode 100644
index 0000000..a94b76b
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/CSS/dark_theme.css
@@ -0,0 +1,1461 @@
+/* ===== Dark Theme Root ===== */
+.root {
+    -fx-background-color: #0f1c26;  /* overall dark base */
+    -fx-text-fill: #e8f1f8;
+}
+
+/* Sidebar buttons */
+.sidebar-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: white;
+    -fx-font-size: 14px;
+    -fx-pref-width: 230;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 8 0 8 16;
+}
+.sidebar-btn:hover {
+    -fx-background-color: #2f3e50;
+    -fx-cursor: hand;
+}
+
+/* Telegram-style toggle switch */
+.telegram-toggle {
+    -fx-background-color: #555;
+    -fx-background-radius: 15;
+    -fx-padding: 2;
+    -fx-pref-width: 40;
+    -fx-pref-height: 20;
+    -fx-alignment: center-left;
+    -fx-cursor: hand;
+}
+.telegram-toggle.on {
+    -fx-background-color: #4fa8f0;
+}
+.toggle-thumb {
+    -fx-background-color: white;
+    -fx-background-radius: 50%;
+    -fx-pref-width: 16;
+    -fx-pref-height: 16;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 3, 0, 0, 1);
+}
+
+/* Separator */
+.thin-separator {
+    -fx-background-color: transparent;
+    -fx-padding: 0;
+}
+.thin-separator .line {
+    -fx-border-color: #2e3948; /* Telegram's subtle dark line */
+    -fx-border-width: 0.5px;
+}
+
+/* Theme background & text */
+#sidebarRoot {
+    -fx-background-color: #1b2735; /* dark theme */
+}
+.button, .label {
+    -fx-text-fill: white;
+}
+
+/* Thin Telegram-like SplitPane divider (dark) */
+.split-pane:horizontal > .split-pane-divider {
+    -fx-background-color: transparent; /* no big solid block */
+    -fx-border-color: #cccccc; /* the visible thin line */
+    -fx-border-width: 0 1px 0 1px; /* 1px vertical line */
+    -fx-padding: 0 0 0 0.5px; /* big invisible hitbox for the mouse */
+}
+
+.placeholder-label {
+    -fx-text-fill: #aaa;              /* text color */
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-background-color: #2a2a2a;    /* bubble background */
+    -fx-padding: 8 10 8 10;         /* top/right/bottom/left spacing */
+    -fx-background-radius: 20;        /* rounded corners */
+}
+
+/* ===== Chat page (dark) ===== */
+.chat-root { -fx-background-color: #0f1c26; }
+
+/* Header bar */
+.chat-header {
+    -fx-background-color: #0f1c26;
+    -fx-border-color: #2e3948;
+    -fx-border-width: 0 0 1 0;
+}
+.chat-title  { -fx-text-fill: #e8f1f8; -fx-font-size: 14px; -fx-font-weight: bold; }
+.chat-status { -fx-text-fill: #8ea1b2; -fx-font-size: 12px; }
+
+/* Icon-only buttons */
+.icon-btn {
+    -fx-background-color: transparent;
+    -fx-padding: 6 8 6 8;
+    -fx-cursor: hand;
+}
+.icon-btn:hover {
+    -fx-background-color: rgba(255,255,255,0.06);
+    -fx-background-radius: 6;
+}
+
+/* Messages area */
+.chat-scroll { -fx-background-color: transparent; }
+
+/* Input bar */
+.chat-input-bar {
+    -fx-background-color: #15222d;
+    -fx-border-color: #2e3948;
+    -fx-border-width: 1 0 0 0;
+}
+
+/* Send button (telegram-ish blue) */
+.send-btn {
+    -fx-background-color: #2ca4ff;
+    -fx-background-radius: 18;
+    -fx-padding: 8 12 8 12;
+    -fx-cursor: hand;
+}
+.send-btn:hover { -fx-background-color: #1996f3; }
+
+/* Active/empty states (matches controller’s styleClass) */
+.send-btn.send-empty {
+    -fx-opacity: 0.5; /* look inactive */
+}
+.send-btn.send-ready {
+    -fx-opacity: 1.0; /* fully active */
+}
+.send-btn:disabled {
+    -fx-opacity: 0.4;
+    -fx-cursor: default;
+}
+
+/* Input bubble */
+.msg-input {
+    -fx-background-color: #1b2b39;   /* dark bluish background */
+    -fx-control-inner-background: #1b2b39;
+    -fx-text-fill: #e8f1f8;
+    -fx-prompt-text-fill: #8ea1b2;
+    -fx-background-radius: 18;
+    -fx-padding: 6 12 6 12;
+    -fx-border-color: transparent;
+    -fx-focus-color: transparent;
+    -fx-faint-focus-color: transparent;
+}
+
+.msg-input .scroll-pane {
+    -fx-vbar-policy: never;
+    -fx-hbar-policy: never;
+    -fx-background-color: transparent;
+}
+.msg-input .scroll-pane .corner {
+    -fx-background-color: transparent;
+}
+
+/* Context menu */
+.context-menu {
+    -fx-background-color: #1b2735;
+    -fx-background-radius: 6;
+    -fx-padding: 4;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.4), 8, 0, 0, 2);
+}
+
+.menu-item {
+    -fx-font-size: 13px;
+    -fx-text-fill: #e8f1f8;
+    -fx-padding: 6 12;
+}
+
+.menu-item:focused {
+    -fx-background-color: rgba(255,255,255,0.08);
+    -fx-background-radius: 4;
+}
+
+
+/* ===== Search panel (dark) ===== */
+.chat-search-pane { -fx-background-color: #1b2735; }
+.chat-search-bar { -fx-background-color: transparent; -fx-padding: 8 10; }
+.search-placeholder { -fx-text-fill: #8ea1b2; -fx-font-size: 13px; }
+
+/* ===== Global search bar ===== */
+.global-search-pane {
+    -fx-background-color: #1b2b39;
+    -fx-background-radius: 15;
+    -fx-text-fill: #e8f1f8;
+    -fx-prompt-text-fill: #8ea1b2;
+}
+
+/* ===== Chat list ===== */
+.chat-list { -fx-background-color: #0f1c26; }
+.chat-list .label { -fx-text-fill: #e8f1f8; }
+
+/* ===== Sidebar / Left Pane ===== */
+.sidebar-pane {
+    -fx-background-color: #1b2735; /* Telegram dark */
+}
+
+.sidebar-topbar {
+    -fx-background-color: transparent;
+}
+
+.menu-btn {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+}
+
+.global-search {
+    -fx-background-color: #2a3a4a;
+    -fx-background-radius: 15;
+    -fx-text-fill: #e8f1f8;
+    -fx-prompt-text-fill: #8ea1b2;
+    -fx-border-color: transparent;
+}
+
+/* Chat list */
+.chat-list {
+    -fx-background-color: #0f1c26;
+}
+
+.chat-scroll {
+    -fx-background-color: transparent;
+}
+
+/* ===== Search Panel ===== */
+.chat-search-pane {
+    -fx-background-color: #1b2735;
+}
+
+.search-label {
+    -fx-text-fill: #8ea1b2;
+    -fx-font-size: 11px;
+    -fx-padding: 10 0 5 10;
+}
+
+.search-separator {
+    -fx-background-color: #2e3948;
+}
+
+.search-scope-bar {
+    -fx-padding: 8 10;
+    -fx-border-color: #2e3948;
+    -fx-border-width: 0 0 1 0;
+}
+
+.search-scope {
+    -fx-text-fill: #8ea1b2;
+    -fx-font-size: 11px;
+}
+
+.close-btn {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-text-fill: #e8f1f8;
+}
+
+/* ===== Right Chat Panel ===== */
+.chat-display {
+    -fx-background-color: #0f1c26;
+}
+
+/* ===== Overlay ===== */
+.overlay {
+    -fx-background-color: rgba(0,0,0,0.3);
+}
+
+/* Chat item container */
+.chat-item {
+    -fx-background-color: #0f1c26;
+    -fx-padding: 10;
+    -fx-border-color: #2e3948;
+    -fx-border-width: 0 0 1 0;
+}
+
+.chat-item:hover {
+    -fx-background-color: #223446;
+    -fx-cursor: hand;
+}
+
+/* Chat details */
+.chat-name {
+    -fx-font-size: 14;
+    -fx-font-weight: bold;
+    -fx-text-fill: #e8f1f8;
+}
+
+.chat-last-message {
+    -fx-text-fill: #8ea1b2;
+    -fx-font-size: 12;
+}
+
+/* Time + unread */
+.chat-time {
+    -fx-font-size: 11;
+    -fx-text-fill: #8ea1b2;
+}
+
+/* Unread counter (same for both modes) */
+.unread-count {
+    -fx-background-color: #2196f3; /* blue bubble */
+    -fx-text-fill: white !important;          /* always white */
+    -fx-font-size: 10px;
+    -fx-padding: 3 6;
+    -fx-background-radius: 10;
+    -fx-font-weight: bold;
+}
+
+/* === Global Search List (Dark) === */
+.global-search-list {
+    -fx-background-color: #1b2735;              /* uniform dark background */
+    -fx-control-inner-background: #1b2735;
+    -fx-control-inner-background-alt: #1b2735;  /* disable stripes */
+}
+
+.global-search-list .virtual-flow,
+.global-search-list .clipped-container,
+.global-search-list .sheet {
+    -fx-background-color: #1b2735;              /* internal containers same */
+}
+
+.global-search-list .list-cell {
+    -fx-padding: 8 10;
+    -fx-background-color: #1b2735;              /* solid dark rows */
+    -fx-border-color: #2e3948;                  /* subtle divider */
+    -fx-border-width: 0 0 0.5 0;
+    -fx-alignment: CENTER_LEFT;
+    -fx-text-fill: #e8f1f8;                     /* light text */
+}
+
+.global-search-list .list-cell:hover {
+    -fx-background-color: rgba(255, 255, 255, 0.08); /* lighter on hover */
+}
+
+.global-search-list .list-cell:selected {
+    -fx-background-color: #2a3a4a;              /* darker blue-gray on select */
+}
+
+/* Titles & subtitles */
+.global-search-title {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #e8f1f8;
+}
+.global-search-subtitle {
+    -fx-font-size: 12px;
+    -fx-text-fill: #8ea1b2;                     /* muted gray-blue */
+}
+
+/* Search header */
+.search-header {
+    -fx-padding: 8 12;
+    -fx-background-color: #1b2735;
+    -fx-border-color: #2e3948;
+    -fx-border-width: 0 0 1 0;
+}
+.search-header-label {
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #e8f1f8;
+}
+
+/* No results */
+.no-results-label {
+    -fx-font-size: 12px;
+    -fx-text-fill: #8ea1b2;
+}
+
+/* Avatar placeholders */
+.global-search-avatar {
+    -fx-background-radius: 50%;
+    -fx-background-color: #444;
+    -fx-min-width: 36;
+    -fx-min-height: 36;
+}
+
+/* Close button */
+.search-close-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: #e8f1f8;
+    -fx-font-size: 14px;
+    -fx-cursor: hand;
+}
+.search-close-btn:hover {
+    -fx-text-fill: #2ca4ff;
+}
+
+
+/* ===== Overlay ===== */
+.overlay-root {
+    -fx-alignment: CENTER;
+}
+
+.overlay-background {
+    -fx-background-color: transparent;
+    -fx-pref-width: 100%;
+    -fx-pref-height: 100%;
+}
+
+/* ===== Profile Card ===== */
+.profile-card {
+    -fx-background-color: #0f1c26;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+    -fx-max-width: 320;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.6), 12, 0, 0, 4);
+}
+
+/* ===== Header ===== */
+.profile-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #eee;
+}
+.icon-button {
+    -fx-background-color: transparent;
+    -fx-padding: 4;
+    -fx-cursor: hand;
+    -fx-text-fill: #fff;
+}
+
+/* ===== Text Styles ===== */
+.profile-name {
+    -fx-font-size: 18px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #eee;
+}
+
+.profile-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #2196f3; /* online */
+}
+
+.profile-bio {
+    -fx-font-size: 13px;
+    -fx-text-fill: #bbb;
+}
+
+.profile-id {
+    -fx-font-size: 13px;
+    -fx-text-fill: #999;
+}
+
+/* Section separators */
+.section-separator {
+    -fx-background-color: #223446;
+    -fx-pref-height: 2;
+}
+
+/* Info text */
+.profile-info-main {
+    -fx-font-size: 14px;
+    -fx-text-fill: #eee;
+}
+
+.profile-info-sub {
+    -fx-font-size: 11px;
+    -fx-text-fill: #999;
+}
+
+/* ===== Edit Profile Card ===== */
+.edit-profile-card {
+    -fx-background-color: #0f1c26;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.6), 10, 0, 0, 4);
+}
+
+/* ===== Header ===== */
+.edit-profile-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #eee;
+}
+
+.edit-icon-button {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-text-fill: #eee;
+    -fx-font-size: 14px;
+    -fx-padding: 4;
+}
+
+/* ===== Profile Picture ===== */
+.edit-profile-picture {
+    -fx-background-radius: 50%;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.5), 4, 0, 0, 1);
+}
+
+/* ===== Inputs ===== */
+.edit-profile-input {
+    -fx-background-color: #1e2a35;   /* darker background */
+    -fx-background-radius: 6;
+    -fx-border-radius: 6;
+    -fx-border-color: #2e3c48;
+    -fx-border-width: 1;
+    -fx-padding: 6 10 6 10;
+    -fx-font-size: 13px;
+    -fx-text-fill: #eee;
+}
+
+.edit-profile-input:focused {
+    -fx-border-color: #42a5f5;       /* bright blue focus */
+    -fx-background-color: #253443;
+}
+
+.edit-input-description {
+    -fx-font-size: 11px;
+    -fx-text-fill: #aaa;
+}
+
+/* ===== Section Separators ===== */
+.edit-section-separator {
+    -fx-background-color: #333;
+    -fx-pref-height: 1;
+}
+
+.profile-info-label {
+    -fx-font-size: 14px;
+    -fx-text-fill: #bbb;   /* lighter gray for labels */
+    -fx-font-weight: normal;
+}
+
+.camera-button {
+    -fx-background-color: #0088cc;
+    -fx-background-radius: 50%;
+    -fx-cursor: hand;
+    -fx-padding: 4;
+    -fx-border-color: white;   /* white border to stand out */
+    -fx-border-width: 2;
+    -fx-border-radius: 50%;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.25), 4, 0, 0, 1);
+}
+
+.camera-button:hover {
+    -fx-background-color: #0077b6;
+}
+
+.contacts-card {
+    -fx-background-color: #1f2a36;
+    -fx-background-radius: 8;
+    -fx-padding: 12;
+}
+
+.contacts-header {
+    -fx-padding: 8 0 8 0;
+}
+.contacts-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #fff;
+}
+.icon-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #fff;
+}
+
+.contact-item {
+    -fx-padding: 8 12;
+    -fx-background-color: #1e2a35;
+    -fx-background-radius: 6;
+
+    /* Add subtle shadow like light theme */
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.4), 4, 0.2, 0, 1);
+}
+
+.contact-item:hover {
+    -fx-background-color: #253544; /* subtle hover */
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.6), 6, 0.3, 0, 1); /* stronger on hover */
+}
+
+.contact-name {
+    -fx-font-size: 14px;
+    -fx-text-fill: #eee;
+}
+.contact-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #999;
+}
+
+.footer-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #1e90ff;
+    -fx-font-weight: bold;
+}
+
+.overlay-background {
+    -fx-background-color: rgba(0, 0, 0, 0.4); /* semi-transparent black */
+    -fx-pref-width: 100%;
+    -fx-pref-height: 100%;
+}
+
+.contacts-search-box {
+    -fx-background-color: #253544;
+    -fx-background-radius: 10;
+    -fx-padding: 6 10;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.3), 8, 0.3, 0, 1);
+    -fx-alignment: center-left;
+}
+
+.contacts-search {
+    -fx-background-color: #253544;
+    -fx-border-color: #253544;
+    -fx-prompt-text-fill: #777; /* Placeholder text */
+    -fx-text-fill: #eee;        /* Actual user text (light so it’s visible) */
+    -fx-font-size: 13px;
+}
+
+.search-icon {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-opacity: 0.7;
+}
+.search-icon:hover {
+    -fx-opacity: 1;
+}
+
+.no-contacts-label {
+    -fx-text-fill: #aaa;
+    -fx-font-size: 13px;
+}
+
+.contacts-scroll {
+    -fx-background-color: transparent; /* outer scroll */
+}
+
+.contacts-scroll > .viewport {
+    -fx-background-color: #1f2a36; /* matches contacts-card */
+}
+
+.contacts-list {
+    -fx-background-color: #1f2a36;
+}
+
+/* ===== Group Card ===== */
+.group-card {
+    -fx-background-color: #1f2a36;
+    -fx-background-radius: 8;
+    -fx-padding: 16;
+}
+
+.group-name-label {
+    -fx-text-fill: #1e90ff;   /* same blue as light theme */
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+}
+
+.group-input {
+    -fx-background-color: transparent;
+    -fx-border-color: #444;
+    -fx-border-width: 0 0 1 0;
+    -fx-padding: 4 2;
+    -fx-text-fill: #eee;
+    -fx-prompt-text-fill: #777;
+}
+
+.group-camera-button {
+    -fx-background-color: #3390ec;
+    -fx-background-radius: 50%;
+    -fx-cursor: hand;
+}
+
+.footer-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #3390ec;
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+}
+
+/* Group name field normal */
+.group-name-field {
+    -fx-background-color: transparent;
+    -fx-border-color: #1e90ff;
+    -fx-border-width: 0 0 2 0; /* underline only */
+    -fx-text-fill: #fff;
+    -fx-prompt-text-fill: #777;
+    -fx-focus-color: transparent; /* prevent default blue glow */
+    -fx-faint-focus-color: transparent;
+}
+
+/* Error state for group name */
+.group-name-label.error {
+    -fx-text-fill: #e74c3c; /* red */
+}
+
+.group-name-field.error {
+    -fx-border-color: #e74c3c;
+    -fx-border-width: 0 0 2 0; /* only underline */
+    -fx-focus-color: transparent; /* remove default blue glow */
+}
+
+/* Member count label */
+.member-count {
+    -fx-font-size: 12px;
+    -fx-text-fill: #aaa; /* lighter gray for dark background */
+}
+
+/* Pane holding selected members */
+.selected-members-pane {
+    -fx-background-color: transparent;
+    -fx-padding: 6;
+    -fx-hgap: 6;
+    -fx-vgap: 6;
+}
+
+/* Footer */
+.contacts-footer {
+    -fx-background-color: transparent;
+    -fx-padding: 8 12;
+}
+
+/* Chip for selected members */
+.member-chip {
+    -fx-background-color: #253544;  /* dark bluish bubble */
+    -fx-background-radius: 16;
+    -fx-padding: 4 8;
+    -fx-spacing: 6;
+    -fx-alignment: center;
+}
+.member-chip:hover {
+    -fx-background-color: #31475b;  /* lighter on hover */
+}
+
+.desc-counter {
+    -fx-font-size: 11px;
+    -fx-text-fill: #aaa;   /* slightly lighter gray for dark background */
+    -fx-alignment: CENTER_RIGHT;
+}
+
+/* ===== TextArea Scrollbar Styling ===== */
+.text-area .scroll-pane .scroll-bar:vertical {
+    -fx-pref-width: 6px;       /* super thin */
+    -fx-background-color: transparent;
+    -fx-opacity: 0;            /* hidden by default */
+    -fx-padding: 0;
+}
+
+.text-area .scroll-pane:hover .scroll-bar:vertical {
+    -fx-opacity: 0.6;          /* appear on hover */
+    -fx-transition: opacity 0.3s ease;
+}
+
+.text-area .scroll-pane .thumb {
+    -fx-background-color: rgba(120,120,120,0.5); /* subtle gray */
+    -fx-background-radius: 2;
+}
+
+.text-area .scroll-pane .scroll-bar:horizontal {
+    -fx-opacity: 0;  /* hide horizontal completely */
+    -fx-max-height: 0;
+}
+
+/* Channel description text area */
+.channel-desc-area {
+    -fx-background-color: #1f2a36;   /* dark background */
+    -fx-text-fill: #eee;             /* text color */
+    -fx-control-inner-background: #1f2a36; /* inner background */
+    -fx-prompt-text-fill: #888;      /* placeholder */
+    -fx-border-color: #444;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+}
+
+/* Fix for the inner content region */
+.channel-desc-area .content {
+    -fx-background-color: #1f2a36;
+}
+
+.settings-card {
+    -fx-background-color: #1f2a36;
+    -fx-background-radius: 8;
+    -fx-padding: 12;
+}
+
+.settings-avatar {
+    -fx-fit-width: 56px;
+    -fx-fit-height: 56px;
+}
+
+.settings-name {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #ffffff;
+}
+
+.settings-id {
+    -fx-font-size: 13px;
+    -fx-text-fill: #aaaaaa;
+}
+
+.settings-option {
+    -fx-background-color: transparent;
+    -fx-text-fill: #ffffff;
+    -fx-font-size: 14px;
+    -fx-alignment: CENTER_LEFT;
+}
+
+.settings-option:hover {
+    -fx-background-color: #253544;
+}
+
+.settings-menu {
+    -fx-background-color: transparent;
+    -fx-font-size: 18px;
+    -fx-text-fill: #eeeeee;
+}
+
+.settings-header {
+    -fx-padding: 8 12;
+    -fx-border-color: -fx-box-border;
+    -fx-border-width: 0 0 1 0; /* bottom border only */
+}
+
+.settings-title {
+    -fx-font-size: 15px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #fff;
+}
+
+.icon-button {
+    -fx-background-color: transparent;
+    -fx-padding: 0;
+}
+
+.icon-button:hover {
+    -fx-background-color: rgba(0,0,0,0.05);
+    -fx-background-radius: 50%;
+}
+
+/* Profile header */
+.profile-header {
+    -fx-padding: 12 16;
+}
+
+.profile-avatar {
+    -fx-background-radius: 50%;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 4, 0.3, 0, 1);
+}
+
+.profile-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #fff;
+}
+
+.profile-id {
+    -fx-font-size: 12px;
+    -fx-text-fill: #aaa;
+}
+
+/* Hide MenuButton text & arrow */
+.icon-button > .label {
+    -fx-padding: 0;
+    -fx-text-fill: transparent;
+}
+
+.icon-button > .arrow-button,
+.icon-button > .arrow {
+    -fx-padding: 0;
+    -fx-shape: null;  /* removes arrow shape */
+    -fx-background-color: transparent;
+    -fx-opacity: 0;
+}
+
+.icon-image {
+    -fx-smooth: true;       /* keeps scaling smooth */
+    -fx-opacity: 0.8;       /* slightly dim until hover */
+}
+
+.icon-image:hover {
+    -fx-opacity: 1.0;       /* brighten on hover */
+}
+
+/* Container for all settings buttons */
+.settings-options {
+    -fx-background-color: transparent;
+    -fx-spacing: 4;
+    -fx-padding: 8 0 8 0;
+    -fx-border-color: #2a3b47;
+    -fx-border-width: 0 0 0 0;   /* thin top border */
+}
+
+/* Settings action buttons */
+.settings-option {
+    -fx-background-color: transparent;
+    -fx-text-fill: #ddd;
+    -fx-font-size: 14px;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 10 14;
+    -fx-background-radius: 6;
+    -fx-cursor: hand;
+
+    /* space between icon and text */
+    -fx-graphic-text-gap: 10px;
+}
+
+/* Hover effect */
+.settings-option:hover {
+    -fx-background-color: #2c3e50;
+}
+
+/* Pressed effect */
+.settings-option:pressed {
+    -fx-background-color: #1f2a36;
+}
+
+/* Card */
+.privacy-card {
+    -fx-background-color: #1f2a36;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+}
+
+/* Header */
+.privacy-header {
+    -fx-padding: 8 12 8 12;
+}
+.privacy-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: white;
+}
+
+/* Section Titles */
+.section-title {
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #bbbbbb;
+}
+
+/* Items */
+.privacy-item {
+    -fx-padding: 4 0 4 0;
+}
+.item-label {
+    -fx-font-size: 12px;
+    -fx-text-fill: #aaa;
+}
+.privacy-input {
+    -fx-background-color: #2a3b47;
+    -fx-text-fill: white;
+    -fx-background-radius: 6;
+    -fx-padding: 4;
+}
+
+/* Buttons */
+.action-button {
+    -fx-background-color: #3a86ff;
+    -fx-text-fill: white;
+    -fx-background-radius: 6;
+    -fx-padding: 6 12;
+}
+.manage-button {
+    -fx-background-color: #1f2a36;
+    -fx-text-fill: #3a86ff;
+    -fx-font-size: 12px;
+}
+
+.privacy-section {
+    -fx-spacing: 8;
+    -fx-padding: 10 0 10 0;
+    -fx-background-color: transparent;
+    -fx-border-color: #2f2f2f;
+    -fx-border-width: 0 0 0 0;
+}
+
+.privacy-form {
+    -fx-spacing: 8;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 8 0 8 0;
+}
+
+.privacy-form .label {
+    -fx-font-size: 12px;
+    -fx-text-fill: white;
+}
+
+/* Error state (same for both themes) */
+.password-label.error {
+    -fx-text-fill: red;
+}
+
+.password-field.error {
+    -fx-text-fill: red;
+}
+
+.text-field.error {
+    -fx-text-fill: red;
+}
+
+.toggle-visibility-btn {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-padding: 0 6 0 6;
+    -fx-font-size: 14px;
+}
+
+.blocked-card {
+    -fx-background-color: #1f2a36;
+    -fx-background-radius: 10;
+    -fx-padding: 12;
+}
+
+.blocked-header {
+    -fx-padding: 8;
+}
+.blocked-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: white;
+}
+
+.blocked-count {
+    -fx-font-size: 13px;
+    -fx-text-fill: #999;
+    -fx-padding: 4 0;
+}
+
+.blocked-list {
+    -fx-background-color: #253544;
+}
+
+.blocked-row {
+    -fx-padding: 8;
+    -fx-background-color: transparent;
+}
+.blocked-row:hover {
+    -fx-background-color: #253544;
+}
+
+.blocked-name {
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-text-fill: white;
+}
+.blocked-id {
+    -fx-font-size: 12px;
+    -fx-text-fill: #aaa;
+}
+
+.unblock-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #3a86ff;
+    -fx-cursor: hand;
+}
+
+.unblock-button:hover {
+    -fx-text-fill: #66aaff;
+}
+
+.blocked-info-label {
+    -fx-background-color: #2c3e50;   /* darker banner background */
+    -fx-text-fill: #bbb;             /* lighter muted text */
+    -fx-font-size: 12px;
+    -fx-wrap-text: true;
+    -fx-padding: 5;
+    -fx-background-radius: 4;
+}
+
+.blocked-list .thumb {
+    -fx-background-color: rgba(200, 200, 200, 0.5); /* lighter for dark bg */
+}
+
+/* Each list cell */
+.blocked-list .list-cell {
+    -fx-background-color: #1f2a36;
+    -fx-text-fill: #eeeeee;
+    -fx-padding: 8 12;
+    -fx-border-color: #2f2f2f;
+    -fx-border-width: 0 0 1 0;
+}
+
+.blocked-list .list-cell:hover {
+    -fx-background-color: #2a3a4a;
+}
+
+/* Error label */
+.label.error-label {
+    -fx-text-fill: red;
+}
+
+/* Error input */
+.error-input {
+    -fx-border-color: red;
+    -fx-border-radius: 6;
+}
+
+/* === User Info (Dark) === */
+.user-info-card {
+    -fx-background-color: #1f1f1f;
+    -fx-background-radius: 8;
+    -fx-padding: 16;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.5), 12, 0, 0, 3);
+}
+.user-info-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #f2f2f2;
+}
+.user-info-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #fff;
+}
+.user-info-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #aaa;
+}
+.user-info-main {
+    -fx-font-size: 13px;
+    -fx-text-fill: #f0f0f0;
+}
+.user-info-sub {
+    -fx-font-size: 11px;
+    -fx-text-fill: #999;
+}
+.user-info-separator {
+    -fx-background-color: #333;
+}
+
+/* === Shared buttons === */
+.danger-button {
+    -fx-background-color: #e74c3c;
+    -fx-text-fill: white;
+    -fx-background-radius: 6;
+    -fx-padding: 4 12;
+}
+.danger-button:hover {
+    -fx-background-color: #c0392b;
+}
+
+/* === Profile image === */
+.profile-picture {
+    -fx-background-color: #2c2c2c;
+    -fx-background-radius: 50%;
+    -fx-border-color: #444;
+    -fx-border-radius: 50%;
+    -fx-border-width: 1;
+}
+
+.member-row {
+    -fx-alignment: CENTER_LEFT;
+}
+
+.member-scroll {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.profile-card {
+    -fx-background-radius: 12;
+    -fx-background-color: #1f2a36; /* dark gray card */
+    -fx-padding: 16;
+}
+
+.profile-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #e8f1f8; /* light text */
+}
+
+
+.member-row {
+    -fx-padding: 6 0;
+}
+
+.member-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #e8f1f8; /* Telegram light text */
+}
+
+.member-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #8ea1b2; /* grayish */
+}
+
+.member-role {
+    -fx-font-size: 12px;
+    -fx-text-fill: #4fa8f0; /* blue */
+    -fx-font-weight: bold;
+}
+
+/* Group name (bold, light text) */
+.info-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #e8f1f8; /* light gray/white */
+}
+
+/* Members count (blue link style like Telegram dark mode) */
+.info-subtitle {
+    -fx-font-size: 13px;
+    -fx-text-fill: #4fa8f0; /* same Telegram blue */
+}
+
+/* Inputs */
+.input-field, .input-area {
+    -fx-background-color: transparent;
+    -fx-border-width: 0 0 1 0;
+    -fx-border-color: #444;           /* subtle underline */
+    -fx-text-fill: #e6e6e6;           /* light text */
+    -fx-padding: 4 0 4 0;
+    -fx-font-size: 14px;
+}
+.input-area {
+    -fx-font-size: 12px;
+}
+
+/* Info rows */
+.info-row-label {
+    -fx-font-size: 14px;
+    -fx-text-fill: #e6e6e6;
+}
+.info-row-value {
+    -fx-font-size: 14px;
+    -fx-text-fill: #4fa8f0;          /* Telegram blue */
+    -fx-font-weight: bold;
+}
+
+/* Buttons */
+.primary-btn {
+    -fx-background-color: #4fa8f0;
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
+    -fx-background-radius: 6;
+    -fx-padding: 6 14;
+}
+.secondary-btn {
+    -fx-background-color: transparent;
+    -fx-border-color: #8ea1b2;
+    -fx-border-radius: 6;
+    -fx-text-fill: #e6e6e6;
+    -fx-padding: 6 14;
+}
+.circle-pic-btn {
+    -fx-background-color: transparent;
+    -fx-padding: 0;
+}
+
+.manage-link-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: #4fa8f0; /* brighter blue for dark mode */
+    -fx-underline: false;
+    -fx-cursor: hand;
+    -fx-font-size: 13px;
+    -fx-padding: 0 4 0 4;
+}
+
+.manage-link-btn:hover {
+    -fx-underline: true;
+}
+.manage-link-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: #4fa8f0; /* brighter blue for dark mode */
+    -fx-underline: false;
+    -fx-cursor: hand;
+    -fx-font-size: 13px;
+    -fx-padding: 0 4 0 4;
+}
+
+.manage-link-btn:hover {
+    -fx-underline: true;
+}
+
+/* Shared */
+.member-row {
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 6 0;
+}
+
+.member-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+}
+
+.member-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #8ea1b2;
+}
+
+.link-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: -fx-accent;
+    -fx-cursor: hand;
+    -fx-padding: 0 6 0 6;
+}
+
+.link-btn:hover {
+    -fx-underline: true;
+}
+
+.overlay-background {
+    -fx-background-color: rgba(0,0,0,0.4);
+}
+
+.tf-root {
+    -fx-background-color: #1f2a36;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.5), 10, 0, 0, 4);
+}
+
+.tf-toolbar {
+    -fx-padding: 8 12 8 12;
+}
+
+.tf-title {
+    -fx-font-size: 18px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #229ED9; /* Telegram blue */
+}
+
+.tf-caption {
+    -fx-font-size: 12px;
+    -fx-text-fill: #aaa;
+}
+
+.tf-section {
+    -fx-spacing: 8;
+    -fx-padding: 8 0 8 0;
+}
+
+/* ScrollPane backgrounds */
+.scroll-pane {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+}
+
+.scroll-pane .viewport {
+    -fx-background-color: transparent;
+}
+
+.tf-sections {
+    -fx-background-color: #1f2a36; /* same as .tf-root */
+}
+
+/* Section + item text colors */
+.tf-section-title {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #ffffff;
+    -fx-padding: 4 0 2 0;
+    -fx-border-color: #333;
+    -fx-border-width: 0 0 0 0;
+}
+
+.tf-item-title {
+    -fx-font-weight: bold;
+    -fx-font-size: 13px;
+    -fx-text-fill: #f5f5f5;
+}
+
+.tf-item-desc {
+    -fx-font-size: 12px;
+    -fx-text-fill: #cccccc;
+}
+
+.tf-status {
+    -fx-font-size: 11px;
+    -fx-padding: 2 6 2 6;
+    -fx-background-radius: 6;
+}
+.tf-status-available {
+    -fx-text-fill: #a5d6a7;
+    -fx-background-color: #1b5e20;
+}
+.tf-status-progress {
+    -fx-text-fill: #ffb74d;
+    -fx-background-color: #e65100;
+}
+
+/* Permissions card checkboxes */
+.check-box {
+    -fx-font-size: 13px;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+/* === Permissions overlay === */
+.permissions-card {
+    -fx-background-color: #1f1f1f;
+    -fx-background-radius: 12;
+    -fx-padding: 16;
+}
+
+/* Checkboxes */
+.permissions-card .check-box {
+    -fx-text-fill: #e0e0e0;
+}
+
+.permissions-card .check-box:selected .box {
+    -fx-background-color: #3390ec;
+    -fx-border-color: #3390ec;
+}
+
+.permissions-card .check-box .box {
+    -fx-background-color: #2c2c2c;
+    -fx-border-color: #555;
+    -fx-border-radius: 4;
+}
+
+/* Buttons */
+.permissions-card .button {
+    -fx-font-size: 13px;
+    -fx-background-radius: 6;
+}
+
+.permissions-card .button.primary-btn {
+    -fx-background-color: #3390ec;
+    -fx-text-fill: white;
+}
+
+.permissions-card .button.secondary-btn {
+    -fx-background-color: transparent;
+    -fx-border-color: #555;
+    -fx-text-fill: #aaa;
+}
+
+.channel-info-card {
+    -fx-background-color: #2a2a2a;
+}
+
+.channel-title {
+    -fx-text-fill: #f5f5f5;
+}
+
+.channel-subcount {
+    -fx-text-fill: #aaaaaa;
+}
+
+.channel-buttons .button {
+    -fx-background-color: #3c3c3c;
+    -fx-text-fill: #f5f5f5;
+}
+
+.options-button {
+    -fx-text-fill: #dddddd;
+}
+
+.subscriber-item,
+.admin-item {
+    -fx-text-fill: #e0e0e0;
+}
+
+.info-description {
+    -fx-font-size: 12px;
+    -fx-text-fill: #777;
+}
+
+/* Dark theme: Channel Manage styles */
+.description-input {
+    -fx-background-color: #1f2a36;     /* darker to match card */
+    -fx-control-inner-background: #1f2a36;
+    -fx-border-color: #444444;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+    -fx-padding: 6;
+    -fx-font-size: 13px;
+    -fx-text-fill: #dddddd;            /* normal text */
+    -fx-prompt-text-fill: #888888;     /* dimmed placeholder text */
+}
+
+.description-input:focused {
+    -fx-border-color: #4a90e2; /* Telegram blue */
+    -fx-effect: dropshadow(gaussian, rgba(74,144,226,0.5), 6, 0.4, 0, 0);
+}
diff --git a/src/main/resources/org/to/telegramfinalproject/CSS/light_theme.css b/src/main/resources/org/to/telegramfinalproject/CSS/light_theme.css
new file mode 100644
index 0000000..5a6ba18
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/CSS/light_theme.css
@@ -0,0 +1,1410 @@
+.root {
+    -fx-base: #ffffff;
+    -fx-text-base-color: #000000;
+}
+
+/* Sidebar buttons */
+.sidebar-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: black;
+    -fx-font-size: 14px;
+    -fx-pref-width: 230;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 8 0 8 16;
+}
+.sidebar-btn:hover {
+    -fx-background-color: #e6e6e6;
+    -fx-cursor: hand;
+}
+
+/* Telegram-style toggle switch */
+.telegram-toggle {
+    -fx-background-color: #aaa;
+    -fx-background-radius: 15;
+    -fx-padding: 2;
+    -fx-pref-width: 40;
+    -fx-pref-height: 20;
+    -fx-alignment: center-left;
+    -fx-cursor: hand;
+}
+.telegram-toggle.on {
+    -fx-background-color: #4fa8f0;
+}
+.toggle-thumb {
+    -fx-background-color: white;
+    -fx-background-radius: 50%;
+    -fx-pref-width: 16;
+    -fx-pref-height: 16;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 3, 0, 0, 1);
+}
+
+/* Separator */
+.thin-separator {
+    -fx-background-color: transparent;
+    -fx-padding: 0;
+}
+.thin-separator .line {
+    -fx-border-color: #ccc;
+    -fx-border-width: 0.5px;
+}
+
+/* Theme background & text */
+#sidebarRoot {
+    -fx-background-color: white;
+}
+.button, .label {
+    -fx-text-fill: black;
+}
+
+/* SplitPane divider */
+.split-pane:horizontal > .split-pane-divider {
+    -fx-background-color: transparent;
+    -fx-border-color: #cccccc;
+    -fx-border-width: 0 1px 0 1px;
+    -fx-padding: 0 0 0 0.5px;
+}
+
+.placeholder-label {
+    -fx-text-fill: #2e3948;              /* text color */
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-background-color: #f1f1f1;    /* bubble background */
+    -fx-padding: 8 10 8 10;         /* top/right/bottom/left spacing */
+    -fx-background-radius: 20;        /* rounded corners */
+}
+
+/* ===== Chat page (light) ===== */
+.chat-root { -fx-background-color: #ffffff; }
+
+/* Header bar */
+.chat-header {
+    -fx-background-color: #ffffff;
+    -fx-border-color: #e6e6e6;
+    -fx-border-width: 0 0 1 0;
+}
+.chat-title  { -fx-text-fill: #0f141a; -fx-font-size: 14px; -fx-font-weight: bold; }
+.chat-status { -fx-text-fill: #7e8a97; -fx-font-size: 12px; }
+
+/* Icon-only buttons */
+.icon-btn {
+    -fx-background-color: transparent;
+    -fx-padding: 6 8 6 8;
+    -fx-cursor: hand;
+}
+.icon-btn:hover {
+    -fx-background-color: rgba(0,0,0,0.05);
+    -fx-background-radius: 6;
+}
+
+/* Messages area */
+.chat-scroll { -fx-background-color: transparent; }
+
+/* Input bar */
+.chat-input-bar {
+    -fx-background-color: #f5f5f5;
+    -fx-border-color: #e6e6e6;
+    -fx-border-width: 1 0 0 0;
+}
+
+/* Send button (telegram-ish blue) */
+.send-btn {
+    -fx-background-color: #2ca4ff;
+    -fx-background-radius: 18;
+    -fx-padding: 8 12 8 12;
+    -fx-cursor: hand;
+}
+.send-btn:hover { -fx-background-color: #1996f3; }
+
+/* Active/empty states (matches controller’s styleClass) */
+.send-btn.send-empty {
+    -fx-opacity: 0.5; /* look inactive */
+}
+.send-btn.send-ready {
+    -fx-opacity: 1.0; /* fully active */
+}
+.send-btn:disabled {
+    -fx-opacity: 0.4;
+    -fx-cursor: default;
+}
+
+/* Input bubble */
+.msg-input {
+    -fx-background-color: white;
+    -fx-background-radius: 18;
+    -fx-padding: 6 12 6 12;
+    -fx-text-fill: #0f141a;
+    -fx-prompt-text-fill: #9aa6b2;
+    -fx-border-color: transparent;
+
+    -fx-control-inner-background: white;
+    -fx-focus-color: transparent;
+    -fx-faint-focus-color: transparent;
+}
+.msg-input .scroll-pane {
+    -fx-vbar-policy: never;
+    -fx-hbar-policy: never;
+    -fx-background-color: transparent;
+}
+.msg-input .scroll-pane .corner {
+    -fx-background-color: transparent;
+}
+
+/* Context menu */
+.context-menu {
+    -fx-background-color: white;
+    -fx-background-radius: 6;
+    -fx-padding: 4;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 8, 0, 0, 2);
+}
+
+.menu-item {
+    -fx-font-size: 13px;
+    -fx-text-fill: #0f141a;
+    -fx-padding: 6 12;
+}
+
+.menu-item:focused {
+    -fx-background-color: #e6e6e6;
+    -fx-background-radius: 4;
+}
+
+
+/* ===== Search panel (light) ===== */
+.chat-search-pane { -fx-background-color: #f5f5f5; }
+.chat-search-bar { -fx-background-color: transparent; -fx-padding: 8 10; }
+.search-placeholder { -fx-text-fill: #7e8a97; -fx-font-size: 13px; }
+
+/* ===== Global search bar ===== */
+.global-search {
+    -fx-background-color: #f5f5f5;
+    -fx-background-radius: 15;
+    -fx-text-fill: #0f141a;
+    -fx-prompt-text-fill: #9aa6b2;
+}
+
+/* ===== Chat list ===== */
+.chat-list { -fx-background-color: #ffffff; }
+.chat-list .label { -fx-text-fill: #0f141a; }
+
+/* ===== Sidebar / Left Pane ===== */
+.sidebar-pane {
+    -fx-background-color: #ffffff;
+}
+
+.sidebar-topbar {
+    -fx-background-color: transparent;
+}
+
+.menu-btn {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+}
+
+.global-search-pane {
+    -fx-background-color: #f5f5f5;
+    -fx-background-radius: 15;
+    -fx-text-fill: #0f141a;
+    -fx-prompt-text-fill: #7e8a97;
+    -fx-border-color: transparent;
+}
+
+/* Chat list */
+.chat-list {
+    -fx-background-color: transparent;
+}
+
+.chat-scroll {
+    -fx-background-color: transparent;
+}
+
+/* ===== Search Panel ===== */
+.chat-search-pane {
+    -fx-background-color: #f5f5f5;
+}
+
+.search-label {
+    -fx-text-fill: #7e8a97;
+    -fx-font-size: 11px;
+    -fx-padding: 10 0 5 10;
+}
+
+.search-separator {
+    -fx-background-color: #e6e6e6;
+}
+
+.search-scope-bar {
+    -fx-padding: 8 10;
+    -fx-border-color: #e6e6e6;
+    -fx-border-width: 0 0 1 0;
+}
+
+.search-scope {
+    -fx-text-fill: #7e8a97;
+    -fx-font-size: 11px;
+}
+
+.close-btn {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+}
+
+/* ===== Right Chat Panel ===== */
+.chat-display {
+    -fx-background-color: #fafafa;
+}
+
+/* ===== Overlay ===== */
+.overlay {
+    -fx-background-color: rgba(0,0,0,0.3);
+}
+
+/* Chat item container */
+.chat-item {
+    -fx-background-color: #ffffff;
+    -fx-padding: 10;
+    -fx-border-color: #ddd;
+    -fx-border-width: 0 0 1 0;
+}
+
+.chat-item:hover {
+    -fx-background-color: #f5f5f5;
+    -fx-cursor: hand;
+}
+
+/* Chat details */
+.chat-name {
+    -fx-font-size: 14;
+    -fx-font-weight: bold;
+    -fx-text-fill: #0f141a;
+}
+
+.chat-last-message {
+    -fx-text-fill: #7e8a97;
+    -fx-font-size: 12;
+}
+
+/* Time + unread */
+.chat-time {
+    -fx-font-size: 11;
+    -fx-text-fill: #7e8a97;
+}
+
+/* Unread counter (same for both modes) */
+.unread-count {
+    -fx-background-color: #2196f3; /* blue bubble */
+    -fx-text-fill: white !important;          /* always white */
+    -fx-font-size: 10px;
+    -fx-padding: 3 6;
+    -fx-background-radius: 10;
+    -fx-font-weight: bold;
+}
+
+/* === Global Search List === */
+.global-search-list .list-cell {
+    -fx-padding: 8 10;
+    -fx-background-color: transparent;
+    -fx-border-color: #ddd;   /* light divider */
+    -fx-border-width: 0 0 0.5 0;
+    -fx-alignment: CENTER_LEFT;
+}
+
+.global-search-list .list-cell:hover {
+    -fx-background-color: rgba(0, 0, 0, 0.05); /* light hover */
+}
+
+.global-search-title {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: black;
+}
+
+.global-search-subtitle {
+    -fx-font-size: 12px;
+    -fx-text-fill: #666; /* gray for light mode */
+}
+
+/* Avatar placeholder (if no image) */
+.global-search-avatar {
+    -fx-background-radius: 50%;
+    -fx-background-color: #bbb;
+    -fx-min-width: 36;
+    -fx-min-height: 36;
+}
+
+/* Global search panel */
+.global-search-pane {
+    -fx-background-color: -fx-base;
+}
+
+.search-header {
+    -fx-padding: 8 12;
+    -fx-background-color: transparent;
+    -fx-border-color: #ddd;
+    -fx-border-width: 0 0 1 0;
+}
+
+.search-header-label {
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+.no-results-label {
+    -fx-font-size: 12px;
+    -fx-text-fill: gray;
+}
+
+.close-btn {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-font-size: 14px;
+}
+
+/* ===== Global Search Result Panel ===== */
+.search-results-container {
+    -fx-background-color: -fx-base;
+    -fx-padding: 8;
+    -fx-spacing: 6;
+    -fx-border-color: transparent transparent #ddd transparent;
+    -fx-border-width: 0 0 1 0;
+}
+
+.search-results-title {
+    -fx-font-weight: bold;
+    -fx-font-size: 13px;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+.search-result-item {
+    -fx-background-color: transparent;
+    -fx-padding: 6 10;
+    -fx-spacing: 8;
+}
+
+.search-result-item:hover {
+    -fx-background-color: rgba(0,0,0,0.05);
+}
+
+/* Avatar always square, not squeezed */
+.search-result-avatar {
+    -fx-fit-width: 40;
+    -fx-fit-height: 40;
+    -fx-preserve-ratio: true;
+}
+
+/* Close button */
+.search-close-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: -fx-text-base-color;
+    -fx-font-size: 14px;
+    -fx-cursor: hand;
+}
+
+
+/* ===== Overlay ===== */
+.overlay-root {
+    -fx-alignment: CENTER;
+}
+
+.overlay-background {
+    -fx-background-color: rgba(0, 0, 0, 0.4);
+    -fx-pref-width: 100%;
+    -fx-pref-height: 100%;
+}
+
+/* ===== Profile Card ===== */
+.profile-card {
+    -fx-background-color: white;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+    -fx-max-width: 320;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.35), 12, 0, 0, 4);
+}
+
+/* ===== Header ===== */
+.profile-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+}
+.icon-button {
+    -fx-background-color: transparent;
+    -fx-padding: 4;
+    -fx-cursor: hand;
+    -fx-text-fill: #000;
+}
+
+/* ===== Text Styles ===== */
+.profile-name {
+    -fx-font-size: 18px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #222;
+}
+
+.profile-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #2196f3; /* online */
+}
+
+.profile-bio {
+    -fx-font-size: 13px;
+    -fx-text-fill: #555;
+}
+
+.profile-id {
+    -fx-font-size: 13px;
+    -fx-text-fill: #888;
+}
+
+/* Section separators */
+.section-separator {
+    -fx-background-color: #ddd;
+    -fx-pref-height: 2;
+}
+
+/* Info text */
+.profile-info-main {
+    -fx-font-size: 14px;
+    -fx-text-fill: #222;
+}
+
+.profile-info-sub {
+    -fx-font-size: 11px;
+    -fx-text-fill: #888;
+}
+
+/* ===== Edit Profile Card ===== */
+.edit-profile-card {
+    -fx-background-color: white;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.25), 10, 0, 0, 4);
+}
+
+/* ===== Header ===== */
+.edit-profile-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #000;
+}
+
+.edit-icon-button {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-text-fill: #000;
+    -fx-font-size: 14px;
+    -fx-padding: 4;
+}
+
+/* ===== Profile Picture ===== */
+.edit-profile-picture {
+    -fx-background-radius: 50%;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 4, 0, 0, 1);
+}
+
+/* ===== Inputs ===== */
+.edit-profile-input {
+    -fx-background-color: #f5f5f5;   /* light gray background */
+    -fx-background-radius: 6;
+    -fx-border-radius: 6;
+    -fx-border-color: #ddd;
+    -fx-border-width: 1;
+    -fx-padding: 6 10 6 10;
+    -fx-font-size: 13px;
+    -fx-text-fill: #222;
+}
+
+
+.edit-profile-input:focused {
+    -fx-border-color: #2196f3;       /* blue highlight on focus */
+    -fx-background-color: #fff;
+}
+
+.edit-input-description {
+    -fx-font-size: 11px;
+    -fx-text-fill: #666;
+}
+
+/* ===== Section Separators ===== */
+.edit-section-separator {
+    -fx-background-color: #ddd;
+    -fx-pref-height: 1;
+}
+
+.profile-info-label {
+    -fx-font-size: 14px;
+    -fx-text-fill: #444;   /* darker gray for labels */
+    -fx-font-weight: normal;
+}
+
+.camera-button {
+    -fx-background-color: #0088cc;
+    -fx-background-radius: 50%;
+    -fx-cursor: hand;
+    -fx-padding: 4;
+    -fx-border-color: white;   /* white border to stand out */
+    -fx-border-width: 2;
+    -fx-border-radius: 50%;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.25), 4, 0, 0, 1);
+}
+
+.camera-button:hover {
+    -fx-background-color: #0077b6;
+}
+
+.contacts-card {
+    -fx-background-color: white;
+    -fx-background-radius: 8;
+    -fx-padding: 12;
+}
+
+.contacts-header {
+    -fx-padding: 8 0 8 0;
+}
+.contacts-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #000;
+}
+.icon-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #000;
+}
+
+.contacts-search {
+    -fx-background-color: #f5f5f5;
+    -fx-background-radius: 6;
+    -fx-padding: 6;
+    -fx-font-size: 13px;
+}
+
+.contact-item {
+    -fx-padding: 8 12;
+    -fx-background-color: white;
+    -fx-background-radius: 6;
+
+    /* Soft shadow for separation */
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.15), 4, 0.2, 0, 1);
+}
+
+.contact-item:hover {
+    -fx-background-color: #f0f0f0; /* highlight on hover */
+}
+
+.contact-name {
+    -fx-font-size: 14px;
+    -fx-text-fill: #111;
+}
+.contact-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #666;
+}
+
+.footer-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #0078d7;
+    -fx-font-weight: bold;
+}
+
+.overlay-background {
+    -fx-background-color: rgba(0, 0, 0, 0.4); /* semi-transparent black */
+    -fx-pref-width: 100%;
+    -fx-pref-height: 100%;
+}
+
+.contacts-search-box {
+    -fx-background-color: #ffffff;
+    -fx-background-radius: 6;
+    -fx-padding: 6 12;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.1), 4, 0.2, 0, 1);
+    -fx-alignment: center-left;
+}
+
+.contacts-search {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+    -fx-prompt-text-fill: #aaa;
+    -fx-text-fill: #222;
+    -fx-font-size: 13px;
+}
+
+.search-icon {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-opacity: 0.8;
+}
+.search-icon:hover {
+    -fx-opacity: 1;
+}
+
+.no-contacts-label {
+    -fx-text-fill: #777;
+    -fx-font-size: 13px;
+}
+
+/* ===== Group Card ===== */
+.group-card {
+    -fx-background-color: #fff;
+    -fx-background-radius: 8;
+    -fx-padding: 16;
+}
+
+/* Group name label */
+.group-name-label {
+    -fx-text-fill: #1e90ff; /* blue color */
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+}
+
+/* Group name input */
+.group-name-field {
+    -fx-background-color: transparent;
+    -fx-border-width: 0 0 2 0;   /* only bottom line */
+    -fx-border-color: #1e90ff;   /* blue underline */
+    -fx-padding: 4 0 4 0;
+    -fx-font-size: 13px;
+}
+
+.group-camera-button {
+    -fx-background-color: #3390ec;
+    -fx-background-radius: 50%;
+    -fx-cursor: hand;
+}
+
+.footer-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #3390ec;
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+}
+
+/* Error state for group name */
+.group-name-label.error {
+    -fx-text-fill: #e74c3c; /* red */
+}
+
+.group-name-field.error {
+    -fx-border-color: #e74c3c;
+    -fx-border-width: 0 0 2 0; /* only underline */
+    -fx-focus-color: transparent; /* remove default blue glow */
+}
+
+/* Member count label (top right in header) */
+.member-count {
+    -fx-font-size: 12px;
+    -fx-text-fill: #777; /* subtle gray */
+}
+
+/* Pane holding selected members (chips flow horizontally) */
+.selected-members-pane {
+    -fx-background-color: transparent;
+    -fx-padding: 6;
+    -fx-hgap: 6;
+    -fx-vgap: 6;
+}
+
+/* Footer with Cancel & Create buttons */
+.contacts-footer {
+    -fx-background-color: transparent;
+    -fx-padding: 8 12;
+}
+
+/* Small chip for selected members */
+.member-chip {
+    -fx-background-color: #d9d9d9;  /* light gray bubble */
+    -fx-background-radius: 16;
+    -fx-padding: 4 8;
+    -fx-spacing: 6;
+    -fx-alignment: center;
+}
+.member-chip:hover {
+    -fx-background-color: #c6c6c6;  /* slightly darker on hover */
+}
+
+.desc-counter {
+    -fx-font-size: 11px;
+    -fx-text-fill: #888;   /* subtle gray */
+    -fx-alignment: CENTER_RIGHT;
+}
+
+/* ===== TextArea Scrollbar Styling ===== */
+.text-area .scroll-pane .scroll-bar:vertical {
+    -fx-pref-width: 6px;       /* super thin */
+    -fx-background-color: transparent;
+    -fx-opacity: 0;            /* hidden by default */
+    -fx-padding: 0;
+}
+
+.text-area .scroll-pane:hover .scroll-bar:vertical {
+    -fx-opacity: 0.6;          /* appear on hover */
+    -fx-transition: opacity 0.3s ease;
+}
+
+.text-area .scroll-pane .thumb {
+    -fx-background-color: rgba(120,120,120,0.5); /* subtle gray */
+    -fx-background-radius: 2;
+}
+
+.text-area .scroll-pane .scroll-bar:horizontal {
+    -fx-opacity: 0;  /* hide horizontal completely */
+    -fx-max-height: 0;
+}
+
+.channel-desc-area {
+    -fx-background-color: #fff;
+    -fx-text-fill: #000;
+    -fx-control-inner-background: #fff;
+    -fx-prompt-text-fill: #888;
+    -fx-border-color: #ccc;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+}
+
+.channel-desc-area .content {
+    -fx-background-color: #fff;
+}
+
+.settings-card {
+    -fx-background-color: #ffffff;
+    -fx-background-radius: 8;
+    -fx-padding: 12;
+}
+
+.settings-avatar {
+    -fx-fit-width: 56px;
+    -fx-fit-height: 56px;
+}
+
+.settings-name {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #000000;
+}
+
+.settings-id {
+    -fx-font-size: 13px;
+    -fx-text-fill: #666666;
+}
+
+.settings-option {
+    -fx-background-color: transparent;
+    -fx-text-fill: #000000;
+    -fx-font-size: 14px;
+    -fx-alignment: CENTER_LEFT;
+}
+
+.settings-option:hover {
+    -fx-background-color: #f1f1f1;
+}
+
+.settings-menu {
+    -fx-background-color: transparent;
+    -fx-font-size: 18px;
+    -fx-text-fill: #333333;
+}
+
+.settings-header {
+    -fx-padding: 8 12;
+    -fx-border-color: -fx-box-border;
+    -fx-border-width: 0 0 1 0; /* bottom border only */
+}
+
+.settings-title {
+    -fx-font-size: 15px;
+    -fx-font-weight: bold;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+.icon-button {
+    -fx-background-color: transparent;
+    -fx-padding: 0;
+}
+
+.icon-button:hover {
+    -fx-background-color: rgba(0,0,0,0.05);
+    -fx-background-radius: 50%;
+}
+
+/* Profile header */
+.profile-header {
+    -fx-padding: 12 16;
+}
+
+.profile-avatar {
+    -fx-background-radius: 50%;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 4, 0.3, 0, 1);
+}
+
+.profile-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+.profile-id {
+    -fx-font-size: 12px;
+    -fx-text-fill: #888;
+}
+
+/* Hide MenuButton text & arrow */
+.icon-button > .label {
+    -fx-padding: 0;
+    -fx-text-fill: transparent;
+}
+
+.icon-button > .arrow-button,
+.icon-button > .arrow {
+    -fx-padding: 0;
+    -fx-shape: null;  /* removes arrow shape */
+    -fx-background-color: transparent;
+    -fx-opacity: 0;
+}
+
+.icon-image {
+    -fx-smooth: true;       /* keeps scaling smooth */
+    -fx-opacity: 0.8;       /* slightly dim until hover */
+}
+
+.icon-image:hover {
+    -fx-opacity: 1.0;       /* brighten on hover */
+}
+
+/* Container for all settings buttons */
+.settings-options {
+    -fx-background-color: transparent;
+    -fx-spacing: 4;
+    -fx-padding: 8 0 8 0;
+    -fx-border-color: #e6e6e6;
+    -fx-border-width: 0 0 0 0;   /* thin top border */
+}
+
+/* Settings action buttons */
+.settings-option {
+    -fx-background-color: transparent;
+    -fx-text-fill: #222;
+    -fx-font-size: 14px;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 10 14;
+    -fx-background-radius: 6;
+    -fx-cursor: hand;
+
+    /* space between icon and text */
+    -fx-graphic-text-gap: 10px;
+}
+
+/* Hover effect */
+.settings-option:hover {
+    -fx-background-color: #f2f2f2;
+}
+
+/* Pressed effect */
+.settings-option:pressed {
+    -fx-background-color: #e0e0e0;
+}
+
+/* Card */
+.privacy-card {
+    -fx-background-color: white;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+}
+
+/* Header */
+.privacy-header {
+    -fx-padding: 8 12 8 12;
+}
+.privacy-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+}
+
+/* Section Titles */
+.section-title {
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #2a2a2a;
+}
+
+/* Items */
+.privacy-item {
+    -fx-padding: 4 0 4 0;
+}
+.item-label {
+    -fx-font-size: 12px;
+    -fx-text-fill: #444;
+}
+.privacy-input {
+    -fx-background-color: #f5f5f5;
+    -fx-background-radius: 6;
+    -fx-padding: 4;
+}
+
+/* Buttons */
+.action-button {
+    -fx-background-color: #2196f3;
+    -fx-text-fill: white;
+    -fx-background-radius: 6;
+    -fx-padding: 6 12;
+}
+.manage-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #2196f3;
+    -fx-font-size: 12px;
+}
+
+.privacy-section {
+    -fx-spacing: 8;
+    -fx-padding: 10 0 10 0;
+    -fx-background-color: transparent;
+    -fx-border-color: #e0e0e0;
+    -fx-border-width: 0 0 0 0;
+}
+
+.privacy-form {
+    -fx-spacing: 8;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 8 0 8 0;
+}
+
+.privacy-form .label {
+    -fx-font-size: 12px;
+    -fx-text-fill: black;
+}
+
+/* Error state (same for both themes) */
+.password-label.error {
+    -fx-text-fill: red;
+}
+
+.password-field.error {
+    -fx-text-fill: red;
+}
+
+.text-field.error {
+    -fx-text-fill: red;
+}
+
+.toggle-visibility-btn {
+    -fx-background-color: transparent;
+    -fx-cursor: hand;
+    -fx-padding: 0 6 0 6;
+    -fx-font-size: 14px;
+}
+
+/* Blocked Users card */
+.blocked-card {
+    -fx-background-color: white;
+    -fx-background-radius: 10;
+    -fx-padding: 12;
+}
+
+/* Header */
+.blocked-header {
+    -fx-padding: 8;
+}
+.blocked-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: black;
+}
+
+/* Count */
+.blocked-count {
+    -fx-font-size: 13px;
+    -fx-text-fill: #888;
+    -fx-padding: 4 0;
+}
+
+/* List */
+.blocked-list {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+/* Row */
+.blocked-row {
+    -fx-padding: 8;
+    -fx-background-color: transparent;
+}
+.blocked-row:hover {
+    -fx-background-color: #f5f5f5;
+}
+
+/* Labels */
+.blocked-name {
+    -fx-font-size: 13px;
+    -fx-font-weight: bold;
+    -fx-text-fill: black;
+}
+.blocked-id {
+    -fx-font-size: 12px;
+    -fx-text-fill: #666;
+}
+
+/* Button */
+.unblock-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: #2196f3;
+    -fx-cursor: hand;
+}
+
+.unblock-button:hover {
+    -fx-text-fill: #66aaff;
+}
+
+.blocked-info-label {
+    -fx-background-color: #f5f5f5;   /* light gray background */
+    -fx-text-fill: #555;             /* muted text */
+    -fx-font-size: 12px;
+    -fx-wrap-text: true;
+    -fx-padding: 5;                 /* space inside like a banner */
+    -fx-background-radius: 4;        /* soft rounded edges */
+}
+
+/* Error label */
+.label.error-label {
+    -fx-text-fill: red;
+}
+
+/* Error input */
+.error-input {
+    -fx-border-color: red;
+    -fx-border-radius: 6;
+}
+
+/* === User Info (Light) === */
+.user-info-card {
+    -fx-background-color: #ffffff;
+    -fx-background-radius: 8;
+    -fx-padding: 16;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.1), 8, 0, 0, 2);
+}
+.user-info-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #111;
+}
+.user-info-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #111;
+}
+.user-info-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #555;
+}
+.user-info-main {
+    -fx-font-size: 13px;
+    -fx-text-fill: #222;
+}
+.user-info-sub {
+    -fx-font-size: 11px;
+    -fx-text-fill: #888;
+}
+.user-info-separator {
+    -fx-background-color: #e6e6e6;
+}
+
+/* === Shared buttons === */
+.danger-button {
+    -fx-background-color: #e74c3c;
+    -fx-text-fill: white;
+    -fx-background-radius: 6;
+    -fx-padding: 4 12;
+}
+.danger-button:hover {
+    -fx-background-color: #c0392b;
+}
+
+/* === Profile image === */
+.profile-picture {
+    -fx-background-color: #f0f0f0;
+    -fx-background-radius: 50%;
+    -fx-border-color: #ddd;
+    -fx-border-radius: 50%;
+    -fx-border-width: 1;
+}
+
+.member-row {
+    -fx-alignment: CENTER_LEFT;
+}
+
+.member-scroll {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.profile-card {
+    -fx-background-radius: 12;
+    -fx-background-color: #ffffff; /* pure white card */
+    -fx-padding: 16;
+}
+
+.profile-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #0f141a; /* dark text */
+}
+
+.member-row {
+    -fx-padding: 6 0;
+}
+
+.member-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #0f141a; /* Telegram dark gray for names */
+}
+
+.member-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #8ea1b2; /* grayish */
+}
+
+.member-role {
+    -fx-font-size: 12px;
+    -fx-text-fill: #4fa8f0; /* blue */
+    -fx-font-weight: bold;
+}
+
+/* Group name (bold, dark text) */
+.info-title {
+    -fx-font-size: 16px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #0f141a; /* deep gray */
+}
+
+/* Members count (blue link style like Telegram) */
+.info-subtitle {
+    -fx-font-size: 13px;
+    -fx-text-fill: #4fa8f0; /* Telegram blue */
+}
+
+/* Inputs */
+.input-field, .input-area {
+    -fx-background-color: transparent;
+    -fx-border-width: 0 0 1 0;
+    -fx-border-color: #d0d0d0;         /* light underline */
+    -fx-text-fill: #2c2c2c;            /* dark text */
+    -fx-padding: 4 0 4 0;
+    -fx-font-size: 14px;
+}
+.input-area {
+    -fx-font-size: 12px;
+}
+
+/* Info rows */
+.info-row-label {
+    -fx-font-size: 14px;
+    -fx-text-fill: #2c2c2c;
+}
+.info-row-value {
+    -fx-font-size: 14px;
+    -fx-text-fill: #0078d7;           /* Telegram blue */
+    -fx-font-weight: bold;
+}
+
+/* Buttons */
+.primary-btn {
+    -fx-background-color: #0078d7;
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
+    -fx-background-radius: 6;
+    -fx-padding: 6 14;
+}
+.secondary-btn {
+    -fx-background-color: transparent;
+    -fx-border-color: #8ea1b2;
+    -fx-border-radius: 6;
+    -fx-text-fill: #2c2c2c;
+    -fx-padding: 6 14;
+}
+.circle-pic-btn {
+    -fx-background-color: transparent;
+    -fx-padding: 0;
+}
+
+.manage-link-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: #0078d7; /* Telegram blue */
+    -fx-underline: false;
+    -fx-cursor: hand;
+    -fx-font-size: 13px;
+    -fx-padding: 0 4 0 4;
+}
+
+.manage-link-btn:hover {
+    -fx-underline: true;
+}
+
+/* Shared */
+.member-row {
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 6 0;
+}
+
+.member-name {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+}
+
+.member-status {
+    -fx-font-size: 12px;
+    -fx-text-fill: #8ea1b2;
+}
+
+.link-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: -fx-accent;
+    -fx-cursor: hand;
+    -fx-padding: 0 6 0 6;
+}
+
+.link-btn:hover {
+    -fx-underline: true;
+}
+
+.overlay-background {
+    -fx-background-color: rgba(0,0,0,0.4);
+}
+
+.tf-root {
+    -fx-background-color: #ffffff;
+    -fx-background-radius: 10;
+    -fx-padding: 16;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.2), 10, 0, 0, 4);
+}
+
+.tf-toolbar {
+    -fx-padding: 8 12 8 12;
+}
+
+.tf-title {
+    -fx-font-size: 18px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #229ED9; /* Telegram blue */
+}
+
+.tf-caption {
+    -fx-font-size: 12px;
+    -fx-text-fill: #888;
+}
+
+
+/* ScrollPane backgrounds */
+.scroll-pane {
+    -fx-background-color: transparent;
+    -fx-background: transparent;
+}
+
+.scroll-pane .viewport {
+    -fx-background-color: transparent;
+}
+
+.tf-sections {
+    -fx-background-color: transparent;
+}
+
+.tf-section {
+    -fx-spacing: 8;
+    -fx-padding: 8 0 8 0;
+}
+
+.tf-section-title {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #2c2c2c;
+    -fx-padding: 4 0 2 0;
+    -fx-border-color: #ddd;
+    -fx-border-width: 0 0 0 0;
+}
+
+.tf-item-title {
+    -fx-font-weight: bold;
+    -fx-font-size: 13px;
+}
+
+.tf-item-desc {
+    -fx-font-size: 12px;
+    -fx-text-fill: #555;
+}
+
+.tf-status {
+    -fx-font-size: 11px;
+    -fx-padding: 2 6 2 6;
+    -fx-background-radius: 6;
+}
+.tf-status-available {
+    -fx-text-fill: #2e7d32;
+    -fx-background-color: #e8f5e9;
+}
+.tf-status-progress {
+    -fx-text-fill: #e65100;
+    -fx-background-color: #fff3e0;
+}
+
+/* Permissions card checkboxes */
+.check-box {
+    -fx-font-size: 13px;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+/* === Permissions overlay === */
+.permissions-card {
+    -fx-background-color: white;
+    -fx-background-radius: 12;
+    -fx-padding: 16;
+}
+
+/* Checkboxes */
+.permissions-card .check-box {
+    -fx-text-fill: #222;
+}
+
+.permissions-card .check-box:selected .box {
+    -fx-background-color: #3390ec; /* blue tick */
+    -fx-border-color: #3390ec;
+}
+
+.permissions-card .check-box .box {
+    -fx-background-color: white;
+    -fx-border-color: #ccc;
+    -fx-border-radius: 4;
+}
+
+/* Buttons */
+.permissions-card .button {
+    -fx-font-size: 13px;
+    -fx-background-radius: 6;
+}
+
+.permissions-card .button.primary-btn {
+    -fx-background-color: #3390ec;
+    -fx-text-fill: white;
+}
+
+.permissions-card .button.secondary-btn {
+    -fx-background-color: transparent;
+    -fx-border-color: #ccc;
+    -fx-text-fill: #222;
+}
+
+.info-description {
+    -fx-font-size: 12px;
+    -fx-text-fill: #777;
+}
+
+/* Light theme: Channel Manage styles */
+.description-input {
+    -fx-background-color: #ffffff;
+    -fx-border-color: #d0d0d0;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+    -fx-padding: 6;
+    -fx-font-size: 13px;
+    -fx-text-fill: #333333;
+}
+
+.description-input:focused {
+    -fx-border-color: #4a90e2; /* Telegram blue highlight */
+    -fx-effect: dropshadow(gaussian, rgba(74,144,226,0.4), 4, 0.3, 0, 0);
+}
diff --git a/src/main/resources/org/to/telegramfinalproject/CSS/scrollpane.css b/src/main/resources/org/to/telegramfinalproject/CSS/scrollpane.css
new file mode 100644
index 0000000..7c00d54
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/CSS/scrollpane.css
@@ -0,0 +1,39 @@
+.scroll-pane > .viewport {
+    -fx-background-color: transparent; /* No background behind content */
+}
+
+.scroll-pane .scroll-bar {
+    -fx-background-color: transparent; /* Remove background bar */
+    -fx-opacity: 0; /* Initially hidden */
+    -fx-padding: 0;
+    -fx-pref-width: 6px; /* Thinner scrollbar */
+    -fx-background-insets: 0;
+    -fx-background-radius: 3px;
+    -fx-transition: opacity 0.3s ease;
+}
+
+.scroll-pane:hover .scroll-bar {
+    -fx-opacity: 0.6; /* Show on hover */
+}
+
+.scroll-pane .thumb {
+    -fx-background-color: rgba(100, 100, 100, 0.5); /* Semi-transparent thumb */
+    -fx-background-radius: 3px;
+}
+
+
+.blocked-list .scroll-bar {
+    -fx-background-color: transparent;
+    -fx-opacity: 0;
+    -fx-pref-width: 6px;
+    -fx-background-radius: 3px;
+}
+
+.blocked-list:hover .scroll-bar {
+    -fx-opacity: 0.6;
+}
+
+.blocked-list .thumb {
+    -fx-background-color: rgba(100, 100, 100, 0.5);
+    -fx-background-radius: 3px;
+}
diff --git a/src/main/resources/org/to/telegramfinalproject/CSS/sidebar_menu.css b/src/main/resources/org/to/telegramfinalproject/CSS/sidebar_menu.css
new file mode 100644
index 0000000..061edd5
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/CSS/sidebar_menu.css
@@ -0,0 +1,14 @@
+.sidebar-btn {
+    -fx-background-color: transparent;
+    -fx-text-fill: white;
+    -fx-font-size: 14px;
+    -fx-pref-width: 230;
+    -fx-alignment: CENTER_LEFT;
+    -fx-padding: 8 0 8 16;
+}
+
+.sidebar-btn:hover {
+    -fx-background-color: #2f3e50;
+    -fx-cursor: hand;
+    -fx-text-fill: white;
+}
\ No newline at end of file
diff --git a/src/main/resources/org/to/telegramfinalproject/CSS/telegram-action.css b/src/main/resources/org/to/telegramfinalproject/CSS/telegram-action.css
new file mode 100644
index 0000000..e9fe509
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/CSS/telegram-action.css
@@ -0,0 +1,109 @@
+/* Colors */
+:root {
+  -tg-bg:        #ffffff;
+  -tg-sheet:     #ffffff;
+  -tg-shadow:    rgba(0,0,0,.25);
+  -tg-sep:       rgba(0,0,0,.06);
+  -tg-text:      #0f141a;
+  -tg-subtext:   #6e7b87;
+  -tg-danger:    #e53935;
+  -tg-primary:   #2481cc;
+  -tg-chip-bg:   #f5f7fa;
+}
+
+/* ACTION SHEET */
+.tg-action-sheet {
+  -fx-background-color: -tg-sheet;
+  -fx-background-radius: 16;
+  -fx-effect: dropshadow(gaussian, -tg-shadow, 24, 0.26, 0, 4);
+  -fx-padding: 0;
+  -fx-border-radius: 16;
+}
+
+.tg-reaction-bar {
+  -fx-background-color: transparent;
+  -fx-spacing: 12;
+}
+.tg-reaction {
+  -fx-font-size: 22px;
+  -fx-cursor: hand;
+  -fx-padding: 2 4 2 4;
+  -fx-background-radius: 12;
+}
+.tg-reaction:hover {
+  -fx-background-color: -tg-chip-bg;
+}
+
+.tg-menu { -fx-background-color: transparent; }
+
+.tg-item {
+  -fx-background-color: transparent;
+  -fx-background-radius: 12;
+}
+.tg-item:hover {
+  -fx-background-color: -tg-chip-bg;
+}
+.tg-item .tg-label {
+  -fx-text-fill: -tg-text;
+  -fx-font-size: 16px;
+}
+.tg-item.danger .tg-label {
+  -fx-text-fill: -tg-danger;
+}
+
+.tg-sep {
+  -fx-background-color: -tg-sep;
+  -fx-min-height: 1px;
+  -fx-pref-height: 1px;
+  -fx-max-height: 1px;
+  -fx-background-insets: 0 14 0 14;
+}
+
+/* DELETE SHEET */
+.tg-delete-sheet {
+  -fx-background-color: -tg-bg;
+  -fx-background-radius: 16;
+  -fx-effect: dropshadow(gaussian, -tg-shadow, 28, 0.28, 0, 4);
+}
+.tg-delete-title {
+  -fx-font-size: 18px;
+  -fx-text-fill: -tg-text;
+}
+.tg-delete-check {
+  -fx-text-fill: -tg-text;
+  -fx-font-size: 14px;
+}
+
+/* Buttons */
+.tg-btn-secondary {
+  -fx-background-color: transparent;
+  -fx-text-fill: -tg-primary;
+  -fx-font-size: 14px;
+  -fx-padding: 8 14 8 14;
+  -fx-background-radius: 10;
+}
+.tg-btn-secondary:hover {
+  -fx-background-color: -tg-chip-bg;
+}
+
+.tg-btn-danger {
+  -fx-background-color: -tg-danger;
+  -fx-text-fill: white;
+  -fx-font-size: 14px;
+  -fx-padding: 8 16 8 16;
+  -fx-background-radius: 10;
+}
+.tg-btn-danger:hover { -fx-opacity: .9; }
+
+/* دارک‌مود (اگر CSS سوییچ داری، این کلس را به Scene اضافه کن) */
+.root.dark .tg-action-sheet,
+.root.dark .tg-delete-sheet { -fx-background-color: #1f2a33; }
+.root.dark {
+  -tg-bg:       #1f2a33;
+  -tg-sheet:    #22303a;
+  -tg-text:     #e8f1f8;
+  -tg-subtext:  #9bb2c3;
+  -tg-sep:      rgba(255,255,255,.08);
+  -tg-chip-bg:  rgba(255,255,255,.06);
+  -tg-shadow:   rgba(0,0,0,.45);
+}
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/broken_heart.png b/src/main/resources/org/to/telegramfinalproject/Emojis/broken_heart.png
new file mode 100644
index 0000000..f881ae3
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/broken_heart.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/clown.png b/src/main/resources/org/to/telegramfinalproject/Emojis/clown.png
new file mode 100644
index 0000000..0069daf
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/clown.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/cry.png b/src/main/resources/org/to/telegramfinalproject/Emojis/cry.png
new file mode 100644
index 0000000..6b54034
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/cry.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/heart_on_fire.png b/src/main/resources/org/to/telegramfinalproject/Emojis/heart_on_fire.png
new file mode 100644
index 0000000..50c9dd7
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/heart_on_fire.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/laugh.png b/src/main/resources/org/to/telegramfinalproject/Emojis/laugh.png
new file mode 100644
index 0000000..e40286e
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/laugh.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/moai.png b/src/main/resources/org/to/telegramfinalproject/Emojis/moai.png
new file mode 100644
index 0000000..8f744ba
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/moai.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/moon.png b/src/main/resources/org/to/telegramfinalproject/Emojis/moon.png
new file mode 100644
index 0000000..ec8fc3c
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/moon.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/pumpkin.png b/src/main/resources/org/to/telegramfinalproject/Emojis/pumpkin.png
new file mode 100644
index 0000000..e8d2f4c
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/pumpkin.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/red_heart.png b/src/main/resources/org/to/telegramfinalproject/Emojis/red_heart.png
new file mode 100644
index 0000000..41ce911
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/red_heart.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/smile.png b/src/main/resources/org/to/telegramfinalproject/Emojis/smile.png
new file mode 100644
index 0000000..7a3abf3
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/smile.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/suspicious.png b/src/main/resources/org/to/telegramfinalproject/Emojis/suspicious.png
new file mode 100644
index 0000000..ae24da6
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/suspicious.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/thumbs_down.png b/src/main/resources/org/to/telegramfinalproject/Emojis/thumbs_down.png
new file mode 100644
index 0000000..19b7f82
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/thumbs_down.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Emojis/thumbs_up.png b/src/main/resources/org/to/telegramfinalproject/Emojis/thumbs_up.png
new file mode 100644
index 0000000..5e8c558
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Emojis/thumbs_up.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/Intro.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/Intro.fxml
new file mode 100644
index 0000000..02ff71b
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/Intro.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.shape.Circle?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml" fx:controller="org.to.telegramfinalproject.UI.IntroController">
+    <VBox fx:id="rootVBox" alignment="CENTER" spacing="15">
+        <padding>
+            <Insets top="40" right="40" bottom="40" left="40"/>
+        </padding>
+
+        <StackPane fx:id="imagePane" maxWidth="400" maxHeight="250" VBox.vgrow="NEVER" />
+
+        <Label fx:id="caption"
+               style="-fx-font-size: 16px; -fx-text-alignment: center;"
+               wrapText="true"
+               maxWidth="600"
+               alignment="CENTER" />
+
+        <HBox fx:id="dotContainer" spacing="10" alignment="CENTER" />
+
+        <Button fx:id="startButton"
+                text="Start Messaging"
+                onAction="#handleStartMessaging"
+                style="-fx-background-color: #2AABEE; -fx-text-fill: white; -fx-font-weight: bold;"
+                maxWidth="200"
+                minHeight="40" />
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/add_admins.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/add_admins.fxml
new file mode 100644
index 0000000..c7db2bf
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/add_admins.fxml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.AddAdminsController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="addAdminsCard" styleClass="profile-card" spacing="12"
+          prefWidth="340" maxWidth="340"
+          prefHeight="480" maxHeight="480">
+
+        <!-- Header -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Add Admins" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- Members list -->
+        <ScrollPane fx:id="membersScroll" fitToWidth="true" VBox.vgrow="ALWAYS"
+                    styleClass="member-scroll">
+            <content>
+                <VBox fx:id="membersList" spacing="10">
+                    <padding>
+                        <Insets top="10" right="10" bottom="10" left="10"/>
+                    </padding>
+                </VBox>
+            </content>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- Footer -->
+        <HBox spacing="10" alignment="CENTER_RIGHT">
+            <Button fx:id="closeFooterButton" text="Close" styleClass="secondary-btn"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/add_member.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/add_member.fxml
new file mode 100644
index 0000000..98ca2d8
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/add_member.fxml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.AddMembersController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Add Members card -->
+    <VBox fx:id="addMembersCard" styleClass="contacts-card"
+          prefWidth="360" maxWidth="360"
+          prefHeight="520" maxHeight="520">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10" styleClass="contacts-header">
+            <Label text="Add Members" styleClass="contacts-title"/>
+            <!-- Member count -->
+            <Label fx:id="memberCountLabel" text="0 / 200000" styleClass="member-count"/>
+            <Pane HBox.hgrow="ALWAYS"/> <!-- pushes elements to right -->
+        </HBox>
+
+        <!-- ===== Selected Members Row ===== -->
+        <FlowPane fx:id="selectedMembersPane"
+                  hgap="6" vgap="6"
+                  styleClass="selected-members-pane">
+            <padding>
+                <Insets top="6" right="6" bottom="6" left="6"/>
+            </padding>
+        </FlowPane>
+
+        <!-- ===== Search Bar with Icon ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="6" styleClass="contacts-search-box">
+            <Button fx:id="searchIcon" styleClass="search-icon"/>
+            <TextField fx:id="searchField"
+                       promptText="Search"
+                       styleClass="contacts-search"
+                       HBox.hgrow="ALWAYS"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Contacts List (fills space) ===== -->
+        <ScrollPane fx:id="contactsScroll"
+                    fitToWidth="true"
+                    vbarPolicy="AS_NEEDED"
+                    hbarPolicy="NEVER"
+                    VBox.vgrow="ALWAYS"
+                    styleClass="contacts-scroll">
+            <VBox fx:id="contactsList" spacing="6" styleClass="contacts-list"/>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Footer ===== -->
+        <HBox alignment="CENTER_RIGHT" styleClass="contacts-footer">
+            <padding>
+                <Insets top="8" right="8" bottom="8" left="8"/>
+            </padding>
+            <Button fx:id="cancelButton" text="Cancel" styleClass="footer-button"/>
+            <Button fx:id="createButton" text="Create" styleClass="footer-button"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/add_subscriber.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/add_subscriber.fxml
new file mode 100644
index 0000000..5c918e7
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/add_subscriber.fxml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.AddSubscriberController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Add Members card -->
+    <VBox fx:id="addMembersCard" styleClass="contacts-card"
+          prefWidth="360" maxWidth="360"
+          prefHeight="520" maxHeight="520">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10" styleClass="contacts-header">
+            <Label text="Add Subscribers" styleClass="contacts-title"/>
+            <!-- Member count -->
+            <Label fx:id="memberCountLabel" text="0 / 200000" styleClass="member-count"/>
+            <Pane HBox.hgrow="ALWAYS"/> <!-- pushes elements to right -->
+        </HBox>
+
+        <!-- ===== Selected Members Row ===== -->
+        <FlowPane fx:id="selectedMembersPane"
+                  hgap="6" vgap="6"
+                  styleClass="selected-members-pane">
+            <padding>
+                <Insets top="6" right="6" bottom="6" left="6"/>
+            </padding>
+        </FlowPane>
+
+        <!-- ===== Search Bar with Icon ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="6" styleClass="contacts-search-box">
+            <Button fx:id="searchIcon" styleClass="search-icon"/>
+            <TextField fx:id="searchField"
+                       promptText="Search"
+                       styleClass="contacts-search"
+                       HBox.hgrow="ALWAYS"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Contacts List (fills space) ===== -->
+        <ScrollPane fx:id="contactsScroll"
+                    fitToWidth="true"
+                    vbarPolicy="AS_NEEDED"
+                    hbarPolicy="NEVER"
+                    VBox.vgrow="ALWAYS"
+                    styleClass="contacts-scroll">
+            <VBox fx:id="contactsList" spacing="6" styleClass="contacts-list"/>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Footer: Skip + Add ===== -->
+        <HBox alignment="CENTER_RIGHT" styleClass="contacts-footer" spacing="16">
+            <padding>
+                <Insets top="8" right="12" bottom="8" left="12"/>
+            </padding>
+            <Button fx:id="skipButton" text="Skip" styleClass="footer-button"/>
+            <Button fx:id="addButton" text="Add" styleClass="footer-button"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/blocked_users.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/blocked_users.fxml
new file mode 100644
index 0000000..11f4644
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/blocked_users.fxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.BlockedUsersController"
+           styleClass="overlay-root">
+
+    <!-- Dimmed background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="blockedCard" styleClass="blocked-card" spacing="8"
+          prefWidth="380" maxWidth="380"
+          prefHeight="500" maxHeight="500">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10" styleClass="blocked-header">
+            <Button fx:id="backButton" styleClass="icon-button"/>
+            <Label text="Blocked users" styleClass="blocked-title"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator/>
+
+        <Label text="Blocked users can't send you messages or add you to groups.
+They will not see your profile photos, online and last seen status."
+               wrapText="true"
+               prefHeight="160"
+               maxHeight="160"
+               styleClass="blocked-info-label"/>
+
+        <!-- ===== List of blocked users ===== -->
+        <Label fx:id="countLabel" text="0 blocked users" styleClass="blocked-count"/>
+
+        <ListView fx:id="blockedList" styleClass="blocked-list" VBox.vgrow="ALWAYS"/>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/change_credentials.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/change_credentials.fxml
new file mode 100644
index 0000000..647de6e
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/change_credentials.fxml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ChangeCredentialsController"
+           styleClass="overlay-root">
+
+    <!-- Dimmed background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Main card -->
+    <VBox fx:id="credentialsCard"
+          styleClass="privacy-card"
+          spacing="16"
+          alignment="TOP_CENTER"
+          prefWidth="380" maxWidth="380"
+          prefHeight="280" maxHeight="280">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10" styleClass="privacy-header">
+            <Label text="Change Credentials" styleClass="privacy-title"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator/>
+
+        <!-- ===== Form ===== -->
+        <VBox spacing="10" alignment="CENTER_LEFT" styleClass="privacy-form">
+
+            <!-- New Username -->
+            <Label fx:id="usernameLabel" text="New Username" styleClass="password-label"/>
+            <TextField fx:id="usernameField"
+                       promptText="Enter new username"
+                       styleClass="privacy-input"/>
+
+            <!-- New Password -->
+            <Label fx:id="passwordLabel" text="New Password" styleClass="password-label"/>
+
+            <HBox alignment="CENTER_LEFT" spacing="4" styleClass="privacy-item">
+                <PasswordField fx:id="passwordField"
+                               promptText="Enter new password"
+                               styleClass="privacy-input"
+                               HBox.hgrow="ALWAYS"/>
+                <TextField fx:id="visiblePasswordField"
+                           promptText="Enter new password"
+                           styleClass="privacy-input"
+                           visible="false" managed="false"
+                           HBox.hgrow="ALWAYS"/>
+                <Button fx:id="togglePasswordBtn"
+                        text="👁"
+                        styleClass="toggle-visibility-btn"/>
+            </HBox>
+
+            <!-- Confirm Password -->
+            <Label fx:id="confirmPasswordLabel" text="Confirm Password" styleClass="password-label"/>
+
+            <HBox alignment="CENTER_LEFT" spacing="4" styleClass="privacy-item">
+                <PasswordField fx:id="confirmPasswordField"
+                               promptText="Re-enter new password"
+                               styleClass="privacy-input"
+                               HBox.hgrow="ALWAYS"/>
+                <TextField fx:id="visibleConfirmPasswordField"
+                           promptText="Re-enter new password"
+                           styleClass="privacy-input"
+                           visible="false" managed="false"
+                           HBox.hgrow="ALWAYS"/>
+                <Button fx:id="toggleConfirmBtn"
+                        text="👁"
+                        styleClass="toggle-visibility-btn"/>
+            </HBox>
+        </VBox>
+
+        <!-- ===== Footer ===== -->
+        <HBox alignment="CENTER_RIGHT" spacing="12">
+            <Button fx:id="cancelButton" text="Cancel" styleClass="footer-button"/>
+            <Button fx:id="saveButton" text="Save" styleClass="action-button"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/channel_info.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/channel_info.fxml
new file mode 100644
index 0000000..37c2691
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/channel_info.fxml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.image.Image?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ChannelInfoController"
+           styleClass="overlay-root">
+
+    <!-- Background (click to close) -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Channel card -->
+    <VBox fx:id="channelCard" styleClass="profile-card" spacing="16"
+          prefWidth="360" maxWidth="360"
+          prefHeight="500" maxHeight="500">
+
+        <!-- ===== Header: Title + More + Close ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Channel Info" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+
+            <!-- More -->
+            <Button fx:id="infoMoreButton" styleClass="icon-button">
+                <graphic>
+                    <ImageView fx:id="moreIcon" fitWidth="18" fitHeight="18" preserveRatio="true"/>
+                </graphic>
+                <contextMenu>
+                    <ContextMenu fx:id="infoMoreMenu">
+                        <items>
+                            <!-- Add Members -->
+                            <MenuItem fx:id="addMembersBtn" text="Add members">
+                                <graphic>
+                                    <ImageView fx:id="addMemberIcon" fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/add_member_dark.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+
+                            <!-- Manage Channel -->
+                            <MenuItem fx:id="manageChannelBtn" text="Manage channel">
+                                <graphic>
+                                    <ImageView fx:id="manageChannelIcon" fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/manage_dark.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+
+                            <!-- Delete Channel (owner only) -->
+                            <MenuItem fx:id="deleteChannelBtn" text="Delete channel" style="-fx-text-fill: red;" visible="false">
+                                <graphic>
+                                    <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/delete_red.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+                        </items>
+                    </ContextMenu>
+                </contextMenu>
+            </Button>
+
+            <!-- Close -->
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <!-- ===== Channel picture + name + subscriber count ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <!-- Channel picture -->
+            <ImageView fx:id="channelAvatar" fitWidth="60" fitHeight="60" preserveRatio="true"
+                       styleClass="profile-picture"/>
+
+            <!-- Name + subs stacked -->
+            <VBox alignment="CENTER_LEFT" spacing="4">
+                <Label fx:id="channelName" text="Channel name" styleClass="info-title"/>
+                <Label fx:id="subscriberCount" text="0 subscribers" styleClass="info-subtitle"/>
+                <!-- New description label -->
+                <Label fx:id="channelDescription" text="Channel description..." wrapText="true"
+                       styleClass="info-description"/>
+            </VBox>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Subscribers list ===== -->
+        <VBox spacing="8" styleClass="info-blocks" VBox.vgrow="ALWAYS">
+            <HBox spacing="8" alignment="CENTER_LEFT">
+                <ImageView fx:id="subscribersIcon" fitWidth="26" fitHeight="26" preserveRatio="true">
+                    <image>
+                        <Image url="@/org/to/telegramfinalproject/Icons/group_member_dark.png"/>
+                    </image>
+                </ImageView>
+                <Label fx:id="subscribersHeader" text="0 SUBSCRIBERS" styleClass="profile-info-sub"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Button fx:id="addSubscriberButton" styleClass="icon-button">
+                    <graphic>
+                        <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                            <image>
+                                <Image url="@/org/to/telegramfinalproject/Icons/add_member_dark.png"/>
+                            </image>
+                        </ImageView>
+                    </graphic>
+                </Button>
+            </HBox>
+
+            <ScrollPane fx:id="subscribersScroll" fitToWidth="true" styleClass="member-scroll" VBox.vgrow="ALWAYS">
+                <content>
+                    <VBox fx:id="subscribersList" spacing="10"/>
+                </content>
+            </ScrollPane>
+        </VBox>
+
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/chat_item.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/chat_item.fxml
new file mode 100644
index 0000000..6846611
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/chat_item.fxml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+
+<?import javafx.scene.shape.Circle?>
+<HBox xmlns:fx="http://javafx.com/fxml"
+      fx:controller="org.to.telegramfinalproject.UI.ChatItemController"
+      spacing="10" alignment="CENTER_LEFT"
+      styleClass="chat-item">
+
+    <!-- Avatar container with fixed size -->
+    <StackPane fx:id="avatarContainer"
+               prefWidth="40" prefHeight="40"
+               minWidth="40" minHeight="40"
+               maxWidth="40" maxHeight="40"
+               alignment="CENTER">
+
+        <!-- User profile image -->
+        <ImageView fx:id="profileImageUser"
+                   fitWidth="60" fitHeight="60"
+                   preserveRatio="true"
+                   visible="true" managed="true"/>
+
+        <!-- System avatar (circle + icon) -->
+        <StackPane fx:id="systemAvatar"
+                   prefWidth="40" prefHeight="40"
+                   visible="false" managed="false"
+                   alignment="CENTER">
+
+            <Circle fx:id="systemCircle"
+                    radius="20"
+                    fill="gray"/>
+
+            <ImageView fx:id="profileImageSystem"
+                       fitWidth="28" fitHeight="28"
+                       preserveRatio="true"/>
+        </StackPane>
+    </StackPane>
+
+    <!-- Chat Details -->
+    <VBox alignment="CENTER_LEFT" HBox.hgrow="ALWAYS">
+        <Label fx:id="chatName" styleClass="chat-name"/>
+        <Label fx:id="lastMessage" styleClass="chat-last-message"/>
+    </VBox>
+
+    <!-- Time + Unread -->
+    <VBox alignment="CENTER_RIGHT" spacing="5">
+        <Label fx:id="chatTime" styleClass="chat-time"/>
+        <Label fx:id="unreadCount" styleClass="unread-count"/>
+    </VBox>
+</HBox>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/chat_page.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/chat_page.fxml
new file mode 100644
index 0000000..308fc29
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/chat_page.fxml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+
+<?import java.net.URL?>
+<VBox xmlns="http://javafx.com/javafx/17"
+      xmlns:fx="http://javafx.com/fxml"
+      fx:controller="org.to.telegramfinalproject.UI.ChatPageController"
+      spacing="0"
+      styleClass="chat-root">
+    <stylesheets>
+        <URL value="@/org/to/telegramfinalproject/CSS/chat.css"/>
+    </stylesheets>
+
+    <!-- HEADER: avatar + name/status (left) | search + more (right) -->
+    <HBox fx:id="chatHeader" spacing="10" styleClass="chat-header">
+        <padding><Insets top="8" right="12" bottom="8" left="12"/></padding>
+
+        <!-- Avatar -->
+        <ImageView fx:id="userAvatar" fitWidth="36" fitHeight="36" preserveRatio="true"/>
+
+        <!-- Title + status -->
+        <VBox alignment="CENTER_LEFT">
+            <Label fx:id="chatTitle" text="User name" styleClass="chat-title"/>
+            <Label fx:id="chatStatus" text="last seen recently" styleClass="chat-status"/>
+        </VBox>
+
+        <Region HBox.hgrow="ALWAYS"/>
+
+        <!-- Search-in-chat -->
+        <Button fx:id="searchInChatButton" styleClass="icon-btn" onAction="#openSearchPanel">
+            <graphic>
+                <ImageView fx:id="searchIcon" fitWidth="20" fitHeight="20" preserveRatio="true">
+                    <image><Image url="@/org/to/telegramfinalproject/Icons/search_light.png"/></image>
+                </ImageView>
+            </graphic>
+        </Button>
+
+        <!-- More / overflow -->
+        <Button fx:id="chatMoreButton" styleClass="icon-btn">
+            <graphic>
+                <ImageView fx:id="moreIcon" fitWidth="18" fitHeight="18" preserveRatio="true">
+                    <image><Image url="@/org/to/telegramfinalproject/Icons/more_light.png"/></image>
+                </ImageView>
+            </graphic>
+            <contextMenu>
+                <ContextMenu fx:id="chatMoreMenu">
+                    <items>
+                        <!-- Private -->
+                        <MenuItem fx:id="archiveItem" text="Archive chat" visible="false">
+                            <graphic>
+                                <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                    <image><Image url="@/org/to/telegramfinalproject/Icons/archived_chats_dark.png"/></image>
+                                </ImageView>
+                            </graphic>
+                        </MenuItem>
+                        <MenuItem fx:id="viewProfileItem" text="View profile" visible="false">
+                            <graphic>
+                                <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                    <image><Image url="@/org/to/telegramfinalproject/Icons/view_profile_dark.png"/></image>
+                                </ImageView>
+                            </graphic>
+                        </MenuItem>
+                        <MenuItem fx:id="deleteChatItem" text="Delete chat" style="-fx-text-fill: red;" visible="false">
+                            <graphic>
+                                <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                    <image><Image url="@/org/to/telegramfinalproject/Icons/delete_red.png"/></image>
+                                </ImageView>
+                            </graphic>
+                        </MenuItem>
+
+                        <!-- Group -->
+                        <MenuItem fx:id="viewGroupItem" text="View group info" visible="false">
+                            <graphic>
+                                <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                    <image><Image url="@/org/to/telegramfinalproject/Icons/group_dark.png"/></image>
+                                </ImageView>
+                            </graphic>
+                        </MenuItem>
+                        <MenuItem fx:id="leaveGroupItem" text="Leave group" style="-fx-text-fill: red;" visible="false">
+                            <graphic>
+                                <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                    <image><Image url="@/org/to/telegramfinalproject/Icons/log_out.png"/></image>
+                                </ImageView>
+                            </graphic>
+                        </MenuItem>
+
+                        <!-- Channel -->
+                        <MenuItem fx:id="viewChannelItem" text="View channel info" visible="false">
+                            <graphic>
+                                <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                    <image><Image url="@/org/to/telegramfinalproject/Icons/group_dark.png"/></image>
+                                </ImageView>
+                            </graphic>
+                        </MenuItem>
+                        <MenuItem fx:id="leaveChannelItem" text="Leave channel" style="-fx-text-fill: red;" visible="false">
+                            <graphic>
+                                <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                    <image><Image url="@/org/to/telegramfinalproject/Icons/log_out.png"/></image>
+                                </ImageView>
+                            </graphic>
+                        </MenuItem>
+                    </items>
+                </ContextMenu>
+            </contextMenu>
+        </Button>
+    </HBox>
+
+    <!-- MESSAGES -->
+    <ScrollPane fx:id="messageScrollPane"
+                fitToWidth="true"
+                vbarPolicy="AS_NEEDED"
+                hbarPolicy="NEVER"
+                VBox.vgrow="ALWAYS"
+                styleClass="chat-scroll">
+        <content>
+            <VBox fx:id="messageContainer" spacing="10">
+                <padding><Insets top="10" right="10" bottom="10" left="10"/></padding>
+            </VBox>
+        </content>
+    </ScrollPane>
+
+    <!-- ===== FOOTER: فقط یکی از این پنل‌ها نمایش داده می‌شود ===== -->
+
+    <!-- حالت عادی: کامپوزر پیام -->
+    <VBox fx:id="composerPane" spacing="0" visible="true" managed="true">
+        <HBox spacing="8" styleClass="chat-input-bar">
+            <padding><Insets top="8" right="12" bottom="8" left="12"/></padding>
+
+            <!-- Attachment -->
+            <Button fx:id="attachmentButton" styleClass="icon-btn">
+                <graphic>
+                    <ImageView fx:id="attachmentIcon" fitWidth="20" fitHeight="20" preserveRatio="true">
+                        <image><Image url="@/org/to/telegramfinalproject/Icons/attachment_light.png"/></image>
+                    </ImageView>
+                </graphic>
+            </Button>
+
+            <!-- Expanding input -->
+            <TextArea fx:id="messageInput"
+                      HBox.hgrow="ALWAYS"
+                      promptText="Write a message..."
+                      styleClass="msg-input"
+                      wrapText="true"
+                      prefRowCount="1"
+                      minHeight="40"
+                      maxHeight="120"
+                      VBox.vgrow="NEVER"/>
+
+            <!-- Send -->
+            <Button fx:id="sendButton" styleClass="send-btn">
+                <graphic>
+                    <ImageView fx:id="sendIcon" fitWidth="20" fitHeight="20" preserveRatio="true">
+                        <image><Image url="@/org/to/telegramfinalproject/Icons/send_cyan2.png"/></image>
+                    </ImageView>
+                </graphic>
+            </Button>
+        </HBox>
+    </VBox>
+
+    <VBox fx:id="joinPane" alignment="CENTER" visible="false" managed="false" styleClass="chat-input-bar">
+        <padding><Insets top="12" right="12" bottom="12" left="12"/></padding>
+        <Button fx:id="joinButton" id="joinAction"
+                text="JOIN CHANNEL" onAction="#onJoinClicked"/>
+    </VBox>
+
+    <VBox fx:id="addContactPane" alignment="CENTER" visible="false" managed="false" styleClass="chat-input-bar">
+        <padding><Insets top="12" right="12" bottom="12" left="12"/></padding>
+        <Button fx:id="addContactButton" id="addContactAction"
+                text="ADD CONTACT" onAction="#onAddContactClicked"/>
+    </VBox>
+
+    <VBox fx:id="readOnlyPane" spacing="0" alignment="CENTER"
+          visible="false" managed="false" styleClass="chat-footer-banner" >
+        <padding><Insets top="10" right="12" bottom="10" left="12"/></padding>
+        <Label fx:id="readOnlyLabel"
+               text="You are not allowed to send messages."
+               styleClass="footer-link-btn"/>
+
+    </VBox>
+
+    <VBox fx:id="blockedPane" spacing="0" alignment="CENTER"
+          visible="false" managed="false" styleClass="chat-footer-banner">
+        <padding><Insets top="12" right="12" bottom="12" left="12"/></padding>
+
+        <Button
+                fx:id="unblockBtn"
+                id="unblockAction"
+                text="UNBLOCK"
+                onAction="#onUnblockClicked"
+                styleClass="footer-link-btn danger"
+                style="-fx-background-color: transparent; -fx-background-insets: 0; -fx-background-radius: 0; -fx-border-color: transparent; -fx-border-width: 0; -fx-text-fill: #D32F2F; -fx-font-weight: 700; -fx-padding: 6 12; -fx-effect: null;"/>
+
+    </VBox>
+
+
+
+</VBox>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/check_password.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/check_password.fxml
new file mode 100644
index 0000000..c8b78ff
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/check_password.fxml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.geometry.Insets?>
+
+<StackPane fx:id="overlayRoot" xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.CheckPasswordController"
+           styleClass="overlay-root">
+
+    <!-- Dimmed background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Password card -->
+    <VBox fx:id="checkPasswordCard"
+          styleClass="privacy-card"
+          spacing="16"
+          alignment="CENTER"
+          prefWidth="350" maxWidth="350"
+          prefHeight="200" maxHeight="200">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10" styleClass="privacy-header">
+            <!-- Back -->
+            <Button fx:id="backButton" styleClass="icon-button"/>
+            <Label text="Confirm Password" styleClass="privacy-title"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <!-- Close -->
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator/>
+
+        <!-- ===== Form ===== -->
+        <VBox spacing="10" alignment="CENTER_LEFT" styleClass="privacy-form">
+            <Label fx:id="passwordLabel" text="Enter your current password"
+                   styleClass="password-label"/>
+            <HBox alignment="CENTER_LEFT" spacing="4" styleClass="privacy-item">
+                <PasswordField fx:id="passwordField"
+                               promptText="Current password"
+                               styleClass="privacy-input"
+                               HBox.hgrow="ALWAYS"/>
+                <TextField fx:id="visiblePasswordField"
+                           promptText="Current password"
+                           styleClass="privacy-input"
+                           visible="false"
+                           managed="false"
+                           HBox.hgrow="ALWAYS"/>
+                <Button fx:id="toggleVisibilityBtn"
+                        text="👁"
+                        styleClass="toggle-visibility-btn"/>
+            </HBox>
+        </VBox>
+
+        <!-- ===== Actions ===== -->
+        <HBox alignment="CENTER_RIGHT" spacing="10">
+            <Button fx:id="cancelButton" text="Cancel" styleClass="footer-button"/>
+            <Button fx:id="confirmButton" text="Next" styleClass="action-button"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/contacts.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/contacts.fxml
new file mode 100644
index 0000000..ddc9d91
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/contacts.fxml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+
+<?import javafx.geometry.Insets?>
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ContactsController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Contacts card -->
+    <VBox fx:id="contactsCard" styleClass="contacts-card"
+          prefWidth="360" maxWidth="360"
+          prefHeight="520" maxHeight="520">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10" styleClass="contacts-header">
+            <Label text="Contacts" styleClass="contacts-title"/>
+            <Pane HBox.hgrow="ALWAYS"/> <!-- pushes elements to right -->
+        </HBox>
+
+        <!-- ===== Search Bar with Icon ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="6" styleClass="contacts-search-box">
+            <Button fx:id="searchIcon" styleClass="search-icon"/>
+            <TextField fx:id="searchField"
+                       promptText="Search"
+                       styleClass="contacts-search"
+                       HBox.hgrow="ALWAYS"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Contacts List (fills space) ===== -->
+        <ScrollPane fx:id="contactsScroll"
+                    fitToWidth="true"
+                    vbarPolicy="AS_NEEDED"
+                    hbarPolicy="NEVER"
+                    VBox.vgrow="ALWAYS"
+                    styleClass="contacts-scroll">
+            <VBox fx:id="contactsList" spacing="6" styleClass="contacts-list"/>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Footer ===== -->
+        <HBox alignment="CENTER_RIGHT" styleClass="contacts-footer">
+            <padding>
+                <Insets top="8" right="8" bottom="8" left="8"/>
+            </padding>
+            <Button fx:id="closeFooterButton" text="Close" styleClass="footer-button"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/edit_profile.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/edit_profile.fxml
new file mode 100644
index 0000000..cc83a0e
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/edit_profile.fxml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane styleClass="overlay-root" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="org.to.telegramfinalproject.UI.EditProfileController">
+   <children>
+   
+       <!-- Background (click to close) -->
+       <Pane fx:id="overlayBackground" styleClass="overlay-background" />
+   
+       <!-- Profile edit card -->
+       <VBox fx:id="editCard" maxHeight="520" maxWidth="400" prefHeight="520" prefWidth="400" spacing="16" styleClass="edit-profile-card">
+      <children>
+      
+              <!-- ===== Header: Back + Title + Close ===== -->
+              <HBox alignment="CENTER_LEFT" spacing="10">
+         <children>
+                     <!-- Back button -->
+                     <Button fx:id="backButton" styleClass="edit-icon-button" />
+         
+                     <!-- Title -->
+                     <Label styleClass="edit-profile-title" text="Edit Profile" HBox.hgrow="ALWAYS" />
+         
+                     <!-- Spacer pushes close button to the right -->
+                     <Pane HBox.hgrow="ALWAYS" />
+         
+                     <!-- Close button -->
+                     <Button fx:id="closeButton" styleClass="edit-icon-button" text="✕" />
+         </children>
+              </HBox>
+
+          <!-- ===== Profile picture with camera overlay + name/status ===== -->
+          <VBox alignment="CENTER" spacing="2">
+
+              <!-- Profile picture + camera button -->
+              <StackPane alignment="CENTER">
+                  <!-- Profile Picture -->
+                  <ImageView fx:id="profileImageView"
+                             fitWidth="100" fitHeight="100"
+                             preserveRatio="true"
+                             styleClass="edit-profile-picture"/>
+
+                  <!-- Camera Button pinned bottom-center -->
+                  <Button fx:id="cameraButton"
+                          prefWidth="32" prefHeight="32"
+                          styleClass="camera-button"
+                          StackPane.alignment="BOTTOM_CENTER"
+                          translateX="30" translateY="5"> <!-- pushes down so it overlaps -->
+                      <graphic>
+                          <ImageView fx:id="cameraIcon"
+                                     fitWidth="16" fitHeight="16"
+                                     preserveRatio="true"/>
+                      </graphic>
+                  </Button>
+              </StackPane>
+
+              <!-- Name + Status -->
+              <Label fx:id="profileName" text="User Name" styleClass="profile-name"/>
+              <Label fx:id="profileStatus" text="online" styleClass="profile-status"/>
+
+          </VBox>
+
+
+          <Separator styleClass="edit-section-separator" />
+      
+              <!-- ===== Bio (full width field + description) ===== -->
+          <VBox spacing="4">
+              <children>
+                  <HBox alignment="CENTER_LEFT" spacing="10">
+                      <children>
+                          <Label styleClass="profile-info-label" text="Bio" />
+                          <TextField fx:id="bioField" prefHeight="25.0" prefWidth="152.0" styleClass="edit-profile-input" HBox.hgrow="ALWAYS" />
+                      </children>
+                  </HBox>
+                  <Label styleClass="edit-input-description" text="Any details such as age, occupation, or city." />
+              </children>
+          </VBox>
+      
+              <Separator styleClass="section-separator" />
+      
+              <!-- ===== Name row (Label left, editable field right) ===== -->
+              <VBox spacing="4">
+         <children>
+                     <HBox alignment="CENTER_LEFT" spacing="10">
+                        <children>
+                            <Label styleClass="profile-info-label" text="Name" />
+                            <TextField fx:id="nameField" prefHeight="25.0" prefWidth="152.0" styleClass="edit-profile-input" HBox.hgrow="ALWAYS" />
+                        </children>
+                     </HBox>
+                     <Label styleClass="edit-input-description" text="This is your profile name. It will be visible to your contacts." />
+         </children>
+              </VBox>
+      
+              <Separator styleClass="section-separator" />
+      
+              <!-- ===== Username row (Label left, editable field right) ===== -->
+              <VBox spacing="4">
+         <children>
+                     <HBox alignment="CENTER_LEFT" spacing="10">
+                        <children>
+                            <Label styleClass="profile-info-label" text="Username" />
+                            <TextField fx:id="usernameField" prefHeight="25.0" prefWidth="153.0" styleClass="edit-profile-input" HBox.hgrow="ALWAYS" />
+                        </children>
+                     </HBox>
+                     <Label styleClass="edit-input-description" text="Username lets people contact you." />
+         </children>
+              </VBox>
+      </children>
+       </VBox>
+   </children>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/group_info.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/group_info.fxml
new file mode 100644
index 0000000..1139eaf
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/group_info.fxml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<?import javafx.scene.image.Image?>
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.GroupInfoController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Group card -->
+    <VBox fx:id="groupCard" styleClass="profile-card" spacing="16"
+          prefWidth="360" maxWidth="360"
+          prefHeight="500" maxHeight="500">
+
+        <!-- ===== Header: Title + More + Close ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Group Info" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+
+            <!-- More -->
+            <Button fx:id="infoMoreButton" styleClass="icon-button">
+                <graphic>
+                    <ImageView fx:id="moreIcon" fitWidth="18" fitHeight="18" preserveRatio="true"/>
+                </graphic>
+                <contextMenu>
+                    <ContextMenu fx:id="infoMoreMenu">
+                        <items>
+                            <!-- Add Member -->
+                            <MenuItem fx:id="addMemberItem" text="Add member">
+                                <graphic>
+                                    <ImageView fx:id="addMemberIcon" fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/add_member_dark.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+
+                            <!-- Manage Group -->
+                            <MenuItem fx:id="manageGroupItem" text="Manage group">
+                                <graphic>
+                                    <ImageView fx:id="manageChannelIcon" fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/manage_dark.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+
+                            <!-- Delete Chat (owner only) -->
+                            <MenuItem fx:id="deleteGroupItem" text="Delete chat" style="-fx-text-fill: red;" visible="false">
+                                <graphic>
+                                    <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/delete_red.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+                        </items>
+                    </ContextMenu>
+                </contextMenu>
+            </Button>
+
+            <!-- Close -->
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <!-- ===== Group picture + name + members count ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <!-- Group picture -->
+            <ImageView fx:id="groupImage" fitWidth="60" fitHeight="60" preserveRatio="true"
+                       styleClass="profile-picture"/>
+
+            <!-- Name + members stacked -->
+            <VBox alignment="CENTER_LEFT" spacing="4">
+                <Label fx:id="groupName" text="Group name" styleClass="info-title"/>
+                <Label fx:id="memberCount" text="0 members" styleClass="info-subtitle"/>
+            </VBox>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Members list ===== -->
+        <VBox spacing="8" styleClass="info-blocks" VBox.vgrow="ALWAYS">
+            <HBox spacing="8" alignment="CENTER_LEFT">
+                <ImageView fx:id="membersIcon" fitWidth="26" fitHeight="26" preserveRatio="true">
+                    <image>
+                        <Image url="@/org/to/telegramfinalproject/Icons/group_member_dark.png"/>
+                    </image>
+                </ImageView>
+                <Label fx:id="membersHeader" text="0 MEMBERS" styleClass="profile-info-sub"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Button fx:id="addMemberButton" styleClass="icon-button">
+                    <graphic>
+                        <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                            <image>
+                                <Image url="@/org/to/telegramfinalproject/Icons/add_member_dark.png"/>
+                            </image>
+                        </ImageView>
+                    </graphic>
+                </Button>
+            </HBox>
+
+            <ScrollPane fx:id="membersScroll" fitToWidth="true" styleClass="member-scroll" VBox.vgrow="ALWAYS">
+                <content>
+                    <VBox fx:id="membersList" spacing="10"/>
+                </content>
+            </ScrollPane>
+        </VBox>
+
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/login_view.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/login_view.fxml
new file mode 100644
index 0000000..aade0c2
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/login_view.fxml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Pos?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane prefHeight="600.0" prefWidth="800.0"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="org.to.telegramfinalproject.UI.LoginController">
+
+    <children>
+        <VBox alignment="CENTER" spacing="20"
+              AnchorPane.topAnchor="0.0"
+              AnchorPane.bottomAnchor="0.0"
+              AnchorPane.leftAnchor="0.0"
+              AnchorPane.rightAnchor="0.0">
+
+            <!-- Title -->
+            <Label text="Welcome Back"
+                   style="-fx-font-size: 24px; -fx-font-weight: bold;" />
+
+            <!-- Username Field -->
+            <TextField fx:id="usernameField"
+                       promptText="Username"
+                       maxWidth="320"
+                       prefHeight="30"/>
+
+            <!-- Password Field with toggle -->
+            <HBox alignment="CENTER" spacing="5" maxWidth="320">
+                <children>
+                    <StackPane>
+                        <children>
+                            <PasswordField fx:id="passwordField"
+                                           promptText="Password"
+                                           prefWidth="290"
+                                           prefHeight="30"/>
+                            <TextField fx:id="visiblePasswordField"
+                                       promptText="Password"
+                                       prefWidth="290"
+                                       prefHeight="30"
+                                       visible="false"
+                                       managed="false"/>
+                        </children>
+                    </StackPane>
+                    <Button fx:id="toggleVisibilityBtn"
+                            text="👁"
+                            prefWidth="30"
+                            prefHeight="30"
+                            style="-fx-background-color: transparent;"
+                            onAction="#togglePasswordVisibility"/>
+                </children>
+            </HBox>
+
+            <!-- Login Button -->
+            <Button text="Login"
+                    maxWidth="150"
+                    onAction="#handleLogin"
+                    style="-fx-background-color: #2AABEE; -fx-text-fill: white; -fx-font-weight: bold;" />
+
+            <!-- Error Label -->
+            <Label fx:id="errorLabel"
+                   textFill="red"
+                   visible="false"/>
+
+            <!-- Hyperlink to Register -->
+            <Hyperlink text="Don't have an account? Create one"
+                       onAction="#switchToRegister"
+                       style="-fx-font-size: 12px;" />
+        </VBox>
+    </children>
+</AnchorPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/main.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/main.fxml
new file mode 100644
index 0000000..d3faff1
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/main.fxml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+
+<StackPane fx:id="mainRoot"
+           xmlns="http://javafx.com/javafx/8"
+           xmlns:fx="http://javafx.com/fxml/1"
+           fx:controller="org.to.telegramfinalproject.UI.MainController">
+
+    <children>
+        <!-- SplitPane: left (chat list / search) + right (chat panel) -->
+        <SplitPane fx:id="mainSplitPane"
+                   dividerPositions="0.32"
+                   orientation="HORIZONTAL"
+                   prefHeight="700" prefWidth="1100"
+                   styleClass="thin-splitpane">
+            <items>
+
+                <!-- LEFT: Sidebar -->
+                <VBox fx:id="leftPane" minWidth="72" styleClass="sidebar-pane">
+
+                    <!-- Top bar (always visible) -->
+                    <HBox spacing="10" styleClass="search-bar-container">
+                        <padding>
+                            <Insets bottom="10" left="10" right="10" top="10"/>
+                        </padding>
+                        <children>
+                            <Button fx:id="menuButton"
+                                    minHeight="29.0" minWidth="40"
+                                    onAction="#toggleSidebar"
+                                    prefHeight="29.0" prefWidth="40.0"
+                                    styleClass="menu-btn">
+                                <graphic>
+                                    <ImageView fx:id="menuIcon" fitHeight="24" fitWidth="17"
+                                               preserveRatio="true" smooth="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/menu_dark.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </Button>
+
+                            <HBox spacing="5" alignment="CENTER" HBox.hgrow="ALWAYS">
+                                <TextField fx:id="searchBar"
+                                           promptText="Search"
+                                           HBox.hgrow="ALWAYS"
+                                           maxWidth="Infinity"
+                                           styleClass="global-search"/>
+                            </HBox>
+
+                        </children>
+                    </HBox>
+
+                    <!-- Content area (chat list vs search) -->
+                    <StackPane VBox.vgrow="ALWAYS">
+
+                        <!-- Chat list (default) -->
+                        <ScrollPane fx:id="scrollPane" fitToWidth="true" hbarPolicy="NEVER"
+                                    vbarPolicy="AS_NEEDED"
+                                    visible="true" managed="true"
+                                    styleClass="chat-scroll">
+                            <content>
+                                <VBox fx:id="chatListContainer" spacing="5"
+                                      styleClass="chat-list">
+                                    <padding>
+                                        <Insets bottom="10" left="10" right="10" top="10"/>
+                                    </padding>
+                                </VBox>
+                            </content>
+                        </ScrollPane>
+
+                        <!-- Search in chat -->
+                        <VBox fx:id="chatSearchPane"
+                              visible="false" managed="false"
+                              styleClass="chat-search-pane">
+
+                            <Label text="Search messages in" styleClass="search-label"/>
+                            <Separator styleClass="search-separator" prefHeight="0.5"/>
+
+                            <HBox spacing="10" alignment="CENTER_LEFT" styleClass="search-scope-bar">
+                                <ImageView fx:id="searchChatAvatar" fitWidth="32" fitHeight="32" preserveRatio="true"/>
+                                <VBox alignment="CENTER_LEFT">
+                                    <Label text="This chat" styleClass="search-scope"/>
+                                </VBox>
+                                <Region HBox.hgrow="ALWAYS"/>
+                                <Button text="✕" onAction="#closeSearchPanel" styleClass="close-btn"/>
+                            </HBox>
+
+                            <VBox alignment="CENTER" spacing="10" prefHeight="300">
+                                <ImageView fx:id="searchIconLarge" fitWidth="64" fitHeight="64" preserveRatio="true"/>
+                                <Label text="Search for messages" styleClass="search-placeholder"/>
+                            </VBox>
+
+                            <ListView fx:id="chatSearchResults" visible="false" managed="false"/>
+                        </VBox>
+
+                        <!-- Global Search Panel -->
+                        <VBox fx:id="globalSearchPane" visible="false" managed="false" styleClass="global-search-pane">
+
+                            <!-- Header -->
+                            <HBox alignment="CENTER_LEFT">
+                                <Label text="  Search results" styleClass="search-results-title"/>
+                                <Region HBox.hgrow="ALWAYS"/>
+                                <Button text="✕" onAction="#closeGlobalSearch" styleClass="search-close-btn"/>
+                            </HBox>
+
+                            <!-- Search results -->
+                            <ScrollPane fx:id="globalSearchScroll"
+                                        fitToWidth="true"
+                                        hbarPolicy="NEVER"
+                                        vbarPolicy="AS_NEEDED"
+                                        styleClass="chat-scroll">
+                                <content>
+                                    <VBox fx:id="globalSearchResultsContainer" spacing="5"
+                                          styleClass="global-search-list">
+                                        <!-- One search result item -->
+                                        <HBox spacing="10" alignment="CENTER_LEFT" styleClass="search-result-item">
+                                            <!-- Avatar -->
+                                            <StackPane>
+                                                <ImageView fx:id="searchResultAvatar"
+                                                           fitWidth="40" fitHeight="40"
+                                                           preserveRatio="true"
+                                                           smooth="true"
+                                                           cache="true"
+                                                           styleClass="avatar"/>
+                                            </StackPane>
+
+                                            <!-- Texts -->
+                                            <VBox spacing="2">
+                                                <Label fx:id="searchResultTitle" styleClass="global-search-title"/>
+                                                <Label fx:id="searchResultSubtitle" styleClass="global-search-subtitle"/>
+                                            </VBox>
+                                        </HBox>
+                                    </VBox>
+                                </content>
+                            </ScrollPane>
+
+                            <!-- No Results Placeholder -->
+                            <VBox fx:id="noResultsBox" alignment="CENTER" spacing="10" visible="false" managed="false">
+                                <ImageView fx:id="noResultIcon" fitWidth="64" fitHeight="64" preserveRatio="true">
+                                    <image>
+                                        <Image url="@/org/to/telegramfinalproject/Icons/no_result_dark.png"/>
+                                    </image>
+                                </ImageView>
+                                <Label text="No results found" styleClass="no-results-label"/>
+                            </VBox>
+                        </VBox>
+                    </StackPane>
+                </VBox>
+
+                <!-- RIGHT: Chat panel -->
+                <StackPane fx:id="chatDisplayArea" minWidth="360" styleClass="chat-display">
+                    <children>
+                        <Label fx:id="placeholderLabel" alignment="CENTER"
+                               prefHeight="21.0" prefWidth="248.0"
+                               styleClass="placeholder-label"
+                               text="Select a chat to start messaging">
+                            <font><Font size="15"/></font>
+                        </Label>
+                    </children>
+                </StackPane>
+            </items>
+        </SplitPane>
+
+        <!-- ===== Overlay background for sidebar only ===== -->
+        <Pane fx:id="overlay"
+              mouseTransparent="true"
+              onMouseClicked="#closeSidebar"
+              styleClass="overlay"
+              visible="false"/>
+
+        <!-- ===== Overlay layer for profile/settings/etc. ===== -->
+        <StackPane fx:id="overlayLayer"
+                   pickOnBounds="false"/>
+    </children>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/manage_admins.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_admins.fxml
new file mode 100644
index 0000000..63203d6
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_admins.fxml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ManageAdminsController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="adminsCard" styleClass="profile-card" spacing="12"
+          prefWidth="360" maxWidth="360"
+          prefHeight="500" maxHeight="500">
+
+        <!-- Header -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Administrators" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- Scroll list -->
+        <ScrollPane fx:id="adminsScroll" fitToWidth="true" styleClass="member-scroll" VBox.vgrow="ALWAYS">
+            <content>
+                <VBox fx:id="adminsList" spacing="10"/>
+            </content>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- Footer -->
+        <HBox spacing="10" alignment="CENTER_RIGHT">
+            <Button fx:id="addAdminButton" text="Add admin" styleClass="secondary-btn" HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeFooterButton" text="Close" styleClass="primary-btn"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/manage_channel.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_channel.fxml
new file mode 100644
index 0000000..bcfd565
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_channel.fxml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ManageChannelController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="manageChannelCard" styleClass="profile-card" spacing="16"
+          prefWidth="360" maxWidth="360"
+          prefHeight="520" maxHeight="520">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Edit channel" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <!-- ===== Channel picture + fields ===== -->
+        <VBox alignment="CENTER" spacing="12">
+            <!-- Channel picture -->
+            <Button fx:id="changePicButton" styleClass="circle-pic-btn">
+                <graphic>
+                    <ImageView fx:id="channelImage" fitWidth="80" fitHeight="80" preserveRatio="true">
+                        <image>
+                            <Image url="@/org/to/telegramfinalproject/Avatars/default_channel_profile.png"/>
+                        </image>
+                    </ImageView>
+                </graphic>
+            </Button>
+
+            <!-- Channel name -->
+            <TextField fx:id="channelNameField" promptText="Channel name" styleClass="input-field"/>
+
+            <!-- Channel ID -->
+            <TextField fx:id="channelIdField" promptText="Channel ID (unique)" styleClass="input-field"/>
+
+            <!-- Channel description -->
+            <TextArea fx:id="channelDescriptionField"
+                      promptText="Description (optional)"
+                      wrapText="true"
+                      prefRowCount="3"
+                      VBox.vgrow="ALWAYS"
+                      styleClass="description-input"/>
+        </VBox>
+
+        <!-- ===== Options ===== -->
+        <VBox spacing="10" styleClass="info-blocks" VBox.vgrow="ALWAYS">
+            <!-- Administrators -->
+            <HBox alignment="CENTER_LEFT" spacing="10">
+                <Label text="Administrators" styleClass="info-row-label"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Label fx:id="adminCount" text="0" styleClass="info-row-value"/>
+                <Button fx:id="manageAdminsButton" text="Manage" styleClass="manage-link-btn"/>
+            </HBox>
+
+            <!-- Subscribers -->
+            <HBox alignment="CENTER_LEFT" spacing="10">
+                <Label text="Subscribers" styleClass="info-row-label"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Label fx:id="subscriberCount" text="0" styleClass="info-row-value"/>
+                <Button fx:id="manageSubscribersButton" text="Manage" styleClass="manage-link-btn"/>
+            </HBox>
+        </VBox>
+
+        <!-- ===== Footer ===== -->
+        <HBox spacing="10" alignment="CENTER_RIGHT">
+            <Button fx:id="cancelButton" text="Cancel" styleClass="secondary-btn"/>
+            <Button fx:id="saveButton" text="Save" styleClass="primary-btn"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/manage_channel_admins.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_channel_admins.fxml
new file mode 100644
index 0000000..e704fb2
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_channel_admins.fxml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ManageChannelAdminsController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="adminsCard" styleClass="profile-card" spacing="12"
+          prefWidth="360" maxWidth="360"
+          prefHeight="500" maxHeight="500">
+
+        <!-- Header -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Channel Administrators" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- Scroll list -->
+        <ScrollPane fx:id="adminsScroll" fitToWidth="true" styleClass="member-scroll" VBox.vgrow="ALWAYS">
+            <content>
+                <VBox fx:id="adminsList" spacing="10"/>
+            </content>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- Footer -->
+        <HBox spacing="10" alignment="CENTER_RIGHT">
+            <Button fx:id="addAdminButton" text="Add admin" styleClass="secondary-btn" HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeFooterButton" text="Close" styleClass="primary-btn"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/manage_group.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_group.fxml
new file mode 100644
index 0000000..72f5dae
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_group.fxml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ManageGroupController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="manageGroupCard" styleClass="profile-card" spacing="16"
+          prefWidth="360" maxWidth="360"
+          prefHeight="520" maxHeight="520">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Edit group" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <!-- ===== Group picture + name + description ===== -->
+        <VBox alignment="CENTER" spacing="12">
+            <!-- Group picture -->
+            <Button fx:id="changePicButton" styleClass="circle-pic-btn">
+                <graphic>
+                    <ImageView fx:id="groupImage" fitWidth="80" fitHeight="80" preserveRatio="true">
+                        <image>
+                            <Image url="@/org/to/telegramfinalproject/Avatars/default_group_profile.png"/>
+                        </image>
+                    </ImageView>
+                </graphic>
+            </Button>
+
+            <!-- Group name -->
+            <TextField fx:id="groupNameField" promptText="Group name" styleClass="input-field"/>
+
+            <!-- Group ID -->
+            <TextField fx:id="groupIdField" promptText="Group ID (unique)" styleClass="input-field"/>
+        </VBox>
+
+
+        <!-- ===== Options ===== -->
+        <VBox spacing="10" styleClass="info-blocks" VBox.vgrow="ALWAYS">
+            <!-- Administrators -->
+            <HBox alignment="CENTER_LEFT" spacing="10">
+                <Label text="Administrators" styleClass="info-row-label"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Label fx:id="adminCount" text="0" styleClass="info-row-value"/>
+                <Button fx:id="manageAdminsButton" text="Manage" styleClass="manage-link-btn"/>
+            </HBox>
+
+            <!-- Members -->
+            <HBox alignment="CENTER_LEFT" spacing="10">
+                <Label text="Members" styleClass="info-row-label"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Label fx:id="memberCount" text="0" styleClass="info-row-value"/>
+                <Button fx:id="manageMembersButton" text="Manage" styleClass="manage-link-btn"/>
+            </HBox>
+        </VBox>
+
+        <!-- ===== Footer ===== -->
+        <HBox spacing="10" alignment="CENTER_RIGHT">
+            <Button fx:id="cancelButton" text="Cancel" styleClass="secondary-btn"/>
+            <Button fx:id="saveButton" text="Save" styleClass="primary-btn"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/manage_members.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_members.fxml
new file mode 100644
index 0000000..f65b249
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_members.fxml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ManageMembersController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="membersCard" styleClass="profile-card" spacing="12"
+          prefWidth="360" maxWidth="360"
+          prefHeight="520" maxHeight="520">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Members" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Members List ===== -->
+        <ScrollPane fx:id="membersScroll" fitToWidth="true" styleClass="member-scroll" VBox.vgrow="ALWAYS">
+            <content>
+                <VBox fx:id="membersList" spacing="10"/>
+            </content>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Footer ===== -->
+        <HBox spacing="12" alignment="CENTER_RIGHT">
+            <Button fx:id="addMembersButton" text="Add members" styleClass="secondary-btn"/>
+            <Button fx:id="closeFooterButton" text="Close" styleClass="primary-btn"/>
+        </HBox>
+
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/manage_subscribers.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_subscribers.fxml
new file mode 100644
index 0000000..fa6b317
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/manage_subscribers.fxml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.ManageSubscribersController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="subscribersCard" styleClass="profile-card" spacing="12"
+          prefWidth="360" maxWidth="360"
+          prefHeight="520" maxHeight="520">
+
+        <!-- ===== Header ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Subscribers" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Subscribers List ===== -->
+        <ScrollPane fx:id="subscribersScroll" fitToWidth="true" styleClass="member-scroll" VBox.vgrow="ALWAYS">
+            <content>
+                <VBox fx:id="subscribersList" spacing="10"/>
+            </content>
+        </ScrollPane>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- ===== Footer ===== -->
+        <HBox spacing="12" alignment="CENTER_RIGHT">
+            <Button fx:id="addSubscribersButton" text="Add subscribers" styleClass="secondary-btn"/>
+            <Button fx:id="closeFooterButton" text="Close" styleClass="primary-btn"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/my_profile.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/my_profile.fxml
new file mode 100644
index 0000000..56c23cc
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/my_profile.fxml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<?import javafx.scene.image.Image?>
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.MyProfileController"
+           styleClass="overlay-root">
+
+    <!-- Background (click to close) -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Profile card -->
+    <VBox fx:id="profileCard" styleClass="profile-card" spacing="16"
+          prefWidth="360" maxWidth="360"
+          prefHeight="480" maxHeight="480">
+
+        <!-- ===== Header: My Profile (left) + actions (right) ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="My Profile" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/> <!-- pushes buttons to right -->
+
+            <Button fx:id="editButton" styleClass="icon-button"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <!-- ===== Profile section: picture + name/status ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <ImageView fx:id="profileImage" fitWidth="80" fitHeight="80" preserveRatio="true"
+                       styleClass="profile-picture"/>
+            <VBox alignment="CENTER_LEFT" spacing="4">
+                <Label fx:id="profileName" text="User Name" styleClass="profile-name"/>
+                <Label fx:id="profileStatus" text="online" styleClass="profile-status"/>
+            </VBox>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- User info blocks (shifted to align under profile image) -->
+        <HBox alignment="TOP_LEFT">
+            <Pane prefWidth="30"/>
+
+            <VBox spacing="16">
+
+                <!-- Bio -->
+                <VBox fx:id="bioBlock" spacing="2">
+                    <Label fx:id="userBio" wrapText="true" styleClass="profile-info-main"/>
+                    <Label text="Bio" styleClass="profile-info-sub"/>
+                </VBox>
+
+                <!-- Username -->
+                <VBox spacing="2">
+                    <Label fx:id="userId" styleClass="profile-info-main"/>
+                    <Label text="Username" styleClass="profile-info-sub"/>
+                </VBox>
+
+            </VBox>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/new_channel.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/new_channel.fxml
new file mode 100644
index 0000000..eee83ab
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/new_channel.fxml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+
+<StackPane fx:id="overlayRoot" xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.NewChannelController"
+           styleClass="overlay-root">
+
+    <!-- Dimmed background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Channel card -->
+    <VBox fx:id="newChannelCard"
+          styleClass="group-card"
+          spacing="16"
+          alignment="CENTER"
+          prefWidth="400" maxWidth="400"
+          prefHeight="380" maxHeight="380">
+
+        <!-- Header Row: Picture + Name -->
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <!-- Channel Picture -->
+            <Button fx:id="cameraButton"
+                    prefWidth="64" prefHeight="64"
+                    styleClass="group-camera-button">
+                <graphic>
+                    <ImageView fx:id="cameraIcon"
+                               fitWidth="28" fitHeight="28"
+                               preserveRatio="true"/>
+                </graphic>
+            </Button>
+
+            <!-- Channel Name -->
+            <VBox spacing="4" alignment="CENTER_LEFT" HBox.hgrow="ALWAYS">
+                <Label fx:id="channelNameLabel" text="Channel name" styleClass="group-name-label"/>
+                <TextField fx:id="channelNameField"
+                           promptText="Enter channel name"
+                           styleClass="group-name-field"
+                           HBox.hgrow="ALWAYS"/>
+            </VBox>
+        </HBox>
+
+        <!-- ID -->
+        <VBox spacing="4" alignment="CENTER_LEFT">
+            <Label fx:id="channelIdLabel" text="Channel ID" styleClass="group-name-label"/>
+            <TextField fx:id="channelIdField"
+                       promptText="Enter channel ID"
+                       styleClass="group-name-field"
+                       HBox.hgrow="ALWAYS"/>
+        </VBox>
+
+        <!-- Channel Description -->
+        <VBox spacing="4" alignment="CENTER_LEFT">
+            <Label fx:id="channelDescLabel" text="Description (optional)" styleClass="group-name-label"/>
+            <TextArea fx:id="channelDescField"
+                      promptText="Enter description"
+                      styleClass="channel-desc-area"
+                      prefRowCount="3"
+                      wrapText="true"/>
+            <Label fx:id="descCounter" text="0 / 255" styleClass="desc-counter"/>
+        </VBox>
+
+        <!-- Footer: Cancel + Create -->
+        <HBox alignment="CENTER_RIGHT" spacing="16">
+            <Button fx:id="cancelButton" text="Cancel" styleClass="footer-button"/>
+            <Button fx:id="createButton" text="Create" styleClass="footer-button"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/new_group.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/new_group.fxml
new file mode 100644
index 0000000..cb2e354
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/new_group.fxml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane fx:id="overlayRoot" xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.NewGroupController"
+           styleClass="overlay-root">
+
+    <!-- Dimmed background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Group card -->
+    <VBox fx:id="newGroupCard"
+          styleClass="group-card"
+          spacing="16"
+          alignment="CENTER"
+          prefWidth="400" maxWidth="400"
+          prefHeight="220" maxHeight="220">
+
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <!-- Group Picture -->
+            <Button fx:id="cameraButton"
+                    prefWidth="64" prefHeight="64"
+                    styleClass="group-camera-button">
+                <graphic>
+                    <ImageView fx:id="cameraIcon"
+                               fitWidth="28" fitHeight="28"
+                               preserveRatio="true"/>
+                </graphic>
+            </Button>
+
+            <!-- Group Name -->
+            <VBox spacing="4" alignment="CENTER_LEFT" HBox.hgrow="ALWAYS">
+                <Label fx:id="groupNameLabel" text="Group name" styleClass="group-name-label"/>
+                <TextField fx:id="groupNameField"
+                           promptText="Enter group name"
+                           styleClass="group-name-field"
+                           HBox.hgrow="ALWAYS"/>
+            </VBox>
+        </HBox>
+
+        <!-- Group ID (below the name) -->
+        <VBox spacing="4" alignment="CENTER_LEFT">
+            <Label fx:id="groupIdLabel" text="Group ID" styleClass="group-name-label"/>
+            <TextField fx:id="groupIdField"
+                       promptText="Enter group ID"
+                       styleClass="group-name-field"
+                       HBox.hgrow="ALWAYS"/>
+        </VBox>
+
+        <!-- Footer: Cancel + Next -->
+        <HBox alignment="CENTER_RIGHT" spacing="16">
+            <Button fx:id="cancelButton" text="Cancel" styleClass="footer-button"/>
+            <Button fx:id="nextButton" text="Next" styleClass="footer-button"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/privacy_security.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/privacy_security.fxml
new file mode 100644
index 0000000..7f103ec
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/privacy_security.fxml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
+
+<StackPane fx:id="overlayRoot"
+           xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.PrivacySecurityController"
+           styleClass="overlay-root">
+
+    <!-- Dimmed Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Main Card -->
+    <VBox fx:id="privacyCard"
+          styleClass="privacy-card"
+          spacing="16"
+          prefWidth="360" maxWidth="360"
+          prefHeight="480" maxHeight="480">
+
+        <!-- ===== Header: Back + Title + Close ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10" styleClass="privacy-header">
+            <!-- Back button -->
+            <Button fx:id="backButton" styleClass="edit-icon-button"/>
+
+            <!-- Title -->
+            <Label fx:id="privacyTitle" text="Privacy and Security" styleClass="privacy-title" HBox.hgrow="ALWAYS"/>
+
+            <Pane HBox.hgrow="ALWAYS"/>
+
+            <!-- Close button -->
+            <Button fx:id="closeButton" styleClass="edit-icon-button" text="✕"/>
+        </HBox>
+
+
+        <Separator/>
+
+        <!-- ===== Security Section ===== -->
+        <VBox spacing="8" styleClass="privacy-section">
+            <Label text="Security" styleClass="section-title"/>
+
+            <!-- Username & Password -->
+            <HBox alignment="CENTER_LEFT" spacing="8" styleClass="privacy-item">
+
+                <!-- Icon -->
+                <ImageView fx:id="usernameIcon" fitWidth="18" fitHeight="18" preserveRatio="true">
+                    <image>
+                        <Image url="@/org/to/telegramfinalproject/Icons/username_dark.png"/>
+                    </image>
+                </ImageView>
+
+                <Label text="Username &amp; Password" styleClass="item-label"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Button fx:id="changeCredentialsButton" text="Change" styleClass="manage-button"/>
+            </HBox>
+        </VBox>
+
+        <Separator/>
+
+        <!-- ===== Privacy Section ===== -->
+        <VBox spacing="8" styleClass="privacy-section">
+            <Label text="Privacy" styleClass="section-title"/>
+
+            <!-- Blocked Users -->
+            <HBox alignment="CENTER_LEFT" spacing="8" styleClass="privacy-item">
+
+                <!-- Icon -->
+                <ImageView fx:id="blockIcon" fitWidth="18" fitHeight="18" preserveRatio="true">
+                    <image>
+                        <Image url="@/org/to/telegramfinalproject/Icons/hand_dark.png"/>
+                    </image>
+                </ImageView>
+
+                <Label text="Blocked Users" styleClass="item-label"/>
+                <Pane HBox.hgrow="ALWAYS"/>
+                <Button fx:id="blockedUsersButton" text="Manage" styleClass="manage-button"/>
+            </HBox>
+        </VBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/register_view.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/register_view.fxml
new file mode 100644
index 0000000..5ec8499
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/register_view.fxml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+
+<AnchorPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="org.to.telegramfinalproject.UI.RegisterController"
+            prefWidth="800" prefHeight="600">
+
+    <VBox spacing="15" alignment="CENTER"
+          AnchorPane.topAnchor="0" AnchorPane.bottomAnchor="0"
+          AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0">
+
+        <Label text="Create Your Account"
+               style="-fx-font-size: 24px; -fx-font-weight: bold;" />
+
+        <TextField fx:id="userIdField"
+                   promptText="User ID"
+                   prefWidth="320" prefHeight="30"
+                   maxWidth="320"/>
+
+        <TextField fx:id="usernameField"
+                   promptText="Username"
+                   prefWidth="320" prefHeight="30"
+                   maxWidth="320"/>
+
+        <TextField fx:id="profileNameField"
+                   promptText="Profile Name"
+                   prefWidth="320" prefHeight="30"
+                   maxWidth="320"/>
+
+        <!-- Password -->
+        <HBox alignment="CENTER" spacing="5" maxWidth="320">
+            <children>
+                <StackPane>
+                    <children>
+                        <PasswordField fx:id="passwordField"
+                                       promptText="Password"
+                                       prefWidth="300" prefHeight="30"/>
+                        <TextField fx:id="visiblePasswordField"
+                                   promptText="Password"
+                                   prefWidth="300" prefHeight="30"
+                                   visible="false" managed="false"/>
+                    </children>
+                </StackPane>
+                <Button fx:id="togglePasswordBtn"
+                        text="👁"
+                        prefWidth="20" prefHeight="30"
+                        style="-fx-background-color: transparent; -fx-padding: 0;"
+                        onAction="#togglePasswordVisibility"/>
+            </children>
+        </HBox>
+
+        <!-- Confirm Password -->
+        <HBox alignment="CENTER" spacing="5" maxWidth="320">
+            <children>
+                <StackPane>
+                    <children>
+                        <PasswordField fx:id="confirmPasswordField"
+                                       promptText="Confirm Password"
+                                       prefWidth="300" prefHeight="30"/>
+                        <TextField fx:id="visibleConfirmPasswordField"
+                                   promptText="Confirm Password"
+                                   prefWidth="300" prefHeight="30"
+                                   visible="false" managed="false"/>
+                    </children>
+                </StackPane>
+                <Button fx:id="toggleConfirmBtn"
+                        text="👁"
+                        prefWidth="20" prefHeight="30"
+                        style="-fx-background-color: transparent; -fx-padding: 0;"
+                        onAction="#toggleConfirmPasswordVisibility"/>
+            </children>
+        </HBox>
+
+        <Button text="Register"
+                onAction="#handleRegister"
+                style="-fx-background-color: #2AABEE; -fx-text-fill: white; -fx-font-weight: bold;"
+                prefWidth="150" prefHeight="35"/>
+
+        <Label fx:id="errorLabel"
+               textFill="red"
+               visible="false"/>
+
+        <Hyperlink text="Already have an account? Login"
+                   onAction="#switchToLogin"
+                   style="-fx-font-size: 12px;"/>
+
+    </VBox>
+</AnchorPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/set_group_admin_permissions.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/set_group_admin_permissions.fxml
new file mode 100644
index 0000000..fa345e2
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/set_group_admin_permissions.fxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.SetGroupAdminPermissionsController"
+           styleClass="overlay-root">
+
+    <!-- Background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Card -->
+    <VBox fx:id="permissionsCard" styleClass="profile-card" spacing="16"
+          prefWidth="320" maxWidth="320"
+          prefHeight="350" maxHeight="350">
+
+        <!-- Header -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="Set Admin Permissions" styleClass="profile-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/>
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+        <Separator/>
+
+        <!-- Permissions list -->
+        <VBox spacing="8">
+            <CheckBox fx:id="canAddMember" text="Can add members"/>
+            <CheckBox fx:id="canRemoveMember" text="Can remove members"/>
+            <CheckBox fx:id="canAddAdmin" text="Can add admins"/>
+            <CheckBox fx:id="canRemoveAdmin" text="Can remove admins"/>
+            <CheckBox fx:id="canEditGroup" text="Can edit group"/>
+        </VBox>
+
+        <Pane VBox.vgrow="ALWAYS"/>
+
+        <Separator/>
+
+        <!-- Footer -->
+        <HBox alignment="CENTER_RIGHT" spacing="10">
+            <Button fx:id="cancelButton" text="Cancel" styleClass="secondary-btn"/>
+            <Button fx:id="saveButton" text="Save" styleClass="primary-btn"/>
+        </HBox>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/settings.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/settings.fxml
new file mode 100644
index 0000000..ea80770
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/settings.fxml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.image.Image?>
+
+<StackPane styleClass="overlay-root" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="org.to.telegramfinalproject.UI.SettingsController">
+   <children>
+   
+       <!-- Dimmed background -->
+       <Pane fx:id="overlayBackground" styleClass="overlay-background" />
+   
+       <!-- Settings Card -->
+       <VBox fx:id="settingsCard" maxHeight="470" maxWidth="350" prefHeight="470" prefWidth="350" spacing="12" styleClass="settings-card">
+      <children>
+      
+              <!-- ===== Header ===== -->
+              <HBox alignment="CENTER_RIGHT" spacing="10" styleClass="settings-header">
+         <children>
+                     <Label styleClass="settings-title" text="Settings" />
+                     <Region HBox.hgrow="ALWAYS" /> <!-- pushes buttons to the right -->
+         
+                     <!-- 3-dots Menu -->
+                     <MenuButton fx:id="menuButton" styleClass="icon-button">
+                         <graphic>
+                             <ImageView fitHeight="18" fitWidth="18" pickOnBounds="true" preserveRatio="true" styleClass="icon-image">
+                                 <image>
+                                     <Image url="@/org/to/telegramfinalproject/Icons/more_dark.png" />
+                                 </image>
+                             </ImageView>
+                         </graphic>
+                         <items>
+                             <MenuItem fx:id="editProfileItem" text="Edit Profile">
+                                 <graphic>
+                                     <ImageView fitHeight="14" fitWidth="14" preserveRatio="true">
+                                         <image>
+                                             <Image url="@/org/to/telegramfinalproject/Icons/edit_dark.png" />
+                                         </image>
+                                     </ImageView>
+                                 </graphic>
+                             </MenuItem>
+                             <MenuItem fx:id="logoutItem" text="Log Out">
+                                 <graphic>
+                                     <ImageView fitHeight="14" fitWidth="14" preserveRatio="true">
+                                         <image>
+                                             <Image url="@/org/to/telegramfinalproject/Icons/log_out.png" />
+                                         </image>
+                                     </ImageView>
+                                 </graphic>
+                             </MenuItem>
+                         </items>
+                     </MenuButton>
+         
+                     <!-- Close Button -->
+                     <Button fx:id="closeButton" styleClass="icon-button" text="✕" />
+         </children>
+              </HBox>
+      
+              <!-- ===== Profile Info ===== -->
+              <HBox alignment="CENTER_LEFT" spacing="12" styleClass="profile-header">
+         <children>
+                     <!-- Profile Picture -->
+                     <ImageView fx:id="profileImage" fitHeight="92" fitWidth="92" preserveRatio="true" styleClass="profile-avatar" />
+         
+                     <!-- Name + ID -->
+                     <VBox alignment="CENTER_LEFT" spacing="2">
+            <children>
+                            <Label fx:id="profileName" styleClass="profile-name" text="User Name" />
+                            <Label fx:id="profileId" styleClass="profile-id" />
+            </children>
+                     </VBox>
+         </children>
+              </HBox>
+      
+              <Separator />
+      
+              <!-- ===== Options ===== -->
+              <VBox spacing="8" styleClass="settings-options">
+         <children>
+             <!-- My Account -->
+             <Button fx:id="myAccountButton" prefHeight="25.0" prefWidth="361.0" styleClass="settings-option" text="My Account">
+                 <graphic>
+                     <ImageView fitWidth="25" fitHeight="25" preserveRatio="true">
+                         <image>
+                             <Image url="@/org/to/telegramfinalproject/Icons/my_profile_dark.png"/>
+                         </image>
+                     </ImageView>
+                 </graphic>
+             </Button>
+
+             <!-- Privacy and Security -->
+             <Button fx:id="privacyButton" prefHeight="25.0" prefWidth="376.0" styleClass="settings-option" text="Privacy and Security">
+                 <graphic>
+                     <ImageView fitWidth="25" fitHeight="25" preserveRatio="true">
+                         <image>
+                             <Image url="@/org/to/telegramfinalproject/Icons/lock_dark.png"/>
+                         </image>
+                     </ImageView>
+                 </graphic>
+             </Button>
+
+             <!-- Telegram Q&A -->
+             <Button fx:id="faqButton" prefHeight="25.0" prefWidth="390.0" styleClass="settings-option" text="Telegram Q&amp;A">
+                 <graphic>
+                     <ImageView fitWidth="25" fitHeight="25" preserveRatio="true">
+                         <image>
+                             <Image url="@/org/to/telegramfinalproject/Icons/telegram_qna_dark.png"/>
+                         </image>
+                     </ImageView>
+                 </graphic>
+             </Button>
+
+             <!-- Telegram Features -->
+             <Button fx:id="featuresButton" prefHeight="25.0" prefWidth="370.0" styleClass="settings-option" text="Telegram Features">
+                 <graphic>
+                     <ImageView fitWidth="25" fitHeight="25" preserveRatio="true">
+                         <image>
+                             <Image url="@/org/to/telegramfinalproject/Icons/telegram_features_dark.png"/>
+                         </image>
+                     </ImageView>
+                 </graphic>
+             </Button>
+         </children>
+              </VBox>
+      </children>
+       </VBox>
+   </children>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/sidebar_menu.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/sidebar_menu.fxml
new file mode 100644
index 0000000..de39bf4
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/sidebar_menu.fxml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Separator?>
+
+<!-- Sidebar Menu -->
+<StackPane fx:id="sidebarContainer"
+           xmlns="http://javafx.com/javafx/17"
+           xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.SidebarMenuController"
+           prefWidth="250"
+           maxWidth="250"
+           style="-fx-background-color: #2c2c2c;">
+
+    <!-- The actual VBox menu -->
+    <VBox fx:id="sidebarRoot"
+          spacing="20"
+          alignment="TOP_LEFT"
+          prefWidth="250">
+
+        <padding>
+            <Insets top="20" left="10" right="10" bottom="10"/>
+        </padding>
+
+        <!-- Profile Section -->
+        <VBox alignment="TOP_LEFT" spacing="10">
+            <padding>
+                <Insets top="10" left="10" bottom="0" right="0"/>
+            </padding>
+            <ImageView fx:id="profileImage" fitWidth="80" fitHeight="80"
+                       pickOnBounds="true" preserveRatio="true"/>
+            <Label fx:id="usernameLabel" text="   Asal Lotfi"
+                   textFill="white"
+                   style="-fx-font-size: 14px; -fx-font-weight: bold;"/>
+        </VBox>
+
+        <!-- Menu Buttons -->
+        <VBox spacing="8" alignment="TOP_LEFT">
+
+            <Separator orientation="HORIZONTAL" styleClass="thin-separator" />
+
+            <Button fx:id="myProfileButton" text="  My Profile" styleClass="sidebar-btn"/>
+
+            <Separator orientation="HORIZONTAL" styleClass="thin-separator" />
+
+            <Button fx:id="newGroupButton" text="  New Group" styleClass="sidebar-btn"/>
+            <Button fx:id="newChannelButton" text="  New Channel" styleClass="sidebar-btn"/>
+            <Button fx:id="contactsButton" text="  Contacts" styleClass="sidebar-btn"/>
+            <Button fx:id="savedMessagesButton" text="  Saved Messages" styleClass="sidebar-btn"/>
+            <Button fx:id="settingsButton" text="  Settings" styleClass="sidebar-btn"/>
+            <Button fx:id="telegramFeaturesButton" text="  Telegram Features" styleClass="sidebar-btn"/>
+            <Button fx:id="telegramQnAButton" text="  Telegram Q&amp;A" styleClass="sidebar-btn"/>
+
+            <!-- Night Mode Toggle -->
+            <HBox spacing="10" alignment="CENTER_LEFT">
+                <padding>
+                    <Insets left="15"/>
+                </padding>
+                <ImageView fx:id="nightModeIcon" fitWidth="22" fitHeight="22" pickOnBounds="true" preserveRatio="true"/>
+                <Label text="Night Mode" textFill="white" style="-fx-font-size: 13px;"/>
+                <HBox fx:id="nightModeToggle" styleClass="telegram-toggle">
+                    <Region fx:id="toggleThumb" styleClass="toggle-thumb"/>
+                </HBox>
+            </HBox>
+        </VBox>
+        <!-- Push footer to bottom -->
+        <Pane VBox.vgrow="ALWAYS" />
+
+        <!-- Footer label -->
+        <Label text="Telegram Desktop"
+               style="-fx-font-size: 12px; -fx-text-fill: #888; -fx-padding: 10;" />
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/telegram_features.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/telegram_features.fxml
new file mode 100644
index 0000000..af00397
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/telegram_features.fxml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:id="rootOverlay"
+           fx:controller="org.to.telegramfinalproject.UI.TelegramFeaturesController"
+           styleClass="overlay-root">
+
+    <!-- Background (click to close) -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Content card -->
+    <BorderPane fx:id="contentCard"
+                styleClass="tf-root"
+                maxWidth="700" maxHeight="520">
+
+        <!-- Header -->
+        <top>
+            <HBox spacing="10" styleClass="tf-toolbar">
+                <children>
+                    <Label text="Telegram Features" styleClass="tf-title"/>
+                    <Region HBox.hgrow="ALWAYS"/>
+                </children>
+            </HBox>
+        </top>
+
+        <!-- Scrollable content -->
+        <center>
+            <ScrollPane fx:id="featureScroll" fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="AS_NEEDED">
+                <content>
+                    <VBox spacing="24" styleClass="tf-sections">
+                        <padding>
+                            <Insets top="8" right="16" bottom="8" left="16"/>
+                        </padding>
+
+                        <!-- Section 1 -->
+                        <VBox spacing="8" styleClass="tf-section">
+                            <Label text="1) Account &amp; Authentication" styleClass="tf-section-title"/>
+                            <VBox spacing="12">
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Register, Login &amp; Logout" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Create account, sign in/out, and manage sessions (devices, multi-login prevention)." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Profile &amp; Presence" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Bio, photo, display name, user id, online / last seen." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+                            </VBox>
+                        </VBox>
+
+                        <Separator/>
+
+                        <!-- Section 2 -->
+                        <VBox spacing="8" styleClass="tf-section">
+                            <Label text="2) Contacts" styleClass="tf-section-title"/>
+                            <VBox spacing="12">
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Add / Remove Contacts" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Add, remove, and browse contacts with full profile view." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Block / Unblock" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Manage private chat access and visibility." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+                            </VBox>
+                        </VBox>
+
+                        <Separator/>
+
+                        <!-- Section 3 -->
+                        <VBox spacing="8" styleClass="tf-section">
+                            <Label text="3) Chats" styleClass="tf-section-title"/>
+                            <VBox spacing="12">
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Private Chats" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Create or open private chats (get_or_create_private_chat)." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Groups" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Create groups, add members, roles &amp; permissions, ownership transfer." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Channels" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Create channels, manage subscribers, admins, and ownership." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Saved Messages" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Personal cloud chat to keep your own notes and files." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Archive Chats" styleClass="tf-item-title"/>
+                                        <Label text="In Progress" styleClass="tf-status tf-status-progress"/>
+                                    </HBox>
+                                    <Label text="Move chats in/out of Archive for better organization." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+                            </VBox>
+                        </VBox>
+
+                        <Separator/>
+
+                        <!-- Section 4 -->
+                        <VBox spacing="8" styleClass="tf-section">
+                            <Label text="4) Messaging" styleClass="tf-section-title"/>
+                            <VBox spacing="12">
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Reply" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Quote and reply to a specific message." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+
+                                <VBox>
+                                    <HBox spacing="8" alignment="CENTER_LEFT">
+                                        <Label text="Forward" styleClass="tf-item-title"/>
+                                        <Label text="Available" styleClass="tf-status tf-status-available"/>
+                                    </HBox>
+                                    <Label text="Send a message to another chat with source attribution." wrapText="true" styleClass="tf-item-desc"/>
+                                </VBox>
+                            </VBox>
+                        </VBox>
+
+                    </VBox>
+                </content>
+            </ScrollPane>
+        </center>
+
+        <padding>
+            <Insets top="8" right="8" bottom="8" left="8"/>
+        </padding>
+    </BorderPane>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/telegram_qna.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/telegram_qna.fxml
new file mode 100644
index 0000000..49d89c1
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/telegram_qna.fxml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:id="rootOverlay"
+           fx:controller="org.to.telegramfinalproject.UI.TelegramQnAController"
+           styleClass="overlay-root">
+
+    <!-- Background (click to close) -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Content card -->
+    <BorderPane fx:id="contentCard"
+                styleClass="tf-root"
+                maxWidth="700" maxHeight="520">
+
+        <!-- Header -->
+        <top>
+            <HBox spacing="10" styleClass="tf-toolbar">
+                <children>
+                    <Label text="Telegram FAQ" styleClass="tf-title"/>
+                    <Region HBox.hgrow="ALWAYS"/>
+                    <Label text="(frequently asked questions)" styleClass="tf-caption"/>
+                </children>
+            </HBox>
+        </top>
+
+        <!-- Scrollable content -->
+        <center>
+            <ScrollPane fx:id="qnaScroll" fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="AS_NEEDED">
+                <content>
+                    <VBox spacing="20" styleClass="tf-sections">
+                        <padding>
+                            <Insets top="8" right="16" bottom="8" left="16"/>
+                        </padding>
+
+                        <!-- FAQ Item -->
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="1) How do I create a new account?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Download the Telegram app, enter your phone number, and confirm it with the SMS code. Then you can set up your name and profile picture."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="2) How can I add a new contact?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Tap the menu, choose 'Contacts', then 'Add Contact'. Enter the phone number and name. Telegram will link it to their account automatically."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="3) How do I start a private chat?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Open the contact’s profile and tap 'Message'. This will create a private chat window with them."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="4) How can I create a group?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Go to the menu, select 'New Group', choose members, and set a group name and picture."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="5) How do channels work?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Channels let you broadcast messages to large audiences. Only admins can post, but everyone who subscribes receives the updates."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="6) How can I search for messages?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Use the search bar at the top of the chat list for global search, or use the search option inside a chat to find specific messages."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="7) How do I delete or edit a message?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Long-press (or right-click) on your message. Choose 'Edit' to change it or 'Delete' to remove it. You can delete for yourself or for everyone if allowed."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="8) How can I use reactions?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Tap and hold on a message, then choose an emoji reaction to express your feedback instantly."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="9) How do I archive chats?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Swipe left on a chat (mobile) or right-click on it (desktop) and choose 'Archive'. Archived chats are hidden in a separate folder until a new message arrives."/>
+                        </VBox>
+
+                        <VBox spacing="6" styleClass="tf-section">
+                            <Label text="10) How can I enable Dark Mode?" styleClass="tf-section-title"/>
+                            <Label wrapText="true" styleClass="tf-item-desc"
+                                   text="Open 'Settings' → 'Appearance' and switch between Light and Dark themes. You can also schedule it automatically."/>
+                        </VBox>
+                    </VBox>
+                </content>
+            </ScrollPane>
+        </center>
+
+        <padding>
+            <Insets top="8" right="8" bottom="8" left="8"/>
+        </padding>
+    </BorderPane>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Fxml/user_info.fxml b/src/main/resources/org/to/telegramfinalproject/Fxml/user_info.fxml
new file mode 100644
index 0000000..f53506c
--- /dev/null
+++ b/src/main/resources/org/to/telegramfinalproject/Fxml/user_info.fxml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+
+<?import javafx.scene.image.Image?>
+<StackPane xmlns:fx="http://javafx.com/fxml"
+           fx:controller="org.to.telegramfinalproject.UI.UserInfoController"
+           styleClass="overlay-root">
+
+    <!-- Dimmed background -->
+    <Pane fx:id="overlayBackground" styleClass="overlay-background"/>
+
+    <!-- Profile card -->
+    <VBox fx:id="profileCard" styleClass="profile-card" spacing="16"
+          prefWidth="360" maxWidth="360"
+          prefHeight="480" maxHeight="480">
+
+        <!-- ===== Header: User Info (left) + actions (right) ===== -->
+        <HBox alignment="CENTER_LEFT" spacing="10">
+            <Label text="User Info" styleClass="user-info-title" HBox.hgrow="ALWAYS"/>
+            <Pane HBox.hgrow="ALWAYS"/> <!-- pushes buttons to right -->
+
+            <!-- More / overflow -->
+            <Button fx:id="infoMoreButton" styleClass="icon-button">
+                <graphic>
+                    <ImageView fx:id="moreIcon" fitWidth="18" fitHeight="18" preserveRatio="true">
+                        <image>
+                            <Image url="@/org/to/telegramfinalproject/Icons/more_dark.png"/>
+                        </image>
+                    </ImageView>
+                </graphic>
+                <contextMenu>
+                    <ContextMenu fx:id="infoMoreMenu">
+                        <items>
+                            <MenuItem fx:id="blockItem" text="Block" style="-fx-text-fill: red;">
+                                <graphic>
+                                    <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/block_red.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+                            <MenuItem fx:id="unblockItem" text="Unblock" visible="false" style="-fx-text-fill: red;">
+                                <graphic>
+                                    <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/block_red.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+                            <MenuItem fx:id="deleteChatItem" text="Delete chat" style="-fx-text-fill: red;">
+                                <graphic>
+                                    <ImageView fitWidth="16" fitHeight="16" preserveRatio="true">
+                                        <image>
+                                            <Image url="@/org/to/telegramfinalproject/Icons/delete_red.png"/>
+                                        </image>
+                                    </ImageView>
+                                </graphic>
+                            </MenuItem>
+                        </items>
+                    </ContextMenu>
+                </contextMenu>
+            </Button>
+
+            <!-- Close -->
+            <Button fx:id="closeButton" styleClass="icon-button" text="✕"/>
+        </HBox>
+
+
+        <!-- Profile: picture + name/status -->
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <ImageView fx:id="profileImage" fitWidth="80" fitHeight="80" preserveRatio="true"
+                       styleClass="profile-picture"/>
+            <VBox alignment="CENTER_LEFT" spacing="4">
+                <Label fx:id="profileName" text="User Name" styleClass="profile-name"/>
+                <Label fx:id="profileStatus" text="last seen recently" styleClass="profile-status"/>
+            </VBox>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+
+        <!-- Info blocks -->
+        <HBox alignment="TOP_LEFT">
+            <Pane prefWidth="30"/> <!-- left spacer -->
+
+            <VBox spacing="16" styleClass="info-blocks">
+
+                <!-- Bio -->
+                <HBox spacing="10" alignment="TOP_LEFT" fx:id="bioBlock">
+                    <!-- Icon -->
+                    <ImageView fx:id="bioIcon" fitWidth="16" fitHeight="16" preserveRatio="true"
+                               styleClass="info-icon">
+                        <image>
+                            <Image url="@/org/to/telegramfinalproject/Icons/bio_dark.png"/>
+                        </image>
+                    </ImageView>
+
+                    <!-- Texts -->
+                    <VBox spacing="2">
+                        <Label fx:id="userBio" wrapText="true" styleClass="profile-info-main"/>
+                        <Label text="Bio" styleClass="profile-info-sub"/>
+                    </VBox>
+                </HBox>
+
+                <!-- Username -->
+                <HBox spacing="10" alignment="TOP_LEFT" fx:id="usernameBlock">
+                    <!-- Icon -->
+                    <ImageView fx:id="usernameIcon" fitWidth="16" fitHeight="16" preserveRatio="true"
+                               styleClass="info-icon">
+                        <image>
+                            <Image url="@/org/to/telegramfinalproject/Icons/username_dark.png"/>
+                        </image>
+                    </ImageView>
+
+                    <!-- Texts -->
+                    <VBox spacing="2">
+                        <Label fx:id="userId" styleClass="profile-info-main"/>
+                        <Label text="Username" styleClass="profile-info-sub"/>
+                    </VBox>
+                </HBox>
+
+            </VBox>
+        </HBox>
+
+        <Separator styleClass="section-separator"/>
+    </VBox>
+</StackPane>
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/add_member_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/add_member_dark.png
new file mode 100644
index 0000000..2aab4c1
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/add_member_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/add_member_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/add_member_light.png
new file mode 100644
index 0000000..a5fdc03
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/add_member_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/administrator_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/administrator_dark.png
new file mode 100644
index 0000000..98c92cc
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/administrator_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/administrator_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/administrator_light.png
new file mode 100644
index 0000000..bd90eda
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/administrator_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/archived_chats_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/archived_chats_dark.png
new file mode 100644
index 0000000..5e3d1db
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/archived_chats_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/archived_chats_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/archived_chats_light.png
new file mode 100644
index 0000000..6a03fc9
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/archived_chats_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/attachment_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/attachment_dark.png
new file mode 100644
index 0000000..28e566d
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/attachment_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/attachment_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/attachment_light.png
new file mode 100644
index 0000000..9f0aedf
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/attachment_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/back_button_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/back_button_dark.png
new file mode 100644
index 0000000..9a8cff7
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/back_button_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/back_button_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/back_button_light.png
new file mode 100644
index 0000000..dffe507
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/back_button_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/bio_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/bio_dark.png
new file mode 100644
index 0000000..a3eef7d
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/bio_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/bio_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/bio_light.png
new file mode 100644
index 0000000..8605d60
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/bio_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/block_red.png b/src/main/resources/org/to/telegramfinalproject/Icons/block_red.png
new file mode 100644
index 0000000..9cb5ba3
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/block_red.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/camera.png b/src/main/resources/org/to/telegramfinalproject/Icons/camera.png
new file mode 100644
index 0000000..dc102db
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/camera.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/contacts_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/contacts_dark.png
new file mode 100644
index 0000000..2c81681
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/contacts_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/contacts_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/contacts_light.png
new file mode 100644
index 0000000..3a71414
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/contacts_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/delete_red.png b/src/main/resources/org/to/telegramfinalproject/Icons/delete_red.png
new file mode 100644
index 0000000..bc25804
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/delete_red.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/edit_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/edit_dark.png
new file mode 100644
index 0000000..3a46012
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/edit_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/edit_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/edit_light.png
new file mode 100644
index 0000000..571c0d0
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/edit_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/group_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/group_dark.png
new file mode 100644
index 0000000..73e7ab7
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/group_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/group_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/group_light.png
new file mode 100644
index 0000000..4e802ef
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/group_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/group_member_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/group_member_dark.png
new file mode 100644
index 0000000..4820aa1
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/group_member_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/group_member_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/group_member_light.png
new file mode 100644
index 0000000..1af6c74
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/group_member_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/hand_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/hand_dark.png
new file mode 100644
index 0000000..0ff49f1
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/hand_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/hand_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/hand_light.png
new file mode 100644
index 0000000..a4694c7
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/hand_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/ic_copy.png b/src/main/resources/org/to/telegramfinalproject/Icons/ic_copy.png
new file mode 100644
index 0000000..a40af72
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/ic_copy.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/ic_delete.png b/src/main/resources/org/to/telegramfinalproject/Icons/ic_delete.png
new file mode 100644
index 0000000..ad2222c
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/ic_delete.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/ic_delete_danger.png b/src/main/resources/org/to/telegramfinalproject/Icons/ic_delete_danger.png
new file mode 100644
index 0000000..be8abf3
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/ic_delete_danger.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/ic_edit.png b/src/main/resources/org/to/telegramfinalproject/Icons/ic_edit.png
new file mode 100644
index 0000000..fcc6f26
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/ic_edit.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/ic_forward.png b/src/main/resources/org/to/telegramfinalproject/Icons/ic_forward.png
new file mode 100644
index 0000000..6d79369
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/ic_forward.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/ic_reply.png b/src/main/resources/org/to/telegramfinalproject/Icons/ic_reply.png
new file mode 100644
index 0000000..3a14b10
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/ic_reply.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/ic_save.png b/src/main/resources/org/to/telegramfinalproject/Icons/ic_save.png
new file mode 100644
index 0000000..7bcf70d
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/ic_save.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/lock_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/lock_dark.png
new file mode 100644
index 0000000..80c4ceb
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/lock_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/lock_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/lock_light.png
new file mode 100644
index 0000000..bf04fb0
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/lock_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/log_out.png b/src/main/resources/org/to/telegramfinalproject/Icons/log_out.png
new file mode 100644
index 0000000..e7f7fc8
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/log_out.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/manage_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/manage_dark.png
new file mode 100644
index 0000000..8292878
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/manage_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/manage_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/manage_light.png
new file mode 100644
index 0000000..9bd2bf8
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/manage_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/menu_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/menu_dark.png
new file mode 100644
index 0000000..2a3e6d7
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/menu_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/menu_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/menu_light.png
new file mode 100644
index 0000000..c40e78b
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/menu_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/more_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/more_dark.png
new file mode 100644
index 0000000..b69f972
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/more_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/more_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/more_light.png
new file mode 100644
index 0000000..c86dc96
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/more_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/my_profile_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/my_profile_dark.png
new file mode 100644
index 0000000..6d23203
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/my_profile_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/my_profile_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/my_profile_light.png
new file mode 100644
index 0000000..e865d56
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/my_profile_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/new_channel_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/new_channel_dark.png
new file mode 100644
index 0000000..156c170
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/new_channel_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/new_channel_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/new_channel_light.png
new file mode 100644
index 0000000..884f5b5
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/new_channel_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/new_group_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/new_group_dark.png
new file mode 100644
index 0000000..1280107
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/new_group_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/new_group_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/new_group_light.png
new file mode 100644
index 0000000..f2c4969
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/new_group_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/night_mode_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/night_mode_dark.png
new file mode 100644
index 0000000..1ebf9f6
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/night_mode_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/night_mode_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/night_mode_light.png
new file mode 100644
index 0000000..8f9515a
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/night_mode_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/no_result_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/no_result_dark.png
new file mode 100644
index 0000000..0e365d1
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/no_result_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/no_result_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/no_result_light.png
new file mode 100644
index 0000000..e379f6c
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/no_result_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/password_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/password_dark.png
new file mode 100644
index 0000000..a0352ee
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/password_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/password_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/password_light.png
new file mode 100644
index 0000000..35f1644
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/password_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/saved_messages_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/saved_messages_dark.png
new file mode 100644
index 0000000..eb3abef
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/saved_messages_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/saved_messages_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/saved_messages_light.png
new file mode 100644
index 0000000..d5c2f67
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/saved_messages_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/search_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/search_dark.png
new file mode 100644
index 0000000..56bca66
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/search_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/search_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/search_light.png
new file mode 100644
index 0000000..e136091
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/search_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/send_cyan.png b/src/main/resources/org/to/telegramfinalproject/Icons/send_cyan.png
new file mode 100644
index 0000000..18fcc5f
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/send_cyan.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/send_cyan2.png b/src/main/resources/org/to/telegramfinalproject/Icons/send_cyan2.png
new file mode 100644
index 0000000..f635979
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/send_cyan2.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/settings_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/settings_dark.png
new file mode 100644
index 0000000..78719ff
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/settings_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/settings_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/settings_light.png
new file mode 100644
index 0000000..5668acb
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/settings_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/smiley.png b/src/main/resources/org/to/telegramfinalproject/Icons/smiley.png
new file mode 100644
index 0000000..767f8aa
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/smiley.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/telegram_features_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_features_dark.png
new file mode 100644
index 0000000..dab579c
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_features_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/telegram_features_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_features_light.png
new file mode 100644
index 0000000..2d15e68
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_features_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/telegram_qna_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_qna_dark.png
new file mode 100644
index 0000000..671d745
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_qna_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/telegram_qna_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_qna_light.png
new file mode 100644
index 0000000..ac99f53
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/telegram_qna_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/user_id_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/user_id_dark.png
new file mode 100644
index 0000000..86a41ce
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/user_id_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/user_id_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/user_id_light.png
new file mode 100644
index 0000000..4840c0f
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/user_id_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/username_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/username_dark.png
new file mode 100644
index 0000000..ff274ee
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/username_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/username_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/username_light.png
new file mode 100644
index 0000000..0def66e
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/username_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/view_profile_dark.png b/src/main/resources/org/to/telegramfinalproject/Icons/view_profile_dark.png
new file mode 100644
index 0000000..0fe6b75
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/view_profile_dark.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Icons/view_profile_light.png b/src/main/resources/org/to/telegramfinalproject/Icons/view_profile_light.png
new file mode 100644
index 0000000..9eeeffe
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Icons/view_profile_light.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Images/fast.png b/src/main/resources/org/to/telegramfinalproject/Images/fast.png
new file mode 100644
index 0000000..372f48b
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Images/fast.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Images/free.png b/src/main/resources/org/to/telegramfinalproject/Images/free.png
new file mode 100644
index 0000000..aa0d5d0
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Images/free.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Images/secure.png b/src/main/resources/org/to/telegramfinalproject/Images/secure.png
new file mode 100644
index 0000000..8388802
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Images/secure.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/Images/telegram_icon.png b/src/main/resources/org/to/telegramfinalproject/Images/telegram_icon.png
new file mode 100644
index 0000000..d955219
Binary files /dev/null and b/src/main/resources/org/to/telegramfinalproject/Images/telegram_icon.png differ
diff --git a/src/main/resources/org/to/telegramfinalproject/hello-view.fxml b/src/main/resources/org/to/telegramfinalproject/hello-view.fxml
deleted file mode 100644
index 6d1b9c1..0000000
--- a/src/main/resources/org/to/telegramfinalproject/hello-view.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.VBox?>
-
-<?import javafx.scene.control.Button?>
-<VBox alignment="CENTER" spacing="20.0" xmlns:fx="http://javafx.com/fxml"
-      fx:controller="org.to.telegramfinalproject.HelloController">
-  <padding>
-    <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
-  </padding>
-
-  <Label fx:id="welcomeText"/>
-  <Button text="Hello!" onAction="#onHelloButtonClick"/>
-</VBox>
diff --git a/uploads/audios/2025-08-13/f17172fe-9860-4166-bc2f-714429f8f927.mp3 b/uploads/audios/2025-08-13/f17172fe-9860-4166-bc2f-714429f8f927.mp3
new file mode 100644
index 0000000..e284599
Binary files /dev/null and b/uploads/audios/2025-08-13/f17172fe-9860-4166-bc2f-714429f8f927.mp3 differ
diff --git a/uploads/audios/2025-08-14/7864e991-10b4-4c83-bff0-52893ad3b952.mp3 b/uploads/audios/2025-08-14/7864e991-10b4-4c83-bff0-52893ad3b952.mp3
new file mode 100644
index 0000000..70cae69
Binary files /dev/null and b/uploads/audios/2025-08-14/7864e991-10b4-4c83-bff0-52893ad3b952.mp3 differ
diff --git a/uploads/audios/2025-08-14/d36ad08c-ab2d-45bf-954e-ddf29acf59c5.mp3 b/uploads/audios/2025-08-14/d36ad08c-ab2d-45bf-954e-ddf29acf59c5.mp3
new file mode 100644
index 0000000..7c414d9
Binary files /dev/null and b/uploads/audios/2025-08-14/d36ad08c-ab2d-45bf-954e-ddf29acf59c5.mp3 differ
diff --git a/uploads/audios/2025-08-15/521a295c-4d57-4a89-91bc-cfd160799db7.wav b/uploads/audios/2025-08-15/521a295c-4d57-4a89-91bc-cfd160799db7.wav
new file mode 100644
index 0000000..b2a42ce
Binary files /dev/null and b/uploads/audios/2025-08-15/521a295c-4d57-4a89-91bc-cfd160799db7.wav differ
diff --git a/uploads/audios/2025-09-06/f2e8ed9f-7bfa-4064-aba8-6b1d723ba3d7.mp3 b/uploads/audios/2025-09-06/f2e8ed9f-7bfa-4064-aba8-6b1d723ba3d7.mp3
new file mode 100644
index 0000000..7c414d9
Binary files /dev/null and b/uploads/audios/2025-09-06/f2e8ed9f-7bfa-4064-aba8-6b1d723ba3d7.mp3 differ
diff --git a/uploads/audios/2025-09-08/6d8c65c6-cb89-48ba-83e1-3a4a49dcfd64.mp3 b/uploads/audios/2025-09-08/6d8c65c6-cb89-48ba-83e1-3a4a49dcfd64.mp3
new file mode 100644
index 0000000..7c414d9
Binary files /dev/null and b/uploads/audios/2025-09-08/6d8c65c6-cb89-48ba-83e1-3a4a49dcfd64.mp3 differ
diff --git a/uploads/audios/2025-09-08/810aea99-ca7b-46e0-8aed-dca4de6e7a06.mp3 b/uploads/audios/2025-09-08/810aea99-ca7b-46e0-8aed-dca4de6e7a06.mp3
new file mode 100644
index 0000000..70cae69
Binary files /dev/null and b/uploads/audios/2025-09-08/810aea99-ca7b-46e0-8aed-dca4de6e7a06.mp3 differ
diff --git a/uploads/audios/2025-09-08/f2e4fa82-e4d6-42f4-bc30-2beb48f38697.mp3 b/uploads/audios/2025-09-08/f2e4fa82-e4d6-42f4-bc30-2beb48f38697.mp3
new file mode 100644
index 0000000..70cae69
Binary files /dev/null and b/uploads/audios/2025-09-08/f2e4fa82-e4d6-42f4-bc30-2beb48f38697.mp3 differ
diff --git a/uploads/avatars/2025-08-31/0abd3115-2b51-4bd1-97f9-c012ba349781.jpg b/uploads/avatars/2025-08-31/0abd3115-2b51-4bd1-97f9-c012ba349781.jpg
new file mode 100644
index 0000000..f768a20
Binary files /dev/null and b/uploads/avatars/2025-08-31/0abd3115-2b51-4bd1-97f9-c012ba349781.jpg differ
diff --git a/uploads/avatars/2025-08-31/30175b7c-9aff-4553-bb45-37e03d3a97e5.jpg b/uploads/avatars/2025-08-31/30175b7c-9aff-4553-bb45-37e03d3a97e5.jpg
new file mode 100644
index 0000000..daf95f8
Binary files /dev/null and b/uploads/avatars/2025-08-31/30175b7c-9aff-4553-bb45-37e03d3a97e5.jpg differ
diff --git a/uploads/avatars/2025-08-31/54ae3db6-6258-48f1-892b-991e756f06e5.jpg b/uploads/avatars/2025-08-31/54ae3db6-6258-48f1-892b-991e756f06e5.jpg
new file mode 100644
index 0000000..daf95f8
Binary files /dev/null and b/uploads/avatars/2025-08-31/54ae3db6-6258-48f1-892b-991e756f06e5.jpg differ
diff --git a/uploads/avatars/2025-08-31/cb32b296-bd73-4d0c-b1e8-2e29ebc66c51.jpg b/uploads/avatars/2025-08-31/cb32b296-bd73-4d0c-b1e8-2e29ebc66c51.jpg
new file mode 100644
index 0000000..f768a20
Binary files /dev/null and b/uploads/avatars/2025-08-31/cb32b296-bd73-4d0c-b1e8-2e29ebc66c51.jpg differ
diff --git a/uploads/avatars/2025-08-31/cd17841e-eb14-46a7-a466-5d949abeec4d.jpg b/uploads/avatars/2025-08-31/cd17841e-eb14-46a7-a466-5d949abeec4d.jpg
new file mode 100644
index 0000000..b6eac22
Binary files /dev/null and b/uploads/avatars/2025-08-31/cd17841e-eb14-46a7-a466-5d949abeec4d.jpg differ
diff --git a/uploads/avatars/2025-08-31/df680c1b-b9c8-46c8-94e3-3ddf93700f6d.jpg b/uploads/avatars/2025-08-31/df680c1b-b9c8-46c8-94e3-3ddf93700f6d.jpg
new file mode 100644
index 0000000..d2ee316
Binary files /dev/null and b/uploads/avatars/2025-08-31/df680c1b-b9c8-46c8-94e3-3ddf93700f6d.jpg differ
diff --git a/uploads/avatars/2025-08-31/dfb184c7-d6c8-4a49-a73a-744bba49692b.jpg b/uploads/avatars/2025-08-31/dfb184c7-d6c8-4a49-a73a-744bba49692b.jpg
new file mode 100644
index 0000000..8c03f5c
Binary files /dev/null and b/uploads/avatars/2025-08-31/dfb184c7-d6c8-4a49-a73a-744bba49692b.jpg differ
diff --git a/uploads/avatars/2025-09-04/0c49fdf9-8cec-4724-9e8c-eb2f22829e85.png b/uploads/avatars/2025-09-04/0c49fdf9-8cec-4724-9e8c-eb2f22829e85.png
new file mode 100644
index 0000000..6f674aa
Binary files /dev/null and b/uploads/avatars/2025-09-04/0c49fdf9-8cec-4724-9e8c-eb2f22829e85.png differ
diff --git a/uploads/avatars/2025-09-04/165ff232-2d0b-49b3-8455-ab3f7d178800.png b/uploads/avatars/2025-09-04/165ff232-2d0b-49b3-8455-ab3f7d178800.png
new file mode 100644
index 0000000..8f744ba
Binary files /dev/null and b/uploads/avatars/2025-09-04/165ff232-2d0b-49b3-8455-ab3f7d178800.png differ
diff --git a/uploads/avatars/2025-09-04/19dfd58c-cbcc-4e7d-93bd-693dfc1cdd7f.png b/uploads/avatars/2025-09-04/19dfd58c-cbcc-4e7d-93bd-693dfc1cdd7f.png
new file mode 100644
index 0000000..19b7f82
Binary files /dev/null and b/uploads/avatars/2025-09-04/19dfd58c-cbcc-4e7d-93bd-693dfc1cdd7f.png differ
diff --git a/uploads/avatars/2025-09-04/28387c9f-0edc-463b-905c-be483e044c4d.png b/uploads/avatars/2025-09-04/28387c9f-0edc-463b-905c-be483e044c4d.png
new file mode 100644
index 0000000..19b7f82
Binary files /dev/null and b/uploads/avatars/2025-09-04/28387c9f-0edc-463b-905c-be483e044c4d.png differ
diff --git a/uploads/avatars/2025-09-04/2b664f51-f42c-4435-a1ea-3bc63f128d37.png b/uploads/avatars/2025-09-04/2b664f51-f42c-4435-a1ea-3bc63f128d37.png
new file mode 100644
index 0000000..19b7f82
Binary files /dev/null and b/uploads/avatars/2025-09-04/2b664f51-f42c-4435-a1ea-3bc63f128d37.png differ
diff --git a/uploads/avatars/2025-09-04/37c58631-8766-4c70-ab18-8c3f4c7349ba.png b/uploads/avatars/2025-09-04/37c58631-8766-4c70-ab18-8c3f4c7349ba.png
new file mode 100644
index 0000000..8f744ba
Binary files /dev/null and b/uploads/avatars/2025-09-04/37c58631-8766-4c70-ab18-8c3f4c7349ba.png differ
diff --git a/uploads/avatars/2025-09-04/3aa7cd3a-5f03-48f1-9d52-e4134e48d639.png b/uploads/avatars/2025-09-04/3aa7cd3a-5f03-48f1-9d52-e4134e48d639.png
new file mode 100644
index 0000000..8f744ba
Binary files /dev/null and b/uploads/avatars/2025-09-04/3aa7cd3a-5f03-48f1-9d52-e4134e48d639.png differ
diff --git a/uploads/avatars/2025-09-04/4daa0186-964a-4d8f-ab04-540655ce4cfe.png b/uploads/avatars/2025-09-04/4daa0186-964a-4d8f-ab04-540655ce4cfe.png
new file mode 100644
index 0000000..8f744ba
Binary files /dev/null and b/uploads/avatars/2025-09-04/4daa0186-964a-4d8f-ab04-540655ce4cfe.png differ
diff --git a/uploads/avatars/2025-09-04/63ba8ffb-8749-4e08-9068-80faa04dffcc.png b/uploads/avatars/2025-09-04/63ba8ffb-8749-4e08-9068-80faa04dffcc.png
new file mode 100644
index 0000000..19b7f82
Binary files /dev/null and b/uploads/avatars/2025-09-04/63ba8ffb-8749-4e08-9068-80faa04dffcc.png differ
diff --git a/uploads/avatars/2025-09-04/6963902f-10ee-4411-afef-fd5bf9593d35.jpg b/uploads/avatars/2025-09-04/6963902f-10ee-4411-afef-fd5bf9593d35.jpg
new file mode 100644
index 0000000..b6eac22
Binary files /dev/null and b/uploads/avatars/2025-09-04/6963902f-10ee-4411-afef-fd5bf9593d35.jpg differ
diff --git a/uploads/avatars/2025-09-04/6fbab85a-66b9-42f8-b6eb-f33e16567a35.jpg b/uploads/avatars/2025-09-04/6fbab85a-66b9-42f8-b6eb-f33e16567a35.jpg
new file mode 100644
index 0000000..8c03f5c
Binary files /dev/null and b/uploads/avatars/2025-09-04/6fbab85a-66b9-42f8-b6eb-f33e16567a35.jpg differ
diff --git a/uploads/avatars/2025-09-04/72e47bef-83fa-4d35-beac-cbf3594fd416.png b/uploads/avatars/2025-09-04/72e47bef-83fa-4d35-beac-cbf3594fd416.png
new file mode 100644
index 0000000..8f744ba
Binary files /dev/null and b/uploads/avatars/2025-09-04/72e47bef-83fa-4d35-beac-cbf3594fd416.png differ
diff --git a/uploads/avatars/2025-09-04/75ab6cb9-da64-40a2-a8f1-de1a2d63bbcc.jpg b/uploads/avatars/2025-09-04/75ab6cb9-da64-40a2-a8f1-de1a2d63bbcc.jpg
new file mode 100644
index 0000000..f768a20
Binary files /dev/null and b/uploads/avatars/2025-09-04/75ab6cb9-da64-40a2-a8f1-de1a2d63bbcc.jpg differ
diff --git a/uploads/avatars/2025-09-04/937d8470-efc1-4000-a08d-8daf9996f09f.png b/uploads/avatars/2025-09-04/937d8470-efc1-4000-a08d-8daf9996f09f.png
new file mode 100644
index 0000000..5e8c558
Binary files /dev/null and b/uploads/avatars/2025-09-04/937d8470-efc1-4000-a08d-8daf9996f09f.png differ
diff --git a/uploads/avatars/2025-09-04/b13fca0f-6e75-42ef-a9ac-610b3b12231a.jpg b/uploads/avatars/2025-09-04/b13fca0f-6e75-42ef-a9ac-610b3b12231a.jpg
new file mode 100644
index 0000000..f768a20
Binary files /dev/null and b/uploads/avatars/2025-09-04/b13fca0f-6e75-42ef-a9ac-610b3b12231a.jpg differ
diff --git a/uploads/avatars/2025-09-05/0ae6648c-9b72-43db-8229-206d8134c0f3.jpg b/uploads/avatars/2025-09-05/0ae6648c-9b72-43db-8229-206d8134c0f3.jpg
new file mode 100644
index 0000000..ee48cbb
Binary files /dev/null and b/uploads/avatars/2025-09-05/0ae6648c-9b72-43db-8229-206d8134c0f3.jpg differ
diff --git a/uploads/avatars/2025-09-05/3336cf86-cb4e-47d6-85c2-44431a1ed07f.jpg b/uploads/avatars/2025-09-05/3336cf86-cb4e-47d6-85c2-44431a1ed07f.jpg
new file mode 100644
index 0000000..3a96141
Binary files /dev/null and b/uploads/avatars/2025-09-05/3336cf86-cb4e-47d6-85c2-44431a1ed07f.jpg differ
diff --git a/uploads/avatars/2025-09-05/5b195266-4c7b-4b66-8303-c469dd49b5ed.jpg b/uploads/avatars/2025-09-05/5b195266-4c7b-4b66-8303-c469dd49b5ed.jpg
new file mode 100644
index 0000000..8233662
Binary files /dev/null and b/uploads/avatars/2025-09-05/5b195266-4c7b-4b66-8303-c469dd49b5ed.jpg differ
diff --git a/uploads/avatars/2025-09-05/81dcf31e-c523-46de-97f6-2bdea7009589.jpg b/uploads/avatars/2025-09-05/81dcf31e-c523-46de-97f6-2bdea7009589.jpg
new file mode 100644
index 0000000..05084e6
Binary files /dev/null and b/uploads/avatars/2025-09-05/81dcf31e-c523-46de-97f6-2bdea7009589.jpg differ
diff --git a/uploads/avatars/2025-09-05/91103024-fa95-4ee9-aa82-7b6e50ac960f.jpg b/uploads/avatars/2025-09-05/91103024-fa95-4ee9-aa82-7b6e50ac960f.jpg
new file mode 100644
index 0000000..3a96141
Binary files /dev/null and b/uploads/avatars/2025-09-05/91103024-fa95-4ee9-aa82-7b6e50ac960f.jpg differ
diff --git a/uploads/avatars/2025-09-05/a60e9051-ca4c-4eaa-95b8-417044af8569.jpg b/uploads/avatars/2025-09-05/a60e9051-ca4c-4eaa-95b8-417044af8569.jpg
new file mode 100644
index 0000000..05084e6
Binary files /dev/null and b/uploads/avatars/2025-09-05/a60e9051-ca4c-4eaa-95b8-417044af8569.jpg differ
diff --git a/uploads/avatars/2025-09-05/ca9f35f2-8ecb-450f-8b56-b6b67c87f256.jpg b/uploads/avatars/2025-09-05/ca9f35f2-8ecb-450f-8b56-b6b67c87f256.jpg
new file mode 100644
index 0000000..103ad9a
Binary files /dev/null and b/uploads/avatars/2025-09-05/ca9f35f2-8ecb-450f-8b56-b6b67c87f256.jpg differ
diff --git a/uploads/avatars/2025-09-08/01919d14-e3f5-4dd4-b579-21fe59c5bfed.jpg b/uploads/avatars/2025-09-08/01919d14-e3f5-4dd4-b579-21fe59c5bfed.jpg
new file mode 100644
index 0000000..5a37195
Binary files /dev/null and b/uploads/avatars/2025-09-08/01919d14-e3f5-4dd4-b579-21fe59c5bfed.jpg differ
diff --git a/uploads/avatars/2025-09-08/049e91ab-8337-49d1-8b54-9418741f5e07.jpg b/uploads/avatars/2025-09-08/049e91ab-8337-49d1-8b54-9418741f5e07.jpg
new file mode 100644
index 0000000..3c74d30
Binary files /dev/null and b/uploads/avatars/2025-09-08/049e91ab-8337-49d1-8b54-9418741f5e07.jpg differ
diff --git a/uploads/avatars/2025-09-08/12b6441a-e7a7-402d-ac52-bf81460f135a.jpg b/uploads/avatars/2025-09-08/12b6441a-e7a7-402d-ac52-bf81460f135a.jpg
new file mode 100644
index 0000000..d28a894
Binary files /dev/null and b/uploads/avatars/2025-09-08/12b6441a-e7a7-402d-ac52-bf81460f135a.jpg differ
diff --git a/uploads/avatars/2025-09-08/9369c195-1426-4a95-a64c-3687de82da72.jpg b/uploads/avatars/2025-09-08/9369c195-1426-4a95-a64c-3687de82da72.jpg
new file mode 100644
index 0000000..5a37195
Binary files /dev/null and b/uploads/avatars/2025-09-08/9369c195-1426-4a95-a64c-3687de82da72.jpg differ
diff --git a/uploads/avatars/2025-09-08/a01fa00f-00cc-4222-9e75-4f44fe0d6d26.jpg b/uploads/avatars/2025-09-08/a01fa00f-00cc-4222-9e75-4f44fe0d6d26.jpg
new file mode 100644
index 0000000..5a37195
Binary files /dev/null and b/uploads/avatars/2025-09-08/a01fa00f-00cc-4222-9e75-4f44fe0d6d26.jpg differ
diff --git a/uploads/avatars/2025-09-08/ce62f491-c4bb-4529-afd0-251965eb69c1.jpg b/uploads/avatars/2025-09-08/ce62f491-c4bb-4529-afd0-251965eb69c1.jpg
new file mode 100644
index 0000000..61984d6
Binary files /dev/null and b/uploads/avatars/2025-09-08/ce62f491-c4bb-4529-afd0-251965eb69c1.jpg differ
diff --git a/uploads/avatars/2025-09-08/e744b9b9-0973-44a5-b91e-f2aa0593c478.jpg b/uploads/avatars/2025-09-08/e744b9b9-0973-44a5-b91e-f2aa0593c478.jpg
new file mode 100644
index 0000000..4ba8aae
Binary files /dev/null and b/uploads/avatars/2025-09-08/e744b9b9-0973-44a5-b91e-f2aa0593c478.jpg differ
diff --git a/uploads/images/2025-08-13/85abac07-0807-491d-934c-b4b6e516c9b1.png b/uploads/images/2025-08-13/85abac07-0807-491d-934c-b4b6e516c9b1.png
new file mode 100644
index 0000000..d48fdf4
Binary files /dev/null and b/uploads/images/2025-08-13/85abac07-0807-491d-934c-b4b6e516c9b1.png differ
diff --git a/uploads/images/2025-08-13/98df3bac-4469-4af0-a632-92a957c98de4.png b/uploads/images/2025-08-13/98df3bac-4469-4af0-a632-92a957c98de4.png
new file mode 100644
index 0000000..bdbb787
Binary files /dev/null and b/uploads/images/2025-08-13/98df3bac-4469-4af0-a632-92a957c98de4.png differ
diff --git a/uploads/images/2025-08-13/eefa7708-0865-4c9d-a0c4-829f0887cecd.png b/uploads/images/2025-08-13/eefa7708-0865-4c9d-a0c4-829f0887cecd.png
new file mode 100644
index 0000000..d48fdf4
Binary files /dev/null and b/uploads/images/2025-08-13/eefa7708-0865-4c9d-a0c4-829f0887cecd.png differ
diff --git a/uploads/images/2025-08-14/47f40cc4-16c2-4aac-a913-097739bc6b50.png b/uploads/images/2025-08-14/47f40cc4-16c2-4aac-a913-097739bc6b50.png
new file mode 100644
index 0000000..af4cbdb
Binary files /dev/null and b/uploads/images/2025-08-14/47f40cc4-16c2-4aac-a913-097739bc6b50.png differ
diff --git a/uploads/images/2025-08-15/087d2525-18b6-4566-b5ec-99a9846d87ea.png b/uploads/images/2025-08-15/087d2525-18b6-4566-b5ec-99a9846d87ea.png
new file mode 100644
index 0000000..a45eb23
Binary files /dev/null and b/uploads/images/2025-08-15/087d2525-18b6-4566-b5ec-99a9846d87ea.png differ
diff --git a/uploads/images/2025-08-15/5552f0cc-5078-4669-aacf-0de7805a621c.png b/uploads/images/2025-08-15/5552f0cc-5078-4669-aacf-0de7805a621c.png
new file mode 100644
index 0000000..a45eb23
Binary files /dev/null and b/uploads/images/2025-08-15/5552f0cc-5078-4669-aacf-0de7805a621c.png differ
diff --git a/uploads/images/2025-08-15/729b945f-ad58-4bac-b0a2-eb2d34af1f12.png b/uploads/images/2025-08-15/729b945f-ad58-4bac-b0a2-eb2d34af1f12.png
new file mode 100644
index 0000000..a45eb23
Binary files /dev/null and b/uploads/images/2025-08-15/729b945f-ad58-4bac-b0a2-eb2d34af1f12.png differ
diff --git a/uploads/images/2025-08-15/98d4293b-679f-4229-8e38-d66296508818.png b/uploads/images/2025-08-15/98d4293b-679f-4229-8e38-d66296508818.png
new file mode 100644
index 0000000..a45eb23
Binary files /dev/null and b/uploads/images/2025-08-15/98d4293b-679f-4229-8e38-d66296508818.png differ
diff --git a/uploads/images/2025-08-15/a76f6013-3876-4962-b963-4115b59175a9.jpg b/uploads/images/2025-08-15/a76f6013-3876-4962-b963-4115b59175a9.jpg
new file mode 100644
index 0000000..f2de6b4
Binary files /dev/null and b/uploads/images/2025-08-15/a76f6013-3876-4962-b963-4115b59175a9.jpg differ
diff --git a/uploads/images/2025-09-06/aa3264e4-685d-4ab1-b6fb-e7fa1e44f1c5.jpg b/uploads/images/2025-09-06/aa3264e4-685d-4ab1-b6fb-e7fa1e44f1c5.jpg
new file mode 100644
index 0000000..4ba8aae
Binary files /dev/null and b/uploads/images/2025-09-06/aa3264e4-685d-4ab1-b6fb-e7fa1e44f1c5.jpg differ
diff --git a/uploads/images/2025-09-06/d82b5664-7682-4b37-ac62-4bc291933618.jpg b/uploads/images/2025-09-06/d82b5664-7682-4b37-ac62-4bc291933618.jpg
new file mode 100644
index 0000000..3a96141
Binary files /dev/null and b/uploads/images/2025-09-06/d82b5664-7682-4b37-ac62-4bc291933618.jpg differ
diff --git a/uploads/images/2025-09-06/f8c06ffd-c35b-454b-844b-a97c2352a07e.jpg b/uploads/images/2025-09-06/f8c06ffd-c35b-454b-844b-a97c2352a07e.jpg
new file mode 100644
index 0000000..05084e6
Binary files /dev/null and b/uploads/images/2025-09-06/f8c06ffd-c35b-454b-844b-a97c2352a07e.jpg differ
diff --git a/uploads/images/2025-09-07/242a76f9-f540-4d3a-bd0a-6507099b164e.jpeg b/uploads/images/2025-09-07/242a76f9-f540-4d3a-bd0a-6507099b164e.jpeg
new file mode 100644
index 0000000..9515e2c
Binary files /dev/null and b/uploads/images/2025-09-07/242a76f9-f540-4d3a-bd0a-6507099b164e.jpeg differ
diff --git a/uploads/images/2025-09-07/7b6d3072-1c72-40d8-bee7-d6dbfda54dd2.jpg b/uploads/images/2025-09-07/7b6d3072-1c72-40d8-bee7-d6dbfda54dd2.jpg
new file mode 100644
index 0000000..4ba8aae
Binary files /dev/null and b/uploads/images/2025-09-07/7b6d3072-1c72-40d8-bee7-d6dbfda54dd2.jpg differ
diff --git a/uploads/images/2025-09-07/a93c7324-22fa-4268-9f1e-34a9448f5f6e.jpg b/uploads/images/2025-09-07/a93c7324-22fa-4268-9f1e-34a9448f5f6e.jpg
new file mode 100644
index 0000000..f6d2c4e
Binary files /dev/null and b/uploads/images/2025-09-07/a93c7324-22fa-4268-9f1e-34a9448f5f6e.jpg differ
diff --git a/uploads/images/2025-09-07/d9208502-a2a5-41d2-b912-29d622b582bf.jpg b/uploads/images/2025-09-07/d9208502-a2a5-41d2-b912-29d622b582bf.jpg
new file mode 100644
index 0000000..103ad9a
Binary files /dev/null and b/uploads/images/2025-09-07/d9208502-a2a5-41d2-b912-29d622b582bf.jpg differ
diff --git a/uploads/images/2025-09-07/dcb9b568-abea-43f4-bc39-acd71dc2438c.jpg b/uploads/images/2025-09-07/dcb9b568-abea-43f4-bc39-acd71dc2438c.jpg
new file mode 100644
index 0000000..b0ee46f
Binary files /dev/null and b/uploads/images/2025-09-07/dcb9b568-abea-43f4-bc39-acd71dc2438c.jpg differ
diff --git a/uploads/images/2025-09-07/e85885e6-4502-45fe-a2fe-71dd1f8595ba.jpg b/uploads/images/2025-09-07/e85885e6-4502-45fe-a2fe-71dd1f8595ba.jpg
new file mode 100644
index 0000000..05084e6
Binary files /dev/null and b/uploads/images/2025-09-07/e85885e6-4502-45fe-a2fe-71dd1f8595ba.jpg differ
diff --git a/uploads/images/2025-09-07/f87ee3b0-0a90-4c54-be85-a91f04d517df.jpg b/uploads/images/2025-09-07/f87ee3b0-0a90-4c54-be85-a91f04d517df.jpg
new file mode 100644
index 0000000..6436ef0
Binary files /dev/null and b/uploads/images/2025-09-07/f87ee3b0-0a90-4c54-be85-a91f04d517df.jpg differ
diff --git a/uploads/images/2025-09-08/0d3d9920-1bbe-4dca-816f-bcced6cb1b94.jpg b/uploads/images/2025-09-08/0d3d9920-1bbe-4dca-816f-bcced6cb1b94.jpg
new file mode 100644
index 0000000..05084e6
Binary files /dev/null and b/uploads/images/2025-09-08/0d3d9920-1bbe-4dca-816f-bcced6cb1b94.jpg differ
diff --git a/uploads/images/2025-09-08/0f42c3e1-56d7-4a80-8d03-ce4ee63cafa1.jpg b/uploads/images/2025-09-08/0f42c3e1-56d7-4a80-8d03-ce4ee63cafa1.jpg
new file mode 100644
index 0000000..ee48cbb
Binary files /dev/null and b/uploads/images/2025-09-08/0f42c3e1-56d7-4a80-8d03-ce4ee63cafa1.jpg differ
diff --git a/uploads/images/2025-09-08/19b9a652-30d8-426a-896e-dcfd30fe3da3.jpg b/uploads/images/2025-09-08/19b9a652-30d8-426a-896e-dcfd30fe3da3.jpg
new file mode 100644
index 0000000..ee48cbb
Binary files /dev/null and b/uploads/images/2025-09-08/19b9a652-30d8-426a-896e-dcfd30fe3da3.jpg differ
diff --git a/uploads/images/2025-09-08/8020b7a3-5ff0-4ab1-aa62-9a4825bcfbab.jpg b/uploads/images/2025-09-08/8020b7a3-5ff0-4ab1-aa62-9a4825bcfbab.jpg
new file mode 100644
index 0000000..6436ef0
Binary files /dev/null and b/uploads/images/2025-09-08/8020b7a3-5ff0-4ab1-aa62-9a4825bcfbab.jpg differ
diff --git a/uploads/images/2025-09-08/ecbc6432-a82f-4559-b2d0-1c6c7ae5b801.jpg b/uploads/images/2025-09-08/ecbc6432-a82f-4559-b2d0-1c6c7ae5b801.jpg
new file mode 100644
index 0000000..6436ef0
Binary files /dev/null and b/uploads/images/2025-09-08/ecbc6432-a82f-4559-b2d0-1c6c7ae5b801.jpg differ