From 77e7bfbbc15b77913b6b2d7f8872473b9e89fb97 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 14 May 2024 07:08:57 -0700
Subject: [PATCH] Fix upgrade cancel

---
 src-tauri/src/updates.rs               | 19 +++++++++++--------
 src-tauri/tauri.conf.json              |  2 +-
 src-web/components/WorkspaceHeader.tsx |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src-tauri/src/updates.rs b/src-tauri/src/updates.rs
index d23169d5..1c29bf19 100644
--- a/src-tauri/src/updates.rs
+++ b/src-tauri/src/updates.rs
@@ -53,22 +53,21 @@ impl YaakUpdater {
     ) -> Result<bool, tauri_plugin_updater::Error> {
         self.last_update_check = SystemTime::now();
 
-        let enabled = !is_dev();
-        info!(
-            "Checking for updates mode={} enabled={}",
-            mode, enabled
-        );
+        let enabled = is_dev();
+        info!("Checking for updates mode={} enabled={}", mode, enabled);
 
         if !enabled {
             return Ok(false);
         }
-
-        match app_handle
+        
+        let update_check_result = app_handle
             .updater_builder()
             .header("X-Update-Mode", mode.to_string())?
             .build()?
             .check()
-            .await
+            .await;
+
+        match update_check_result
         {
             Ok(Some(update)) => {
                 let h = app_handle.clone();
@@ -78,6 +77,8 @@ impl YaakUpdater {
                         "{} is available. Would you like to download and install it now?",
                         update.version
                     ))
+                    .ok_button_label("Download")
+                    .cancel_button_label("Later")
                     .title("Update Available")
                     .show(|confirmed| {
                         if !confirmed {
@@ -89,6 +90,8 @@ impl YaakUpdater {
                                     if h.dialog()
                                         .message("Would you like to restart the app?")
                                         .title("Update Installed")
+                                        .ok_button_label("Restart")
+                                        .cancel_button_label("Later")
                                         .blocking_show()
                                     {
                                         h.restart();
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 01589ec7..0de541d6 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -6,7 +6,7 @@
     "frontendDist": "../dist"
   },
   "productName": "Yaak",
-  "version": "2024.4.0-beta.3",
+  "version": "2024.4.0-beta.2",
   "identifier": "app.yaak.desktop",
   "app": {
     "withGlobalTauri": false,
diff --git a/src-web/components/WorkspaceHeader.tsx b/src-web/components/WorkspaceHeader.tsx
index c19b9513..672dcccb 100644
--- a/src-web/components/WorkspaceHeader.tsx
+++ b/src-web/components/WorkspaceHeader.tsx
@@ -40,7 +40,7 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
       <div className="pointer-events-none">
         <RecentRequestsDropdown />
       </div>
-      <div className="flex-1 flex items-center h-full justify-end pointer-events-none">
+      <div className="flex-1 flex gap-1 items-center h-full justify-end pointer-events-none">
         <ImportCurlButton />
         <SettingsDropdown />
         {(osInfo?.osType === 'linux' || osInfo?.osType === 'windows') && (