Merge remote-tracking branch 'origin/main' into tauri-publish-asset

arduino · May 31, 2024 · d115a1c · d115a1c
2 parents 891ea97 + a0e46e0
commit d115a1c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/installer/src/App.jsx b/installer/src/App.jsx
@@ -66,10 +66,10 @@ function App() {
     }, []);
 
     const updateLeftServo = (ev) => {
-        setLeftServo(ev.currentTarget.value);
+        setLeftServo(Number(ev.currentTarget.value));
     };
     const updateRightServo = (ev) => {
-        setRightServo(ev.currentTarget.value);
+        setRightServo(Number(ev.currentTarget.value));
     };
 
     const updateName = (ev) => {
@@ -108,10 +108,9 @@ function App() {
                     code: data.code, // atm code is not used
                 });
             } else {
-                dispatch({
-                    type: 'GENERIC_ERROR',
-                    error: new Error('Error uploading sketch'),
-                });
+                handleError(
+                    new Error(`Unknown error uploading sketch: ${data.code}`)
+                );
             }
         };
 
@@ -245,7 +244,7 @@ function App() {
                         </div>
                     </form>
                     {state.error && (
-                        <p className="text-red-600 container mx-auto">
+                        <p className="text-red-600 container mx-auto pt-2">
                             {state.error?.message}
                         </p>
                     )}

diff --git a/installer/src/reducers/state-reducer.js b/installer/src/reducers/state-reducer.js
@@ -38,8 +38,9 @@ const reducer = (state, action) => {
                 uploading: false,
                 uploadButtonEnabled:
                     state.boards?.length > 0 && state.selectedBoard,
-                error: action.error,
+                error: new Error(action.error?.toString()),
             };
+
         case 'BOARDS_RETRIEVED':
             return {
                 ...state,