From 7cef6efa6fb4dffbf2f9d8d47a91bc04302f58a2 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Wed, 27 Sep 2023 18:24:58 +0700
Subject: [PATCH] fix crash on windows

---
 src-tauri/Cargo.toml             | 3 ++-
 src-tauri/src/main.rs            | 4 +++-
 src/app/auth/import/step-3.tsx   | 2 +-
 src/shared/navigation.tsx        | 3 ++-
 src/shared/widgets/emptyList.tsx | 4 ++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 95d84a51..2e7d3753 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -17,7 +17,6 @@ tauri-build = { version = "1.4", features = [] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.4", features = [
-  "macos-private-api",
   "window-close",
   "window-print",
   "window-create",
@@ -54,6 +53,8 @@ sqlx-cli = { version = "0.7.0", default-features = false, features = [
 ] }
 rust-argon2 = "1.0"
 webpage = { version = "1.6.0", features = ["serde"] }
+
+[target.'cfg(any(target_os = "macos"))'.dependencies]
 cocoa = "0.25.0"
 objc = "0.2.7"
 
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 9526311c..4b20956b 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -114,14 +114,16 @@ fn main() {
 
       #[cfg(target_os = "macos")]
       window.set_transparent_titlebar(true);
+      #[cfg(target_os = "macos")]
       window.position_traffic_lights(16.0, 25.0);
 
       Ok(())
     })
     .on_window_event(|e| {
+      #[cfg(target_os = "macos")]
       if let WindowEvent::Resized(..) = e.event() {
         let window = e.window();
-        window.position_traffic_lights(16., 25.);
+        window.position_traffic_lights(16.0, 25.0);
       }
     })
     .plugin(
diff --git a/src/app/auth/import/step-3.tsx b/src/app/auth/import/step-3.tsx
index 2c51dbaa..bf8bbff7 100644
--- a/src/app/auth/import/step-3.tsx
+++ b/src/app/auth/import/step-3.tsx
@@ -81,7 +81,7 @@ export function ImportStep3Screen() {
           </button>
           <span className="text-center text-sm text-white/50">
             By clicking &apos;Continue&apos;, Lume will sync your old relay list and
-            metadata. It may take a bit
+            metadata.<br/>It may take a bit, please be patient.
           </span>
         </div>
       </div>
diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx
index 4fd9029e..321509dd 100644
--- a/src/shared/navigation.tsx
+++ b/src/shared/navigation.tsx
@@ -15,7 +15,8 @@ import { useSidebar } from '@stores/sidebar';
 import { compactNumber } from '@utils/number';
 
 export function Navigation() {
-  const [totalNewActivities] = useActivities((state) => [state.totalNewActivities]);
+  const totalNewActivities = useActivities((state) => state.totalNewActivities);
+
   const [chats, toggleChats] = useSidebar((state) => [state.chats, state.toggleChats]);
   const [integrations, toggleIntegrations] = useSidebar((state) => [
     state.integrations,
diff --git a/src/shared/widgets/emptyList.tsx b/src/shared/widgets/emptyList.tsx
index bce8ab1a..f9e8dfc8 100644
--- a/src/shared/widgets/emptyList.tsx
+++ b/src/shared/widgets/emptyList.tsx
@@ -4,12 +4,15 @@ import { useEffect, useState } from 'react';
 import { useStorage } from '@libs/storage/provider';
 
 import { useNostr } from '@utils/hooks/useNostr';
+import { useStronghold } from '@stores/stronghold';
 
 export function EmptyList() {
   const { db } = useStorage();
   const { getAllEventsSinceLastLogin } = useNostr();
 
+  const setIsFetched = useStronghold((state) => state.setIsFetched);
   const queryClient = useQueryClient();
+  
   const [progress, setProgress] = useState(0);
 
   useEffect(() => {
@@ -21,6 +24,7 @@ export function EmptyList() {
 
       if (promises) {
         setProgress(100);
+        setIsFetched();
         // invalidate queries
         queryClient.invalidateQueries(['local-network-widget']);
       }