diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
index 508e4653e..5f9688814 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
@@ -16,23 +16,23 @@
x:DataType="vm:MainWindowViewModel"
x:CompileBindings="True">
-
-
+ -->
-
+
-
+
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
index fd9fdb88a..d93e60aad 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
@@ -16,163 +16,163 @@
x:DataType="vm:ProxyScriptManagePageViewModel"
x:CompileBindings="True"
x:Class="System.Application.UI.Views.Pages.ProxyScriptManagePage">
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
index 397cb5fd7..c66a290b1 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
@@ -91,7 +91,7 @@ namespace System.Application.UI.ViewModels
}
#endif
- var users = SteamUsers.ToArray();
+ var users = SteamUsers.OrderByDescending(o => o.LastLoginTime).ToArray();
for (var i = 0; i < SteamUsers.Count; i++)
{
var temp = users[i];
@@ -111,10 +111,10 @@ namespace System.Application.UI.ViewModels
users[i].Remark = remark;
users[i].AvatarFullStream = httpService.GetImageAsync(users[i].AvatarFull, ImageChannelType.SteamAvatars);
}
- SteamUsers = new ObservableCollection(
- users.OrderByDescending(o => o.LastLoginTime).ToList());
- foreach (var item in SteamUsers)
+ SteamUsers = new ObservableCollection(users);
+
+ foreach (var item in users)
{
item.MiniProfile = await webApiService.GetUserMiniProfile(item.SteamId3_Int);
var miniProfile = item.MiniProfile;
@@ -125,8 +125,7 @@ namespace System.Application.UI.ViewModels
}
}
- SteamUsers = new ObservableCollection(
- users.OrderByDescending(o => o.LastLoginTime).ToList());
+ SteamUsers = new ObservableCollection(users);
this.WhenAnyValue(x => x.SteamUsers)
.Subscribe(items => items?