fix: rewrite BuildCard with clean imperative code — no invalid method chaining

windows/PopupWindow.xaml.cs

@@ -1,11 +1,7 @@
 using ClaudeCheckerWindows.Controls;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -20,7 +16,6 @@ public partial class PopupWindow : Window
     public PopupWindow()
     {
         InitializeComponent();
-        DataContext = VM;
 
         VM.PropertyChanged      += (_, e) => Dispatcher.InvokeAsync(() => OnVmChanged(e.PropertyName));
         Updater.PropertyChanged += (_, e) => Dispatcher.InvokeAsync(() => OnUpdaterChanged(e.PropertyName));
@@ -37,7 +32,7 @@ public partial class PopupWindow : Window
         Deactivated += (_, _) => Hide();
     }
 
-    // ── Card rendering ──────────────────────────────────────────────
+    // ── Card rendering ───────────────────────────────────────────────
 
     private void RebuildCards()
     {
@@ -48,144 +43,107 @@ public partial class PopupWindow : Window
 
     private static UIElement BuildCard(AgentLimit limit)
     {
-        var accent = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var accent     = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
+        var secondary  = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
 
-        var gauge = new GaugeControl
+        // Gauge
+        var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
+
+        // Live badge
+        var liveBadge = new Border
         {
-            Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent,
+            Background   = new SolidColorBrush(Color.FromArgb(26, 0, 200, 0)),
+            CornerRadius = new CornerRadius(4),
+            Padding      = new Thickness(6, 2, 6, 2),
+            Margin       = new Thickness(0, 0, 6, 0),
+            Visibility   = limit.IsLive ? Visibility.Visible : Visibility.Collapsed,
+            Child        = new TextBlock { Text = "Live", FontSize = 10, FontWeight = FontWeights.Medium,
+                               Foreground = new SolidColorBrush(Colors.LightGreen) }
         };
 
-        var livePanel = new StackPanel { Orientation = Orientation.Horizontal };
+        // Usage badge
-        if (limit.IsLive)
-        {
-            livePanel.Children.Add(new Border
-            {
-                Background   = new SolidColorBrush(Color.FromArgb(26, 0, 255, 0)),
-                CornerRadius = new CornerRadius(4),
-                Padding      = new Thickness(6, 2, 6, 2),
-                Margin       = new Thickness(0, 0, 6, 0),
-                Child        = new TextBlock
-                {
-                    Text       = "Live",
-                    FontSize   = 10,
-                    FontWeight = FontWeights.Medium,
-                    Foreground = new SolidColorBrush(Colors.LightGreen),
-                }
-            });
-        }
-
         var usageBadge = new Border
         {
-            Background    = new SolidColorBrush(Color.FromArgb(15, 255, 255, 255)),
+            Background   = new SolidColorBrush(Color.FromArgb(15, 255, 255, 255)),
-            CornerRadius  = new CornerRadius(4),
+            CornerRadius = new CornerRadius(4),
-            Padding       = new Thickness(6, 2, 6, 2),
+            Padding      = new Thickness(6, 2, 6, 2),
-            Child         = new TextBlock
+            Child        = new TextBlock { Text = $"Usg: {limit.UsageLabel}", FontSize = 10,
-            {
+                               FontWeight = FontWeights.Medium, Foreground = secondary }
-                Text       = $"Usg: {limit.UsageLabel}",
-                FontSize   = 10,
-                FontWeight = FontWeights.Medium,
-                Foreground = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"],
-            }
-        };
-        livePanel.Children.Add(usageBadge);
-
-        var progressBar = new ProgressBar
-        {
-            Value      = limit.UsedPercent,
-            Maximum    = 100,
-            Height     = 4,
-            Foreground = accent,
-            Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
-            BorderThickness = new Thickness(0),
-            Margin     = new Thickness(0, 4, 0, 4),
         };
 
-        var sparkline = new SparklineControl
+        // Header row: Claude · Pro | [Live] [Usg]
-        {
+        var badgeStack = new StackPanel { Orientation = Orientation.Horizontal };
-            Height    = 28,
+        badgeStack.Children.Add(liveBadge);
-            Data      = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
+        badgeStack.Children.Add(usageBadge);
-            LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
-            Margin    = new Thickness(0, 8, 0, 0),
-        };
 
-        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
+        var nameStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        infoPanel.Children.Add(new Grid
+        nameStack.Children.Add(new TextBlock { Text = "✦", FontSize = 11, Foreground = accent, VerticalAlignment = VerticalAlignment.Center });
-        {
+        nameStack.Children.Add(new TextBlock { Text = "Claude", FontSize = 13, FontWeight = FontWeights.SemiBold,
-            Children =
+            Foreground = Brushes.White, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
-            {
+        nameStack.Children.Add(new TextBlock { Text = $"·  {VM.PlanLabel}", FontSize = 11,
-                new StackPanel
+            Foreground = secondary, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center });
-                {
-                    Orientation = Orientation.Horizontal,
-                    Children    =
-                    {
-                        MakeText("✦", 11, accent),
-                        MakeText("Claude", 13, Brushes.White, FontWeights.SemiBold, new Thickness(6,0,0,0)),
-                        MakeText($"·  {VM.PlanLabel}", 11,
-                            (SolidColorBrush)Application.Current.Resources["SecondaryBrush"],
-                            margin: new Thickness(6,0,0,0)),
-                    }
-                }.Also(s => Grid.SetColumn(s, 0)),
-                new StackPanel
-                {
-                    Orientation         = Orientation.Horizontal,
-                    HorizontalAlignment = HorizontalAlignment.Right,
-                    Children            = { /* live + usg */ },
-                }.Also(s => { Grid.SetColumn(s, 1); ((StackPanel)s).Children.Add(livePanel); }),
-            }.Tap(g => {
-                var gc = (Grid)g.Parent ?? (Grid)Application.Current.MainWindow;
-                ((Grid)g.Parent!).ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-                ((Grid)g.Parent!).ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-            }),
-        });
 
-        // Simpler row approach
         var headerRow = new Grid();
         headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
         headerRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        Grid.SetColumn(nameStack,  0);
+        Grid.SetColumn(badgeStack, 1);
+        headerRow.Children.Add(nameStack);
+        headerRow.Children.Add(badgeStack);
 
-        var leftStack = new StackPanel { Orientation = Orientation.Horizontal };
+        // Progress bar
-        leftStack.Children.Add(MakeText("✦", 11, accent));
+        var progress = new ProgressBar
-        leftStack.Children.Add(MakeText("Claude", 13, Brushes.White, FontWeights.SemiBold, new Thickness(6, 0, 0, 0)));
+        {
-        leftStack.Children.Add(MakeText($"·  {VM.PlanLabel}", 11,
+            Value = limit.UsedPercent, Maximum = 100, Height = 4,
-            (SolidColorBrush)Application.Current.Resources["SecondaryBrush"], margin: new Thickness(6, 0, 0, 0)));
+            Margin = new Thickness(0, 4, 0, 4),
+            Foreground = accent,
+            Background = new SolidColorBrush(Color.FromArgb(18, 255, 255, 255)),
+            BorderThickness = new Thickness(0),
+        };
 
-        Grid.SetColumn(leftStack, 0);
+        // Time row
-        Grid.SetColumn(livePanel, 1);
+        var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
-        headerRow.Children.Add(leftStack);
+        timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
-        headerRow.Children.Add(livePanel);
+        timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
+            FontWeight = FontWeights.Medium, Foreground = Brushes.White, VerticalAlignment = VerticalAlignment.Center });
 
-        infoPanel.Children.Clear();
+        var resetText = new TextBlock
-        infoPanel.Children.Add(headerRow);
+        {
-        infoPanel.Children.Add(progressBar);
+            Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
+            FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
+        };
 
         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);
-        var timeLeft = new StackPanel { Orientation = Orientation.Horizontal };
+        Grid.SetColumn(resetText,  1);
-        timeLeft.Children.Add(MakeText("⏱ ", 10, (SolidColorBrush)Application.Current.Resources["SecondaryBrush"]));
+        timeRow.Children.Add(timeStack);
-        timeLeft.Children.Add(MakeText(limit.TimeRemaining, 12, Brushes.White, FontWeights.Medium));
-
-        var resetText = MakeText(
-            $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
-            11, (SolidColorBrush)Application.Current.Resources["SecondaryBrush"]);
-
-        Grid.SetColumn(timeLeft, 0);
-        Grid.SetColumn(resetText, 1);
-        timeRow.Children.Add(timeLeft);
         timeRow.Children.Add(resetText);
+
+        // Sparkline
+        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,
+        };
+
+        // Info panel
+        var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
+        infoPanel.Children.Add(headerRow);
+        infoPanel.Children.Add(progress);
         infoPanel.Children.Add(timeRow);
         infoPanel.Children.Add(sparkline);
 
-        var cardContent = new Grid { Margin = new Thickness(16, 12, 16, 12) };
+        // Card content grid
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
-        cardContent.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(16, GridUnitType.Pixel) });
-
+        cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-        Grid.SetColumn(gauge, 0);
+        Grid.SetColumn(gauge,     0);
         Grid.SetColumn(infoPanel, 2);
-        cardContent.Children.Add(gauge);
+        cardGrid.Children.Add(gauge);
-        cardContent.Children.Add(infoPanel);
+        cardGrid.Children.Add(infoPanel);
 
         var card = new Border
         {
@@ -193,15 +151,15 @@ public partial class PopupWindow : Window
             CornerRadius    = new CornerRadius(8),
             BorderBrush     = new SolidColorBrush(Color.FromArgb(20, 255, 255, 255)),
             BorderThickness = new Thickness(0.5),
-            Child           = cardContent,
             Margin          = new Thickness(8, 0, 8, 0),
+            Child           = cardGrid,
         };
 
         var sectionLabel = new TextBlock
         {
-            Text      = limit.WindowLabel,
+            Text   = limit.WindowLabel,
-            Style     = (Style)Application.Current.Resources["HeaderText"],
+            Style  = (Style)Application.Current.Resources["HeaderText"],
-            Margin    = new Thickness(16, 10, 16, 4),
+            Margin = new Thickness(16, 10, 16, 4),
         };
 
         var section = new StackPanel();
@@ -210,18 +168,6 @@ public partial class PopupWindow : Window
         return section;
     }
 
-    private static TextBlock MakeText(string text, double size, Brush fg,
-        FontWeight? weight = null, Thickness? margin = null)
-        => new()
-        {
-            Text                = text,
-            FontSize            = size,
-            Foreground          = fg,
-            FontWeight          = weight ?? FontWeights.Normal,
-            Margin              = margin ?? new Thickness(0),
-            VerticalAlignment   = VerticalAlignment.Center,
-        };
-
     // ── State updates ────────────────────────────────────────────────
 
     private void OnVmChanged(string? prop)
@@ -259,9 +205,8 @@ public partial class PopupWindow : Window
         if (VM.LastUpdated.HasValue)
         {
             var diff = DateTime.Now - VM.LastUpdated.Value;
-            LastUpdatedText.Text = diff.TotalSeconds < 10
+            LastUpdatedText.Text = diff.TotalSeconds < 10 ? "Updated just now"
-                ? "Updated just now"
+                                                          : $"Updated {(int)diff.TotalSeconds}s ago";
-                : $"Updated {(int)diff.TotalSeconds}s ago";
         }
         else
         {
@@ -274,45 +219,37 @@ public partial class PopupWindow : Window
 
     private void InitSettings()
     {
-        VersionLabel.Text = $"v{App.Updater.CurrentVersion}";
+        VersionLabel.Text    = $"v{Updater.CurrentVersion}";
         BetaToggle.IsChecked = Updater.BetaChannel;
         CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
 
-        RefreshPicker.ItemsSource = new[]
+        var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
-        {
+                                ("4 min", 240), ("5 min", 300), ("10 min", 600) };
-            ("1 min",  60),  ("2 min",  120), ("3 min",  180),
+        RefreshPicker.ItemsSource        = intervals;
-            ("4 min",  240), ("5 min",  300), ("10 min", 600),
+        RefreshPicker.DisplayMemberPath  = "Item1";
-        };
+        var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
-        RefreshPicker.DisplayMemberPath = "Item1";
+        RefreshPicker.SelectedIndex      = idx < 0 ? 1 : idx;
-        RefreshPicker.SelectedIndex = Array.FindIndex(
-            new[] { 60, 120, 180, 240, 300, 600 },
-            s => s == VM.RefreshInterval).Let(i => i < 0 ? 1 : i);
 
-        var signedIn = VM.IsSignedIn;
         AuthPanel.Children.Clear();
-        AuthPanel.Children.Add(new StackPanel
+        var dot = new System.Windows.Shapes.Ellipse
         {
-            Orientation = Orientation.Horizontal,
+            Width = 7, Height = 7, Margin = new Thickness(0, 0, 6, 0),
-            Children    =
+            Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
-            {
+            VerticalAlignment = VerticalAlignment.Center,
-                new Ellipse
+        };
-                {
+        var label = new TextBlock
-                    Width = 7, Height = 7,
+        {
-                    Fill  = signedIn ? Brushes.LimeGreen : Brushes.Orange,
+            Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
-                    Margin = new Thickness(0,0,6,0),
+            FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
-                    VerticalAlignment = VerticalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
-                },
+        };
-                new TextBlock
+        var authRow = new StackPanel { Orientation = Orientation.Horizontal };
-                {
+        authRow.Children.Add(dot);
-                    Text       = signedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
+        authRow.Children.Add(label);
-                    FontSize   = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
+        AuthPanel.Children.Add(authRow);
-                    VerticalAlignment = VerticalAlignment.Center,
-                }
-            }
-        });
 
-        SignOutButton.Visibility = signedIn ? Visibility.Visible : Visibility.Collapsed;
+        SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
-        SignInButton.Content     = signedIn ? "Re-authenticate" : "Sign In";
+        SignInButton.Content     = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
     }
 
     // ── Event handlers ───────────────────────────────────────────────
@@ -320,18 +257,18 @@ public partial class PopupWindow : Window
     private void Settings_Click(object s, RoutedEventArgs e)
     {
         InitSettings();
-        MainPanel.Visibility    = Visibility.Collapsed;
+        MainPanel.Visibility     = Visibility.Collapsed;
         SettingsPanel.Visibility = Visibility.Visible;
-        UpdatePanel.Visibility  = Visibility.Collapsed;
+        UpdatePanel.Visibility   = Visibility.Collapsed;
     }
 
     private void BackFromSettings_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private void ShowMain()
     {
-        MainPanel.Visibility    = Visibility.Visible;
+        MainPanel.Visibility     = Visibility.Visible;
         SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility  = Visibility.Collapsed;
+        UpdatePanel.Visibility   = Visibility.Collapsed;
     }
 
     private void Close_Click(object s, RoutedEventArgs e) => Hide();
@@ -342,19 +279,19 @@ public partial class PopupWindow : Window
 
     private void ShowUpdatePanel()
     {
-        CurrentVerLabel.Text    = $"v{Updater.CurrentVersion}";
+        CurrentVerLabel.Text  = $"v{Updater.CurrentVersion}";
-        NewVerLabel.Text        = $"v{Updater.LatestVersion}";
+        NewVerLabel.Text      = $"v{Updater.LatestVersion}";
-        ReleaseNotesText.Text   = Updater.ReleaseNotes;
+        ReleaseNotesText.Text = Updater.ReleaseNotes;
-        MainPanel.Visibility    = Visibility.Collapsed;
+        MainPanel.Visibility     = Visibility.Collapsed;
         SettingsPanel.Visibility = Visibility.Collapsed;
-        UpdatePanel.Visibility  = Visibility.Visible;
+        UpdatePanel.Visibility   = Visibility.Visible;
     }
 
     private void CloseUpdate_Click(object s, RoutedEventArgs e) => ShowMain();
 
     private async void Install_Click(object s, RoutedEventArgs e)
     {
-        NotNowButton.Visibility  = Visibility.Collapsed;
+        NotNowButton.Visibility     = Visibility.Collapsed;
         UpdateStatusText.Visibility = Visibility.Visible;
         UpdateProgress.Visibility   = Visibility.Visible;
         await Updater.DownloadAndInstallAsync();
@@ -362,8 +299,7 @@ public partial class PopupWindow : Window
 
     private void SignIn_Click(object s, RoutedEventArgs e)
     {
-        var login = new LoginWindow();
+        var login = new LoginWindow { Owner = this };
-        login.Owner = this;
         if (login.ShowDialog() == true)
         {
             _ = VM.RefreshAsync();
@@ -385,10 +321,10 @@ public partial class PopupWindow : Window
 
     private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
     {
-        if (RefreshPicker.SelectedItem is (string _, int seconds))
+        if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
         {
-            VM.RefreshInterval = seconds;
+            VM.RefreshInterval = selected.Item2;
-            ((App)Application.Current).ScheduleTimer(seconds);
+            ((App)Application.Current).ScheduleTimer(selected.Item2);
         }
     }
 
@@ -400,12 +336,3 @@ public partial class PopupWindow : Window
         CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
     }
 }
-
-// Minimal extension helpers to avoid repeating boilerplate
-file static class Extensions
-{
-    public static T Also<T>(this T t, Action<T> f) { f(t); return t; }
-    public static TResult Let<T, TResult>(this T t, Func<T, TResult> f) => f(t);
-}
-
-file class Ellipse : System.Windows.Shapes.Ellipse { }