PR review

Author: ibetitsmike

App/App.xaml.cs

@@ -165,6 +165,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
         }, CancellationToken.None);
 
         // Initialize file sync.
+        // We're adding a 5s delay here to avoid race conditions when loading the mutagen binary.
 
         _ = Task.Delay(5000).ContinueWith((_) =>
         {

App/ViewModels/FileSyncListViewModel.cs

@@ -143,9 +143,9 @@ public void Initialize(Window window, DispatcherQueue dispatcherQueue)
 
         var rpcModel = _rpcController.GetState();
         var credentialModel = _credentialManager.GetCachedCredentials();
-        MaybeSetUnavailableMessage(rpcModel, credentialModel);
         var syncSessionState = _syncSessionController.GetState();
         UpdateSyncSessionState(syncSessionState);
+        MaybeSetUnavailableMessage(rpcModel, credentialModel, syncSessionState);
     }
 
     private void RpcControllerStateChanged(object? sender, RpcModel rpcModel)
@@ -159,7 +159,8 @@ private void RpcControllerStateChanged(object? sender, RpcModel rpcModel)
         }
 
         var credentialModel = _credentialManager.GetCachedCredentials();
-        MaybeSetUnavailableMessage(rpcModel, credentialModel);
+        var syncSessionState = _syncSessionController.GetState();
+        MaybeSetUnavailableMessage(rpcModel, credentialModel, syncSessionState);
     }
 
     private void CredentialManagerCredentialsChanged(object? sender, CredentialModel credentialModel)
@@ -173,7 +174,8 @@ private void CredentialManagerCredentialsChanged(object? sender, CredentialModel
         }
 
         var rpcModel = _rpcController.GetState();
-        MaybeSetUnavailableMessage(rpcModel, credentialModel);
+        var syncSessionState = _syncSessionController.GetState();
+        MaybeSetUnavailableMessage(rpcModel, credentialModel, syncSessionState);
     }
 
     private void SyncSessionStateChanged(object? sender, SyncSessionControllerStateModel syncSessionState)
@@ -189,7 +191,7 @@ private void SyncSessionStateChanged(object? sender, SyncSessionControllerStateM
         UpdateSyncSessionState(syncSessionState);
     }
 
-    private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel credentialModel, SyncSessionControllerStateModel? syncSessionState = null)
+    private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel credentialModel, SyncSessionControllerStateModel syncSessionState)
     {
         var oldMessage = UnavailableMessage;
         if (rpcModel.RpcLifecycle != RpcLifecycle.Connected)
@@ -205,7 +207,7 @@ private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel crede
         {
             UnavailableMessage = "Please start Coder Connect from the tray window to access file sync.";
         }
-        else if (syncSessionState != null && syncSessionState.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
+        else if (syncSessionState.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
         {
             UnavailableMessage = "Sync session controller is not initialized. Please wait...";
         }

App/ViewModels/TrayWindowDisconnectedViewModel.cs

@@ -1,12 +1,8 @@
 using Coder.Desktop.App.Models;
 using Coder.Desktop.App.Services;
-using Coder.Desktop.App.Views.Pages;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Diagnostics;
 using System.Threading.Tasks;
 
 namespace Coder.Desktop.App.ViewModels;

App/Views/Pages/TrayWindowDisconnectedPage.xaml

@@ -30,9 +30,12 @@
 
         <controls:HorizontalRule />
 
-        <TextBlock TextWrapping="Wrap" Foreground="Red" Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
-            <Bold>Reconnect failed</Bold>
-        </TextBlock>
+        <TextBlock FontWeight="semibold"
+                   TextWrapping="Wrap"
+                   Foreground="Red"
+                   Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
+                   Text ="Reconnect failed"/>
+
 
         <TextBlock
             TextWrapping="Wrap"

App/Views/Pages/TrayWindowDisconnectedPage.xaml.cs

@@ -1,7 +1,5 @@
 using Coder.Desktop.App.ViewModels;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System;
 
 namespace Coder.Desktop.App.Views.Pages;