complying to rule of hooks

deltachat · Sep 14, 2023 · 2ebc6d6 · 2ebc6d6
1 parent be8a71d
commit 2ebc6d6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/renderer/components/OtherAccountsUnreadBadge.tsx b/src/renderer/components/OtherAccountsUnreadBadge.tsx
@@ -20,9 +20,10 @@ export default function OtherAccountsUnreadBadge(props: ComponentProps) {
   ] = useState<boolean>(false)
 
   const settings = useSettingsStore()[0]
-  if (settings === null) return null
 
   useEffect(() => {
+    if (settings === null) return
+    if (settings.desktopSettings.syncAllAccounts === false) return
     let updating = false
     const update = () => {
       if (updating) return
@@ -46,9 +47,9 @@ export default function OtherAccountsUnreadBadge(props: ComponentProps) {
       )
 
     return update
-  }, [settings.desktopSettings.syncAllAccounts])
+  }, [settings])
 
-  if (settings.desktopSettings.syncAllAccounts && haveOtherAccountsUnread) {
+  if (settings && settings.desktopSettings.syncAllAccounts && haveOtherAccountsUnread) {
     return <div className='unread-badge' style={{ ...props }} />
   } else {
     return null