Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2

interface/src/App.tsx

@@ -4,6 +4,7 @@ import { ToastContainer, Slide } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.min.css';
 
 import { localStorageDetector } from 'typesafe-i18n/detectors';
+import { FeaturesLoader } from './contexts/features';
 import type { FC } from 'react';
 import AppRouting from 'AppRouting';
 import CustomTheme from 'CustomTheme';
@@ -26,7 +27,9 @@ const App: FC = () => {
   return (
     <TypesafeI18n locale={detectedLocale}>
       <CustomTheme>
-        <AppRouting />
+        <FeaturesLoader>
+          <AppRouting />
+        </FeaturesLoader>
         <ToastContainer
           position="bottom-left"
           autoClose={3000}

interface/src/SignIn.tsx

@@ -3,6 +3,7 @@ import { Box, Fab, Paper, Typography, Button } from '@mui/material';
 import { useRequest } from 'alova';
 import { useContext, useState } from 'react';
 import { toast } from 'react-toastify';
+import { FeaturesContext } from './contexts/features';
 import type { ValidateFieldsError } from 'async-validator';
 
 import type { Locales } from 'i18n/i18n-types';
@@ -33,6 +34,8 @@ const SignIn: FC = () => {
 
   const { LL, setLocale, locale } = useContext(I18nContext);
 
+  const { features } = useContext(FeaturesContext);
+
   const [signInRequest, setSignInRequest] = useState<SignInRequest>({
     username: '',
     password: ''
@@ -107,6 +110,7 @@ const SignIn: FC = () => {
         })}
       >
         <Typography variant="h4">{PROJECT_NAME}</Typography>
+        <Typography variant="subtitle2">{features.version}</Typography>
         <Box
           mt={2}
           mb={2}

interface/src/contexts/features/FeaturesLoader.tsx

@@ -5,10 +5,9 @@ import type { FC } from 'react';
 
 import type { RequiredChildrenProps } from 'utils';
 import * as FeaturesApi from 'api/features';
-import { ApplicationError, LoadingSpinner } from 'components';
 
 const FeaturesLoader: FC<RequiredChildrenProps> = (props) => {
-  const { data: features, error } = useRequest(FeaturesApi.readFeatures);
+  const { data: features } = useRequest(FeaturesApi.readFeatures);
 
   if (features) {
     return (
@@ -21,12 +20,6 @@ const FeaturesLoader: FC<RequiredChildrenProps> = (props) => {
       </FeaturesContext.Provider>
     );
   }
-
-  if (error) {
-    return <ApplicationError message={error?.message} />;
-  }
-
-  return <LoadingSpinner height="100vh" />;
 };
 
 export default FeaturesLoader;

interface/src/framework/mqtt/MqttSettingsForm.tsx

@@ -182,6 +182,7 @@ const MqttSettingsForm: FC = () => {
             </Grid>
           )}
         </Grid>
+
         <BlockFormControlLabel
           control={<Checkbox name="clean_session" checked={data.clean_session} onChange={updateFormValue} />}
           label={LL.MQTT_CLEAN_SESSION()}

interface/src/framework/system/UploadFileForm.tsx

@@ -54,7 +54,7 @@ const UploadFileForm: FC = () => {
       if (err.message === 'The user aborted a request') {
         toast.warning(LL.UPLOAD() + ' ' + LL.ABORTED());
       } else if (err.message === 'Network Error') {
-        toast.warning('Invalid file extension');
+        toast.warning('Invalid file extension or incompatible bin file');
       } else {
         toast.error(err.message);
       }

interface/src/types/features.ts

@@ -1,8 +1,4 @@
 export interface Features {
-  project: boolean;
-  security: boolean;
-  mqtt: boolean;
-  ntp: boolean;
-  ota: boolean;
-  upload_firmware: boolean;
+  version: string;
+  platform: string; // "ESP32-C3" "ESP32-S2" "ESP32-S3" "ESP32"
 }