From a508bea4b01fe210df23946bfb832c7a94780c4f Mon Sep 17 00:00:00 2001
From: Dinis Vieira <dinisvieira@outlook.com>
Date: Wed, 21 Feb 2024 10:55:26 +0000
Subject: [PATCH] [PM-6291] Fix Device Login Pending Requests screen not
 displaying anything (#3012)

* PM-6291 Changed Passwordless Request Login Page Layout structure so that it can display properly

* PM-6291 Additional changes to allow iOS to show the correct with on the collectionview items
---
 .../LoginPasswordlessRequestsListPage.xaml    | 117 +++++++++---------
 .../LoginPasswordlessRequestsListPage.xaml.cs |  18 ++-
 .../LoginPasswordlessRequestsListViewModel.cs |   2 +-
 3 files changed, 77 insertions(+), 60 deletions(-)

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 @@
                         <Label
                             Text="{u:I18n FingerprintPhrase}"
                             FontSize="Small"
-                            Padding="0, 10, 0 ,0"
                             FontAttributes="Bold"/>
                         <controls:MonoLabel
                             FormattedText="{Binding FingerprintPhrase}"
@@ -70,64 +69,70 @@
                             Grid.ColumnSpan="2"/>
                     </Grid>
 	        </DataTemplate>
-
-            <StackLayout
-                x:Key="mainLayout"
-                x:Name="_mainLayout"
-                Padding="0, 10">
-                <RefreshView
-                    IsRefreshing="{Binding IsRefreshing}"
-                    Command="{Binding RefreshCommand}"
-                    VerticalOptions="FillAndExpand"
-                    BackgroundColor="{DynamicResource BackgroundColor}">
-                    <StackLayout>
-                        <Image
-                            x:Name="_emptyPlaceholder"
-                            Source="empty_login_requests"
-                            HorizontalOptions="Center"
-                            WidthRequest="160"
-                            HeightRequest="160"
-                            Margin="0,70,0,0"
-                            IsVisible="{Binding HasLoginRequests, Converter={StaticResource inverseBool}}"
-                            SemanticProperties.Description="{u:I18n NoPendingRequests}" />
-                        <controls:CustomLabel
-                            StyleClass="box-label-regular"
-                            Text="{u:I18n NoPendingRequests}"
-                            IsVisible="{Binding HasLoginRequests, Converter={StaticResource inverseBool}}"
-                            FontAttributes="{OnPlatform iOS=Bold}"
-                            FontWeight="500"
-                            HorizontalTextAlignment="Center"
-                            Margin="14,10,14,0"/>
-                        <controls:ExtendedCollectionView
-                            ItemsSource="{Binding LoginRequests}"
-                            ItemTemplate="{StaticResource loginRequestTemplate}"
-                            SelectionMode="Single"
-                            IsVisible="{Binding HasLoginRequests}"
-                            ExtraDataForLogging="Login requests page" >
-                            <controls:ExtendedCollectionView.Behaviors>
-                                <xct:EventToCommandBehavior
-                                    EventName="SelectionChanged"
-                                    Command="{Binding AnswerRequestCommand}"
-                                    EventArgsConverter="{StaticResource SelectionChangedEventArgsConverter}" />
-                            </controls:ExtendedCollectionView.Behaviors>
-                        </controls:ExtendedCollectionView>
-                    </StackLayout>
-                </RefreshView>
-                <controls:IconLabelButton
-                        VerticalOptions="End"
-                        Margin="10,0"
-                        Icon="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
-                        Label="{u:I18n DeclineAllRequests}"
-                        ButtonCommand="{Binding DeclineAllRequestsCommand}"
-                        IsVisible="{Binding HasLoginRequests}"
-                        AutomationId="DeleteAllRequestsButton" />
-            </StackLayout>
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <ContentView 
-        x:Name="_mainContent">
-    </ContentView>
+    <Grid
+        RowDefinitions="*, Auto"
+        Padding="0, 10">
+        <RefreshView
+            Grid.Row="0"
+            IsRefreshing="{Binding IsRefreshing}"
+            Command="{Binding RefreshCommand}"
+            VerticalOptions="Fill"
+            BackgroundColor="{DynamicResource BackgroundColor}">
+            <Grid RowDefinitions="Auto, *">
+                <VerticalStackLayout Grid.Row="0" 
+                                     HorizontalOptions="Center">
+                    <Image
+                        x:Name="_emptyPlaceholder"
+                        Source="empty_login_requests"
+                        WidthRequest="160"
+                        HeightRequest="160"
+                        Margin="0,70,0,0"
+                        IsVisible="{Binding HasLoginRequests, Converter={StaticResource inverseBool}}"
+                        SemanticProperties.Description="{u:I18n NoPendingRequests}" />
+                    <controls:CustomLabel
+                        StyleClass="box-label-regular"
+                        Text="{u:I18n NoPendingRequests}"
+                        IsVisible="{Binding HasLoginRequests, Converter={StaticResource inverseBool}}"
+                        FontAttributes="{OnPlatform iOS=Bold}"
+                        FontWeight="500"
+                        Margin="14,10,14,0"/>
+                </VerticalStackLayout>
+                <controls:ExtendedCollectionView
+                    Grid.Row="1"
+                    ItemsSource="{Binding LoginRequests}"
+                    ItemTemplate="{StaticResource loginRequestTemplate}"
+                    SelectionMode="Single"
+                    IsVisible="{Binding HasLoginRequests}"
+                    ExtraDataForLogging="Login requests page" >
+                    <controls:ExtendedCollectionView.Behaviors>
+                        <xct:EventToCommandBehavior
+                            EventName="SelectionChanged"
+                            Command="{Binding AnswerRequestCommand}"
+                            EventArgsConverter="{StaticResource SelectionChangedEventArgsConverter}" />
+                    </controls:ExtendedCollectionView.Behaviors>
+                </controls:ExtendedCollectionView>
+            </Grid>
+        </RefreshView>
+        
+        <controls:IconLabelButton
+            Grid.Row="1"
+            VerticalOptions="End"
+            Margin="10,0"
+            Icon="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
+            Label="{u:I18n DeclineAllRequests}"
+            ButtonCommand="{Binding DeclineAllRequestsCommand}"
+            IsVisible="{Binding HasLoginRequests}"
+            AutomationId="DeleteAllRequestsButton" />
+
+        <Grid x:Name="_activityIndicatorGrid" Grid.Row="0" Grid.RowSpan="2" BackgroundColor="{DynamicResource BackgroundColor}">
+            <ActivityIndicator IsRunning="True"
+                               VerticalOptions="Center" 
+                               HorizontalOptions="Center" />
+        </Grid>
+    </Grid>
 
 </pages:BaseContentPage>
 
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()