From d1f4d9236f5009a14135fa0b4d68dc2cf10540ba Mon Sep 17 00:00:00 2001
From: Ho Kim <ho.kim@ulagbulag.io>
Date: Tue, 30 Jul 2024 18:41:48 +0000
Subject: [PATCH] fix: remove screen flickering

---
 crates/cassette/src/pages/cassette.rs | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/crates/cassette/src/pages/cassette.rs b/crates/cassette/src/pages/cassette.rs
index a69406d..ccfd60d 100644
--- a/crates/cassette/src/pages/cassette.rs
+++ b/crates/cassette/src/pages/cassette.rs
@@ -1,6 +1,7 @@
 use cassette_core::{
     cassette::{Cassette as CassetteData, CassetteState},
     net::fetch::FetchState,
+    prelude::*,
     task::{TaskRenderer, TaskState},
 };
 use patternfly_yew::prelude::*;
@@ -97,7 +98,7 @@ fn cassette_data(props: &DataProps) -> Html {
     }
 
     html! {
-        <super::PageBody {title} {subtitle} >
+        <super::PageBody { title } { subtitle } >
             { for contents }
         </super::PageBody>
     }
@@ -114,23 +115,22 @@ fn cassette_fallback(props: &FallbackProps) -> Html {
     let FallbackProps { error } = props;
 
     let title = if error.is_some() { "Error" } else { "" };
-    let subtitle = if error.is_some() {
-        None
-    } else {
-        Some("Loading...")
-    };
-
-    let error = props.error.as_deref().map(|error| {
-        html! {
-            <Alert inline=true title="Error" r#type={AlertType::Danger}>
-                { error }
-            </Alert>
-        }
-    });
+
+    let content = props
+        .error
+        .as_deref()
+        .map(|error| {
+            html! {
+                <Alert inline=true title="Error" r#type={AlertType::Danger}>
+                    { error }
+                </Alert>
+            }
+        })
+        .unwrap_or_else(|| html! { <Loading /> });
 
     html! {
-        <super::PageBody {title} {subtitle} >
-            { for error }
+        <super::PageBody { title } >
+            { content }
         </super::PageBody>
     }
 }