Fix form reset

src/components/Channel.tsx

@@ -77,6 +77,7 @@ export const Channel = ({ channel }: ChannelProps): JSX.Element => {
     });
 
     await connection.setChannel(channelData, (): Promise<void> => {
+      reset({ ...data });
       setLoading(false);
       return Promise.resolve();
     });

src/core/slices/appSlice.ts

@@ -23,6 +23,7 @@ interface Notification {
 
 interface AppState {
   mobileNavOpen: boolean;
+  navCollapsed: boolean;
   connectionModalOpen: boolean;
   darkMode: boolean;
   currentPage: currentPageName;
@@ -37,6 +38,7 @@ interface AppState {
 
 const initialState: AppState = {
   mobileNavOpen: false,
+  navCollapsed: false,
   connectionModalOpen: true,
   darkMode: localStorage.getItem('darkMode') === 'true' ?? false,
   currentPage: 'messages',

src/pages/Plugins/ExternalNotification.tsx

@@ -52,7 +52,11 @@ export const ExternalNotification = ({
   }, [reset, preferences]);
 
   const onSubmit = handleSubmit((data) => {
-    void connection.setPreferences(data);
+    void connection.setPreferences(data, async (): Promise<void> => {
+      //add loading indicator
+      reset({ ...data });
+      await Promise.resolve();
+    });
   });
 
   //todo, add loading indicator

src/pages/Plugins/RangeTest.tsx

@@ -41,7 +41,11 @@ export const RangeTest = ({
   }, [reset, preferences]);
 
   const onSubmit = handleSubmit((data) => {
-    void connection.setPreferences(data);
+    void connection.setPreferences(data, async (): Promise<void> => {
+      //add loading indicator
+      reset({ ...data });
+      await Promise.resolve();
+    });
   });
 
   //todo, add loading indicator

src/pages/Plugins/Serial.tsx

@@ -44,7 +44,11 @@ export const Serial = ({ navOpen, setNavOpen }: SerialProps): JSX.Element => {
   }, [reset, preferences]);
 
   const onSubmit = handleSubmit((data) => {
-    void connection.setPreferences(data);
+    void connection.setPreferences(data, async (): Promise<void> => {
+      //add loading indicator
+      reset({ ...data });
+      await Promise.resolve();
+    });
   });
   //todo, add loading indicator
 

src/pages/Plugins/StoreAndForward.tsx

@@ -39,7 +39,11 @@ export const StoreAndForward = ({
   }, [reset, preferences]);
 
   const onSubmit = handleSubmit((data) => {
-    void connection.setPreferences(data);
+    void connection.setPreferences(data, async (): Promise<void> => {
+      //add loading indicator
+      reset({ ...data });
+      await Promise.resolve();
+    });
   });
   //todo, add loading indicator
 

src/pages/settings/Channels.tsx

@@ -59,6 +59,7 @@ export const Channels = ({
     });
 
     await connection.setChannel(channelData, (): Promise<void> => {
+      reset({ ...data });
       setLoading(false);
       return Promise.resolve();
     });

src/pages/settings/Position.tsx

@@ -62,8 +62,9 @@ export const Position = ({
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
     void connection.setPreferences(data, async () => {
-      await Promise.resolve();
+      reset({ ...data });
       setLoading(false);
+      await Promise.resolve();
     });
   });
 

src/pages/settings/Power.tsx

@@ -38,8 +38,9 @@ export const Power = ({ navOpen, setNavOpen }: PowerProps): JSX.Element => {
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
     void connection.setPreferences(data, async () => {
-      await Promise.resolve();
+      reset({ ...data });
       setLoading(false);
+      await Promise.resolve();
     });
   });
   return (

src/pages/settings/Radio.tsx

@@ -35,8 +35,9 @@ export const Radio = ({ navOpen, setNavOpen }: RadioProps): JSX.Element => {
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
     void connection.setPreferences(data, async () => {
-      await Promise.resolve();
+      reset({ ...data });
       setLoading(false);
+      await Promise.resolve();
     });
   });
   return (

src/pages/settings/User.tsx

@@ -67,8 +67,9 @@ export const User = ({ navOpen, setNavOpen }: UserProps): JSX.Element => {
 
     if (node?.user) {
       void connection.setOwner({ ...node.user, ...data }, async () => {
-        await Promise.resolve();
+        reset({ ...data });
         setLoading(false);
+        await Promise.resolve();
       });
       // TODO: can be removed once getUser is implemented
       // dispatch(

src/pages/settings/WiFi.tsx

@@ -49,8 +49,9 @@ export const WiFi = ({ navOpen, setNavOpen }: WiFiProps): JSX.Element => {
   const onSubmit = handleSubmit((data) => {
     setLoading(true);
     void connection.setPreferences(data, async () => {
-      await Promise.resolve();
+      reset({ ...data });
       setLoading(false);
+      await Promise.resolve();
     });
   });
   return (