From 72a3d9c549a71e0c3d3081de90f003370267d2c4 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 6 Dec 2023 21:44:53 +0100
Subject: [PATCH 1/3] fix bug introduced by the eslintenig

---
 packages/core-extensions/src/moonbase/webpackModules/stores.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-extensions/src/moonbase/webpackModules/stores.ts b/packages/core-extensions/src/moonbase/webpackModules/stores.ts
index b1c729a..4342299 100644
--- a/packages/core-extensions/src/moonbase/webpackModules/stores.ts
+++ b/packages/core-extensions/src/moonbase/webpackModules/stores.ts
@@ -53,7 +53,7 @@ class MoonbaseSettingsStore extends Flux.Store<any> {
           for (const ext of exts) {
             try {
               const existingExtension = this.extensions[ext.id];
-              if (existingExtension !== null) {
+              if (existingExtension !== undefined) {
                 if (this.hasUpdate(repo, ext, existingExtension)) {
                   this.updates[ext.id] = {
                     version: ext.version!,

From 3c7289f31d12cc9a035783e0e8b7934f041b3cbc Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 6 Dec 2023 21:45:14 +0100
Subject: [PATCH 2/3] use proper panel buttons in moonbase

---
 .../core-extensions/src/moonbase/index.tsx    |  3 +-
 .../core-extensions/src/moonbase/ui/index.tsx | 30 +++++++++----------
 .../types/src/coreExtensions/components.ts    |  1 +
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/core-extensions/src/moonbase/index.tsx b/packages/core-extensions/src/moonbase/index.tsx
index a00ad26..2d16f49 100644
--- a/packages/core-extensions/src/moonbase/index.tsx
+++ b/packages/core-extensions/src/moonbase/index.tsx
@@ -18,7 +18,8 @@ export const webpackModules: ExtensionWebExports["webpackModules"] = {
       { ext: "common", id: "components" },
       { ext: "moonbase", id: "stores" },
       DownloadIconSVG,
-      TrashIconSVG
+      TrashIconSVG,
+      "Masks.PANEL_BUTTON"
     ],
     entrypoint: true,
     run: (module, exports, require) => {
diff --git a/packages/core-extensions/src/moonbase/ui/index.tsx b/packages/core-extensions/src/moonbase/ui/index.tsx
index b12f7cc..e94f115 100644
--- a/packages/core-extensions/src/moonbase/ui/index.tsx
+++ b/packages/core-extensions/src/moonbase/ui/index.tsx
@@ -29,6 +29,9 @@ export default (require: typeof WebpackRequire) => {
   const DownloadIcon = spacepack.findByCode(DownloadIconSVG)[0].exports.default;
   const TrashIcon = spacepack.findByCode(TrashIconSVG)[0].exports.default;
 
+  const PanelButton =
+    spacepack.findByCode("Masks.PANEL_BUTTON")[0].exports.default;
+
   function ExtensionCard({ id }: { id: string }) {
     const [tab, setTab] = React.useState(ExtensionPage.Info);
     const { ext, enabled, busy, update } = Flux.useStateFromStores(
@@ -103,30 +106,27 @@ export default (require: typeof WebpackRequire) => {
                 }}
               >
                 {ext.source.type === ExtensionLoadSource.Normal && (
-                  // TODO: this needs centering
-                  <Button
-                    color={Button.Colors.RED}
-                    size={Button.Sizes.ICON}
-                    submitting={busy}
+                  <PanelButton
+                    icon={() => (
+                      <TrashIcon
+                        color={CommonComponents.tokens.colors.STATUS_DANGER}
+                      />
+                    )}
+                    tooltipText="Delete"
                     onClick={() => {
                       MoonbaseSettingsStore.deleteExtension(id);
                     }}
-                  >
-                    <TrashIcon width={27} />
-                  </Button>
+                  />
                 )}
 
                 {update !== null && (
-                  <Button
-                    color={Button.Colors.BRAND}
-                    size={Button.Sizes.ICON}
-                    submitting={busy}
+                  <PanelButton
+                    icon={DownloadIcon}
+                    tooltipText="Delete"
                     onClick={() => {
                       MoonbaseSettingsStore.installExtension(id);
                     }}
-                  >
-                    <DownloadIcon width={27} />
-                  </Button>
+                  />
                 )}
 
                 <Switch
diff --git a/packages/types/src/coreExtensions/components.ts b/packages/types/src/coreExtensions/components.ts
index c79ce05..aee08f3 100644
--- a/packages/types/src/coreExtensions/components.ts
+++ b/packages/types/src/coreExtensions/components.ts
@@ -351,4 +351,5 @@ export type CommonComponents = {
   // TODO
   useVariableSelect: any;
   multiSelect: any;
+  tokens: any;
 };

From 601cec757882f4d20a2a6421b19d98563513d840 Mon Sep 17 00:00:00 2001
From: redstonekasi <kasi@hanneskann.de>
Date: Wed, 6 Dec 2023 21:57:39 +0100
Subject: [PATCH 3/3] make delete icon not red

---
 packages/core-extensions/src/moonbase/ui/index.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/core-extensions/src/moonbase/ui/index.tsx b/packages/core-extensions/src/moonbase/ui/index.tsx
index e94f115..f5b1a6c 100644
--- a/packages/core-extensions/src/moonbase/ui/index.tsx
+++ b/packages/core-extensions/src/moonbase/ui/index.tsx
@@ -107,11 +107,7 @@ export default (require: typeof WebpackRequire) => {
               >
                 {ext.source.type === ExtensionLoadSource.Normal && (
                   <PanelButton
-                    icon={() => (
-                      <TrashIcon
-                        color={CommonComponents.tokens.colors.STATUS_DANGER}
-                      />
-                    )}
+                    icon={TrashIcon}
                     tooltipText="Delete"
                     onClick={() => {
                       MoonbaseSettingsStore.deleteExtension(id);