From 68ad480d7facce43ffda6e58ce61e53551ad4ab6 Mon Sep 17 00:00:00 2001
From: Shea <nu@she-a.eu>
Date: Sun, 12 Jul 2026 16:35:52 +0300
Subject: [PATCH] maybe more stringent rules maybe

Signed-off-by: Shea <nu@she-a.eu>
---
 .changeset/fix_unverified_maybe.md                |  5 +++++
 .../unverified-notice/UnverifiedNoticeBanner.tsx  |  3 +--
 src/app/features/room/RoomTimeline.tsx            |  2 +-
 src/app/pages/client/sidebar/UserMenuTab.tsx      | 15 ++++-----------
 4 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/fix_unverified_maybe.md

diff --git a/.changeset/fix_unverified_maybe.md b/.changeset/fix_unverified_maybe.md
new file mode 100644
index 000000000..a3f23d711
--- /dev/null
+++ b/.changeset/fix_unverified_maybe.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fix the account button showing you 0 sessions active and the verify this device showing when you have zero devices to verify
diff --git a/src/app/components/unverified-notice/UnverifiedNoticeBanner.tsx b/src/app/components/unverified-notice/UnverifiedNoticeBanner.tsx
index 11a912e21..29632f182 100644
--- a/src/app/components/unverified-notice/UnverifiedNoticeBanner.tsx
+++ b/src/app/components/unverified-notice/UnverifiedNoticeBanner.tsx
@@ -12,8 +12,7 @@ export function UnverifiedNoticeBanner() {
 
   const isUnverified = useIsUnverified();
   const unverifiedDeviceCount = useUnverifiedDevices();
-  const hasUnverified =
-    isUnverified || (unverifiedDeviceCount !== undefined && unverifiedDeviceCount > 0);
+  const hasUnverified = (unverifiedDeviceCount ?? 0) > 0;
   const [dismissCount, setDismissCount] = useState(unverifiedDeviceCount);
 
   const [isDismissedNotice, setIsDismissedNotice] = useState(
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index 45e00bc87..4653911d2 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -856,7 +856,7 @@ export function RoomTimeline({
   return (
     <Box grow="Yes" style={{ position: 'relative' }}>
       {unreadInfo?.readUptoEventId && !unreadInfo?.inLiveTimeline && isReady && (
-        <TimelineFloat position="Top">
+        <TimelineFloat position="Top" style={{ background: 'transparent' }}>
           <Chip
             variant="Primary"
             radii="Pill"
diff --git a/src/app/pages/client/sidebar/UserMenuTab.tsx b/src/app/pages/client/sidebar/UserMenuTab.tsx
index 69d2e3ce0..f319ef230 100644
--- a/src/app/pages/client/sidebar/UserMenuTab.tsx
+++ b/src/app/pages/client/sidebar/UserMenuTab.tsx
@@ -598,14 +598,8 @@ export function useUnverifiedDevices() {
   const crypto = mx.getCrypto();
   const [devices] = useDeviceList();
 
-  const [, otherDevices] = useSplitCurrentDevice(devices);
-
-  const otherDevicesId = useDeviceIds(otherDevices);
-  const unverifiedDeviceCount = useUnverifiedDeviceCount(
-    crypto,
-    mx.getSafeUserId(),
-    otherDevicesId
-  );
+  const devicesId = useDeviceIds(devices);
+  const unverifiedDeviceCount = useUnverifiedDeviceCount(crypto, mx.getSafeUserId(), devicesId);
   return unverifiedDeviceCount;
 }
 
@@ -616,8 +610,7 @@ export function UnverifiedMenuOption() {
   const unverifiedDeviceCount = useUnverifiedDevices();
   const unverified = useIsUnverified();
 
-  const hasUnverified =
-    unverified || (unverifiedDeviceCount !== undefined && unverifiedDeviceCount > 0);
+  const hasUnverified = (unverifiedDeviceCount ?? 0) > 0;
 
   return (
     <>
@@ -659,7 +652,7 @@ export function UserMenuTab({ isBottom, isMobile }: { isBottom?: boolean; isMobi
 
   const unverifiedDeviceCount = useUnverifiedDevices();
   const unverified = useIsUnverified();
-  const hasUnverified = unverified || (unverifiedDeviceCount ?? 0) > 0;
+  const hasUnverified = (unverifiedDeviceCount ?? 0) > 0;
 
   const displayName = profile.displayName ?? getMxIdLocalPart(userId) ?? userId;
   const avatarUrl = profile.avatarUrl