fix: remove sparkline from limit cards (belongs only in Session Diary)

windows/App.xaml

@@ -15,7 +15,8 @@
         <SolidColorBrush x:Key="SurfaceBrush"      Color="#FAFAFA" po:Freeze="False"/>
         <SolidColorBrush x:Key="BannerBgBrush"     Color="#E8F2FB" po:Freeze="False"/>
         <SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
-        <SolidColorBrush x:Key="HoverBrush"       Color="#EBEBEB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="HoverBrush"        Color="#EBEBEB" po:Freeze="False"/>
+        <SolidColorBrush x:Key="PressedBrush"      Color="#D6D6D6" po:Freeze="False"/>
         <SolidColorBrush x:Key="BadgeBrush"        Color="#F0F0F0" po:Freeze="False"/>
 
         <Style x:Key="HeaderText" TargetType="TextBlock">
@@ -26,27 +27,31 @@
         </Style>
 
         <Style x:Key="PrimaryButton" TargetType="Button">
-            <Setter Property="Background"      Value="{DynamicResource BlueBrush}"/>
-            <Setter Property="Foreground"      Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding"         Value="14,6"/>
-            <Setter Property="FontSize"        Value="12"/>
-            <Setter Property="FontWeight"      Value="SemiBold"/>
-            <Setter Property="FontFamily"      Value="Segoe UI"/>
-            <Setter Property="Cursor"          Value="Hand"/>
+            <Setter Property="Background"        Value="{DynamicResource BlueBrush}"/>
+            <Setter Property="Foreground"        Value="White"/>
+            <Setter Property="BorderThickness"   Value="0"/>
+            <Setter Property="Padding"           Value="14,6"/>
+            <Setter Property="FontSize"          Value="12"/>
+            <Setter Property="FontWeight"        Value="SemiBold"/>
+            <Setter Property="FontFamily"        Value="Segoe UI"/>
+            <Setter Property="Cursor"            Value="Hand"/>
+            <Setter Property="FocusVisualStyle"  Value="{x:Null}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}" CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
+                        <Border x:Name="Bd" Background="{TemplateBinding Background}"
+                                CornerRadius="4" Padding="{TemplateBinding Padding}">
                             <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#106EBE"/>
+                                <Setter TargetName="Bd" Property="Background" Value="#106EBE"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="#005A9E"/>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Background" Value="#BDBDBD"/>
+                                <Setter TargetName="Bd" Property="Background" Value="#BDBDBD"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -55,18 +60,20 @@
         </Style>
 
         <Style x:Key="SmallButton" TargetType="Button">
-            <Setter Property="Background"      Value="{DynamicResource ButtonBrush}"/>
-            <Setter Property="BorderBrush"     Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Foreground"      Value="{DynamicResource TextBrush}"/>
-            <Setter Property="Padding"         Value="10,4"/>
-            <Setter Property="FontSize"        Value="12"/>
-            <Setter Property="FontFamily"      Value="Segoe UI"/>
-            <Setter Property="Cursor"          Value="Hand"/>
+            <Setter Property="Background"       Value="{DynamicResource ButtonBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderThickness"  Value="1"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+            <Setter Property="Padding"          Value="10,4"/>
+            <Setter Property="FontSize"         Value="12"/>
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
+            <Setter Property="Cursor"           Value="Hand"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
+                        <Border x:Name="Bd"
+                                Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="4" Padding="{TemplateBinding Padding}">
@@ -74,7 +81,10 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="{DynamicResource HoverBrush}"/>
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource PressedBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -83,18 +93,19 @@
         </Style>
 
         <Style TargetType="ComboBox">
-            <Setter Property="FontFamily"      Value="Segoe UI"/>
-            <Setter Property="FontSize"        Value="12"/>
-            <Setter Property="Background"      Value="{DynamicResource CardBrush}"/>
-            <Setter Property="Foreground"      Value="{DynamicResource TextBrush}"/>
-            <Setter Property="BorderBrush"     Value="{DynamicResource BorderBrush}"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding"         Value="8,4"/>
+            <Setter Property="FontFamily"       Value="Segoe UI"/>
+            <Setter Property="FontSize"         Value="12"/>
+            <Setter Property="Background"       Value="{DynamicResource CardBrush}"/>
+            <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+            <Setter Property="BorderBrush"      Value="{DynamicResource BorderBrush}"/>
+            <Setter Property="BorderThickness"  Value="1"/>
+            <Setter Property="Padding"          Value="8,4"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ComboBox">
                         <Grid>
-                            <Border x:Name="Border"
+                            <Border x:Name="Bd"
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
@@ -106,14 +117,21 @@
                                         ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
                                         Margin="{TemplateBinding Padding}"
                                         VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                    <TextBlock Text="▾" FontSize="10"
+                                    <TextBlock Text="&#x25BE;" FontSize="10"
                                                Foreground="{DynamicResource SecondaryBrush}"
                                                HorizontalAlignment="Right" VerticalAlignment="Center"
                                                Margin="0,0,8,0" IsHitTestVisible="False"/>
+                                    <!-- Fully transparent toggle — no system chrome bleeds through -->
                                     <ToggleButton Focusable="False" ClickMode="Press"
+                                                  FocusVisualStyle="{x:Null}"
                                                   IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
-                                                      RelativeSource={RelativeSource TemplatedParent}}"
-                                                  Background="Transparent" BorderThickness="0"/>
+                                                      RelativeSource={RelativeSource TemplatedParent}}">
+                                        <ToggleButton.Template>
+                                            <ControlTemplate TargetType="ToggleButton">
+                                                <Border Background="Transparent"/>
+                                            </ControlTemplate>
+                                        </ToggleButton.Template>
+                                    </ToggleButton>
                                 </Grid>
                             </Border>
                             <Popup x:Name="Popup" Placement="Bottom"
@@ -132,15 +150,21 @@
                                 </Border>
                             </Popup>
                         </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
             <Setter Property="ItemContainerStyle">
                 <Setter.Value>
                     <Style TargetType="ComboBoxItem">
-                        <Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
-                        <Setter Property="Background" Value="{DynamicResource CardBrush}"/>
-                        <Setter Property="Padding"    Value="10,5"/>
+                        <Setter Property="Foreground"       Value="{DynamicResource TextBrush}"/>
+                        <Setter Property="Background"       Value="{DynamicResource CardBrush}"/>
+                        <Setter Property="Padding"          Value="10,5"/>
+                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="ComboBoxItem">
@@ -154,6 +178,10 @@
                                             <Setter TargetName="Bd" Property="Background"
                                                     Value="{DynamicResource HoverBrush}"/>
                                         </Trigger>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter TargetName="Bd" Property="Background"
+                                                    Value="{DynamicResource HoverBrush}"/>
+                                        </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
                             </Setter.Value>

windows/Controls/GaugeControl.cs

@@ -46,29 +46,16 @@ public class GaugeControl : FrameworkElement
             DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
                 new Pen(Accent, StrokeWidth));
 
-        var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
-
+        var dpi       = VisualTreeHelper.GetDpi(this).PixelsPerDip;
         var textColor = ThemeManager.IsDark ? Color.FromRgb(0xF5, 0xF5, 0xF5) : Color.FromRgb(0x1C, 0x1C, 0x1C);
-        var subColor  = Color.FromRgb(0x9E, 0x9E, 0x9E);
 
         var pctText = new FormattedText(
             $"{(int)Math.Round(Percent)}%",
             CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
             new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
-            14, new SolidColorBrush(textColor), dpi);
-        var sub = new FormattedText(
-            "used",
-            CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
-            new Typeface("Segoe UI"), 8,
-            new SolidColorBrush(subColor), dpi)
-        {
-            TextAlignment = TextAlignment.Center
-        };
+            18, new SolidColorBrush(textColor), dpi);
 
-        var totalHeight = pctText.Height + 2 + sub.Height;
-        var startY      = cy - totalHeight / 2;
-        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, startY));
-        dc.DrawText(sub,     new Point(cx - sub.Width     / 2, startY + pctText.Height + 2));
+        dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2));
     }
 
     private static void DrawArc(DrawingContext dc, double cx, double cy, double r,

windows/PopupWindow.xaml.cs

@@ -15,7 +15,6 @@ public partial class PopupWindow : Window
     private static readonly UpdateManager  Updater = App.Updater;
     private readonly DispatcherTimer _clockTimer;
 
-
     [DllImport("dwmapi.dll")]
     private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int value, int size);
 
@@ -71,10 +70,8 @@ public partial class PopupWindow : Window
         var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
         var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
 
-        // Gauge
         var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
 
-        // Live badge
         var liveBadge = new Border
         {
             Background   = new SolidColorBrush(Color.FromArgb(30, 0, 160, 0)),
@@ -86,7 +83,6 @@ public partial class PopupWindow : Window
                                Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 0)) }
         };
 
-        // Usage badge
         var usageBadge = new Border
         {
             Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
@@ -124,36 +120,56 @@ public partial class PopupWindow : Window
             BorderThickness = new Thickness(0),
         };
 
-        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
-        timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
+        // Left: time remaining + reset date inline
+        var timeLeft = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
+        timeLeft.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+        timeLeft.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
             FontWeight = FontWeights.Medium, Foreground = text, VerticalAlignment = VerticalAlignment.Center });
-
-        var resetText = new TextBlock
+        timeLeft.Children.Add(new TextBlock
         {
-            Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
-            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
-        };
+            Text = $"   Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
+            FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        });
+
+        // Right: "after reset" when 0%, "today HH:MM" when refreshed today
+        string? refreshLabel = limit.UsedPercent == 0
+            ? "after reset"
+            : VM.LastUpdated?.Date == DateTime.Today
+                ? "today " + VM.LastUpdated.Value.ToString("h:mm tt")
+                : null;
+
+        UIElement timeRight;
+        if (refreshLabel != null)
+        {
+            var inner = new StackPanel { Orientation = Orientation.Horizontal };
+            inner.Children.Add(new TextBlock { Text = "↗ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+            inner.Children.Add(new TextBlock { Text = refreshLabel, FontSize = 10, FontWeight = FontWeights.Medium,
+                Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
+            timeRight = new Border
+            {
+                Background   = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
+                CornerRadius = new CornerRadius(4),
+                Padding      = new Thickness(6, 2, 6, 2),
+                Child        = inner
+            };
+        }
+        else
+        {
+            timeRight = new TextBlock();
+        }
 
         var timeRow = new Grid();
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
         timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-        Grid.SetColumn(timeStack, 0);
-        Grid.SetColumn(resetText, 1);
-        timeRow.Children.Add(timeStack);
-        timeRow.Children.Add(resetText);
-
-        var sparkline = new SparklineControl
-        {
-            Height = 28, Margin = new Thickness(0, 8, 0, 0), LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
-            Data = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
-        };
+        Grid.SetColumn(timeLeft,  0);
+        Grid.SetColumn(timeRight, 1);
+        timeRow.Children.Add(timeLeft);
+        timeRow.Children.Add(timeRight);
 
         var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
         infoPanel.Children.Add(headerRow);
         infoPanel.Children.Add(progress);
         infoPanel.Children.Add(timeRow);
-        infoPanel.Children.Add(sparkline);
 
         var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
         cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
@@ -189,29 +205,40 @@ public partial class PopupWindow : Window
 
     private static UIElement BuildDiarySection(AgentLimit limit)
     {
-        var text      = (SolidColorBrush)Application.Current.Resources["TextBrush"];
         var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
         var border    = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
 
-        var samples = limit.BurnHistory.Count;
-        var avgBurn = limit.BurnRate;
-
-        var subtitle = new TextBlock
+        // Stats row inside the card (mirrors macOS layout without the Claude icon/header)
+        var statsRow = new Grid { Margin = new Thickness(12, 10, 12, 6) };
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        var samplesText = new TextBlock
         {
-            Text       = $"{samples} samples · {avgBurn:F1}%/h avg burn rate",
-            FontSize   = 11,
-            Foreground = secondary,
-            Margin     = new Thickness(16, 0, 16, 6),
+            Text = $"{limit.BurnHistory.Count} samples",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
         };
+        var burnText = new TextBlock
+        {
+            Text = $"Avg burn rate: {limit.BurnRate:F1}%/h",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
+        Grid.SetColumn(samplesText, 0);
+        Grid.SetColumn(burnText,    1);
+        statsRow.Children.Add(samplesText);
+        statsRow.Children.Add(burnText);
 
         var sparkline = new SparklineControl
         {
-            Height    = 32,
-            Margin    = new Thickness(8, 8, 8, 8),
+            Height    = 40,
+            Margin    = new Thickness(8, 0, 8, 8),
             LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
             Data      = limit.BurnHistory,
         };
 
+        var cardContent = new StackPanel();
+        cardContent.Children.Add(statsRow);
+        cardContent.Children.Add(sparkline);
+
         var card = new Border
         {
             Background      = (SolidColorBrush)Application.Current.Resources["CardBrush"],
@@ -219,7 +246,7 @@ public partial class PopupWindow : Window
             BorderBrush     = border,
             BorderThickness = new Thickness(1),
             Margin          = new Thickness(12, 0, 12, 0),
-            Child           = sparkline,
+            Child           = cardContent,
         };
 
         var sectionLabel = new TextBlock
@@ -231,7 +258,6 @@ public partial class PopupWindow : Window
 
         var section = new StackPanel();
         section.Children.Add(sectionLabel);
-        section.Children.Add(subtitle);
         section.Children.Add(card);
         return section;
     }
@@ -247,13 +273,11 @@ public partial class PopupWindow : Window
         var prepaid  = VM.Prepaid;
         var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
 
-        // Fall back to extra_usage fields when the overage/prepaid endpoints return nothing.
-        // extra_usage.used_credits is in cents (e.g. 5231 = EUR 52.31); overage endpoint
-        // already returns the value in currency units, so only divide for the fallback path.
-        var spent   = overage?.UsedCredits        ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
-        var limit   = overage?.MonthlyCreditLimit ?? VM.ExtraUsage?.MonthlyLimit ?? 0;
-        var balance = prepaid?.Amount             ?? 0;
-        // Show "Unlimited" when no limit is configured (null monthly_limit)
+        // All credit values from the API are in cents — divide by 100.
+        var spent   = (overage?.UsedCredits        / 100.0) ?? (VM.ExtraUsage?.UsedCredits  / 100.0) ?? 0;
+        var limit   = (overage?.MonthlyCreditLimit / 100.0) ?? (VM.ExtraUsage?.MonthlyLimit / 100.0) ?? 0;
+        var balance = (prepaid?.Amount             / 100.0) ?? 0;
+
         bool unlimited = overage?.MonthlyCreditLimit == null && VM.ExtraUsage?.MonthlyLimit == null;
 
         UIElement MakeRow(string label, string value, bool highlight = false)
@@ -273,9 +297,9 @@ public partial class PopupWindow : Window
 
         var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
         contentPanel.Children.Add(MakeRow("Spent",   $"{currency} {spent:F2}", spent > 0));
-        if (unlimited)    contentPanel.Children.Add(MakeRow("Limit",   "Unlimited"));
-        else if (limit > 0) contentPanel.Children.Add(MakeRow("Limit", $"{currency} {limit:F2}"));
-        if (balance > 0)  contentPanel.Children.Add(MakeRow("Balance", $"{currency} {balance:F2}"));
+        if (unlimited)      contentPanel.Children.Add(MakeRow("Limit",   "Unlimited"));
+        else if (limit > 0) contentPanel.Children.Add(MakeRow("Limit",   $"{currency} {limit:F2}"));
+        if (balance > 0)    contentPanel.Children.Add(MakeRow("Balance", $"{currency} {balance:F2}"));
 
         if (limit > 0)
         {
@@ -384,18 +408,35 @@ public partial class PopupWindow : Window
 
     // ── Settings ─────────────────────────────────────────────────────
 
+    private static readonly (string Label, int Seconds)[] RefreshIntervals =
+    [
+        ("1 min",  60),
+        ("2 min",  120),
+        ("3 min",  180),
+        ("4 min",  240),
+        ("5 min",  300),
+        ("10 min", 600),
+    ];
+
     private void InitSettings()
     {
         VersionLabel.Text    = $"v{Updater.CurrentVersion}";
         BetaToggle.IsChecked = Updater.BetaChannel;
         UpdateAboutSection();
 
-        var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
-                                ("4 min", 240), ("5 min", 300), ("10 min", 600) };
-        RefreshPicker.ItemsSource        = intervals;
-        RefreshPicker.DisplayMemberPath  = "Item1";
-        var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
-        RefreshPicker.SelectedIndex      = idx < 0 ? 1 : idx;
+        // Populate ComboBox with ComboBoxItem — DisplayMemberPath doesn't bind reliably
+        // on ValueTuple at runtime so we build items explicitly.
+        RefreshPicker.SelectionChanged -= RefreshPicker_Changed;
+        RefreshPicker.Items.Clear();
+        int selectIdx = 1; // default: 2 min
+        for (int i = 0; i < RefreshIntervals.Length; i++)
+        {
+            var (label, seconds) = RefreshIntervals[i];
+            RefreshPicker.Items.Add(new ComboBoxItem { Content = label, Tag = seconds });
+            if (seconds == VM.RefreshInterval) selectIdx = i;
+        }
+        RefreshPicker.SelectedIndex = selectIdx;
+        RefreshPicker.SelectionChanged += RefreshPicker_Changed;
 
         AuthPanel.Children.Clear();
         var dot = new System.Windows.Shapes.Ellipse
@@ -404,15 +445,16 @@ public partial class PopupWindow : Window
             Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
             VerticalAlignment = VerticalAlignment.Center,
         };
-        var label = new TextBlock
+        var label2 = new TextBlock
         {
             Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
-            FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
+            FontSize = 13, FontWeight = FontWeights.SemiBold,
+            Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
             VerticalAlignment = VerticalAlignment.Center,
         };
         var authRow = new StackPanel { Orientation = Orientation.Horizontal };
         authRow.Children.Add(dot);
-        authRow.Children.Add(label);
+        authRow.Children.Add(label2);
         AuthPanel.Children.Add(authRow);
 
         SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
@@ -467,12 +509,10 @@ public partial class PopupWindow : Window
         var login = new LoginWindow { Owner = this };
         if (login.ShowDialog() == true)
         {
-            // Show cached data from SaveAndClose immediately (no WebView2 needed)
             await VM.LoadFromCacheAsync();
             InitSettings();
             ShowMain();
 
-            // Full refresh in background after WebView2 folder is definitely released
             _ = Task.Run(async () =>
             {
                 await Task.Delay(3000);
@@ -498,10 +538,10 @@ public partial class PopupWindow : Window
 
     private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
     {
-        if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
+        if (RefreshPicker.SelectedItem is ComboBoxItem item && item.Tag is int seconds)
         {
-            VM.RefreshInterval = selected.Item2;
-            ((App)Application.Current).ScheduleTimer(selected.Item2);
+            VM.RefreshInterval = seconds;
+            ((App)Application.Current).ScheduleTimer(seconds);
         }
     }