Merge branch 'main' into feat/back-button

src/pages/provider_contact.rs

@@ -119,27 +119,34 @@ pub fn ProviderContactPage() -> impl IntoView {
     });
 
     let mut toasts_context = expect_context::<ToastContext>();
-    Effect::new(move || {
+    Effect::watch(
-        match submit_action.value().get() {
+        move || submit_action.value().get(),
-            Some(Ok(_)) => toasts_context.toast(
+        move |value, _, _| {
-                Toast::new()
+            log!("Running submit_action effect");
+            let Some(result) = value else {
+                return;
+            };
+            
+            let toast = match result {
+                Ok(_) => Toast::new()
                     .id(uuid::Uuid::new_v4())
                     .header("Submission Successful")
-                    .msg("You can go back or continue editing your responses.")
+                    .msg("You can go back or continue editing your responses."),
-            ),
+                Err(err) => Toast::new()
-            Some(Err(err)) => toasts_context.toast(
-                Toast::new()
                     .id(uuid::Uuid::new_v4())
                     .header("Submission Failed")
                     .msg(err.to_string())
-            ),
+            };
-            _ => {}
-        }
 
+            untrack(move || {
                 submit_action.clear();
+                toasts_context.toast(toast);
             });
+        },
+        false
+    );
 
-    // Display contact form.
+// Display contact form.
     view! {
         <Banner title="R15 Scholarships" logo="/PHS_Stacked_Acronym.png" path="/" />
         <AuthLoaded fallback=Loading>

src/pages/scholarship_info.rs

@@ -490,25 +490,32 @@ fn ScholarshipForm(
         });
     };
 
-    Effect::new(move || {
+    Effect::watch(
-        match submit_action.value().get() {
+        move || submit_action.value().get(),
-            Some(Ok(_)) => toasts.toast(
+        move |value, _, _| {
-                Toast::new()
+            log!("Running submit_action effect");
+            let Some(result) = value else {
+                return;
+            };
+
+            let toast = match result {
+                Ok(_) => Toast::new()
                     .id(uuid::Uuid::new_v4())
                     .header("Submission Successful")
-                    .msg("You can go back or continue editing your responses.")
+                    .msg("You can go back or continue editing your responses."),
-            ),
+                Err(err) => Toast::new()
-            Some(Err(err)) => toasts.toast(
-                Toast::new()
                     .id(uuid::Uuid::new_v4())
                     .header("Submission Failed")
                     .msg(err.to_string())
-            ),
+            };
-            _ => {}
-        }
 
+            untrack(move || {
                 submit_action.clear();
+                toasts.toast(toast);
             });
+        },
+        false
+    );
 
     //#endregion