Cargo.lock

@@ -2965,7 +2965,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.9.1"
+version = "0.9.0"
 dependencies = [
  "itertools 0.14.0",
  "log",
@@ -2980,14 +2980,14 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.9.1"
+version = "0.9.0"
 dependencies = [
  "anyhow",
 ]
 
 [[package]]
 name = "letterbox-server"
-version = "0.9.1"
+version = "0.9.0"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3030,7 +3030,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.9.1"
+version = "0.9.0"
 dependencies = [
  "build-info",
  "letterbox-notmuch",
@@ -3039,7 +3039,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.9.1"
+version = "0.9.0"
 dependencies = [
  "build-info",
  "build-info-build",

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.9.1"
+version = "0.9.0"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

server/Cargo.toml

@@ -48,8 +48,8 @@ urlencoding = "2.1.3"
 #xtracing = { path = "../../xtracing" }
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 xtracing = { version = "0.3.0", registry = "xinu" }
-letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.0", path = "../notmuch", registry = "xinu" }
-letterbox-shared = { version = "0.9.1", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.9.0", path = "../shared", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.39"

shared/Cargo.toml

@@ -12,5 +12,5 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.39"
-letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.0", path = "../notmuch", registry = "xinu" }
 serde = { version = "1.0.147", features = ["derive"] }

web/Cargo.toml

@@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
 uuid = { version = "1.13.1", features = [
   "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { version = "0.9.1", path = "../shared", registry = "xinu" }
+letterbox-shared = { version = "0.9.0", path = "../shared", registry = "xinu" }
-letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
+letterbox-notmuch = { version = "0.9.0", path = "../notmuch", registry = "xinu" }
 seed_hooks = { version = "0.4.0", registry = "xinu" }
 
 [package.metadata.wasm-pack.profile.release]

web/src/state.rs

@@ -586,7 +586,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             model.versions.server = Some(version);
         }
 
-        Msg::CatchupStart => {
+        Msg::StartCatchup => {
             let query = if model.query.contains("is:unread") {
                 model.query.to_string()
             } else {
@@ -625,9 +625,6 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
                 return;
             };
         }
-        Msg::CatchupExit => {
-            model.catchup = None;
-        }
     }
 }
 
@@ -781,9 +778,8 @@ pub enum Msg {
     SetProgress(f64),
     UpdateServerVersion(String),
 
-    CatchupStart,
+    StartCatchup,
     CatchupKeepUnread,
     CatchupMarkAsRead,
     CatchupNext,
-    CatchupExit,
 }

web/src/view/mod.rs

@@ -193,7 +193,7 @@ fn catchup_view(
             div![
                 C!["absolute", "right-4", "text-gray-500"],
                 span![i![C!["fas", "fa-x"]]],
-                ev(Ev::Click, move |_| Msg::CatchupExit)
+                ev(Ev::Click, move |_| Msg::GoToSearchResults)
             ],
             h1![
                 C!["text-center"],
@@ -449,7 +449,7 @@ fn search_toolbar(
                 attrs! {At::Title => "Mark as read"},
                 span![i![C!["far", "fa-eye"]]],
                 span![C!["pl-2", "hidden", "md:inline"], "Catch-up"],
-                ev(Ev::Click, |_| Msg::CatchupStart)
+                ev(Ev::Click, |_| Msg::StartCatchup)
             ]],
         ],
         div![