From e3126a98bf4f9dbede6064cab9cafe262d6dd8d7 Mon Sep 17 00:00:00 2001
From: anastasiia <anastasiya1155@gmail.com>
Date: Fri, 17 Nov 2023 08:51:28 -0500
Subject: [PATCH 1/2] create tauri command to automatically open and focus
 bloop app after authentication with GitHub

---
 apps/desktop/src-tauri/src/main.rs             | 18 ++++++++++++++++++
 .../Onboarding/Desktop/UserForm/Step2.tsx      |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs
index 3d41bb628d..7f4fbd7902 100644
--- a/apps/desktop/src-tauri/src/main.rs
+++ b/apps/desktop/src-tauri/src/main.rs
@@ -42,12 +42,30 @@ fn main() {
         .setup(backend::initialize)
         .invoke_handler(tauri::generate_handler![
             show_folder_in_finder,
+            show_main_window,
             backend::get_last_log_file,
         ])
         .run(tauri::generate_context!())
         .expect("error running tauri application");
 }
 
+#[tauri::command]
+fn show_main_window(app_handle: tauri::AppHandle) {
+    match app_handle.get_window("main") {
+        Some(window) => {
+            if !cfg!(target_os = "macos") {
+                window.unminimize().unwrap();
+            }
+            window.unminimize().unwrap();
+            window.set_focus().unwrap();
+            window.show().unwrap();
+        }
+        None => {
+
+        }
+    }
+}
+
 #[tauri::command]
 fn show_folder_in_finder(path: String) {
     let path = PathBuf::from(path).canonicalize().unwrap();
diff --git a/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx b/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx
index d518fb441a..3a86e14e86 100644
--- a/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx
+++ b/client/src/pages/Onboarding/Desktop/UserForm/Step2.tsx
@@ -24,7 +24,8 @@ const UserFormStep2 = ({ onContinue }: Props) => {
   const { isGithubConnected, setGithubConnected } = useContext(
     UIContext.GitHubConnected,
   );
-  const { envConfig, openLink, setEnvConfig } = useContext(DeviceContext);
+  const { envConfig, openLink, setEnvConfig, invokeTauriCommand } =
+    useContext(DeviceContext);
   const [isTimedOut, setIsTimedOut] = useState(false);
   const [isBtnClicked, setBtnClicked] = useState(false);
   const [loginUrl, setLoginUrl] = useState('');
@@ -84,6 +85,7 @@ const UserFormStep2 = ({ onContinue }: Props) => {
         () =>
           checkGHAuth().then((d) => {
             if (!!d.user_login) {
+              invokeTauriCommand('show_main_window');
               onContinue();
             }
           }),

From 52ffe1d9822fc6b5a30b8d2de021be27e035cf1e Mon Sep 17 00:00:00 2001
From: anastasiia <anastasiya1155@gmail.com>
Date: Fri, 17 Nov 2023 12:33:21 -0500
Subject: [PATCH 2/2] fix rustfmt

---
 apps/desktop/src-tauri/src/main.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs
index 7f4fbd7902..99a3920ab5 100644
--- a/apps/desktop/src-tauri/src/main.rs
+++ b/apps/desktop/src-tauri/src/main.rs
@@ -60,9 +60,7 @@ fn show_main_window(app_handle: tauri::AppHandle) {
             window.set_focus().unwrap();
             window.show().unwrap();
         }
-        None => {
-
-        }
+        None => {}
     }
 }