Merge aa/type-cleanup-py (work by marios, aa, wolv)v2.10.6-pre1

4 files changed, 15 insertions, 9 deletions

diff --git a/frontend/src/components/modals/filepicker/index.tsx b/frontend/src/components/modals/filepicker/index.tsx
index ae745c9c..c4e72d95 100644
--- a/frontend/src/components/modals/filepicker/index.tsx
+++ b/frontend/src/components/modals/filepicker/index.tsx
@@ -13,7 +13,7 @@ import {
 } from 'decky-frontend-lib';
 import { filesize } from 'filesize';
 import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react';
-import { FileIcon, defaultStyles } from 'react-file-icon';
+import { DefaultExtensionType, FileIcon, defaultStyles } from 'react-file-icon';
 import { useTranslation } from 'react-i18next';
 import { FaArrowUp, FaFolder } from 'react-icons/fa';
 
@@ -316,7 +316,12 @@ const FilePicker: FunctionComponent<FilePickerProps> = ({
                       ) : (
                         <div style={iconStyles}>
                           {file.realpath.includes('.') ? (
-                            <FileIcon {...defaultStyles[extension]} {...styleDefObj[extension]} extension={''} />
+                            <FileIcon
+                              {...defaultStyles[extension as DefaultExtensionType]}
+                              // @ts-expect-error
+                              {...styleDefObj[extension]}
+                              extension={''}
+                            />
                           ) : (
                             <FileIcon />
                           )}
diff --git a/frontend/src/components/settings/pages/general/BranchSelect.tsx b/frontend/src/components/settings/pages/general/BranchSelect.tsx
index 9b304f3a..1af06823 100644
--- a/frontend/src/components/settings/pages/general/BranchSelect.tsx
+++ b/frontend/src/components/settings/pages/general/BranchSelect.tsx
@@ -29,10 +29,10 @@ const BranchSelect: FunctionComponent<{}> = () => {
     <Field label={t('BranchSelect.update_channel.label')} childrenContainerWidth={'fixed'}>
       <Dropdown
         rgOptions={Object.values(UpdateBranch)
-          .filter((branch) => typeof branch == 'string')
+          .filter((branch) => typeof branch == 'number')
           .map((branch) => ({
-            label: tBranches[UpdateBranch[branch]],
-            data: UpdateBranch[branch],
+            label: tBranches[branch as number],
+            data: branch,
           }))}
         selectedOption={selectedBranch}
         onChange={async (newVal) => {
diff --git a/frontend/src/components/settings/pages/general/StoreSelect.tsx b/frontend/src/components/settings/pages/general/StoreSelect.tsx
index ebf1bd81..3cb80303 100644
--- a/frontend/src/components/settings/pages/general/StoreSelect.tsx
+++ b/frontend/src/components/settings/pages/general/StoreSelect.tsx
@@ -26,10 +26,10 @@ const StoreSelect: FunctionComponent<{}> = () => {
       <Field label={t('StoreSelect.store_channel.label')} childrenContainerWidth={'fixed'}>
         <Dropdown
           rgOptions={Object.values(Store)
-            .filter((store) => typeof store == 'string')
+            .filter((store) => typeof store == 'number')
             .map((store) => ({
-              label: tStores[Store[store]],
-              data: Store[store],
+              label: tStores[store as number],
+              data: store,
             }))}
           selectedOption={selectedStore}
           onChange={async (newVal) => {
diff --git a/frontend/src/store.tsx b/frontend/src/store.tsx
index 846c4766..fd458bef 100644
--- a/frontend/src/store.tsx
+++ b/frontend/src/store.tsx
@@ -38,7 +38,8 @@ export async function getStore(): Promise<Store> {
 
 export async function getPluginList(): Promise<StorePlugin[]> {
   let version = await window.DeckyPluginLoader.updateVersion();
-  let store = await getSetting<Store>('store', null);
+  let store = await getSetting<Store | null>('store', null);
+
   let customURL = await getSetting<string>('store-url', 'https://plugins.deckbrew.xyz/plugins');
   let storeURL;
   if (store === null) {