From cb177691aa806467c6eaf3e3bda16844864b60d4 Mon Sep 17 00:00:00 2001
From: olcxja <olcxja@olcxja.ovh>
Date: Sun, 2 Aug 2026 21:19:00 +0200
Subject: [PATCH 1/4] improve topbar text and buttons culling

---
 android/app/src/main/assets/public/main.js   | 74 ++++++++++++++++++--
 android/app/src/main/assets/public/style.css | 17 ++---
 webroot/main.js                              | 74 ++++++++++++++++++--
 webroot/style.css                            | 17 ++---
 4 files changed, 148 insertions(+), 34 deletions(-)

diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index 82922c97..11bd2ef9 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -1483,11 +1483,11 @@ async function switchRoomContent(title, content, showRoomBar, icon = "", skipMob
     let pinCallBtns = showRoomBar ? `${pinBtnHtml}${callBtnHtml}` : '';
 
     let clickableContent = showRoomBar ? 
-        `<button id="room-topbar-clickable" class="inherit" onclick="mobileNavDetails();" style="cursor: pointer; display: flex; align-items: center; border-radius: 0.65rem; background: transparent; outline: none; height: 100%; text-align: left;">
-            ${icon ? icon + '<space></space>' : ''}<inherit>${processBlah(title)}</inherit>
+        `<button id="room-topbar-clickable" class="inherit" onclick="mobileNavDetails();" style="cursor: pointer; display: flex; align-items: center; border-radius: 0.65rem; background: transparent; outline: none; height: 100%; text-align: left; min-width: 0; width: auto; max-width: 100%;">
+            ${icon ? icon + '<space></space>' : ''}<inherit style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: block; min-width: 0; width: auto;">${processBlah(title)}</inherit>
         </button>` :
-        `<inherit style="display: flex; align-items: center; height: 100%;">
-            ${icon ? icon + '<space></space>' : ''}<inherit>${processBlah(title)}</inherit>
+        `<inherit style="display: flex; align-items: center; height: 100%; min-width: 0; width: auto; max-width: 100%;">
+            ${icon ? icon + '<space></space>' : ''}<inherit style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: block; min-width: 0; width: auto;">${processBlah(title)}</inherit>
         </inherit>`;
     roomsTopBarTransition.innerHTML = `${backBtnHtml}${clickableContent}<div class="flex-spacer"></div>${pinCallBtns}`;
 
@@ -4695,3 +4695,69 @@ function scrollToPinnedMessage(e, msgId) {
     }
     scrollToMessage(msgId);
 }
+
+function checkTopbarSpace() {
+    if (typeof roomTopBar === 'undefined' || !roomTopBar) return;
+    
+    let transitionEl = roomTopBar.children.item(0);
+    if (!transitionEl) return;
+    
+    let children = Array.from(transitionEl.children);
+    let usedWidth = 0;
+    
+    let isPinHidden = document.body.classList.contains('hide-topbar-pin');
+    let isCallHidden = document.body.classList.contains('hide-topbar-call');
+    
+    for (let child of children) {
+        if (child.classList.contains('flex-spacer')) continue;
+        
+        if (child.classList.contains('room-action-pin') && isPinHidden) continue;
+        if (child.classList.contains('room-action-call') && isCallHidden) continue;
+        
+        let style = window.getComputedStyle(child);
+        let margins = (parseFloat(style.marginLeft) || 0) + (parseFloat(style.marginRight) || 0);
+
+        if (child.id === 'room-topbar-clickable' || child.tagName.toLowerCase() === 'inherit') {
+            let titleEl = child.querySelector('inherit');
+            if (titleEl) {
+                usedWidth += (child.offsetWidth - titleEl.offsetWidth) + titleEl.scrollWidth + margins;
+            } else {
+                usedWidth += child.offsetWidth + margins;
+            }
+        } else {
+            usedWidth += child.offsetWidth + margins;
+        }
+    }
+    
+    // Safety buffer for padding/rendering quirks
+    let diff = transitionEl.clientWidth - usedWidth - 5; 
+    let iconWidth = 50; 
+    
+    if (diff < 0) {
+        if (!isPinHidden) {
+            document.body.classList.add('hide-topbar-pin');
+        } else if (!isCallHidden) {
+            document.body.classList.add('hide-topbar-call');
+        }
+    } else {
+        if (isCallHidden && diff > iconWidth) {
+            document.body.classList.remove('hide-topbar-call');
+        } else if (isPinHidden && !isCallHidden && diff > iconWidth) {
+            document.body.classList.remove('hide-topbar-pin');
+        }
+    }
+}
+
+if (typeof roomTopBar !== 'undefined' && roomTopBar) {
+    let topbarResizeObserver = new ResizeObserver(() => {
+        checkTopbarSpace();
+    });
+    topbarResizeObserver.observe(roomTopBar);
+    
+    if (roomTopBar.children.length > 0) {
+        let topbarMutationObserver = new MutationObserver(() => {
+            setTimeout(checkTopbarSpace, 10);
+        });
+        topbarMutationObserver.observe(roomTopBar.children.item(0), { childList: true, subtree: true });
+    }
+}
diff --git a/android/app/src/main/assets/public/style.css b/android/app/src/main/assets/public/style.css
index 58e48f25..675a9781 100644
--- a/android/app/src/main/assets/public/style.css
+++ b/android/app/src/main/assets/public/style.css
@@ -216,11 +216,6 @@ sidebar {
     border-right: var(--border-width) solid var(--light-border-color);
 }
 
-sidebar:not(.second) {
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
 sidebar:not(.second)::-webkit-scrollbar {
     display: none;
 }
@@ -1038,12 +1033,8 @@ roomcontent roomtopbar .room-action-call {
     display: none;
 }
 
-@media (max-width: 65rem) and (min-width: 55.001rem) {
-    roomcontent roomtopbar .room-action-pin { display: none !important; }
-    #roomdetailsbar roomtopbar .room-action-pin { display: flex !important; }
-}
+body.hide-topbar-pin roomcontent roomtopbar .room-action-pin { display: none !important; }
+body.hide-topbar-pin #roomdetailsbar roomtopbar .room-action-pin { display: flex !important; }
 
-@media (max-width: 58rem) and (min-width: 55.001rem) {
-    roomcontent roomtopbar .room-action-call { display: none !important; }
-    #roomdetailsbar roomtopbar .room-action-call { display: flex !important; }
-}
+body.hide-topbar-call roomcontent roomtopbar .room-action-call { display: none !important; }
+body.hide-topbar-call #roomdetailsbar roomtopbar .room-action-call { display: flex !important; }
diff --git a/webroot/main.js b/webroot/main.js
index 82922c97..11bd2ef9 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -1483,11 +1483,11 @@ async function switchRoomContent(title, content, showRoomBar, icon = "", skipMob
     let pinCallBtns = showRoomBar ? `${pinBtnHtml}${callBtnHtml}` : '';
 
     let clickableContent = showRoomBar ? 
-        `<button id="room-topbar-clickable" class="inherit" onclick="mobileNavDetails();" style="cursor: pointer; display: flex; align-items: center; border-radius: 0.65rem; background: transparent; outline: none; height: 100%; text-align: left;">
-            ${icon ? icon + '<space></space>' : ''}<inherit>${processBlah(title)}</inherit>
+        `<button id="room-topbar-clickable" class="inherit" onclick="mobileNavDetails();" style="cursor: pointer; display: flex; align-items: center; border-radius: 0.65rem; background: transparent; outline: none; height: 100%; text-align: left; min-width: 0; width: auto; max-width: 100%;">
+            ${icon ? icon + '<space></space>' : ''}<inherit style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: block; min-width: 0; width: auto;">${processBlah(title)}</inherit>
         </button>` :
-        `<inherit style="display: flex; align-items: center; height: 100%;">
-            ${icon ? icon + '<space></space>' : ''}<inherit>${processBlah(title)}</inherit>
+        `<inherit style="display: flex; align-items: center; height: 100%; min-width: 0; width: auto; max-width: 100%;">
+            ${icon ? icon + '<space></space>' : ''}<inherit style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; display: block; min-width: 0; width: auto;">${processBlah(title)}</inherit>
         </inherit>`;
     roomsTopBarTransition.innerHTML = `${backBtnHtml}${clickableContent}<div class="flex-spacer"></div>${pinCallBtns}`;
 
@@ -4695,3 +4695,69 @@ function scrollToPinnedMessage(e, msgId) {
     }
     scrollToMessage(msgId);
 }
+
+function checkTopbarSpace() {
+    if (typeof roomTopBar === 'undefined' || !roomTopBar) return;
+    
+    let transitionEl = roomTopBar.children.item(0);
+    if (!transitionEl) return;
+    
+    let children = Array.from(transitionEl.children);
+    let usedWidth = 0;
+    
+    let isPinHidden = document.body.classList.contains('hide-topbar-pin');
+    let isCallHidden = document.body.classList.contains('hide-topbar-call');
+    
+    for (let child of children) {
+        if (child.classList.contains('flex-spacer')) continue;
+        
+        if (child.classList.contains('room-action-pin') && isPinHidden) continue;
+        if (child.classList.contains('room-action-call') && isCallHidden) continue;
+        
+        let style = window.getComputedStyle(child);
+        let margins = (parseFloat(style.marginLeft) || 0) + (parseFloat(style.marginRight) || 0);
+
+        if (child.id === 'room-topbar-clickable' || child.tagName.toLowerCase() === 'inherit') {
+            let titleEl = child.querySelector('inherit');
+            if (titleEl) {
+                usedWidth += (child.offsetWidth - titleEl.offsetWidth) + titleEl.scrollWidth + margins;
+            } else {
+                usedWidth += child.offsetWidth + margins;
+            }
+        } else {
+            usedWidth += child.offsetWidth + margins;
+        }
+    }
+    
+    // Safety buffer for padding/rendering quirks
+    let diff = transitionEl.clientWidth - usedWidth - 5; 
+    let iconWidth = 50; 
+    
+    if (diff < 0) {
+        if (!isPinHidden) {
+            document.body.classList.add('hide-topbar-pin');
+        } else if (!isCallHidden) {
+            document.body.classList.add('hide-topbar-call');
+        }
+    } else {
+        if (isCallHidden && diff > iconWidth) {
+            document.body.classList.remove('hide-topbar-call');
+        } else if (isPinHidden && !isCallHidden && diff > iconWidth) {
+            document.body.classList.remove('hide-topbar-pin');
+        }
+    }
+}
+
+if (typeof roomTopBar !== 'undefined' && roomTopBar) {
+    let topbarResizeObserver = new ResizeObserver(() => {
+        checkTopbarSpace();
+    });
+    topbarResizeObserver.observe(roomTopBar);
+    
+    if (roomTopBar.children.length > 0) {
+        let topbarMutationObserver = new MutationObserver(() => {
+            setTimeout(checkTopbarSpace, 10);
+        });
+        topbarMutationObserver.observe(roomTopBar.children.item(0), { childList: true, subtree: true });
+    }
+}
diff --git a/webroot/style.css b/webroot/style.css
index 58e48f25..675a9781 100644
--- a/webroot/style.css
+++ b/webroot/style.css
@@ -216,11 +216,6 @@ sidebar {
     border-right: var(--border-width) solid var(--light-border-color);
 }
 
-sidebar:not(.second) {
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
 sidebar:not(.second)::-webkit-scrollbar {
     display: none;
 }
@@ -1038,12 +1033,8 @@ roomcontent roomtopbar .room-action-call {
     display: none;
 }
 
-@media (max-width: 65rem) and (min-width: 55.001rem) {
-    roomcontent roomtopbar .room-action-pin { display: none !important; }
-    #roomdetailsbar roomtopbar .room-action-pin { display: flex !important; }
-}
+body.hide-topbar-pin roomcontent roomtopbar .room-action-pin { display: none !important; }
+body.hide-topbar-pin #roomdetailsbar roomtopbar .room-action-pin { display: flex !important; }
 
-@media (max-width: 58rem) and (min-width: 55.001rem) {
-    roomcontent roomtopbar .room-action-call { display: none !important; }
-    #roomdetailsbar roomtopbar .room-action-call { display: flex !important; }
-}
+body.hide-topbar-call roomcontent roomtopbar .room-action-call { display: none !important; }
+body.hide-topbar-call #roomdetailsbar roomtopbar .room-action-call { display: flex !important; }

From ab99a84579d7f09c3a91b43cc5a8dfc109423b47 Mon Sep 17 00:00:00 2001
From: olcxja <olcxja@olcxja.ovh>
Date: Sun, 2 Aug 2026 21:38:01 +0200
Subject: [PATCH 2/4] fix group invite index

---
 android/app/src/main/assets/public/main.js | 2 +-
 webroot/main.js                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index 11bd2ef9..a2ab99e2 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -2061,7 +2061,7 @@ async function renderInvites(res, type) {
 
                 html += entry;
             } else if (invite.type === "group") {
-                let groupId = invite.id;
+                let groupId = invite.groupId || invite.id;
                 let targetId = (type === "received") ? invite.sender : invite.receiver;
 
                 if (!targetId.includes(":")) {
diff --git a/webroot/main.js b/webroot/main.js
index 11bd2ef9..a2ab99e2 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -2061,7 +2061,7 @@ async function renderInvites(res, type) {
 
                 html += entry;
             } else if (invite.type === "group") {
-                let groupId = invite.id;
+                let groupId = invite.groupId || invite.id;
                 let targetId = (type === "received") ? invite.sender : invite.receiver;
 
                 if (!targetId.includes(":")) {

From 891f39e5b14877796b04e86c2535a5705ce29eb1 Mon Sep 17 00:00:00 2001
From: olcxja <olcxja@olcxja.ovh>
Date: Sun, 2 Aug 2026 22:21:04 +0200
Subject: [PATCH 3/4] add group context menu

---
 android/app/src/main/assets/public/main.js    | 108 +++++++++++++++++-
 android/app/src/main/assets/public/screens.js |  11 ++
 webroot/main.js                               | 108 +++++++++++++++++-
 webroot/screens.js                            |  11 ++
 4 files changed, 236 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index a2ab99e2..f46e7fe1 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -1554,6 +1554,9 @@ async function switchDetailsContent(title, content, showBack = false, backAction
 
 
     let pinCallBtns = showBack ? `${callBtnHtml}` : `${pinBtnHtml}${callBtnHtml}`;
+    if (window.currentRoomType === 'groups' && !showBack) {
+        pinCallBtns = `${groupMenuBtnHtml}${pinCallBtns}`;
+    }
     let backBtn = showBack ? `<button class="topbar-action-btn" onclick="${backAction}" style="margin-right: 0.5rem">${ICONS.arrowBack({ width: "1.5rem", height: "1.5rem" })}</button>` : "";
     roomsTopBarTransition.innerHTML = `<inherit style="display: flex; align-items: center;">${backBtn}<inherit>${processBlah(title)}</inherit></inherit><div class="flex-spacer"></div>${pinCallBtns}`;
 
@@ -2542,7 +2545,7 @@ async function renderGroups(res) {
                 let pfp = await getGroupAvatarUrl(groupId, groupName);
 
                 html += `
-                <button class="room-entry" id="group-btn-${groupId}" onclick="openDm('${groupId}', decodeURIComponent('${safeGroupName}'), '${groupId}', 'groups')">
+                <button class="room-entry" id="group-btn-${groupId}" onclick="openDm('${groupId}', decodeURIComponent('${safeGroupName}'), '${groupId}', 'groups')" oncontextmenu="handleGroupContextMenu(event, '${groupId}')">
                     <img src="${pfp}" class="room-pfp">
                     <div style="display: flex; flex-direction: column; text-align: left; overflow: hidden; width: 100%; margin-left: 0.37rem;">
                         <span class="room-name" style="${nameStyle}">${groupName}</span>
@@ -4761,3 +4764,106 @@ if (typeof roomTopBar !== 'undefined' && roomTopBar) {
         topbarMutationObserver.observe(roomTopBar.children.item(0), { childList: true, subtree: true });
     }
 }
+
+var currentContextMenuGroupId = null;
+
+function handleGroupContextMenu(e, groupId) {
+    if (e) {
+        e.preventDefault();
+        e.stopPropagation();
+    }
+    if (typeof clearContextMenuStyles === "function") clearContextMenuStyles();
+    currentContextMenuGroupId = groupId;
+    
+    let btn = e ? (e.currentTarget || e.target) : null;
+    let rect;
+    if (e && e.type === "click") {
+        rect = btn.getBoundingClientRect();
+        showFixedContextMenu({top: rect.top, right: rect.left, bottom: rect.bottom, left: rect.left}, groupContextMenu);
+    } else if (e) {
+        let clientX = e.clientX !== undefined ? e.clientX : (e.touches && e.touches.length > 0 ? e.touches[0].clientX : 0);
+        let clientY = e.clientY !== undefined ? e.clientY : (e.touches && e.touches.length > 0 ? e.touches[0].clientY : 0);
+        showFixedContextMenu({top: clientY, right: clientX, bottom: clientY, left: clientX}, groupContextMenu);
+    } else {
+        return;
+    }
+
+    let menuRect = fixedContextMenu.getBoundingClientRect();
+    let newLeft = e ? (e.clientX !== undefined ? e.clientX : (e.touches && e.touches.length > 0 ? e.touches[0].clientX : 0)) + 10 : 0;
+    let newTop = e ? (e.clientY !== undefined ? e.clientY : (e.touches && e.touches.length > 0 ? e.touches[0].clientY : 0)) : 0;
+    
+    if (e && e.type === "click") {
+        newLeft = rect.left + 10;
+        newTop = rect.bottom;
+    }
+
+    if (newLeft + menuRect.width > window.innerWidth) {
+        newLeft = window.innerWidth - menuRect.width - 10;
+    }
+    if (newTop + menuRect.height > window.innerHeight) {
+        newTop = window.innerHeight - menuRect.height - 10;
+    }
+
+    fixedContextMenu.style.left = `${newLeft}px`;
+    fixedContextMenu.style.top = `${newTop}px`;
+}
+
+function gotoGroupSettings(groupId) {
+    if (fixedContextMenu) fixedContextMenu.classList.remove("show");
+    // Not implemented yet
+}
+
+function leaveGroupPrompt(groupId) {
+    if (fixedContextMenu) fixedContextMenu.classList.remove("show");
+    
+    let popupContainer = document.getElementById("profile-popup-container");
+    let popupInner = document.getElementById("profile-popup-inner");
+    
+    let html = `
+        <div style="text-align: center; margin-bottom: 1rem;">
+            <h3 style="margin-bottom: 0.5rem;"><blah>title.leave.group</blah></h3>
+            <p style="opacity: 0.7; font-size: 0.9rem;"><blah>desc.leave.group.confirm</blah></p>
+        </div>
+        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
+            <button class="profile-action-btn" style="background: var(--light-border-color); color: var(--text-color); flex: 1;" onclick="closeProfile()">
+                <blah>action.cancel</blah>
+            </button>
+            <button class="profile-action-btn" style="background: var(--big-red); color: white; border: none; flex: 1;" onclick="confirmLeaveGroup('${groupId}')">
+                <blah>title.leave.group</blah>
+            </button>
+        </div>
+    `;
+    
+    popupInner.innerHTML = html;
+    
+    let blahTags = popupInner.getElementsByTagName("blah");
+    for (let i = 0; i < blahTags.length; i++) {
+        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+    }
+    
+    popupContainer.style.display = "flex";
+    popupContainer.offsetHeight; // trigger reflow
+    popupContainer.classList.add("show");
+    isProfileOpen = true;
+}
+
+async function confirmLeaveGroup(groupId) {
+    closeProfile();
+    showAction("action.leaving.group", "leavegroup");
+    try {
+        let payload = JSON.stringify({ string1: groupId });
+        let res = await fetchEncrypted("group/leave", payload);
+        if (res === "success") {
+            if (currentDmId === groupId) {
+                gotoHome();
+            }
+            refreshGroups(0, false);
+        } else if (res.startsWith("error:")) {
+            showBlahNotification(res);
+        }
+    } catch (e) {
+        console.error(e);
+        showBlahNotification("error:something.wrong");
+    }
+    clearAction("leavegroup");
+}
diff --git a/android/app/src/main/assets/public/screens.js b/android/app/src/main/assets/public/screens.js
index ead665d2..8f1f7e04 100644
--- a/android/app/src/main/assets/public/screens.js
+++ b/android/app/src/main/assets/public/screens.js
@@ -250,6 +250,16 @@ var addSpaceMenu = `
     ${ICONS.createSpace()}
     <span class="blah">title.create.space</span>
 </button>`
+var groupContextMenu = `
+<button onclick="gotoGroupSettings(currentContextMenuGroupId)">
+    ${ICONS.settings()}
+    <span class="blah">title.group.settings</span>
+</button>
+<button onclick="leaveGroupPrompt(currentContextMenuGroupId)">
+    ${ICONS.delete({ fill: "var(--big-red)" })}
+    <span class="blah" style="color: var(--big-red)">title.leave.group</span>
+</button>
+`;
 var messageContextMenu = `
 <button onclick="replyMessage(currentContextMenuMsgId)">
     ${ICONS.replyAction()}
@@ -270,6 +280,7 @@ var messageContextMenu = `
 var backBtnHtml = `<button class="mobile-nav-btn" onclick="mobileNavBack()">${ICONS.arrowBack({ width: "1.5rem", height: "1.5rem" })}</button>`;
 var pinBtnHtml = `<button class="topbar-action-btn room-action-pin right" onclick="showPinnedMessages()">${ICONS.pin({ width: "1.5rem", height: "1.5rem" })}</button>`;
 var callBtnHtml = `<button class="topbar-action-btn room-action-call right">${ICONS.call({ width: "1.5rem", height: "1.5rem" })}</button>`;
+var groupMenuBtnHtml = `<button class="topbar-action-btn right" onclick="handleGroupContextMenu(arguments[0], currentDmId)">${ICONS.menu({ width: "1.5rem", height: "1.5rem" })}</button>`;
 
 var settingsBar = `
 <div class="sidebar-section-header">
diff --git a/webroot/main.js b/webroot/main.js
index a2ab99e2..f46e7fe1 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -1554,6 +1554,9 @@ async function switchDetailsContent(title, content, showBack = false, backAction
 
 
     let pinCallBtns = showBack ? `${callBtnHtml}` : `${pinBtnHtml}${callBtnHtml}`;
+    if (window.currentRoomType === 'groups' && !showBack) {
+        pinCallBtns = `${groupMenuBtnHtml}${pinCallBtns}`;
+    }
     let backBtn = showBack ? `<button class="topbar-action-btn" onclick="${backAction}" style="margin-right: 0.5rem">${ICONS.arrowBack({ width: "1.5rem", height: "1.5rem" })}</button>` : "";
     roomsTopBarTransition.innerHTML = `<inherit style="display: flex; align-items: center;">${backBtn}<inherit>${processBlah(title)}</inherit></inherit><div class="flex-spacer"></div>${pinCallBtns}`;
 
@@ -2542,7 +2545,7 @@ async function renderGroups(res) {
                 let pfp = await getGroupAvatarUrl(groupId, groupName);
 
                 html += `
-                <button class="room-entry" id="group-btn-${groupId}" onclick="openDm('${groupId}', decodeURIComponent('${safeGroupName}'), '${groupId}', 'groups')">
+                <button class="room-entry" id="group-btn-${groupId}" onclick="openDm('${groupId}', decodeURIComponent('${safeGroupName}'), '${groupId}', 'groups')" oncontextmenu="handleGroupContextMenu(event, '${groupId}')">
                     <img src="${pfp}" class="room-pfp">
                     <div style="display: flex; flex-direction: column; text-align: left; overflow: hidden; width: 100%; margin-left: 0.37rem;">
                         <span class="room-name" style="${nameStyle}">${groupName}</span>
@@ -4761,3 +4764,106 @@ if (typeof roomTopBar !== 'undefined' && roomTopBar) {
         topbarMutationObserver.observe(roomTopBar.children.item(0), { childList: true, subtree: true });
     }
 }
+
+var currentContextMenuGroupId = null;
+
+function handleGroupContextMenu(e, groupId) {
+    if (e) {
+        e.preventDefault();
+        e.stopPropagation();
+    }
+    if (typeof clearContextMenuStyles === "function") clearContextMenuStyles();
+    currentContextMenuGroupId = groupId;
+    
+    let btn = e ? (e.currentTarget || e.target) : null;
+    let rect;
+    if (e && e.type === "click") {
+        rect = btn.getBoundingClientRect();
+        showFixedContextMenu({top: rect.top, right: rect.left, bottom: rect.bottom, left: rect.left}, groupContextMenu);
+    } else if (e) {
+        let clientX = e.clientX !== undefined ? e.clientX : (e.touches && e.touches.length > 0 ? e.touches[0].clientX : 0);
+        let clientY = e.clientY !== undefined ? e.clientY : (e.touches && e.touches.length > 0 ? e.touches[0].clientY : 0);
+        showFixedContextMenu({top: clientY, right: clientX, bottom: clientY, left: clientX}, groupContextMenu);
+    } else {
+        return;
+    }
+
+    let menuRect = fixedContextMenu.getBoundingClientRect();
+    let newLeft = e ? (e.clientX !== undefined ? e.clientX : (e.touches && e.touches.length > 0 ? e.touches[0].clientX : 0)) + 10 : 0;
+    let newTop = e ? (e.clientY !== undefined ? e.clientY : (e.touches && e.touches.length > 0 ? e.touches[0].clientY : 0)) : 0;
+    
+    if (e && e.type === "click") {
+        newLeft = rect.left + 10;
+        newTop = rect.bottom;
+    }
+
+    if (newLeft + menuRect.width > window.innerWidth) {
+        newLeft = window.innerWidth - menuRect.width - 10;
+    }
+    if (newTop + menuRect.height > window.innerHeight) {
+        newTop = window.innerHeight - menuRect.height - 10;
+    }
+
+    fixedContextMenu.style.left = `${newLeft}px`;
+    fixedContextMenu.style.top = `${newTop}px`;
+}
+
+function gotoGroupSettings(groupId) {
+    if (fixedContextMenu) fixedContextMenu.classList.remove("show");
+    // Not implemented yet
+}
+
+function leaveGroupPrompt(groupId) {
+    if (fixedContextMenu) fixedContextMenu.classList.remove("show");
+    
+    let popupContainer = document.getElementById("profile-popup-container");
+    let popupInner = document.getElementById("profile-popup-inner");
+    
+    let html = `
+        <div style="text-align: center; margin-bottom: 1rem;">
+            <h3 style="margin-bottom: 0.5rem;"><blah>title.leave.group</blah></h3>
+            <p style="opacity: 0.7; font-size: 0.9rem;"><blah>desc.leave.group.confirm</blah></p>
+        </div>
+        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
+            <button class="profile-action-btn" style="background: var(--light-border-color); color: var(--text-color); flex: 1;" onclick="closeProfile()">
+                <blah>action.cancel</blah>
+            </button>
+            <button class="profile-action-btn" style="background: var(--big-red); color: white; border: none; flex: 1;" onclick="confirmLeaveGroup('${groupId}')">
+                <blah>title.leave.group</blah>
+            </button>
+        </div>
+    `;
+    
+    popupInner.innerHTML = html;
+    
+    let blahTags = popupInner.getElementsByTagName("blah");
+    for (let i = 0; i < blahTags.length; i++) {
+        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+    }
+    
+    popupContainer.style.display = "flex";
+    popupContainer.offsetHeight; // trigger reflow
+    popupContainer.classList.add("show");
+    isProfileOpen = true;
+}
+
+async function confirmLeaveGroup(groupId) {
+    closeProfile();
+    showAction("action.leaving.group", "leavegroup");
+    try {
+        let payload = JSON.stringify({ string1: groupId });
+        let res = await fetchEncrypted("group/leave", payload);
+        if (res === "success") {
+            if (currentDmId === groupId) {
+                gotoHome();
+            }
+            refreshGroups(0, false);
+        } else if (res.startsWith("error:")) {
+            showBlahNotification(res);
+        }
+    } catch (e) {
+        console.error(e);
+        showBlahNotification("error:something.wrong");
+    }
+    clearAction("leavegroup");
+}
diff --git a/webroot/screens.js b/webroot/screens.js
index ead665d2..8f1f7e04 100644
--- a/webroot/screens.js
+++ b/webroot/screens.js
@@ -250,6 +250,16 @@ var addSpaceMenu = `
     ${ICONS.createSpace()}
     <span class="blah">title.create.space</span>
 </button>`
+var groupContextMenu = `
+<button onclick="gotoGroupSettings(currentContextMenuGroupId)">
+    ${ICONS.settings()}
+    <span class="blah">title.group.settings</span>
+</button>
+<button onclick="leaveGroupPrompt(currentContextMenuGroupId)">
+    ${ICONS.delete({ fill: "var(--big-red)" })}
+    <span class="blah" style="color: var(--big-red)">title.leave.group</span>
+</button>
+`;
 var messageContextMenu = `
 <button onclick="replyMessage(currentContextMenuMsgId)">
     ${ICONS.replyAction()}
@@ -270,6 +280,7 @@ var messageContextMenu = `
 var backBtnHtml = `<button class="mobile-nav-btn" onclick="mobileNavBack()">${ICONS.arrowBack({ width: "1.5rem", height: "1.5rem" })}</button>`;
 var pinBtnHtml = `<button class="topbar-action-btn room-action-pin right" onclick="showPinnedMessages()">${ICONS.pin({ width: "1.5rem", height: "1.5rem" })}</button>`;
 var callBtnHtml = `<button class="topbar-action-btn room-action-call right">${ICONS.call({ width: "1.5rem", height: "1.5rem" })}</button>`;
+var groupMenuBtnHtml = `<button class="topbar-action-btn right" onclick="handleGroupContextMenu(arguments[0], currentDmId)">${ICONS.menu({ width: "1.5rem", height: "1.5rem" })}</button>`;
 
 var settingsBar = `
 <div class="sidebar-section-header">

From 113530acb8480137d1a66ba1b123f37a351da219 Mon Sep 17 00:00:00 2001
From: olcxja <olcxja@olcxja.ovh>
Date: Sun, 2 Aug 2026 22:40:42 +0200
Subject: [PATCH 4/4] test new generic popups

---
 .../src/main/assets/public/blah/en-cat.json   |   9 +-
 .../src/main/assets/public/blah/en-us.json    |   9 +-
 .../src/main/assets/public/blah/pl-pl.json    |   9 +-
 android/app/src/main/assets/public/index.html |  15 +-
 android/app/src/main/assets/public/main.js    | 243 ++++++++++++------
 android/app/src/main/assets/public/style.css  |  34 +++
 webroot/blah/en-cat.json                      |   9 +-
 webroot/blah/en-us.json                       |   9 +-
 webroot/blah/pl-pl.json                       |   9 +-
 webroot/index.html                            |  15 +-
 webroot/main.js                               | 243 ++++++++++++------
 webroot/style.css                             |  34 +++
 12 files changed, 462 insertions(+), 176 deletions(-)

diff --git a/android/app/src/main/assets/public/blah/en-cat.json b/android/app/src/main/assets/public/blah/en-cat.json
index 3d8cd6fa..f06e9ea5 100644
--- a/android/app/src/main/assets/public/blah/en-cat.json
+++ b/android/app/src/main/assets/public/blah/en-cat.json
@@ -257,5 +257,10 @@
     "en-cat": "Meowlish",
     "avatar.updated": "Avatar updated successfully",
     "profile.updated": "Profile updated successfully",
-    "banner.updated": "Banner updated successfully"
-}
+    "banner.updated": "Banner updated successfully",
+    "action.invite": "Invite, meow",
+    "action.leaving.group": "Leaving group, meow...",
+    "action.key.rotating": "Rotating keys, meow...",
+    "action.key.rotation": "Key rotation, meow",
+    "desc.leave.group.confirm": "Are you sure you want to leave this group, meow?"
+}
\ No newline at end of file
diff --git a/android/app/src/main/assets/public/blah/en-us.json b/android/app/src/main/assets/public/blah/en-us.json
index 19aa86ea..effa6346 100644
--- a/android/app/src/main/assets/public/blah/en-us.json
+++ b/android/app/src/main/assets/public/blah/en-us.json
@@ -257,5 +257,10 @@
     "success:avatar.updated": "Avatar updated successfully",
     "en-us": "English",
     "pl-pl": "Polish",
-    "en-cat": "Meowlish"
-}
+    "en-cat": "Meowlish",
+    "action.invite": "Invite",
+    "action.leaving.group": "Leaving group...",
+    "action.key.rotating": "Rotating keys...",
+    "action.key.rotation": "Key rotation",
+    "desc.leave.group.confirm": "Are you sure you want to leave this group?"
+}
\ No newline at end of file
diff --git a/android/app/src/main/assets/public/blah/pl-pl.json b/android/app/src/main/assets/public/blah/pl-pl.json
index 302197a2..3a00a975 100644
--- a/android/app/src/main/assets/public/blah/pl-pl.json
+++ b/android/app/src/main/assets/public/blah/pl-pl.json
@@ -257,5 +257,10 @@
     "success:avatar.updated": "Awatar został pomyślnie zaktualizowany",
     "en-us": "Angielski",
     "pl-pl": "Polski",
-    "en-cat": "Koci (Meowlish)"
-}
+    "en-cat": "Koci (Meowlish)",
+    "action.invite": "Zaproś",
+    "action.leaving.group": "Opuszczanie grupy...",
+    "action.key.rotating": "Obracanie kluczy...",
+    "action.key.rotation": "Rotacja kluczy",
+    "desc.leave.group.confirm": "Czy na pewno chcesz opuścić tę grupę?"
+}
\ No newline at end of file
diff --git a/android/app/src/main/assets/public/index.html b/android/app/src/main/assets/public/index.html
index c7570624..9156be42 100644
--- a/android/app/src/main/assets/public/index.html
+++ b/android/app/src/main/assets/public/index.html
@@ -120,21 +120,16 @@
         </div>
     </div>
 
-    <div id="rotation-popup-container" class="profile-popup-container" style="display: none; z-index: 9999;">
-        <div class="profile-popup-bg" onclick="closeRotationPopup()"></div>
-        <div class="profile-popup-content">
-            <button class="profile-popup-close-btn" onclick="closeRotationPopup()">
+    <div id="generic-popup-container" class="profile-popup-container" style="display: none; z-index: 9999;">
+        <div class="profile-popup-bg" onclick="closeGenericPopup()"></div>
+        <div class="profile-popup-content popup-auto-height">
+            <button class="profile-popup-close-btn" onclick="closeGenericPopup()">
                 <script>
                     document.currentScript.insertAdjacentHTML('beforebegin', ICONS.close());
                     document.currentScript.remove();
                 </script>
             </button>
-            <div id="profile-popup-inner" style="padding: 2rem; display: flex; flex-direction: column; align-items: center; gap: 1rem;">
-                <div style="font-size: 1.2rem; font-weight: 500; text-align: center;"><blah>title.key.rotation</blah></div>
-                <div style="width: 100%; text-align: center; color: var(--text-color); opacity: 0.8; margin-top: 1rem; margin-bottom: 1rem;" id="rotation-popup-desc">
-                    <!-- content injected dynamically -->
-                </div>
-                <button class="profile-action-btn" onclick="executeKeyRotation()"><blah>action.rotate.keys</blah></button>
+            <div id="generic-popup-inner" style="padding: 2rem; display: flex; flex-direction: column; align-items: center; gap: 1rem; width: 100%; box-sizing: border-box;">
             </div>
         </div>
     </div>
diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index f46e7fe1..7a90b060 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -408,18 +408,126 @@ async function getGroupKey(groupId, keyIndex) {
     }
 }
 
-function closeRotationPopup() {
-    let popupContainer = document.getElementById("rotation-popup-container");
-    if(popupContainer) {
+let pendingRotationMessagePayload = null;
+
+let genericPopupConfirmCallback = null;
+let genericPopupCancelCallback = null;
+
+function closeGenericPopup() {
+    let popupContainer = document.getElementById("generic-popup-container");
+    if (popupContainer) {
         popupContainer.classList.remove("show");
         setTimeout(() => {
             popupContainer.style.display = "none";
         }, 200);
     }
-    clearAction("key_rotation");
+    if (genericPopupCancelCallback) {
+        genericPopupCancelCallback();
+        genericPopupCancelCallback = null;
+    }
+    genericPopupConfirmCallback = null;
 }
 
-let pendingRotationMessagePayload = null;
+function showConfirmPopup(titleKey, descHtml, confirmActionKey, cancelActionKey, onConfirm, onCancel = null, isDestructive = false) {
+    let popupContainer = document.getElementById("generic-popup-container");
+    let popupInner = document.getElementById("generic-popup-inner");
+    
+    let confirmClass = isDestructive ? "popup-btn-danger" : "popup-btn-confirm";
+    
+    genericPopupCancelCallback = onCancel;
+    
+    genericPopupConfirmCallback = () => {
+        let cb = onConfirm;
+        genericPopupCancelCallback = null; // Prevent cancel from firing on confirm
+        closeGenericPopup();
+        if (cb) cb();
+    };
+    
+    let html = `
+        <div style="font-size: 1.2rem; font-weight: 500; text-align: center;"><blah>${titleKey}</blah></div>
+        <div style="width: 100%; text-align: center; color: var(--text-color); opacity: 0.8; margin-top: 1rem; margin-bottom: 1rem;">
+            ${descHtml}
+        </div>
+        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
+            <button class="profile-action-btn popup-btn-cancel" onclick="closeGenericPopup()">
+                <blah>${cancelActionKey}</blah>
+            </button>
+            <button class="profile-action-btn ${confirmClass}" onclick="if(genericPopupConfirmCallback) genericPopupConfirmCallback()">
+                <blah>${confirmActionKey}</blah>
+            </button>
+        </div>
+    `;
+    
+    popupInner.innerHTML = html;
+    
+    let blahTags = popupInner.getElementsByTagName("blah");
+    for (let i = 0; i < blahTags.length; i++) {
+        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+    }
+    
+    popupContainer.style.display = "flex";
+    popupContainer.offsetHeight; // trigger reflow
+    popupContainer.classList.add("show");
+}
+
+function showPromptPopup(titleKey, descHtml, placeholderKey, confirmActionKey, cancelActionKey, onConfirm, onCancel = null, isDestructive = false) {
+    let popupContainer = document.getElementById("generic-popup-container");
+    let popupInner = document.getElementById("generic-popup-inner");
+    
+    let confirmClass = isDestructive ? "popup-btn-danger" : "popup-btn-confirm";
+    
+    genericPopupCancelCallback = onCancel;
+    
+    genericPopupConfirmCallback = () => {
+        let val = document.getElementById("generic-popup-input").value;
+        let cb = onConfirm;
+        genericPopupCancelCallback = null; // Prevent cancel from firing on confirm
+        closeGenericPopup();
+        if (cb) cb(val);
+    };
+    
+    let html = `
+        <div style="font-size: 1.2rem; font-weight: 500; text-align: center;"><blah>${titleKey}</blah></div>
+        <div style="width: 100%; text-align: center; color: var(--text-color); opacity: 0.8; margin-top: 0.5rem; margin-bottom: 1rem;">
+            ${descHtml}
+        </div>
+        <input type="text" id="generic-popup-input" class="forminput" placeholder="{blah(${placeholderKey})}" style="width: 100%; margin-bottom: 1rem; box-sizing: border-box;" onkeydown="if(arguments[0].key === 'Enter') { if(genericPopupConfirmCallback) genericPopupConfirmCallback(); }">
+        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
+            <button class="profile-action-btn popup-btn-cancel" onclick="closeGenericPopup()">
+                <blah>${cancelActionKey}</blah>
+            </button>
+            <button class="profile-action-btn ${confirmClass}" onclick="if(genericPopupConfirmCallback) genericPopupConfirmCallback()">
+                <blah>${confirmActionKey}</blah>
+            </button>
+        </div>
+    `;
+    
+    popupInner.innerHTML = html;
+    
+    let input = document.getElementById("generic-popup-input");
+    if (input && input.placeholder.includes("{blah(")) {
+        let key = input.placeholder.replace("{blah(", "").replace(")}", "");
+        input.placeholder = processBlah(key);
+    }
+    
+    let blahTags = popupInner.getElementsByTagName("blah");
+    for (let i = 0; i < blahTags.length; i++) {
+        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+    }
+    
+    popupContainer.style.display = "flex";
+    popupContainer.offsetHeight; // trigger reflow
+    popupContainer.classList.add("show");
+    
+    setTimeout(() => {
+        let el = document.getElementById("generic-popup-input");
+        if (el) el.focus();
+    }, 100);
+}
+
+function closeRotationPopup() {
+    closeGenericPopup();
+}
 
 async function showRotationPopup(groupId, originalMessagePayload) {
     pendingRotationMessagePayload = originalMessagePayload;
@@ -431,17 +539,16 @@ async function showRotationPopup(groupId, originalMessagePayload) {
         
         let members = JSON.parse(membersRaw);
         
-        let desc = document.getElementById("rotation-popup-desc");
-        desc.innerHTML = `<blah>desc.key.rotation.info</blah><br><br><b>${members.length} <blah>label.members</blah></b>`;
-        let blahTags = desc.getElementsByTagName("blah");
-        for (let i = 0; i < blahTags.length; i++) {
-            blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
-        }
+        let descHtml = `<blah>desc.key.rotation.info</blah><br><br><b>${members.length} <blah>label.members</blah></b>`;
         
-        let popupContainer = document.getElementById("rotation-popup-container");
-        popupContainer.style.display = "flex";
-        popupContainer.offsetHeight; // trigger reflow
-        popupContainer.classList.add("show");
+        showConfirmPopup(
+            "title.key.rotation",
+            descHtml,
+            "action.rotate.keys",
+            "action.cancel",
+            () => executeKeyRotation(),
+            () => clearAction("key_rotation")
+        );
     } catch(e) {
         clearAction("key_rotation");
         showBlahNotification("error:something.wrong");
@@ -2632,35 +2739,47 @@ async function generateDmMembersHtml(targetId, targetUsername) {
 }
 
 async function inviteToGroupPrompt(groupId) {
-    let targetUsername = prompt(processBlah("prompt.invite.username"));
-    if (!targetUsername) return;
-    
-    if (!targetUsername.includes(":")) {
-        targetUsername += `:${host}`;
-    }
-    
-    let idRes = await fetchAsync(`${url}/nametoid?u=${targetUsername}`);
-    if (idRes.startsWith("error") || idRes.trim() === "0" || idRes.trim() === "") {
-        showBlahNotification("error:user.not.found");
-        return;
-    }
-    let targetId = idRes.trim();
+    showPromptPopup(
+        "action.invite",
+        "",
+        "prompt.invite.username",
+        "action.invite",
+        "action.cancel",
+        async (targetUsername) => {
+            if (targetUsername) {
+                targetUsername = targetUsername.trim();
+                if (targetUsername.length > 0) {
+                    if (!targetUsername.includes(":")) {
+                        targetUsername += `:${host}`;
+                    }
+                    let idRes = await fetchAsync(`${url}/nametoid?u=${targetUsername}`);
+                    if (idRes.startsWith("error") || idRes.trim() === "0" || idRes.trim() === "") {
+                        showBlahNotification("error:user.not.found");
+                        return;
+                    }
+                    let targetId = idRes.trim();
 
-    try {
-        showAction("action.invite.sending", "invite.action");
-        
-        let payload = JSON.stringify({
-            string1: groupId,
-            string2: targetId
-        });
-        
-        let res = await fetchEncrypted("group/invite", payload);
-        clearAction("invite.action");
-        showBlahNotification(res || "success:invite.sent");
-    } catch (e) {
-        clearAction("invite.action");
-        showBlahNotification("error:something.wrong");
-    }
+                    try {
+                        showAction("action.invite.sending", "invite.action");
+                        
+                        let payload = JSON.stringify({
+                            string1: groupId,
+                            string2: targetId
+                        });
+                        
+                        let res = await fetchEncrypted("group/invite", payload);
+                        clearAction("invite.action");
+                        showBlahNotification(res || "success:invite.sent");
+                    } catch (e) {
+                        clearAction("invite.action");
+                        showBlahNotification("error:something.wrong");
+                    }
+                }
+            }
+        },
+        null,
+        false
+    );
 }
 
 async function generateGroupMembersHtml(groupId, groupName) {
@@ -4816,35 +4935,15 @@ function gotoGroupSettings(groupId) {
 function leaveGroupPrompt(groupId) {
     if (fixedContextMenu) fixedContextMenu.classList.remove("show");
     
-    let popupContainer = document.getElementById("profile-popup-container");
-    let popupInner = document.getElementById("profile-popup-inner");
-    
-    let html = `
-        <div style="text-align: center; margin-bottom: 1rem;">
-            <h3 style="margin-bottom: 0.5rem;"><blah>title.leave.group</blah></h3>
-            <p style="opacity: 0.7; font-size: 0.9rem;"><blah>desc.leave.group.confirm</blah></p>
-        </div>
-        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
-            <button class="profile-action-btn" style="background: var(--light-border-color); color: var(--text-color); flex: 1;" onclick="closeProfile()">
-                <blah>action.cancel</blah>
-            </button>
-            <button class="profile-action-btn" style="background: var(--big-red); color: white; border: none; flex: 1;" onclick="confirmLeaveGroup('${groupId}')">
-                <blah>title.leave.group</blah>
-            </button>
-        </div>
-    `;
-    
-    popupInner.innerHTML = html;
-    
-    let blahTags = popupInner.getElementsByTagName("blah");
-    for (let i = 0; i < blahTags.length; i++) {
-        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
-    }
-    
-    popupContainer.style.display = "flex";
-    popupContainer.offsetHeight; // trigger reflow
-    popupContainer.classList.add("show");
-    isProfileOpen = true;
+    showConfirmPopup(
+        "title.leave.group",
+        `<blah>desc.leave.group.confirm</blah>`,
+        "title.leave.group",
+        "action.cancel",
+        () => confirmLeaveGroup(groupId),
+        null,
+        true
+    );
 }
 
 async function confirmLeaveGroup(groupId) {
diff --git a/android/app/src/main/assets/public/style.css b/android/app/src/main/assets/public/style.css
index 675a9781..d9c8260e 100644
--- a/android/app/src/main/assets/public/style.css
+++ b/android/app/src/main/assets/public/style.css
@@ -874,6 +874,40 @@ sidebarelement:has(.icon-button:active) indicator:not(.active) {
     display: flex;
     flex-direction: column;
 }
+.popup-auto-height {
+    height: auto;
+    max-height: 85vh;
+}
+.popup-btn-cancel {
+    background: rgba(255, 255, 255, 0.05);
+    color: var(--text-color);
+    border: var(--border-width) solid var(--light-border-color);
+    flex: 1;
+    justify-content: center;
+}
+.popup-btn-cancel:hover {
+    background: rgba(255, 255, 255, 0.1);
+}
+.popup-btn-confirm {
+    background: var(--text-color);
+    color: var(--main-bg-color);
+    border: none;
+    flex: 1;
+    justify-content: center;
+}
+.popup-btn-confirm:hover {
+    background: white;
+}
+.popup-btn-danger {
+    background: var(--big-red);
+    color: white;
+    border: none;
+    flex: 1;
+    justify-content: center;
+}
+.popup-btn-danger:hover {
+    background: #ff5252;
+}
 .profile-popup-container.show .profile-popup-content {
     transform: scale(1);
     opacity: 1;
diff --git a/webroot/blah/en-cat.json b/webroot/blah/en-cat.json
index 3d8cd6fa..f06e9ea5 100644
--- a/webroot/blah/en-cat.json
+++ b/webroot/blah/en-cat.json
@@ -257,5 +257,10 @@
     "en-cat": "Meowlish",
     "avatar.updated": "Avatar updated successfully",
     "profile.updated": "Profile updated successfully",
-    "banner.updated": "Banner updated successfully"
-}
+    "banner.updated": "Banner updated successfully",
+    "action.invite": "Invite, meow",
+    "action.leaving.group": "Leaving group, meow...",
+    "action.key.rotating": "Rotating keys, meow...",
+    "action.key.rotation": "Key rotation, meow",
+    "desc.leave.group.confirm": "Are you sure you want to leave this group, meow?"
+}
\ No newline at end of file
diff --git a/webroot/blah/en-us.json b/webroot/blah/en-us.json
index 19aa86ea..effa6346 100644
--- a/webroot/blah/en-us.json
+++ b/webroot/blah/en-us.json
@@ -257,5 +257,10 @@
     "success:avatar.updated": "Avatar updated successfully",
     "en-us": "English",
     "pl-pl": "Polish",
-    "en-cat": "Meowlish"
-}
+    "en-cat": "Meowlish",
+    "action.invite": "Invite",
+    "action.leaving.group": "Leaving group...",
+    "action.key.rotating": "Rotating keys...",
+    "action.key.rotation": "Key rotation",
+    "desc.leave.group.confirm": "Are you sure you want to leave this group?"
+}
\ No newline at end of file
diff --git a/webroot/blah/pl-pl.json b/webroot/blah/pl-pl.json
index 302197a2..3a00a975 100644
--- a/webroot/blah/pl-pl.json
+++ b/webroot/blah/pl-pl.json
@@ -257,5 +257,10 @@
     "success:avatar.updated": "Awatar został pomyślnie zaktualizowany",
     "en-us": "Angielski",
     "pl-pl": "Polski",
-    "en-cat": "Koci (Meowlish)"
-}
+    "en-cat": "Koci (Meowlish)",
+    "action.invite": "Zaproś",
+    "action.leaving.group": "Opuszczanie grupy...",
+    "action.key.rotating": "Obracanie kluczy...",
+    "action.key.rotation": "Rotacja kluczy",
+    "desc.leave.group.confirm": "Czy na pewno chcesz opuścić tę grupę?"
+}
\ No newline at end of file
diff --git a/webroot/index.html b/webroot/index.html
index c7570624..9156be42 100644
--- a/webroot/index.html
+++ b/webroot/index.html
@@ -120,21 +120,16 @@
         </div>
     </div>
 
-    <div id="rotation-popup-container" class="profile-popup-container" style="display: none; z-index: 9999;">
-        <div class="profile-popup-bg" onclick="closeRotationPopup()"></div>
-        <div class="profile-popup-content">
-            <button class="profile-popup-close-btn" onclick="closeRotationPopup()">
+    <div id="generic-popup-container" class="profile-popup-container" style="display: none; z-index: 9999;">
+        <div class="profile-popup-bg" onclick="closeGenericPopup()"></div>
+        <div class="profile-popup-content popup-auto-height">
+            <button class="profile-popup-close-btn" onclick="closeGenericPopup()">
                 <script>
                     document.currentScript.insertAdjacentHTML('beforebegin', ICONS.close());
                     document.currentScript.remove();
                 </script>
             </button>
-            <div id="profile-popup-inner" style="padding: 2rem; display: flex; flex-direction: column; align-items: center; gap: 1rem;">
-                <div style="font-size: 1.2rem; font-weight: 500; text-align: center;"><blah>title.key.rotation</blah></div>
-                <div style="width: 100%; text-align: center; color: var(--text-color); opacity: 0.8; margin-top: 1rem; margin-bottom: 1rem;" id="rotation-popup-desc">
-                    <!-- content injected dynamically -->
-                </div>
-                <button class="profile-action-btn" onclick="executeKeyRotation()"><blah>action.rotate.keys</blah></button>
+            <div id="generic-popup-inner" style="padding: 2rem; display: flex; flex-direction: column; align-items: center; gap: 1rem; width: 100%; box-sizing: border-box;">
             </div>
         </div>
     </div>
diff --git a/webroot/main.js b/webroot/main.js
index f46e7fe1..7a90b060 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -408,18 +408,126 @@ async function getGroupKey(groupId, keyIndex) {
     }
 }
 
-function closeRotationPopup() {
-    let popupContainer = document.getElementById("rotation-popup-container");
-    if(popupContainer) {
+let pendingRotationMessagePayload = null;
+
+let genericPopupConfirmCallback = null;
+let genericPopupCancelCallback = null;
+
+function closeGenericPopup() {
+    let popupContainer = document.getElementById("generic-popup-container");
+    if (popupContainer) {
         popupContainer.classList.remove("show");
         setTimeout(() => {
             popupContainer.style.display = "none";
         }, 200);
     }
-    clearAction("key_rotation");
+    if (genericPopupCancelCallback) {
+        genericPopupCancelCallback();
+        genericPopupCancelCallback = null;
+    }
+    genericPopupConfirmCallback = null;
 }
 
-let pendingRotationMessagePayload = null;
+function showConfirmPopup(titleKey, descHtml, confirmActionKey, cancelActionKey, onConfirm, onCancel = null, isDestructive = false) {
+    let popupContainer = document.getElementById("generic-popup-container");
+    let popupInner = document.getElementById("generic-popup-inner");
+    
+    let confirmClass = isDestructive ? "popup-btn-danger" : "popup-btn-confirm";
+    
+    genericPopupCancelCallback = onCancel;
+    
+    genericPopupConfirmCallback = () => {
+        let cb = onConfirm;
+        genericPopupCancelCallback = null; // Prevent cancel from firing on confirm
+        closeGenericPopup();
+        if (cb) cb();
+    };
+    
+    let html = `
+        <div style="font-size: 1.2rem; font-weight: 500; text-align: center;"><blah>${titleKey}</blah></div>
+        <div style="width: 100%; text-align: center; color: var(--text-color); opacity: 0.8; margin-top: 1rem; margin-bottom: 1rem;">
+            ${descHtml}
+        </div>
+        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
+            <button class="profile-action-btn popup-btn-cancel" onclick="closeGenericPopup()">
+                <blah>${cancelActionKey}</blah>
+            </button>
+            <button class="profile-action-btn ${confirmClass}" onclick="if(genericPopupConfirmCallback) genericPopupConfirmCallback()">
+                <blah>${confirmActionKey}</blah>
+            </button>
+        </div>
+    `;
+    
+    popupInner.innerHTML = html;
+    
+    let blahTags = popupInner.getElementsByTagName("blah");
+    for (let i = 0; i < blahTags.length; i++) {
+        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+    }
+    
+    popupContainer.style.display = "flex";
+    popupContainer.offsetHeight; // trigger reflow
+    popupContainer.classList.add("show");
+}
+
+function showPromptPopup(titleKey, descHtml, placeholderKey, confirmActionKey, cancelActionKey, onConfirm, onCancel = null, isDestructive = false) {
+    let popupContainer = document.getElementById("generic-popup-container");
+    let popupInner = document.getElementById("generic-popup-inner");
+    
+    let confirmClass = isDestructive ? "popup-btn-danger" : "popup-btn-confirm";
+    
+    genericPopupCancelCallback = onCancel;
+    
+    genericPopupConfirmCallback = () => {
+        let val = document.getElementById("generic-popup-input").value;
+        let cb = onConfirm;
+        genericPopupCancelCallback = null; // Prevent cancel from firing on confirm
+        closeGenericPopup();
+        if (cb) cb(val);
+    };
+    
+    let html = `
+        <div style="font-size: 1.2rem; font-weight: 500; text-align: center;"><blah>${titleKey}</blah></div>
+        <div style="width: 100%; text-align: center; color: var(--text-color); opacity: 0.8; margin-top: 0.5rem; margin-bottom: 1rem;">
+            ${descHtml}
+        </div>
+        <input type="text" id="generic-popup-input" class="forminput" placeholder="{blah(${placeholderKey})}" style="width: 100%; margin-bottom: 1rem; box-sizing: border-box;" onkeydown="if(arguments[0].key === 'Enter') { if(genericPopupConfirmCallback) genericPopupConfirmCallback(); }">
+        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
+            <button class="profile-action-btn popup-btn-cancel" onclick="closeGenericPopup()">
+                <blah>${cancelActionKey}</blah>
+            </button>
+            <button class="profile-action-btn ${confirmClass}" onclick="if(genericPopupConfirmCallback) genericPopupConfirmCallback()">
+                <blah>${confirmActionKey}</blah>
+            </button>
+        </div>
+    `;
+    
+    popupInner.innerHTML = html;
+    
+    let input = document.getElementById("generic-popup-input");
+    if (input && input.placeholder.includes("{blah(")) {
+        let key = input.placeholder.replace("{blah(", "").replace(")}", "");
+        input.placeholder = processBlah(key);
+    }
+    
+    let blahTags = popupInner.getElementsByTagName("blah");
+    for (let i = 0; i < blahTags.length; i++) {
+        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
+    }
+    
+    popupContainer.style.display = "flex";
+    popupContainer.offsetHeight; // trigger reflow
+    popupContainer.classList.add("show");
+    
+    setTimeout(() => {
+        let el = document.getElementById("generic-popup-input");
+        if (el) el.focus();
+    }, 100);
+}
+
+function closeRotationPopup() {
+    closeGenericPopup();
+}
 
 async function showRotationPopup(groupId, originalMessagePayload) {
     pendingRotationMessagePayload = originalMessagePayload;
@@ -431,17 +539,16 @@ async function showRotationPopup(groupId, originalMessagePayload) {
         
         let members = JSON.parse(membersRaw);
         
-        let desc = document.getElementById("rotation-popup-desc");
-        desc.innerHTML = `<blah>desc.key.rotation.info</blah><br><br><b>${members.length} <blah>label.members</blah></b>`;
-        let blahTags = desc.getElementsByTagName("blah");
-        for (let i = 0; i < blahTags.length; i++) {
-            blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
-        }
+        let descHtml = `<blah>desc.key.rotation.info</blah><br><br><b>${members.length} <blah>label.members</blah></b>`;
         
-        let popupContainer = document.getElementById("rotation-popup-container");
-        popupContainer.style.display = "flex";
-        popupContainer.offsetHeight; // trigger reflow
-        popupContainer.classList.add("show");
+        showConfirmPopup(
+            "title.key.rotation",
+            descHtml,
+            "action.rotate.keys",
+            "action.cancel",
+            () => executeKeyRotation(),
+            () => clearAction("key_rotation")
+        );
     } catch(e) {
         clearAction("key_rotation");
         showBlahNotification("error:something.wrong");
@@ -2632,35 +2739,47 @@ async function generateDmMembersHtml(targetId, targetUsername) {
 }
 
 async function inviteToGroupPrompt(groupId) {
-    let targetUsername = prompt(processBlah("prompt.invite.username"));
-    if (!targetUsername) return;
-    
-    if (!targetUsername.includes(":")) {
-        targetUsername += `:${host}`;
-    }
-    
-    let idRes = await fetchAsync(`${url}/nametoid?u=${targetUsername}`);
-    if (idRes.startsWith("error") || idRes.trim() === "0" || idRes.trim() === "") {
-        showBlahNotification("error:user.not.found");
-        return;
-    }
-    let targetId = idRes.trim();
+    showPromptPopup(
+        "action.invite",
+        "",
+        "prompt.invite.username",
+        "action.invite",
+        "action.cancel",
+        async (targetUsername) => {
+            if (targetUsername) {
+                targetUsername = targetUsername.trim();
+                if (targetUsername.length > 0) {
+                    if (!targetUsername.includes(":")) {
+                        targetUsername += `:${host}`;
+                    }
+                    let idRes = await fetchAsync(`${url}/nametoid?u=${targetUsername}`);
+                    if (idRes.startsWith("error") || idRes.trim() === "0" || idRes.trim() === "") {
+                        showBlahNotification("error:user.not.found");
+                        return;
+                    }
+                    let targetId = idRes.trim();
 
-    try {
-        showAction("action.invite.sending", "invite.action");
-        
-        let payload = JSON.stringify({
-            string1: groupId,
-            string2: targetId
-        });
-        
-        let res = await fetchEncrypted("group/invite", payload);
-        clearAction("invite.action");
-        showBlahNotification(res || "success:invite.sent");
-    } catch (e) {
-        clearAction("invite.action");
-        showBlahNotification("error:something.wrong");
-    }
+                    try {
+                        showAction("action.invite.sending", "invite.action");
+                        
+                        let payload = JSON.stringify({
+                            string1: groupId,
+                            string2: targetId
+                        });
+                        
+                        let res = await fetchEncrypted("group/invite", payload);
+                        clearAction("invite.action");
+                        showBlahNotification(res || "success:invite.sent");
+                    } catch (e) {
+                        clearAction("invite.action");
+                        showBlahNotification("error:something.wrong");
+                    }
+                }
+            }
+        },
+        null,
+        false
+    );
 }
 
 async function generateGroupMembersHtml(groupId, groupName) {
@@ -4816,35 +4935,15 @@ function gotoGroupSettings(groupId) {
 function leaveGroupPrompt(groupId) {
     if (fixedContextMenu) fixedContextMenu.classList.remove("show");
     
-    let popupContainer = document.getElementById("profile-popup-container");
-    let popupInner = document.getElementById("profile-popup-inner");
-    
-    let html = `
-        <div style="text-align: center; margin-bottom: 1rem;">
-            <h3 style="margin-bottom: 0.5rem;"><blah>title.leave.group</blah></h3>
-            <p style="opacity: 0.7; font-size: 0.9rem;"><blah>desc.leave.group.confirm</blah></p>
-        </div>
-        <div style="display: flex; gap: 0.5rem; justify-content: center; width: 100%;">
-            <button class="profile-action-btn" style="background: var(--light-border-color); color: var(--text-color); flex: 1;" onclick="closeProfile()">
-                <blah>action.cancel</blah>
-            </button>
-            <button class="profile-action-btn" style="background: var(--big-red); color: white; border: none; flex: 1;" onclick="confirmLeaveGroup('${groupId}')">
-                <blah>title.leave.group</blah>
-            </button>
-        </div>
-    `;
-    
-    popupInner.innerHTML = html;
-    
-    let blahTags = popupInner.getElementsByTagName("blah");
-    for (let i = 0; i < blahTags.length; i++) {
-        blahTags[i].innerHTML = processBlah(blahTags[i].innerHTML);
-    }
-    
-    popupContainer.style.display = "flex";
-    popupContainer.offsetHeight; // trigger reflow
-    popupContainer.classList.add("show");
-    isProfileOpen = true;
+    showConfirmPopup(
+        "title.leave.group",
+        `<blah>desc.leave.group.confirm</blah>`,
+        "title.leave.group",
+        "action.cancel",
+        () => confirmLeaveGroup(groupId),
+        null,
+        true
+    );
 }
 
 async function confirmLeaveGroup(groupId) {
diff --git a/webroot/style.css b/webroot/style.css
index 675a9781..d9c8260e 100644
--- a/webroot/style.css
+++ b/webroot/style.css
@@ -874,6 +874,40 @@ sidebarelement:has(.icon-button:active) indicator:not(.active) {
     display: flex;
     flex-direction: column;
 }
+.popup-auto-height {
+    height: auto;
+    max-height: 85vh;
+}
+.popup-btn-cancel {
+    background: rgba(255, 255, 255, 0.05);
+    color: var(--text-color);
+    border: var(--border-width) solid var(--light-border-color);
+    flex: 1;
+    justify-content: center;
+}
+.popup-btn-cancel:hover {
+    background: rgba(255, 255, 255, 0.1);
+}
+.popup-btn-confirm {
+    background: var(--text-color);
+    color: var(--main-bg-color);
+    border: none;
+    flex: 1;
+    justify-content: center;
+}
+.popup-btn-confirm:hover {
+    background: white;
+}
+.popup-btn-danger {
+    background: var(--big-red);
+    color: white;
+    border: none;
+    flex: 1;
+    justify-content: center;
+}
+.popup-btn-danger:hover {
+    background: #ff5252;
+}
 .profile-popup-container.show .profile-popup-content {
     transform: scale(1);
     opacity: 1;