From c203785004ebb58f5b8e062c64eee34dd17a7336 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Fri, 19 Sep 2025 17:18:21 +1200
Subject: [PATCH] Save last group invite

---
 src/components/dialogs/GroupDialog/GroupDialog.vue | 8 ++++++--
 src/components/dialogs/InviteGroupDialog.vue       | 7 ++++++-
 src/stores/group.js                                | 6 +++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue
index 1955586a..d0f236fc 100644
--- a/src/components/dialogs/GroupDialog/GroupDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupDialog.vue
@@ -1293,8 +1293,12 @@
     );
 
     function showInviteGroupDialog(groupId, userId) {
-        inviteGroupDialog.value.groupId = groupId;
-        inviteGroupDialog.value.userId = userId;
+        if (groupId) {
+            inviteGroupDialog.value.groupId = groupId;
+        }
+        if (userId) {
+            inviteGroupDialog.value.userId = userId;
+        }
         inviteGroupDialog.value.visible = true;
     }
 
diff --git a/src/components/dialogs/InviteGroupDialog.vue b/src/components/dialogs/InviteGroupDialog.vue
index f2179f4e..994d56f3 100644
--- a/src/components/dialogs/InviteGroupDialog.vue
+++ b/src/components/dialogs/InviteGroupDialog.vue
@@ -47,6 +47,7 @@
                         :key="inviteGroupDialog.userObject.id"
                         :label="inviteGroupDialog.userObject.displayName"
                         :value="inviteGroupDialog.userObject.id"
+                        style="height: auto"
                         class="x-friend-item">
                         <template v-if="inviteGroupDialog.userObject.id">
                             <div class="avatar" :class="userStatusClass(inviteGroupDialog.userObject)">
@@ -169,6 +170,7 @@
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
     import { groupRequest, userRequest } from '../../api';
+    import configRepository from '../../service/config';
     import { hasGroupPermission, userImage, userStatusClass } from '../../shared/utils';
     import { getNextDialogIndex } from '../../shared/utils/base/ui';
     import { useFriendStore, useGroupStore } from '../../stores';
@@ -182,9 +184,12 @@
         () => {
             return inviteGroupDialog.value.visible;
         },
-        (value) => {
+        (value) => async () => {
             if (value) {
+                inviteGroupDialog.value.groupId = await configRepository.getString('inviteGroupLastGroup', '');
                 initDialog();
+            } else {
+                await configRepository.setString('inviteGroupLastGroup', inviteGroupDialog.value.groupId);
             }
         }
     );
diff --git a/src/stores/group.js b/src/stores/group.js
index d819e35f..f2c21cda 100644
--- a/src/stores/group.js
+++ b/src/stores/group.js
@@ -66,7 +66,11 @@ export const useGroupStore = defineStore('Group', () => {
             groupName: '',
             userId: '',
             userIds: [],
-            userObject: {}
+            userObject: {
+                id: '',
+                displayName: '',
+                $userColour: ''
+            }
         },
         moderateGroupDialog: {
             visible: false,