From 7f672902f949f62502da30806c51ea2401a6f211 Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <modanish@microsoft.com>
Date: Tue, 19 Mar 2024 12:44:03 -0700
Subject: [PATCH 1/9] Added sorting by Provider. Added Last Sync timer. Added
 sorting by name (desc.), alt name (desc.) and last connected (asc.). Fixed
 sort fields not defaulting back to original values after Sync. Fixed resizing
 which could cause UI elements to disappear. Changed card style to Primary,
 Tertiary & Secondary brushes.

---
 .../Styles/HorizontalCardStyles.xaml          |   4 +-
 .../Helpers/DataExtractor.cs                  |   8 +-
 .../Strings/en-us/Resources.resw              |  36 ++++-
 .../ViewModels/ComputeSystemViewModel.cs      |   4 +
 .../ViewModels/LandingPageViewModel.cs        | 142 ++++++++++++++++--
 .../Views/LandingPage.xaml                    | 100 +++++++-----
 .../Views/LandingPage.xaml.cs                 |  19 +--
 7 files changed, 236 insertions(+), 77 deletions(-)

diff --git a/common/Environments/Styles/HorizontalCardStyles.xaml b/common/Environments/Styles/HorizontalCardStyles.xaml
index 7b9123729e..dc05def031 100644
--- a/common/Environments/Styles/HorizontalCardStyles.xaml
+++ b/common/Environments/Styles/HorizontalCardStyles.xaml
@@ -197,7 +197,7 @@
         x:Key="CardBodyStateTextBlockStyle"
         BasedOn="{StaticResource CaptionTextBlockStyle}"
         TargetType="TextBlock">
-        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorTertiaryBrush}" />
         <Setter Property="TextTrimming" Value="CharacterEllipsis" />
     </Style>
 
@@ -227,7 +227,7 @@
         <Setter Property="TextTrimming" Value="CharacterEllipsis" />
     </Style>
 
-    <Style 
+    <Style
         x:Key="CardBodySplitButtonStyle"
         TargetType="SplitButton">
         <Setter Property="HorizontalAlignment" Value="Right" />
diff --git a/tools/Environments/DevHome.Environments/Helpers/DataExtractor.cs b/tools/Environments/DevHome.Environments/Helpers/DataExtractor.cs
index fee6a4a6f3..41695214d7 100644
--- a/tools/Environments/DevHome.Environments/Helpers/DataExtractor.cs
+++ b/tools/Environments/DevHome.Environments/Helpers/DataExtractor.cs
@@ -43,8 +43,8 @@ public static List<OperationsViewModel> FillDotButtonOperations(ComputeSystem co
         }
 
         // ToDo: Correct the function used
-        // operations.Add(new OperationsViewModel("Pin To Taskbar", "\uE718", computeSystem.DeleteAsync));
-        // operations.Add(new OperationsViewModel("Add to Start Menu", "\uF0DF", computeSystem.DeleteAsync));
+        // operations.Add(new OperationsViewModel("Pin To Taskbar", "\uE718", computeSystem.));
+        // operations.Add(new OperationsViewModel("Add to Start Menu", "\uE8A9", computeSystem.));
         return operations;
     }
 
@@ -85,12 +85,12 @@ public static List<OperationsViewModel> FillLaunchButtonOperations(ComputeSystem
 
         if (supportedOperations.HasFlag(ComputeSystemOperations.Resume))
         {
-            operations.Add(new OperationsViewModel("Resume", "\uF2C6", computeSystem.ResumeAsync));
+            operations.Add(new OperationsViewModel("Resume", "\uE768", computeSystem.ResumeAsync));
         }
 
         if (supportedOperations.HasFlag(ComputeSystemOperations.Terminate))
         {
-            operations.Add(new OperationsViewModel("Terminate", "\uE71A", computeSystem.TerminateAsync));
+            operations.Add(new OperationsViewModel("Terminate", "\uEE95", computeSystem.TerminateAsync));
         }
 
         return operations;
diff --git a/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw b/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
index cd2a4a1a19..b17e12f26c 100644
--- a/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
+++ b/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
@@ -111,15 +111,15 @@
     <comment>Text for terminate button in the context menu that will turn off the virtual machine. This button turns off the power to the virtual machine without gracefully shutting it down first.</comment>
   </data>
   <data name="SortByName.Content" xml:space="preserve">
-    <value>Name</value>
-    <comment>Text for 1st option for sort by drop down box</comment>
+    <value>Name: A-Z</value>
+    <comment>Text for sorting in ascending order of name</comment>
   </data>
   <data name="SortByAltName.Content" xml:space="preserve">
-    <value>Alternative Name</value>
-    <comment>Text for 2nd option for sort by drop down box</comment>
+    <value>Alternative Name: A-Z</value>
+    <comment>Text for sorting by alternative name</comment>
   </data>
   <data name="SortByTextBlock.Text" xml:space="preserve">
-    <value>Sort By</value>
+    <value>Sort:</value>
     <comment>Text labelling sort by text block</comment>
   </data>
   <data name="SyncButtonTextBlock.Text" xml:space="preserve">
@@ -131,11 +131,35 @@
     <comment>Title text for the main landing page</comment>
   </data>
   <data name="SearchTextBox.PlaceholderText" xml:space="preserve">
-    <value>Search</value>
+    <value>Filter</value>
     <comment>Text for the search box</comment>
   </data>
   <data name="SortSelectionComboBox.PlaceholderText" xml:space="preserve">
     <value>None</value>
     <comment>Text for the default selection of the sort drop down</comment>
   </data>
+  <data name="ProviderSelectionComboBox.PlaceholderText" xml:space="preserve">
+    <value>All</value>
+    <comment>Text for the default selection of the sort provider drop down</comment>
+  </data>
+  <data name="ProviderTextBlock.Text" xml:space="preserve">
+    <value>Provider:</value>
+    <comment>Text labelling provider text block</comment>
+  </data>
+  <data name="LastSyncTextBlock.Text" xml:space="preserve">
+    <value>Last Synced: </value>
+    <comment>Text for last synced text box</comment>
+  </data>
+  <data name="SortByNameDesc.Content" xml:space="preserve">
+    <value>Name: Z-A</value>
+    <comment>Text for sorting in descending order of name</comment>
+  </data>
+  <data name="SortByAltNameDesc.Content" xml:space="preserve">
+    <value>Alternative Name: Z-A</value>
+    <comment>Text for sorting by alternative name in descending order</comment>
+  </data>
+  <data name="SortByLastConnected.Content" xml:space="preserve">
+    <value>Last Connected</value>
+    <comment>Text for sorting by last connected time</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs
index fe844cfccc..877b844cb6 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs
@@ -34,6 +34,8 @@ public partial class ComputeSystemViewModel : ObservableObject
 
     public string AlternativeName { get; } = string.Empty;
 
+    public DateTime LastConnected { get; set; } = DateTime.Now;
+
     public string Type { get; }
 
     public bool IsOperationInProgress { get; set; }
@@ -132,6 +134,8 @@ public void RemoveStateChangedHandler()
     [RelayCommand]
     public void LaunchAction()
     {
+        LastConnected = DateTime.Now;
+
         // We'll need to disable the card UI while the operation is in progress and handle failures.
         Task.Run(async () =>
         {
diff --git a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
index 04b085098b..b993d81ce3 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
@@ -6,6 +6,7 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -26,7 +27,7 @@ namespace DevHome.Environments.ViewModels;
 /// <summary>
 /// The main view model for the landing page of the Environments tool.
 /// </summary>
-public partial class LandingPageViewModel : ObservableObject
+public partial class LandingPageViewModel : ObservableObject, IDisposable
 {
     private readonly Microsoft.UI.Dispatching.DispatcherQueue _dispatcher;
 
@@ -49,6 +50,19 @@ public partial class LandingPageViewModel : ObservableObject
     [ObservableProperty]
     private bool _showLoadingShimmer = true;
 
+    [ObservableProperty]
+    private int _selectedProviderIndex;
+
+    [ObservableProperty]
+    private int _selectedSortIndex;
+
+    [ObservableProperty]
+    private string _lastSyncTime = "Moments ago...";
+
+    public ObservableCollection<string> Providers { get; set; } = new() { "All" };
+
+    private CancellationTokenSource _cancellationTokenSource = new();
+
     public LandingPageViewModel(IComputeSystemManager manager, EnvironmentsExtensionsService extensionsService, ToastNotificationService toastNotificationService)
     {
         _dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
@@ -56,6 +70,12 @@ public LandingPageViewModel(IComputeSystemManager manager, EnvironmentsExtension
         _notificationService = toastNotificationService;
         _computeSystemManager = manager;
 
+        // Start a new sync timer
+        _ = Task.Run(async () =>
+        {
+            await RunSyncTimmer();
+        });
+
         ComputeSystemsView = new AdvancedCollectionView(ComputeSystems);
     }
 
@@ -65,7 +85,69 @@ public async Task SyncButton()
         // temporary, we'll need to give the users a way to disable this.
         // if they don't want to use hyper-v
         _notificationService.CheckIfUserIsAHyperVAdmin();
+
+        // Reset the sort and filter
+        SelectedSortIndex = -1;
+        Providers = new ObservableCollection<string> { "All" };
+        SelectedProviderIndex = 0;
+
+        // Reset the old sync timer
+        _cancellationTokenSource.Cancel();
+        await _dispatcher.EnqueueAsync(() => LastSyncTime = "Moments ago...");
+
         await LoadModelAsync();
+
+        // Start a new sync timer
+        _ = Task.Run(async () =>
+        {
+            await RunSyncTimmer();
+        });
+    }
+
+    // Updates the last sync time on the UI thread after set delay
+    private async Task UpdateLastSyncTimeUI(string time, TimeSpan delay, CancellationToken token)
+    {
+        await Task.Delay(delay, token);
+
+        if (!token.IsCancellationRequested)
+        {
+            await _dispatcher.EnqueueAsync(() => LastSyncTime = time);
+        }
+    }
+
+    private async Task RunSyncTimmer()
+    {
+        _cancellationTokenSource = new CancellationTokenSource();
+        var cancellationToken = _cancellationTokenSource.Token;
+
+        await UpdateLastSyncTimeUI("A minute ago...", TimeSpan.FromMinutes(1), cancellationToken);
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
+
+        // For the first 2-5 minutes, in 1 minute increments
+        for (var i = 2; i <= 5; i++)
+        {
+            await UpdateLastSyncTimeUI($"{i} minutes ago...", TimeSpan.FromMinutes(1), cancellationToken);
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+        }
+
+        // For the 10-55 minutes, in 5 minute increments
+        for (var i = 2; i <= 11; i++)
+        {
+            await UpdateLastSyncTimeUI($"{i * 5} minutes ago...", TimeSpan.FromMinutes(5), cancellationToken);
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
+        }
+
+        // For an hour and more
+        await UpdateLastSyncTimeUI("More than an hour ago...", TimeSpan.FromMinutes(5), cancellationToken);
     }
 
     /// <summary>
@@ -109,6 +191,7 @@ private async Task AddAllComputeSystemsFromAProvider(ComputeSystemsLoadedData da
 
         await _dispatcher.EnqueueAsync(async () =>
         {
+            Providers.Add(provider.DisplayName);
             try
             {
                 var computeSystemList = data.DevIdToComputeSystemMap.Values.SelectMany(x => x.ComputeSystems).ToList();
@@ -157,22 +240,61 @@ public void SearchHandler(string query)
         };
     }
 
+    /// <summary>
+    /// Updates the view model to filter the compute systems according to the provider.
+    /// </summary>
+    [RelayCommand]
+    public void ProviderHandler()
+    {
+        var currentProvider = Providers[SelectedProviderIndex];
+        ComputeSystemsView.Filter = system =>
+        {
+            if (currentProvider == "All")
+            {
+                return true;
+            }
+
+            if (system is ComputeSystemViewModel computeSystemViewModel)
+            {
+                var type = computeSystemViewModel.Type;
+                return type.Contains(currentProvider, StringComparison.OrdinalIgnoreCase);
+            }
+
+            return false;
+        };
+    }
+
     /// <summary>
     /// Updates the view model to sort the compute systems according to the sort criteria.
     /// </summary>
     [RelayCommand]
-    public void SortHandler(string critieria)
+    public void SortHandler()
     {
         ComputeSystemsView.SortDescriptions.Clear();
-        if (critieria == "Name")
-        {
-            ComputeSystemsView.SortDescriptions.Add(new SortDescription("Name", SortDirection.Ascending));
-            return;
-        }
-        else if (critieria == "Alternative Name")
+
+        // Convert to switch case
+        switch (SelectedSortIndex)
         {
-            ComputeSystemsView.SortDescriptions.Add(new SortDescription("AlternativeName", SortDirection.Ascending));
-            return;
+            case 0:
+                ComputeSystemsView.SortDescriptions.Add(new SortDescription("Name", SortDirection.Ascending));
+                break;
+            case 1:
+                ComputeSystemsView.SortDescriptions.Add(new SortDescription("Name", SortDirection.Descending));
+                break;
+            case 2:
+                ComputeSystemsView.SortDescriptions.Add(new SortDescription("AlternativeName", SortDirection.Ascending));
+                break;
+            case 3:
+                ComputeSystemsView.SortDescriptions.Add(new SortDescription("AlternativeName", SortDirection.Descending));
+                break;
+            case 4:
+                ComputeSystemsView.SortDescriptions.Add(new SortDescription("LastConnected", SortDirection.Ascending));
+                break;
         }
     }
+
+    public void Dispose()
+    {
+        GC.SuppressFinalize(this);
+    }
 }
diff --git a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
index 4cc188f37e..6d3be98c1f 100644
--- a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
+++ b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
@@ -25,6 +25,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="37" />
+            <RowDefinition Height="33" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -33,9 +34,9 @@
 
             <!-- Launch Button template -->
             <DataTemplate x:Key="LaunchButton" x:DataType="vm:ComputeSystemViewModel">
-                <SplitButton 
-                        VerticalAlignment="Top" 
-                        Command="{x:Bind LaunchActionCommand}" 
+                <SplitButton
+                        VerticalAlignment="Top"
+                        Command="{x:Bind LaunchActionCommand}"
                         x:Uid="ms-resource:///DevHome.Environments/Resources/LaunchButton"
                         Style="{StaticResource CardBodySplitButtonStyle}">
                         <SplitButton.Flyout>
@@ -84,7 +85,8 @@
                         TextTrimming="CharacterEllipsis"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        IsTextSelectionEnabled="True"/>
+                        IsTextSelectionEnabled="True"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
                     <TextBlock
                         Grid.Column="2"
                         Visibility="{x:Bind Value, Mode=OneWay, Converter={StaticResource EmptyObjectToObjectConverter}}"
@@ -92,7 +94,8 @@
                         TextTrimming="CharacterEllipsis"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        IsTextSelectionEnabled="True"/>
+                        IsTextSelectionEnabled="True"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
                 </Grid>
             </DataTemplate>
 
@@ -111,32 +114,23 @@
         <!-- Templates end here -->
 
 
-        <Grid Grid.Row="0" Margin="0,0,0,22" x:Name="SyncButtonGrid">
+        <Grid Grid.Row="0" Margin="0,0,0,22" x:Name="TitleGrid">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" x:Uid="Titlebar" Style="{ThemeResource SubtitleTextBlockStyle}" HorizontalAlignment="Left" x:Name="Titlebar"/>
-            <!-- Top right 'Sync' button -->
-<!-- ToDo: Revisit after confirming glyphs to be used -->
-            <Button Grid.Column="4" HorizontalAlignment="Right" Padding="45 5 30 5" Command="{x:Bind ViewModel.SyncButtonCommand}" Margin="0 0 13 0">
-                <StackPanel Orientation="Horizontal">
-                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72C;" FontSize="11">
-                        <FontIcon.RenderTransform>
-                            <ScaleTransform ScaleX="-1"/>
-                        </FontIcon.RenderTransform>
-                    </FontIcon>
-                    <TextBlock x:Uid="SyncButtonTextBlock" Margin="-5 0 0 0"/>
-                </StackPanel>
-            </Button>
         </Grid>
 
-        <StackPanel Grid.Row="1" Orientation="Horizontal">
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="10*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="auto" />
+            </Grid.ColumnDefinitions>
             <!-- Search field -->
-            <AutoSuggestBox x:Uid="SearchTextBox" x:Name="SearchTextBox" MinWidth="350" Height="35" Margin="17 0 0 0" QueryIcon="Find">
+            <AutoSuggestBox  Grid.Column="0" x:Uid="SearchTextBox" x:Name="SearchTextBox" Width="250" Height="35" Margin="17 0 0 0" HorizontalAlignment="Left">
                 <i:Interaction.Behaviors>
                     <ic:EventTriggerBehavior EventName="TextChanged">
                         <ic:InvokeCommandAction
@@ -145,25 +139,57 @@
                     </ic:EventTriggerBehavior>
                 </i:Interaction.Behaviors>
             </AutoSuggestBox>
-            <!-- Sort field -->
-            <TextBlock x:Uid="SortByTextBlock" VerticalAlignment="Center" Margin="50 0 10 0"/>
-            <ComboBox x:Uid="SortSelectionComboBox" x:Name="SortSelectionComboBox" Margin="0 3 0 0" Height="35">
-                <ComboBoxItem x:Uid="SortByName"/>
-                <ComboBoxItem x:Uid="SortByAltName"/>
-                <i:Interaction.Behaviors>
-                    <ic:EventTriggerBehavior EventName="SelectionChanged">
-                        <ic:InvokeCommandAction
-                            Command="{x:Bind ViewModel.SortHandlerCommand}"
-                            CommandParameter="{x:Bind ((ComboBoxItem)SortSelectionComboBox.SelectedItem).Content, Mode=OneWay}" />
-                    </ic:EventTriggerBehavior>
-                </i:Interaction.Behaviors>
-            </ComboBox>
+            <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                <!-- Provider field -->
+                <TextBlock x:Uid="ProviderTextBlock" VerticalAlignment="Center" Margin="50 0 5 0"/>
+                <ComboBox x:Uid="ProviderSelectionComboBox" x:Name="ProviderSelectionComboBox" Margin="0 3 5 0" Height="35"
+                          ItemsSource="{x:Bind ViewModel.Providers}" SelectedIndex="{x:Bind ViewModel.SelectedProviderIndex, Mode=TwoWay}">
+                    <i:Interaction.Behaviors>
+                        <ic:EventTriggerBehavior EventName="SelectionChanged">
+                            <ic:InvokeCommandAction Command="{x:Bind ViewModel.ProviderHandlerCommand}" />
+                        </ic:EventTriggerBehavior>
+                    </i:Interaction.Behaviors>
+                </ComboBox>
+                <!-- Sort field -->
+                <TextBlock x:Uid="SortByTextBlock" VerticalAlignment="Center" Margin="10 0 5 0"/>
+                <ComboBox x:Uid="SortSelectionComboBox" x:Name="SortSelectionComboBox" Margin="0 3 13 0" Height="35"
+                          SelectedIndex="{x:Bind ViewModel.SelectedSortIndex, Mode=TwoWay}">
+                    <ComboBoxItem x:Uid="SortByName"/>
+                    <ComboBoxItem x:Uid="SortByNameDesc"/>
+                    <ComboBoxItem x:Uid="SortByAltName"/>
+                    <ComboBoxItem x:Uid="SortByAltNameDesc"/>
+                    <ComboBoxItem x:Uid="SortByLastConnected"/>
+                    <i:Interaction.Behaviors>
+                        <ic:EventTriggerBehavior EventName="SelectionChanged">
+                            <ic:InvokeCommandAction Command="{x:Bind ViewModel.SortHandlerCommand}"/>
+                        </ic:EventTriggerBehavior>
+                    </i:Interaction.Behaviors>
+                </ComboBox>
+                <!--  'Sync' button -->
+    <!-- ToDo: Revisit after confirming glyphs to be used -->
+                <Button Padding="40 5 30 8" Command="{x:Bind ViewModel.SyncButtonCommand}" Margin="0 3 13 0">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72C;" FontSize="14"/>
+                        <TextBlock x:Uid="SyncButtonTextBlock" Margin="8 0 0 0"/>
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+        </Grid>
+
+        <!-- Last synced text block-->
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 12 15 0" >
+            <TextBlock x:Uid="LastSyncTextBlock"
+                       VerticalAlignment="Center"
+                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                       Margin="0 0 3 0"/>
+            <TextBlock Text="{x:Bind ViewModel.LastSyncTime, Mode=TwoWay}"
+                       VerticalAlignment="Center" Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
         </StackPanel>
 
         <!-- Per VM/Compute System card -->
-        <ScrollViewer Grid.Row="2" Style="{StaticResource EnvironmentScrollViewerStyle}">
+        <ScrollViewer Grid.Row="3" Style="{StaticResource EnvironmentScrollViewerStyle}">
             <StackPanel>
-                <ListView 
+                <ListView
                     ItemsSource="{x:Bind ViewModel.ComputeSystemsView}" SelectionMode="None"
                     ItemContainerStyle="{StaticResource HorizontalCardListViewItemContainerForManagementPageStyle}">
                     <ListView.ItemsPanel>
diff --git a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml.cs b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml.cs
index 2583b386de..bdaeee52af 100644
--- a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml.cs
+++ b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml.cs
@@ -47,21 +47,10 @@ private void AddDebugButtons(object sender, RoutedEventArgs e)
             Command = LocalLoadButtonCommand,
         };
 
-        SyncButtonGrid.Children.Add(onlyLocalButton);
-
-        var onlyRemoteButton = new Button
-        {
-            Content = "Load real extension values",
-            HorizontalAlignment = HorizontalAlignment.Right,
-            Margin = new Thickness(3, 0, 0, 0),
-            Command = RemoteLoadButtonCommand,
-        };
-
-        SyncButtonGrid.Children.Add(onlyRemoteButton);
+        TitleGrid.Children.Add(onlyLocalButton);
 
         var column = Grid.GetColumn(Titlebar);
         Grid.SetColumn(onlyLocalButton, column + 1);
-        Grid.SetColumn(onlyRemoteButton, column + 2);
     }
 
     [RelayCommand]
@@ -69,12 +58,6 @@ private async Task LocalLoadButton()
     {
         await ViewModel.LoadModelAsync(true);
     }
-
-    [RelayCommand]
-    private async Task RemoteLoadButton()
-    {
-        await ViewModel.LoadModelAsync(false);
-    }
 #endif
 
     private void OnLoaded(object sender, RoutedEventArgs e)

From 51a5901f8c02ac78a4e439508ad9057bab0084c3 Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <modanish@microsoft.com>
Date: Wed, 20 Mar 2024 14:05:26 -0700
Subject: [PATCH 2/9] Added localization

---
 .../Strings/en-us/Resources.resw              | 36 ++++++++++++++++---
 .../ViewModels/LandingPageViewModel.cs        | 29 +++++++++------
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw b/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
index b17e12f26c..91f62f5311 100644
--- a/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
+++ b/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
@@ -111,11 +111,11 @@
     <comment>Text for terminate button in the context menu that will turn off the virtual machine. This button turns off the power to the virtual machine without gracefully shutting it down first.</comment>
   </data>
   <data name="SortByName.Content" xml:space="preserve">
-    <value>Name: A-Z</value>
+    <value>Name: Ascending</value>
     <comment>Text for sorting in ascending order of name</comment>
   </data>
   <data name="SortByAltName.Content" xml:space="preserve">
-    <value>Alternative Name: A-Z</value>
+    <value>Alternative Name: Ascending</value>
     <comment>Text for sorting by alternative name</comment>
   </data>
   <data name="SortByTextBlock.Text" xml:space="preserve">
@@ -138,6 +138,10 @@
     <value>None</value>
     <comment>Text for the default selection of the sort drop down</comment>
   </data>
+  <data name="SortSelectionComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Sort by</value>
+    <comment>Name of ComboBox where user can choose how to sort</comment>
+  </data>
   <data name="ProviderSelectionComboBox.PlaceholderText" xml:space="preserve">
     <value>All</value>
     <comment>Text for the default selection of the sort provider drop down</comment>
@@ -146,20 +150,44 @@
     <value>Provider:</value>
     <comment>Text labelling provider text block</comment>
   </data>
+  <data name="ProviderSelectionComboBox.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Provider</value>
+    <comment>Name of ComboBox where user can choose to filter by a particular provider</comment>
+  </data>
   <data name="LastSyncTextBlock.Text" xml:space="preserve">
     <value>Last Synced: </value>
     <comment>Text for last synced text box</comment>
   </data>
   <data name="SortByNameDesc.Content" xml:space="preserve">
-    <value>Name: Z-A</value>
+    <value>Name: Descending</value>
     <comment>Text for sorting in descending order of name</comment>
   </data>
   <data name="SortByAltNameDesc.Content" xml:space="preserve">
-    <value>Alternative Name: Z-A</value>
+    <value>Alternative Name: Descending</value>
     <comment>Text for sorting by alternative name in descending order</comment>
   </data>
   <data name="SortByLastConnected.Content" xml:space="preserve">
     <value>Last Connected</value>
     <comment>Text for sorting by last connected time</comment>
   </data>
+  <data name="HourAgo" xml:space="preserve">
+    <value>More than an hour ago...</value>
+    <comment>Text denoting more than an hour has passed</comment>
+  </data>
+  <data name="MinuteAgo" xml:space="preserve">
+    <value>A minute ago...</value>
+    <comment>Text denoting a minute has passed</comment>
+  </data>
+  <data name="MinutesAgo" xml:space="preserve">
+    <value>minutes ago...</value>
+    <comment>Text denoting multiple minutes have passed</comment>
+  </data>
+  <data name="MomentsAgo" xml:space="preserve">
+    <value>Moments ago...</value>
+    <comment>Text denoting less than a minute has passed</comment>
+  </data>
+  <data name="AllProviders" xml:space="preserve">
+    <value>All</value>
+    <comment>Text for the default value of all providers for filtering</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
index b993d81ce3..36ce1a018e 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
@@ -37,6 +37,8 @@ public partial class LandingPageViewModel : ObservableObject, IDisposable
 
     private readonly IComputeSystemManager _computeSystemManager;
 
+    private readonly StringResource _stringResource;
+
     private readonly object _lock = new();
 
     public bool IsLoading { get; set; }
@@ -57,20 +59,27 @@ public partial class LandingPageViewModel : ObservableObject, IDisposable
     private int _selectedSortIndex;
 
     [ObservableProperty]
-    private string _lastSyncTime = "Moments ago...";
+    private string _lastSyncTime;
 
-    public ObservableCollection<string> Providers { get; set; } = new() { "All" };
+    public ObservableCollection<string> Providers { get; set; }
 
     private CancellationTokenSource _cancellationTokenSource = new();
 
-    public LandingPageViewModel(IComputeSystemManager manager, EnvironmentsExtensionsService extensionsService, ToastNotificationService toastNotificationService)
+    public LandingPageViewModel(
+                IComputeSystemManager manager,
+                EnvironmentsExtensionsService extensionsService,
+                ToastNotificationService toastNotificationService)
     {
         _dispatcher = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
         _extensionsService = extensionsService;
         _notificationService = toastNotificationService;
         _computeSystemManager = manager;
+        _stringResource = new StringResource("DevHome.Environments/Resources");
+
+        Providers = new() { _stringResource.GetLocalized("AllProviders") };
 
         // Start a new sync timer
+        _lastSyncTime = _stringResource.GetLocalized("MomentsAgo");
         _ = Task.Run(async () =>
         {
             await RunSyncTimmer();
@@ -88,12 +97,12 @@ public async Task SyncButton()
 
         // Reset the sort and filter
         SelectedSortIndex = -1;
-        Providers = new ObservableCollection<string> { "All" };
+        Providers = new ObservableCollection<string> { _stringResource.GetLocalized("AllProviders") };
         SelectedProviderIndex = 0;
 
         // Reset the old sync timer
         _cancellationTokenSource.Cancel();
-        await _dispatcher.EnqueueAsync(() => LastSyncTime = "Moments ago...");
+        await _dispatcher.EnqueueAsync(() => LastSyncTime = _stringResource.GetLocalized("MomentsAgo"));
 
         await LoadModelAsync();
 
@@ -120,7 +129,7 @@ private async Task RunSyncTimmer()
         _cancellationTokenSource = new CancellationTokenSource();
         var cancellationToken = _cancellationTokenSource.Token;
 
-        await UpdateLastSyncTimeUI("A minute ago...", TimeSpan.FromMinutes(1), cancellationToken);
+        await UpdateLastSyncTimeUI(_stringResource.GetLocalized("MinuteAgo"), TimeSpan.FromMinutes(1), cancellationToken);
         if (cancellationToken.IsCancellationRequested)
         {
             return;
@@ -129,7 +138,7 @@ private async Task RunSyncTimmer()
         // For the first 2-5 minutes, in 1 minute increments
         for (var i = 2; i <= 5; i++)
         {
-            await UpdateLastSyncTimeUI($"{i} minutes ago...", TimeSpan.FromMinutes(1), cancellationToken);
+            await UpdateLastSyncTimeUI($"{i} {_stringResource.GetLocalized("MinutesAgo")}", TimeSpan.FromMinutes(1), cancellationToken);
             if (cancellationToken.IsCancellationRequested)
             {
                 return;
@@ -139,7 +148,7 @@ private async Task RunSyncTimmer()
         // For the 10-55 minutes, in 5 minute increments
         for (var i = 2; i <= 11; i++)
         {
-            await UpdateLastSyncTimeUI($"{i * 5} minutes ago...", TimeSpan.FromMinutes(5), cancellationToken);
+            await UpdateLastSyncTimeUI($"{i * 5} {_stringResource.GetLocalized("MinutesAgo")}", TimeSpan.FromMinutes(5), cancellationToken);
             if (cancellationToken.IsCancellationRequested)
             {
                 return;
@@ -147,7 +156,7 @@ private async Task RunSyncTimmer()
         }
 
         // For an hour and more
-        await UpdateLastSyncTimeUI("More than an hour ago...", TimeSpan.FromMinutes(5), cancellationToken);
+        await UpdateLastSyncTimeUI(_stringResource.GetLocalized("HourAgo"), TimeSpan.FromMinutes(5), cancellationToken);
     }
 
     /// <summary>
@@ -249,7 +258,7 @@ public void ProviderHandler()
         var currentProvider = Providers[SelectedProviderIndex];
         ComputeSystemsView.Filter = system =>
         {
-            if (currentProvider == "All")
+            if (currentProvider == _stringResource.GetLocalized("AllProviders"))
             {
                 return true;
             }

From 4bfd7fcf166626d7278c991f43650c7fe575571d Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <modanish@microsoft.com>
Date: Wed, 20 Mar 2024 17:37:27 -0700
Subject: [PATCH 3/9] Default Sort fix

---
 .../DevHome.Environments/ViewModels/LandingPageViewModel.cs      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
index 36ce1a018e..93edd709db 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
@@ -76,6 +76,7 @@ public LandingPageViewModel(
         _computeSystemManager = manager;
         _stringResource = new StringResource("DevHome.Environments/Resources");
 
+        SelectedSortIndex = -1;
         Providers = new() { _stringResource.GetLocalized("AllProviders") };
 
         // Start a new sync timer

From c54b6c8d52fe08e1d2ea5244379f9ef6c4cbceb1 Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <modanish@microsoft.com>
Date: Fri, 22 Mar 2024 12:00:04 -0700
Subject: [PATCH 4/9] Accessibility fixes

---
 .../DevHome.Environments/Views/LandingPage.xaml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
index 6d3be98c1f..de2c4f72ff 100644
--- a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
+++ b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
@@ -24,8 +24,8 @@
     <Grid MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
-            <RowDefinition Height="37" />
-            <RowDefinition Height="33" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -130,7 +130,7 @@
                 <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
             <!-- Search field -->
-            <AutoSuggestBox  Grid.Column="0" x:Uid="SearchTextBox" x:Name="SearchTextBox" Width="250" Height="35" Margin="17 0 0 0" HorizontalAlignment="Left">
+            <AutoSuggestBox  Grid.Column="0" x:Uid="SearchTextBox" x:Name="SearchTextBox" Width="250" Margin="17 0 0 0" HorizontalAlignment="Left">
                 <i:Interaction.Behaviors>
                     <ic:EventTriggerBehavior EventName="TextChanged">
                         <ic:InvokeCommandAction
@@ -142,7 +142,7 @@
             <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
                 <!-- Provider field -->
                 <TextBlock x:Uid="ProviderTextBlock" VerticalAlignment="Center" Margin="50 0 5 0"/>
-                <ComboBox x:Uid="ProviderSelectionComboBox" x:Name="ProviderSelectionComboBox" Margin="0 3 5 0" Height="35"
+                <ComboBox x:Uid="ProviderSelectionComboBox" x:Name="ProviderSelectionComboBox" Margin="0 3 5 0"
                           ItemsSource="{x:Bind ViewModel.Providers}" SelectedIndex="{x:Bind ViewModel.SelectedProviderIndex, Mode=TwoWay}">
                     <i:Interaction.Behaviors>
                         <ic:EventTriggerBehavior EventName="SelectionChanged">
@@ -152,7 +152,7 @@
                 </ComboBox>
                 <!-- Sort field -->
                 <TextBlock x:Uid="SortByTextBlock" VerticalAlignment="Center" Margin="10 0 5 0"/>
-                <ComboBox x:Uid="SortSelectionComboBox" x:Name="SortSelectionComboBox" Margin="0 3 13 0" Height="35"
+                <ComboBox x:Uid="SortSelectionComboBox" x:Name="SortSelectionComboBox" Margin="0 3 13 0"
                           SelectedIndex="{x:Bind ViewModel.SelectedSortIndex, Mode=TwoWay}">
                     <ComboBoxItem x:Uid="SortByName"/>
                     <ComboBoxItem x:Uid="SortByNameDesc"/>
@@ -169,7 +169,7 @@
     <!-- ToDo: Revisit after confirming glyphs to be used -->
                 <Button Padding="40 5 30 8" Command="{x:Bind ViewModel.SyncButtonCommand}" Margin="0 3 13 0">
                     <StackPanel Orientation="Horizontal">
-                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72C;" FontSize="14"/>
+                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72C;"/>
                         <TextBlock x:Uid="SyncButtonTextBlock" Margin="8 0 0 0"/>
                     </StackPanel>
                 </Button>

From 59936dc11cc31189617d852d0d6adf19582d95d3 Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <modanish@microsoft.com>
Date: Mon, 25 Mar 2024 10:23:00 -0700
Subject: [PATCH 5/9] Moved timer; Removed comment

---
 .../ViewModels/LandingPageViewModel.cs            | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
index 93edd709db..8397768932 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
@@ -78,13 +78,7 @@ public LandingPageViewModel(
 
         SelectedSortIndex = -1;
         Providers = new() { _stringResource.GetLocalized("AllProviders") };
-
-        // Start a new sync timer
         _lastSyncTime = _stringResource.GetLocalized("MomentsAgo");
-        _ = Task.Run(async () =>
-        {
-            await RunSyncTimmer();
-        });
 
         ComputeSystemsView = new AdvancedCollectionView(ComputeSystems);
     }
@@ -176,6 +170,12 @@ public async Task LoadModelAsync(bool useDebugValues = false)
             IsLoading = true;
         }
 
+        // Start a new sync timer
+        _ = Task.Run(async () =>
+        {
+            await RunSyncTimmer();
+        });
+
         // temporary, we'll need to give the users a way to disable this.
         // if they don't want to use hyper-v
         _notificationService.CheckIfUserIsAHyperVAdmin();
@@ -267,7 +267,7 @@ public void ProviderHandler()
             if (system is ComputeSystemViewModel computeSystemViewModel)
             {
                 var type = computeSystemViewModel.Type;
-                return type.Contains(currentProvider, StringComparison.OrdinalIgnoreCase);
+                return type.Equals(currentProvider, StringComparison.OrdinalIgnoreCase);
             }
 
             return false;
@@ -282,7 +282,6 @@ public void SortHandler()
     {
         ComputeSystemsView.SortDescriptions.Clear();
 
-        // Convert to switch case
         switch (SelectedSortIndex)
         {
             case 0:

From 0fb856d029839b9dbafa6d450b046a6207782a9a Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <modanish@microsoft.com>
Date: Mon, 25 Mar 2024 11:06:48 -0700
Subject: [PATCH 6/9] Changed minutes localization string

---
 .../DevHome.Environments/Strings/en-us/Resources.resw         | 2 +-
 .../DevHome.Environments/ViewModels/LandingPageViewModel.cs   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw b/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
index 91f62f5311..b7f534243f 100644
--- a/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
+++ b/tools/Environments/DevHome.Environments/Strings/en-us/Resources.resw
@@ -179,7 +179,7 @@
     <comment>Text denoting a minute has passed</comment>
   </data>
   <data name="MinutesAgo" xml:space="preserve">
-    <value>minutes ago...</value>
+    <value>{0} minutes ago...</value>
     <comment>Text denoting multiple minutes have passed</comment>
   </data>
   <data name="MomentsAgo" xml:space="preserve">
diff --git a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
index 8397768932..3f6db323c8 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
@@ -133,7 +133,7 @@ private async Task RunSyncTimmer()
         // For the first 2-5 minutes, in 1 minute increments
         for (var i = 2; i <= 5; i++)
         {
-            await UpdateLastSyncTimeUI($"{i} {_stringResource.GetLocalized("MinutesAgo")}", TimeSpan.FromMinutes(1), cancellationToken);
+            await UpdateLastSyncTimeUI(_stringResource.GetLocalized("MinutesAgo", i), TimeSpan.FromMinutes(1), cancellationToken);
             if (cancellationToken.IsCancellationRequested)
             {
                 return;
@@ -143,7 +143,7 @@ private async Task RunSyncTimmer()
         // For the 10-55 minutes, in 5 minute increments
         for (var i = 2; i <= 11; i++)
         {
-            await UpdateLastSyncTimeUI($"{i * 5} {_stringResource.GetLocalized("MinutesAgo")}", TimeSpan.FromMinutes(5), cancellationToken);
+            await UpdateLastSyncTimeUI(_stringResource.GetLocalized("MinutesAgo", i * 5), TimeSpan.FromMinutes(5), cancellationToken);
             if (cancellationToken.IsCancellationRequested)
             {
                 return;

From 72f560fcc2fda29e3fcaf8fbb05a54b3e88b6844 Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <shaan3@gmail.com>
Date: Mon, 25 Mar 2024 14:58:42 -0700
Subject: [PATCH 7/9] Apply krschau's comments from code review

Co-authored-by: Kristen Schau <47155823+krschau@users.noreply.github.com>
---
 .../DevHome.Environments/Views/LandingPage.xaml     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
index 4f51bc2cb2..e7202cdb99 100644
--- a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
+++ b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
@@ -2,8 +2,6 @@
     x:Class="DevHome.Environments.Views.LandingPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pg="using:DevHome.Common"
     xmlns:behaviors="using:DevHome.Common.Behaviors"
     xmlns:vm="using:DevHome.Environments.ViewModels"
@@ -14,7 +12,6 @@
     xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
     behaviors:NavigationViewHeaderBehavior.HeaderMode="Never"
     xmlns:labs="using:CommunityToolkit.Labs.WinUI"
-    mc:Ignorable="d"
     Loaded="OnLoaded">
 
     <pg:ToolPage.Resources>
@@ -124,14 +121,14 @@
             <TextBlock Grid.Column="0" x:Uid="Titlebar" Style="{ThemeResource SubtitleTextBlockStyle}" HorizontalAlignment="Left" x:Name="Titlebar"/>
         </Grid>
 
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="1" MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="10*" />
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
                 <!-- Search field -->
-                <AutoSuggestBox Grid.Column="0" x:Uid="SearchTextBox" x:Name="SearchTextBox" Width="250" Margin="17 0 0 0" HorizontalAlignment="Left">
+                <AutoSuggestBox Grid.Column="0" x:Uid="SearchTextBox" x:Name="SearchTextBox" Width="250" HorizontalAlignment="Left">
                     <i:Interaction.Behaviors>
                         <ic:EventTriggerBehavior EventName="TextChanged">
                             <ic:InvokeCommandAction
@@ -177,17 +174,17 @@
         </Grid>
 
         <!-- Last synced text block-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 12 15 0" >
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
             <TextBlock x:Uid="LastSyncTextBlock"
                        VerticalAlignment="Center"
                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                       Margin="0 0 3 0"/>
+                       Margin="0 12 3 12" />
             <TextBlock Text="{x:Bind ViewModel.LastSyncTime, Mode=TwoWay}"
                        VerticalAlignment="Center" Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
         </StackPanel>
 
         <!-- Per VM/Compute System card -->
-        <ScrollViewer Grid.Row="3" Style="{StaticResource EnvironmentScrollViewerStyle}">
+        <ScrollViewer Grid.Row="3" Style="{StaticResource EnvironmentScrollViewerStyle}" MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
             <StackPanel>
                 <ListView
                       MaxWidth="{ThemeResource MaxPageContentWidth}"

From 3f435224dbcac0db9bc3a99c56498786f5165044 Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <Huzaifa.Danish@microsoft.com>
Date: Mon, 25 Mar 2024 15:26:57 -0700
Subject: [PATCH 8/9] PR comment changes

---
 .../ViewModels/ComputeSystemViewModel.cs                    | 1 +
 .../DevHome.Environments/ViewModels/LandingPageViewModel.cs | 2 +-
 .../DevHome.Environments/Views/LandingPage.xaml             | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs
index 8904d266d7..e39006aa85 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/ComputeSystemViewModel.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
diff --git a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
index 8f498bef2c..12736fedfe 100644
--- a/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
+++ b/tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
@@ -253,7 +253,7 @@ public void ProviderHandler()
         var currentProvider = Providers[SelectedProviderIndex];
         ComputeSystemsView.Filter = system =>
         {
-            if (currentProvider == _stringResource.GetLocalized("AllProviders"))
+            if (currentProvider.Equals(_stringResource.GetLocalized("AllProviders"), StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }
diff --git a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
index e7202cdb99..1f40e7c5d5 100644
--- a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
+++ b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
@@ -18,7 +18,7 @@
         <ResourceDictionary Source="ms-appx:///DevHome.Common/Environments/Templates/EnvironmentsTemplates.xaml" />
     </pg:ToolPage.Resources>
 
-    <Grid MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
@@ -112,7 +112,7 @@
 
 
         <Grid Grid.Row="0" x:Name="TitleGrid"
-              MaxWidth="{ThemeResource MaxPageContentWidth}">
+              MaxWidth="{ThemeResource MaxPageContentWidth}"  Margin="{ThemeResource HeaderMargin}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="auto" />
@@ -179,7 +179,7 @@
                        VerticalAlignment="Center"
                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                        Margin="0 12 3 12" />
-            <TextBlock Text="{x:Bind ViewModel.LastSyncTime, Mode=TwoWay}"
+            <TextBlock Text="{x:Bind ViewModel.LastSyncTime, Mode=OneWay}"
                        VerticalAlignment="Center" Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
         </StackPanel>
 

From c0edbb02d8a9396ef8fb55dea2bbe30072f6a3d8 Mon Sep 17 00:00:00 2001
From: Huzaifa Danish <shaan3@gmail.com>
Date: Tue, 26 Mar 2024 09:55:45 -0700
Subject: [PATCH 9/9] Update
 tools/Environments/DevHome.Environments/Views/LandingPage.xaml

krshau's suggestion

Co-authored-by: Kristen Schau <47155823+krschau@users.noreply.github.com>
---
 .../Views/LandingPage.xaml                    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
index 1f40e7c5d5..5b97553e50 100644
--- a/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
+++ b/tools/Environments/DevHome.Environments/Views/LandingPage.xaml
@@ -174,14 +174,17 @@
         </Grid>
 
         <!-- Last synced text block-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right" MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
-            <TextBlock x:Uid="LastSyncTextBlock"
-                       VerticalAlignment="Center"
-                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                       Margin="0 12 3 12" />
-            <TextBlock Text="{x:Bind ViewModel.LastSyncTime, Mode=OneWay}"
-                       VerticalAlignment="Center" Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-        </StackPanel>
+        <Grid Grid.Row="2" MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
+                <TextBlock x:Uid="LastSyncTextBlock"
+                           VerticalAlignment="Center"
+                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                           Margin="0 12 3 12" />
+                <TextBlock Text="{x:Bind ViewModel.LastSyncTime, Mode=OneWay}"
+                           VerticalAlignment="Center"
+                           Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+            </StackPanel>
+        </Grid>
 
         <!-- Per VM/Compute System card -->
         <ScrollViewer Grid.Row="3" Style="{StaticResource EnvironmentScrollViewerStyle}" MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">