AvatarSettingsButton - fix popout hiding on settings open

Neodymium7 · Dec 10, 2024 · ad32e3b · ad32e3b
1 parent f504466
commit ad32e3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/AvatarSettingsButton/src/index.tsx b/AvatarSettingsButton/src/index.tsx
@@ -48,19 +48,19 @@ export default class AvatarSettingsButton extends BasePlugin {
 
 	openSettings() {
 		UserSettingsWindow.setSection(Sections.ACCOUNT);
+		if (document.querySelector(`.${accountClasses.accountProfilePopoutWrapper}`)) this.openPopout();
 		UserSettingsWindow.open();
-		if (document.querySelector("#status-picker") || document.querySelector("#account")) this.openPopout();
 	}
 
 	openContextMenu(e: MouseEvent) {
+		if (document.querySelector(`.${accountClasses.accountProfilePopoutWrapper}`)) this.openPopout();
 		document.querySelector(settingsSelector).dispatchEvent(
 			new MouseEvent("contextmenu", {
 				bubbles: true,
 				clientX: e.clientX,
 				clientY: screen.height - 12,
 			})
 		);
-		if (document.querySelector("#status-picker") || document.querySelector("#account")) this.openPopout();
 	}
 
 	addListeners() {

diff --git a/AvatarSettingsButton/src/modules/discordmodules.tsx b/AvatarSettingsButton/src/modules/discordmodules.tsx
@@ -8,7 +8,7 @@ const {
 interface AccountClasses {
 	container: string;
 	avatarWrapper: string;
-	withTagAsButton: string;
+	accountProfilePopoutWrapper: string;
 }
 
 const Error = (_props) => (
@@ -42,7 +42,7 @@ export const Sections = expectModule({
 	fallback: { ACCOUNT: "My Account" },
 });
 
-export const accountClasses = expectModule<AccountClasses>(byKeys("buildOverrideButton"), {
+export const accountClasses = expectModule<AccountClasses>(byKeys("accountProfilePopoutWrapper"), {
 	name: "Account Classes",
 	fatal: true,
 });