Merge branch 'dev'

src/equicordplugins/songSpotlight.desktop/lib/oauth2.tsx

@@ -37,10 +37,9 @@ export function presentOAuth2Modal() {
                     if (!access) throw "Access token is missing";
 
                     const refresh = res.headers.get("X-Refresh-Token");
-                    // STUB uncomment this once API is fully rolled out
-                    // if (!refresh) throw "Refresh token is missing";
+                    if (!refresh) throw "Refresh token is missing";
 
-                    useAuthorizationStore.getState().setToken(access, refresh || "");
+                    useAuthorizationStore.getState().setToken(access, refresh);
                     getData();
 
                     showToast("Successfully authorized!", Toasts.Type.SUCCESS);

src/plugins/betterSettings/index.tsx

@@ -17,18 +17,6 @@ import type { HTMLAttributes } from "react";
 
 import fullHeightStyle from "./fullHeightContext.css?managed";
 
-type SettingsEntry = {
-    ariaLabel?: string;
-    element?: any;
-    label?: string;
-    newIndicator?: any;
-    newIndicatorDismissibleContentTypes?: number[];
-    predicate?: () => boolean;
-    searchableTitles?: string[];
-    section: string,
-    tabPredicate?: () => boolean;
-};
-
 const cl = classNameFactory("");
 const Classes = findCssClassesLazy("animating", "baseLayer", "bg", "layer", "layers");
 
@@ -53,11 +41,6 @@ const settings = definePluginSettings({
     }
 });
 
-interface TransformedSettingsEntry {
-    section: string;
-    items: SettingsEntry[];
-}
-
 interface LayerProps extends HTMLAttributes<HTMLDivElement> {
     mode: "SHOWN" | "HIDDEN";
     baseLayer?: boolean;
@@ -168,6 +151,7 @@ export default definePlugin({
         },
         { // Settings cog context menu
             find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
+            predicate: () => settings.store.organizeMenu,
             replacement: [
                 {
                     match: /(\i)=(.{0,20}openUserSettings\)\(\i\)\));/,