From 0bdfb7762f57cec2dac8d5edbc1eed0f443ae9ec Mon Sep 17 00:00:00 2001
From: olcxja <olcxja@olcxja.ovh>
Date: Tue, 14 Jul 2026 17:23:10 +0200
Subject: [PATCH] fix opening dms from profile and profile scroll saving

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

diff --git a/android/app/src/main/assets/public/main.js b/android/app/src/main/assets/public/main.js
index 8e5e81d0..da56db1a 100644
--- a/android/app/src/main/assets/public/main.js
+++ b/android/app/src/main/assets/public/main.js
@@ -1593,7 +1593,7 @@ async function openProfile(accountId) {
             }
             
             if (hasDm) {
-                actionBtnHtml = `<button class="profile-action-btn" onclick="openDm('${dmRoomId}', '${profileName}', '${accountId}'); closeProfile();">${processBlah('action.open.dm')}</button>`;
+                actionBtnHtml = `<button class="profile-action-btn" onclick="openDm('${dmRoomId}', '${nameWithHost}', '${accountId}'); closeProfile();">${processBlah('action.open.dm')}</button>`;
             } else {
                 let sentInvite = false;
                 let receivedInvite = false;
@@ -1648,6 +1648,7 @@ async function openProfile(accountId) {
         
         clearAction('profile-loading');
         popupContainer.style.display = "flex";
+        popupInner.scrollTop = 0;
         popupContainer.offsetHeight;
         popupContainer.classList.add("show");
         isProfileOpen = true;
diff --git a/webroot/main.js b/webroot/main.js
index 8e5e81d0..da56db1a 100644
--- a/webroot/main.js
+++ b/webroot/main.js
@@ -1593,7 +1593,7 @@ async function openProfile(accountId) {
             }
             
             if (hasDm) {
-                actionBtnHtml = `<button class="profile-action-btn" onclick="openDm('${dmRoomId}', '${profileName}', '${accountId}'); closeProfile();">${processBlah('action.open.dm')}</button>`;
+                actionBtnHtml = `<button class="profile-action-btn" onclick="openDm('${dmRoomId}', '${nameWithHost}', '${accountId}'); closeProfile();">${processBlah('action.open.dm')}</button>`;
             } else {
                 let sentInvite = false;
                 let receivedInvite = false;
@@ -1648,6 +1648,7 @@ async function openProfile(accountId) {
         
         clearAction('profile-loading');
         popupContainer.style.display = "flex";
+        popupInner.scrollTop = 0;
         popupContainer.offsetHeight;
         popupContainer.classList.add("show");
         isProfileOpen = true;