From 07fd58e59fd594734f43706b510bb77b0ed25fc9 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 11 Oct 2023 22:44:31 +0200
Subject: [PATCH] Fix forward completer after delegate rework

---
 resources/qml/ForwardCompleter.qml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/qml/ForwardCompleter.qml b/resources/qml/ForwardCompleter.qml
index caaea440..8ed6017c 100644
--- a/resources/qml/ForwardCompleter.qml
+++ b/resources/qml/ForwardCompleter.qml
@@ -10,7 +10,7 @@ import im.nheko 1.0
 Popup {
     id: forwardMessagePopup
 
-    property var mid
+    property string mid: ""
 
     function setMessageEventId(mid_in) {
         mid = mid_in;
@@ -55,7 +55,7 @@ Popup {
             id: replyPreview
 
             eventId: mid
-            userColor: TimelineManager.userColor(modelData.userId, palette.window)
+            userColor: TimelineManager.userColor(replyPreview.userId, palette.window)
             maxWidth: parent.width
         }
         MatrixTextField {
@@ -64,7 +64,7 @@ Popup {
             color: palette.text
             width: forwardMessagePopup.width - forwardMessagePopup.leftPadding * 2
 
-            Keys.onPressed: {
+            Keys.onPressed: (event) => {
                 if (event.key == Qt.Key_Up || event.key == Qt.Key_Backtab) {
                     event.accepted = true;
                     completerPopup.up();
@@ -97,7 +97,7 @@ Popup {
     }
     Connections {
         function onCompletionSelected(id) {
-            room.forwardMessage(messageContextMenu.eventId, id);
+            room.forwardMessage(forwardMessagePopup.mid, id);
             forwardMessagePopup.close();
         }
         function onCountChanged() {