PM-3350 Updated MauiVersion to 8.0.4-nightly.* to have the TapGestureRecognizer fix applied. This is done on the Directory.Build.props so we don't have to change it on every csproj. Also removed the workaround of TapGestureHack and fix the Show environment picker to work on the extensions as well.

Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+ <PropertyGroup>
+   <MauiVersion>8.0.4-nightly.*</MauiVersion>
+ </PropertyGroup>
+</Project>

src/Core/Pages/Accounts/HomePageViewModel.cs

@@ -165,7 +165,7 @@ namespace Bit.App.Pages
 
             await MainThread.InvokeOnMainThreadAsync(async () =>
             {
-                var result = await Page.DisplayActionSheet(AppResources.LoggingInOn, AppResources.Cancel, null, options);
+                var result = await _deviceActionService.Value.DisplayActionSheetAsync(AppResources.LoggingInOn, AppResources.Cancel, null, options);
 
                 if (result is null || result == AppResources.Cancel)
                 {

src/iOS.Autofill/CredentialProviderViewController.TapGestureHack.cs

@@ -1,51 +0,0 @@
-#if ENABLED_TAP_GESTURE_RECOGNIZER_MAUI_EMBEDDED_WORKAROUND
-
-using System;
-using AuthenticationServices;
-using Bit.App.Abstractions;
-using Bit.Core.Utilities;
-using Bit.iOS.Autofill.Models;
-using Bit.iOS.Core.Utilities;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Platform;
-using UIKit;
-
-namespace Bit.iOS.Autofill
-{
-    public partial class CredentialProviderViewController : ASCredentialProviderViewController, IAccountsManagerHost
-    {
-        const string STORYBOARD_NAME = "MainInterface";
-        Lazy<UIStoryboard> _storyboard = new Lazy<UIStoryboard>(() => UIStoryboard.FromName(STORYBOARD_NAME, null));
-
-        public void InitWithContext(Context context)
-        {
-            _context = context;
-        }
-
-        public void DismissLockAndContinue()
-        {
-            if (UIApplication.SharedApplication.KeyWindow is null)
-            {
-                return;
-            }
-
-            UIApplication.SharedApplication.KeyWindow.RootViewController = _storyboard.Value.InstantiateInitialViewController();
-
-            if (UIApplication.SharedApplication.KeyWindow?.RootViewController is CredentialProviderViewController cpvc)
-            {
-                cpvc.InitWithContext(_context);
-                cpvc.OnLockDismissedAsync().FireAndForget();
-            }
-        }
-
-        private void NavigateToPage(ContentPage page)
-        {
-            var navigationPage = new NavigationPage(page);
-
-            var window = new Window(navigationPage);
-            window.ToHandler(MauiContextSingleton.Instance.MauiContext);
-        }
-    }
-}
-
-#endif

src/iOS.Autofill/CredentialProviderViewController.cs

@@ -18,6 +18,8 @@ using CoreFoundation;
 using CoreNFC;
 using Foundation;
 using Microsoft.Maui.ApplicationModel;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Platform;
 using UIKit;
 
 namespace Bit.iOS.Autofill
@@ -248,7 +250,6 @@ namespace Bit.iOS.Autofill
             }
         }
 
-#if !ENABLED_TAP_GESTURE_RECOGNIZER_MAUI_EMBEDDED_WORKAROUND
         public async void DismissLockAndContinue()
         {
             DismissViewController(false, async () => await OnLockDismissedAsync());
@@ -262,7 +263,6 @@ namespace Bit.iOS.Autofill
 
             PresentViewController(uiController, true, null);
         }
-#endif
 
         public async Task OnLockDismissedAsync()
         {

src/iOS.Autofill/iOS.Autofill.csproj

@@ -10,7 +10,7 @@
 
       <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
 
-      <DefineConstants>$(DefineConstants);ENABLED_TAP_GESTURE_RECOGNIZER_MAUI_EMBEDDED_WORKAROUND</DefineConstants>
+      <DefineConstants>$(DefineConstants)</DefineConstants>
 
       <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.0</SupportedOSPlatformVersion>
   </PropertyGroup>
@@ -83,7 +83,6 @@
     <Compile Include="Models\Context.cs" />
     <BundleResource Include="Resources\MaterialIcons_Regular.ttf" />
     <BundleResource Include="Resources\bwi-font.ttf" />
-    <Compile Include="CredentialProviderViewController.TapGestureHack.cs" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\check.png" />