From d0103496b9efea1469604dd225b1c1d07ae36f34 Mon Sep 17 00:00:00 2001
From: mpbw2 <59324545+mpbw2@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:26:14 -0500
Subject: [PATCH] [PM-5910] Workaround for for sliding elements in Duo 2FA flow
 (#2967)

* workaround for sliding elements in duo 2fa flow

* restrict workaround to Android

* restrict workaround to Android

* Revert "restrict workaround to Android"

This reverts commit c2753d5dc4960aeacdb4c798e7273ca86c08881d.

* Revert "restrict workaround to Android"

This reverts commit 69688cfb98e8e3e17812f126b4fd90ffd2ac3cf8.
---
 src/Core/Pages/Accounts/TwoFactorPage.xaml        |  4 ++--
 src/Core/Pages/Accounts/TwoFactorPageViewModel.cs | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Core/Pages/Accounts/TwoFactorPage.xaml b/src/Core/Pages/Accounts/TwoFactorPage.xaml
index 7f953d901..ad0904ce8 100644
--- a/src/Core/Pages/Accounts/TwoFactorPage.xaml
+++ b/src/Core/Pages/Accounts/TwoFactorPage.xaml
@@ -133,12 +133,12 @@
                 </StackLayout>
             </StackLayout>
             <StackLayout Spacing="0" Padding="0" IsVisible="{Binding DuoMethod, Mode=OneWay}"
-                         VerticalOptions="FillAndExpand">
+                         VerticalOptions="StartAndExpand">
                 <controls:HybridWebView
                     x:Name="_duoWebView"
                     HorizontalOptions="FillAndExpand"
                     VerticalOptions="FillAndExpand"
-                    MinimumHeightRequest="400" />
+                    HeightRequest="{Binding DuoWebViewHeight, Mode=OneWay}" />
                 <StackLayout StyleClass="box" VerticalOptions="End">
                     <StackLayout StyleClass="box-row, box-row-switch">
                         <Label
diff --git a/src/Core/Pages/Accounts/TwoFactorPageViewModel.cs b/src/Core/Pages/Accounts/TwoFactorPageViewModel.cs
index 319d55160..fbdd5eec5 100644
--- a/src/Core/Pages/Accounts/TwoFactorPageViewModel.cs
+++ b/src/Core/Pages/Accounts/TwoFactorPageViewModel.cs
@@ -34,6 +34,7 @@ namespace Bit.App.Pages
         private string _webVaultUrl = "https://vault.bitwarden.com";
         private bool _enableContinue = false;
         private bool _showContinue = true;
+        private double _duoWebViewHeight;
 
         public TwoFactorPageViewModel()
         {
@@ -63,6 +64,12 @@ namespace Bit.App.Pages
             set => SetProperty(ref _totpInstruction, value);
         }
 
+        public double DuoWebViewHeight
+        {
+            get => _duoWebViewHeight;
+            set => SetProperty(ref _duoWebViewHeight, value);
+        }
+        
         public bool Remember { get; set; }
 
         public bool AuthingWithSso { get; set; }
@@ -172,6 +179,7 @@ namespace Bit.App.Pages
                     break;
                 case TwoFactorProviderType.Duo:
                 case TwoFactorProviderType.OrganizationDuo:
+                    SetDuoWebViewHeight();
                     var host = WebUtility.UrlEncode(providerData["Host"] as string);
                     var req = WebUtility.UrlEncode(providerData["Signature"] as string);
                     page.DuoWebView.Uri = $"{_webVaultUrl}/duo-connector.html?host={host}&request={req}";
@@ -203,6 +211,12 @@ namespace Bit.App.Pages
             ShowContinue = !(SelectedProviderType == null || DuoMethod || Fido2Method);
         }
 
+        public void SetDuoWebViewHeight()
+        {
+            var screenHeight = DeviceDisplay.MainDisplayInfo.Height / DeviceDisplay.MainDisplayInfo.Density;
+            DuoWebViewHeight = screenHeight > 0 ? (screenHeight / 8) * 6 : 400;
+        }
+
         public async Task Fido2AuthenticateAsync(Dictionary<string, object> providerData = null)
         {
             try