Merge aa/type-cleanup-py (work by marios, aa, wolv)

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) => {

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) => {