From 484b98680a0267d615eee1d1a5f4220946882744 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Wed, 15 Oct 2025 04:54:01 +1100
Subject: [PATCH] Fix InviteGroupDialog, lint

---
 src/App.vue                                        | 5 +++--
 src/components/TitleBar/MacOSTitleBar.vue          | 2 --
 src/components/dialogs/GroupDialog/GroupDialog.vue | 2 --
 src/components/dialogs/InviteGroupDialog.vue       | 6 ++----
 src/components/dialogs/UserDialog/UserDialog.vue   | 2 --
 5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index af57a743..d17fb5a1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,6 @@
 <template>
     <!DOCTYPE html>
     <el-config-provider :locale="currentLocale">
-        <!-- macOS Custom Title Bar -->
         <MacOSTitleBar></MacOSTitleBar>
 
         <div
@@ -64,6 +63,8 @@
 
                 <GroupMemberModerationDialog></GroupMemberModerationDialog>
 
+                <InviteGroupDialog></InviteGroupDialog>
+
                 <FullscreenImagePreview></FullscreenImagePreview>
 
                 <PreviousInstancesInfoDialog></PreviousInstancesInfoDialog>
@@ -144,6 +145,7 @@
     import Sidebar from './views/Sidebar/Sidebar.vue';
     import Tools from './views/Tools/Tools.vue';
     import UserDialog from './components/dialogs/UserDialog/UserDialog.vue';
+    import InviteGroupDialog from './components/dialogs/InviteGroupDialog.vue';
     import VRCXUpdateDialog from './components/dialogs/VRCXUpdateDialog.vue';
     import VRChatConfigDialog from './views/Settings/dialogs/VRChatConfigDialog.vue';
     import WorldDialog from './components/dialogs/WorldDialog/WorldDialog.vue';
@@ -153,7 +155,6 @@
 
     console.log(`isLinux: ${LINUX}`);
 
-    // Simple macOS detection
     const isMacOS = computed(() => {
         return navigator.platform.indexOf('Mac') > -1;
     });
diff --git a/src/components/TitleBar/MacOSTitleBar.vue b/src/components/TitleBar/MacOSTitleBar.vue
index dd524dba..8789b7ff 100644
--- a/src/components/TitleBar/MacOSTitleBar.vue
+++ b/src/components/TitleBar/MacOSTitleBar.vue
@@ -13,12 +13,10 @@
 <script setup>
     import { computed, onMounted } from 'vue';
 
-    // Simple macOS detection
     const isMacOS = computed(() => {
         return navigator.platform.indexOf('Mac') > -1;
     });
 
-    // Make title bar draggable
     onMounted(() => {
         if (isMacOS.value) {
             const titleBar = document.querySelector('.macos-title-bar');
diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue
index 4f467956..310f6916 100644
--- a/src/components/dialogs/GroupDialog/GroupDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupDialog.vue
@@ -1113,7 +1113,6 @@
             </el-tabs>
         </div>
         <GroupPostEditDialog :dialog-data="groupPostEditDialog" :selected-gallery-file="selectedGalleryFile" />
-        <InviteGroupDialog />
         <PreviousInstancesGroupDialog
             :previous-instances-group-dialog="previousInstancesGroupDialog"
             :current-user="currentUser" />
@@ -1172,7 +1171,6 @@
     import { groupRequest } from '../../../api';
 
     import GroupPostEditDialog from './GroupPostEditDialog.vue';
-    import InviteGroupDialog from '../InviteGroupDialog.vue';
     import PreviousInstancesGroupDialog from '../PreviousInstancesDialog/PreviousInstancesGroupDialog.vue';
 
     import * as workerTimers from 'worker-timers';
diff --git a/src/components/dialogs/InviteGroupDialog.vue b/src/components/dialogs/InviteGroupDialog.vue
index 8d42f91d..831e0cf9 100644
--- a/src/components/dialogs/InviteGroupDialog.vue
+++ b/src/components/dialogs/InviteGroupDialog.vue
@@ -183,10 +183,8 @@
     const { t } = useI18n();
 
     watch(
-        () => {
-            return inviteGroupDialog.value.visible;
-        },
-        (value) => async () => {
+        () => inviteGroupDialog.value.visible,
+        async (value) => {
             if (value) {
                 inviteGroupDialog.value.groupId = await configRepository.getString('inviteGroupLastGroup', '');
                 initDialog();
diff --git a/src/components/dialogs/UserDialog/UserDialog.vue b/src/components/dialogs/UserDialog/UserDialog.vue
index febe7099..059ec096 100644
--- a/src/components/dialogs/UserDialog/UserDialog.vue
+++ b/src/components/dialogs/UserDialog/UserDialog.vue
@@ -1677,7 +1677,6 @@
             @closeInviteDialog="closeInviteDialog" />
         <PreviousInstancesUserDialog v-model:previous-instances-user-dialog="previousInstancesUserDialog" />
         <template v-if="userDialog.visible">
-            <InviteGroupDialog />
             <SocialStatusDialog
                 :social-status-dialog="socialStatusDialog"
                 :social-status-history-table="socialStatusHistoryTable" />
@@ -1790,7 +1789,6 @@
     import { database } from '../../../service/database';
     import { userDialogGroupSortingOptions } from '../../../shared/constants';
 
-    import InviteGroupDialog from '../InviteGroupDialog.vue';
     import SendInviteDialog from '../InviteDialog/SendInviteDialog.vue';
 
     const BioDialog = defineAsyncComponent(() => import('./BioDialog.vue'));
