Last touches for 1.0.44

Author: doggybootsy

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vx",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "author": "doggybootsy",
   "main": "index.js",
   "dependencies": {

package.json

@@ -1,5 +1,5 @@
 import { expose, getAndEnsureVXPath } from "common/preloads";
-import electron, { ipcRenderer, IpcRendererEvent } from "electron";
+import electron, { ipcRenderer, IpcRendererEvent, webFrame } from "electron";
 import JSZip from "jszip";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, extname, join } from "node:path";

packages/desktop/preload/native.ts

@@ -182,7 +182,7 @@ export function PluginCard({ plugin }: { plugin: SafePlugin }) {
           </div>
         </div>
       </div>
-      <div className="vx-addon-description"><Markdown text={plugin.description.toString()}/></div>
+      <div className="vx-addon-description">{plugin.description}</div>
       <div className="vx-addon-divider" />
       <div className="vx-addon-footer">
         {plugin.type === "custom" && (

packages/mod/src/dashboard/pages/addons/plugins/card.tsx

@@ -8,7 +8,7 @@ import { NO_RESULTS, NO_RESULTS_ALT, NoAddons, queryStore } from "../shared";
 import { pluginStore } from "../../../../addons/plugins";
 import { useInternalStore } from "../../../../hooks";
 import { openPluginSettingsModal } from "./modal";
-import { Messages } from "vx:i18n";
+import { FormattedMessage, Messages } from "vx:i18n";
 import { addons } from "../../../../native";
 import { IS_DESKTOP } from "vx:self";
 import type { IconFullProps } from "../../../../components/icons";
@@ -56,7 +56,7 @@ function getCustomPlugin(id: string): SafePlugin {
     settings: Settings ? (() => openPluginSettingsModal(name, Settings!)) : null,
     isNew: false,
     icon: Icon ? (props) => (
-      <ErrorBoundary fallback={<Icons.Code />}>
+      <ErrorBoundary fallback={<Icons.Code {...props} />}>
         <Icon {...props} />
       </ErrorBoundary>
     ) : Icons.Code
@@ -65,6 +65,9 @@ function getCustomPlugin(id: string): SafePlugin {
 function convertToSafePlugin(plugin: Plugin): SafePlugin {
   const id = plugin.id.replace(".app", "").replace(".web", "").replace(/-/g, "_").toUpperCase() as Uppercase<string>;
 
+  let description = Messages[`${id}_DESCRIPTION`] as string | FormattedMessage;
+  if (description instanceof FormattedMessage) description = description.format({ }) as string;
+
   return {
     type: "internal",
     id: plugin.id,
@@ -74,7 +77,7 @@ function convertToSafePlugin(plugin: Plugin): SafePlugin {
     getActiveState: () => plugin.getActiveState(),
     originalEnabledState: plugin.originalEnabledState,
     name: Messages[`${id}_NAME`],
-    description: Messages[`${id}_DESCRIPTION`],
+    description,
     authors: plugin.authors,
     settings: plugin.exports.settings ? (() => openPluginSettingsModal(Messages[`${id}_NAME`], plugin.exports.settings!)) : null,
     isNew: newPlugins.has(plugin.id),

packages/mod/src/dashboard/pages/addons/plugins/index.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } fr
 import { IS_DESKTOP } from "vx:self";
 import { Page } from "../..";
 import { internalDataStore } from "../../../api/storage";
-import { Button, Collapsable, Flex, Icons, Spinner } from "../../../components";
+import { Button, Collapsable, Flex, Icons, Markdown, Spinner } from "../../../components";
 import { FormSwitch } from "../../../components/switch";
 import { app, nativeFrame, transparency } from "../../../native";
 import { Updater } from "./updater";
@@ -180,7 +180,7 @@ export function Home() {
   }, [ ]);
 
   return (
-    <Page title="Home" icon={Icons.Logo}>
+    <Page title="Home" icon={Icons.Logo} bodyClassName="vx-home-page">
       <RainbowText>
         <div className="vx-home-header">
           <div className="vx-home-logo" onClick={changeBackground}>
@@ -212,8 +212,6 @@ export function Home() {
 
         <Updater />
 
-        <div style={{ marginTop: 10 }} />
-
         <Category
           title="Notifications"
           subtitle="Configure notifications here"
@@ -236,8 +234,6 @@ export function Home() {
 
         {IS_DESKTOP && (
           <>
-            <div style={{ marginTop: 10 }} />
-
             <Category
               title="Window Settings"
               subtitle="Settings for the browser window"
@@ -252,7 +248,6 @@ export function Home() {
                   internalDataStore.set("content-protection", value);
                   window.DiscordNative!.window.setContentProtection!(value);
                 }}
-                style={{ marginTop: 20 }}
                 note={Messages.CONTENT_PROTECTION_NOTE}
               >
                 {Messages.CONTENT_PROTECTION}
@@ -295,8 +290,6 @@ export function Home() {
             </Category>
           </>
         )}
-
-        <div style={{ marginTop: 10 }} />
 
         <Category
           title="VX Settings"
@@ -310,7 +303,6 @@ export function Home() {
               setUserSettingShortcut(value);
               internalDataStore.set("user-setting-shortcut", value);
             }}
-            style={{ marginTop: 20 }}
             note={Messages.USER_SETTINGS_SHORTCUT_NOTE}
           >
             {Messages.USER_SETTINGS_SHORTCUT}
@@ -353,7 +345,7 @@ export function Home() {
           >
             {Messages.ADD_VX_TO_TITLEBAR}
           </FormSwitch>
-        </Category>   
+        </Category>
       </RainbowText>   
     </Page>
   )

packages/mod/src/dashboard/pages/home/index.tsx

@@ -124,7 +124,7 @@ export function Updater() {
   const state = useInternalStore(updaterStore, () => updaterStore.getState());  
 
   return (
-    <Flex className="vx-updater" justify={Flex.Justify.BETWEEN} align={Flex.Align.CENTER}>
+    <Flex className="vx-updater" justify={Flex.Justify.BETWEEN} align={Flex.Align.CENTER} grow={0}>
       <div className="vx-updater-info">
         <div className="vx-updater-notice">
           {

packages/mod/src/dashboard/pages/home/updater.tsx

@@ -214,7 +214,6 @@ input.vx-addon-input:not(:focus) {
   padding: 6px;
   border-radius: 4px;
   color: var(--text-normal);
-  margin-top: 8px;
   border: 1px solid var(--background-secondary-alt);
 }
 
@@ -552,4 +551,10 @@ button.vx-community-card-button {
 }
 .vx-category[data-is-open="true"] .vx-category-caret {
   rotate: -90deg;
+}
+
+.vx-home-page {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
 }

packages/mod/src/dashboard/pages/index.css

@@ -13,7 +13,7 @@ import { nativeFrame, transparency } from "./native";
 import { compileFunction } from "./util";
 
 import "./notrack";
-import { BdApi } from "./betterdiscord";
+import { internalDataStore } from "./api/storage";
 
 console.log(`Welcome to VX v${env.VERSION}`);
 

packages/mod/src/index.ts

@@ -1,5 +1,5 @@
 import { IS_DESKTOP, git } from "vx:self";
-import { DataStore } from "./api/storage";
+import { DataStore, internalDataStore } from "./api/storage";
 
 export const extensions = {
   open() {