diff --git a/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml b/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
index 9f6af1d14..8f5a9a2d3 100644
--- a/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
+++ b/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
@@ -37,7 +37,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml.cs b/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml.cs
index 0a68ab640..75eceb104 100644
--- a/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml.cs
+++ b/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
using Bit.App.Utilities;
using Bit.Core.Abstractions;
using Bit.Core.Models.Response;
+using Bit.Core.Services;
using Bit.Core.Utilities;
using Microsoft.Maui.ApplicationModel;
using Microsoft.Maui.Controls;
@@ -19,7 +20,6 @@ namespace Bit.App.Pages
public LoginPasswordlessRequestsListPage()
{
InitializeComponent();
- SetActivityIndicator(_mainContent);
_vm = BindingContext as LoginPasswordlessRequestsListViewModel;
_vm.Page = this;
}
@@ -27,9 +27,21 @@ namespace Bit.App.Pages
protected override async void OnAppearing()
{
base.OnAppearing();
- await LoadOnAppearedAsync(_mainLayout, false, _vm.RefreshAsync, _mainContent);
+ try
+ {
+ _activityIndicatorGrid.IsVisible = true;
- UpdatePlaceholder();
+ await _vm.RefreshAsync();
+ UpdatePlaceholder();
+ }
+ catch (Exception ex)
+ {
+ LoggerHelper.LogEvenIfCantBeResolved(ex);
+ }
+ finally
+ {
+ _activityIndicatorGrid.IsVisible = false;
+ }
}
private async void Close_Clicked(object sender, System.EventArgs e)
diff --git a/src/Core/Pages/Settings/LoginPasswordlessRequestsListViewModel.cs b/src/Core/Pages/Settings/LoginPasswordlessRequestsListViewModel.cs
index 083f8c4e6..a738530e2 100644
--- a/src/Core/Pages/Settings/LoginPasswordlessRequestsListViewModel.cs
+++ b/src/Core/Pages/Settings/LoginPasswordlessRequestsListViewModel.cs
@@ -108,7 +108,7 @@ namespace Bit.App.Pages
Origin = loginRequestData.Origin
});
- await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(new NavigationPage(page)));
+ await MainThread.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(new NavigationPage(page)));
}
private async Task DeclineAllRequestsAsync()