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

This commit is contained in:
MichaelDvP
2023-07-12 07:11:10 +02:00
11 changed files with 155 additions and 184 deletions

View File

@@ -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()}

View File

@@ -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);
}