[PM-2470] Load environment from file in env page.

.github/workflows/build.yml

@@ -71,11 +71,6 @@ jobs:
         with:
           nuget-version: 5.9.0
 
-      - name: Set up .NET
-        uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
-        with:
-          dotnet-version: '3.1.x'
-
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1
 
@@ -798,7 +793,7 @@ jobs:
           done
 
       - name: Upload Sources
-        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
+        uses: crowdin/github-action@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}

.github/workflows/crowdin-pull.yml

@@ -30,7 +30,7 @@ jobs:
           secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase"
 
       - name: Download translations
-        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
+        uses: crowdin/github-action@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }}

.github/workflows/enforce-labels.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Enforce Label
-        uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # 2.2.2
+        uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # v2.2.2
         with:
           BANNED_LABELS: "hold,needs-qa"
           BANNED_LABELS_DESCRIPTION: "PRs with the hold or needs-qa labels cannot be merged"

.github/workflows/release.yml

@@ -68,7 +68,7 @@ jobs:
 
       - name: Download all artifacts
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -76,7 +76,7 @@ jobs:
 
       - name: Dry Run - Download all artifacts
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -130,7 +130,7 @@ jobs:
 
       - name: Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type != 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
           workflow_conclusion: success
@@ -139,7 +139,7 @@ jobs:
 
       - name: Dry Run - Download F-Droid .apk artifact
         if: ${{ github.event.inputs.release_type == 'Dry Run' }}
-        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
+        uses: dawidd6/action-download-artifact@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
         with:
           workflow: build.yml
           workflow_conclusion: success

.github/workflows/version-auto-bump.yml

@@ -32,8 +32,12 @@ jobs:
           echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT
 
   trigger_version_bump:
-    name: Bump version to ${{ needs.setup.outputs.version_number }}
+    name: "Version bump"
-    needs: setup
+    runs-on: ubuntu-22.04
+    needs:
+      - setup
+    steps:
+      - name: Bump version to ${{ needs.setup.outputs.version_number }}
         uses: ./.github/workflows/version-bump.yml
         secrets:
           AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}

README.md

@@ -4,7 +4,7 @@
 
 # Bitwarden Mobile Application
 
-<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on F-Droid" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
+<a href="https://play.google.com/store/apps/details?id=com.x8bit.bitwarden" target="_blank"><img alt="Get it on Google Play" src="https://imgur.com/YQzmZi9.png" width="153" height="46"></a> <a href="https://mobileapp.bitwarden.com/fdroid/" target="_blank"><img alt="Get it on Google Play" src="https://i.imgur.com/HDicnzz.png" width="154" height="46"></a> <a href="https://itunes.apple.com/us/app/bitwarden-free-password-manager/id1137397744?mt=8" target="_blank"><img src="https://imgur.com/GdGqPMY.png" width="135" height="40"></a>
 
 The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms.
 

crowdin.yml

@@ -38,15 +38,3 @@ files:
         pt-PT: pt-PT
         en-GB: en-GB
         en-IN: en-IN
-  - source: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/Localizable.strings"
-    dest: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/%original_file_name%"
-    translation: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization//%two_letters_code%.lproj/%original_file_name%"
-    update_option: update_as_unapproved
-    languages_mapping:
-      two_letters_code:
-        zh-CN: zh-Hans
-        zh-TW: zh-Hant
-        pt-BR: pt-BR
-        pt-PT: pt-PT
-        en-GB: en-GB
-        en-IN: en-IN

src/Android/Android.csproj

@@ -159,7 +159,6 @@
     <Compile Include="Constants.cs" />
     <Compile Include="Effects\RemoveFontPaddingEffect.cs" />
     <Compile Include="Services\WatchDeviceService.cs" />
-    <Compile Include="Renderers\CustomLabelRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\bwi-font.ttf" />
@@ -233,18 +232,6 @@
       <SubType></SubType>
       <Generator></Generator>
     </AndroidResource>
-    <AndroidResource Include="Resources\layout\validatable_input_dialog_layout.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_uris_placeholder.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable\empty_uris_placeholder_dark.xml">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\splash_screen.xml" />

src/Android/Autofill/FieldCollection.cs

@@ -12,7 +12,7 @@ namespace Bit.Droid.Autofill
         private List<Field> _passwordFields = null;
         private List<Field> _usernameFields = null;
         private HashSet<string> _ignoreSearchTerms = new HashSet<string> { "search", "find", "recipient", "edit" };
-        private HashSet<string> _usernameTerms = new HashSet<string> { "email", "phone", "username" };
+        private HashSet<string> _usernameTerms = new HashSet<string> { "email", "phone", "username"};
         private HashSet<string> _passwordTerms = new HashSet<string> { "password", "pswd" };
 
         public List<AutofillId> AutofillIds { get; private set; } = new List<AutofillId>();
@@ -54,15 +54,16 @@ namespace Bit.Droid.Autofill
                     if (HintToFieldsMap.ContainsKey(View.AutofillHintPassword))
                     {
                         _passwordFields.AddRange(HintToFieldsMap[View.AutofillHintPassword]);
-                        return _passwordFields;
                     }
                 }
-
+                else
+                {
                     _passwordFields = Fields.Where(f => FieldIsPassword(f)).ToList();
                     if (!_passwordFields.Any())
                     {
                         _passwordFields = Fields.Where(f => FieldHasPasswordTerms(f)).ToList();
                     }
+                }
                 return _passwordFields;
             }
         }
@@ -86,12 +87,9 @@ namespace Bit.Droid.Autofill
                     {
                         _usernameFields.AddRange(HintToFieldsMap[View.AutofillHintUsername]);
                     }
-                    if (_usernameFields.Any())
+                }
+                else
                 {
-                        return _usernameFields;
-                    }
-                }
-
                     foreach (var passwordField in PasswordFields)
                     {
                         var usernameField = Fields.TakeWhile(f => f.AutofillId != passwordField.AutofillId)
@@ -106,6 +104,7 @@ namespace Bit.Droid.Autofill
                     {
                         _usernameFields = Fields.Where(f => FieldIsUsername(f)).ToList();
                     }
+                }
                 return _usernameFields;
             }
         }

src/Android/MainActivity.cs

@@ -44,6 +44,7 @@ namespace Bit.Droid
         private IAppIdService _appIdService;
         private IEventService _eventService;
         private IPushNotificationListenerService _pushNotificationListenerService;
+        private IVaultTimeoutService _vaultTimeoutService;
         private ILogger _logger;
         private PendingIntent _eventUploadPendingIntent;
         private AppOptions _appOptions;
@@ -68,6 +69,7 @@ namespace Bit.Droid
             _appIdService = ServiceContainer.Resolve<IAppIdService>("appIdService");
             _eventService = ServiceContainer.Resolve<IEventService>("eventService");
             _pushNotificationListenerService = ServiceContainer.Resolve<IPushNotificationListenerService>();
+            _vaultTimeoutService = ServiceContainer.Resolve<IVaultTimeoutService>();
             _logger = ServiceContainer.Resolve<ILogger>("logger");
 
             TabLayoutResource = Resource.Layout.Tabbar;
@@ -232,6 +234,7 @@ namespace Bit.Droid
 
         protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
         {
+            _vaultTimeoutService.ResetTimeoutDelay = true;
             if (resultCode == Result.Ok &&
                (requestCode == Core.Constants.SelectFileRequestCode || requestCode == Core.Constants.SaveFileRequestCode))
             {

src/Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.7.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2023.5.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.NFC" />

src/Android/Renderers/CustomLabelRenderer.cs

@@ -1,43 +0,0 @@
-using System.ComponentModel;
-using Android.Content;
-using Android.OS;
-using Bit.App.Controls;
-using Bit.Droid.Renderers;
-using Xamarin.Forms;
-using Xamarin.Forms.Platform.Android;
-
-[assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))]
-namespace Bit.Droid.Renderers
-{
-    public class CustomLabelRenderer : LabelRenderer
-    {
-        public CustomLabelRenderer(Context context)
-            : base(context)
-        { }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
-        {
-            base.OnElementChanged(e);
-
-            if (Control != null && e.NewElement is CustomLabel label)
-            {
-                if (label.FontWeight.HasValue && Build.VERSION.SdkInt >= BuildVersionCodes.P)
-                {
-                    Control.Typeface = Android.Graphics.Typeface.Create(null, label.FontWeight.Value, false);
-                }
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            var label = sender as CustomLabel;
-            switch (e.PropertyName)
-            {
-                case nameof(CustomLabel.AutomationId):
-                    Control.ContentDescription = label.AutomationId;
-                    break;
-            }
-            base.OnElementPropertyChanged(sender, e);
-        }
-    }
-}

src/Android/Resources/drawable/empty_uris_placeholder.xml

@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="129"
-    android:viewportHeight="124"
-    android:width="129dp"
-    android:height="124dp">
-    <path
-        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
-        android:fillColor="#F0F0F0"
-        android:strokeColor="#89929F"
-        android:strokeWidth="3" />
-    <path
-        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
-        android:strokeColor="#89929F"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
-        android:fillColor="#89929F" />
-    <path
-        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
-        android:fillColor="#89929F" />
-</vector>

src/Android/Resources/drawable/empty_uris_placeholder_dark.xml

@@ -1,35 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="129"
-    android:viewportHeight="124"
-    android:width="129dp"
-    android:height="124dp">
-    <path
-        android:pathData="M126.8227 61.9441A59.6843 59.6843 0 0 1 7.4541 61.9441A59.6843 59.6843 0 0 1 126.8227 61.9441Z"
-        android:fillColor="@android:color/transparent"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="3" />
-    <path
-        android:pathData="M21.6167 100.851C52.597 103.31 79.6937 80.3264 82.1391 49.5156C83.6205 30.8497 76.0789 14.8844 62.7275 3.63385"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M14.5633 34.2845C12.2035 66.7711 38.5225 96.3429 72.6666 98.8232C74.2596 98.9389 78.629 98.9975 80.1951 99C84.6245 98.8232 97.8063 96.593 106.813 91.8485C113.439 88.3581 119.745 84.6984 124.644 79.1121"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M124.502 48.5051C106.554 24.3817 68.8237 21.6709 41.4178 42.0617C24.8146 54.4149 14.7327 72.4183 13.9255 90.1427"
-        android:strokeColor="#A3A3A3"
-        android:strokeWidth="1.5"
-        android:strokeLineCap="round" />
-    <path
-        android:pathData="M83.4034 28.3934A5 5 0 0 1 73.4034 28.3934A5 5 0 0 1 83.4034 28.3934Z"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M24.7698 66.5518A5 5 0 0 1 14.7698 66.5518A5 5 0 0 1 24.7698 66.5518Z"
-        android:fillColor="#A3A3A3" />
-    <path
-        android:pathData="M57.344 94.4726A5 5 0 0 1 47.344 94.4726A5 5 0 0 1 57.344 94.4726Z"
-        android:fillColor="#A3A3A3" />
-</vector>

src/Android/Resources/layout/validatable_input_dialog_layout.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="30dp"
-    android:paddingRight="30dp">
-    <TextView
-        android:id="@+id/lblHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_header_text_size"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="-3dp"
-        android:labelFor="@+id/txtValue"/>
-    <EditText
-        android:id="@id/txtValue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_input_text_size"/>
-    <TextView
-        android:id="@+id/lblValueSubinfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="@dimen/dialog_sub_value_info_text_size"/>
-</LinearLayout>
-

src/Android/Resources/values/dimens.xml

@@ -2,7 +2,4 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <dimen name="design_bottom_navigation_text_size" tools:override="true">15sp</dimen>
   <dimen name="design_bottom_navigation_active_text_size" tools:override="true">15sp</dimen>
-  <dimen name="dialog_input_text_size">16sp</dimen>
-  <dimen name="dialog_header_text_size">12sp</dimen>
-  <dimen name="dialog_sub_value_info_text_size">12sp</dimen>
 </resources>

src/Android/Services/DeviceActionService.cs

@@ -13,13 +13,12 @@ using Android.Views.InputMethods;
 using Android.Widget;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
-using Bit.App.Utilities;
-using Bit.App.Utilities.Prompts;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
+using Bit.Core.Utilities;
 using Bit.Droid.Utilities;
 using Plugin.CurrentActivity;
-using Xamarin.Forms.Platform.Android;
+using static Bit.App.Pages.SettingsPageViewModel;
 
 namespace Bit.Droid.Services
 {
@@ -210,7 +209,10 @@ namespace Bit.Droid.Services
             }
             if (numericKeyboard)
             {
-                SetNumericKeyboardTo(input);
+                input.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
+#pragma warning disable CS0618 // Type or member is obsolete
+                input.KeyListener = DigitsKeyListener.GetInstance(false, false);
+#pragma warning restore CS0618 // Type or member is obsolete
             }
             if (password)
             {
@@ -246,83 +248,6 @@ namespace Bit.Droid.Services
             return result.Task;
         }
 
-        public Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config)
-        {
-            var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
-            if (activity == null)
-            {
-                return Task.FromResult<ValidatablePromptResponse?>(null);
-            }
-
-            var alertBuilder = new AlertDialog.Builder(activity);
-            alertBuilder.SetTitle(config.Title);
-            var view = activity.LayoutInflater.Inflate(Resource.Layout.validatable_input_dialog_layout, null);
-            alertBuilder.SetView(view);
-            
-            var result = new TaskCompletionSource<ValidatablePromptResponse?>();
-
-            alertBuilder.SetOnCancelListener(new BasicDialogWithResultCancelListener(result));
-            alertBuilder.SetPositiveButton(config.OkButtonText ?? AppResources.Ok, listener: null);
-            alertBuilder.SetNegativeButton(config.CancelButtonText ?? AppResources.Cancel, (sender, args) => result.TrySetResult(null));
-            if (!string.IsNullOrEmpty(config.ThirdButtonText))
-            {
-                alertBuilder.SetNeutralButton(config.ThirdButtonText, (sender, args) => result.TrySetResult(new ValidatablePromptResponse(null, true)));
-            }
-
-            var alert = alertBuilder.Create();
-
-            var input = view.FindViewById<EditText>(Resource.Id.txtValue);
-            var lblHeader = view.FindViewById<TextView>(Resource.Id.lblHeader);
-            var lblValueSubinfo = view.FindViewById<TextView>(Resource.Id.lblValueSubinfo);
-
-            lblHeader.Text = config.Subtitle;
-            lblValueSubinfo.Text = config.ValueSubInfo;
-
-            var defaultSubInfoColor = lblValueSubinfo.TextColors;
-
-            input.InputType = InputTypes.ClassText;
-
-            if (config.NumericKeyboard)
-            {
-                SetNumericKeyboardTo(input);
-            }
-
-            input.ImeOptions = input.ImeOptions | (ImeAction)ImeFlags.NoPersonalizedLearning | (ImeAction)ImeFlags.NoExtractUi;
-            input.Text = config.Text ?? string.Empty;
-            input.SetSelection(config.Text?.Length ?? 0);
-            input.AfterTextChanged += (sender, args) =>
-            {
-                if (lblValueSubinfo.Text != config.ValueSubInfo)
-                {
-                    lblValueSubinfo.Text = config.ValueSubInfo;
-                    lblHeader.SetTextColor(defaultSubInfoColor);
-                    lblValueSubinfo.SetTextColor(defaultSubInfoColor);
-                }
-            };
-
-            alert.Window.SetSoftInputMode(SoftInput.StateVisible);
-            alert.Show();
-
-            var positiveButton = alert.GetButton((int)DialogButtonType.Positive);
-            positiveButton.Click += (sender, args) =>
-            {
-                var error = config.ValidateText(input.Text);
-                if (error != null)
-                {
-                    lblHeader.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
-                    lblValueSubinfo.SetTextColor(ThemeManager.GetResourceColor("DangerColor").ToAndroid());
-                    lblValueSubinfo.Text = error;
-                    lblValueSubinfo.SendAccessibilityEvent(Android.Views.Accessibility.EventTypes.ViewFocused);
-                    return;
-                }
-
-                result.TrySetResult(new ValidatablePromptResponse(input.Text, false));
-                alert.Dismiss();
-            };
-
-            return result.Task;
-        }
-
         public void RateApp()
         {
             var activity = (MainActivity)CrossCurrentActivity.Current.Activity;
@@ -600,29 +525,5 @@ namespace Bit.Droid.Services
             // only used by iOS
             throw new NotImplementedException();
         }
-
-        private void SetNumericKeyboardTo(EditText editText)
-        {
-            editText.InputType = InputTypes.ClassNumber | InputTypes.NumberFlagDecimal | InputTypes.NumberFlagSigned;
-#pragma warning disable CS0618 // Type or member is obsolete
-            editText.KeyListener = DigitsKeyListener.GetInstance(false, false);
-#pragma warning restore CS0618 // Type or member is obsolete
-        }
-    }
-
-    class BasicDialogWithResultCancelListener : Java.Lang.Object, IDialogInterfaceOnCancelListener
-    {
-        private readonly TaskCompletionSource<ValidatablePromptResponse?> _taskCompletionSource;
-
-        public BasicDialogWithResultCancelListener(TaskCompletionSource<ValidatablePromptResponse?> taskCompletionSource)
-        {
-            _taskCompletionSource = taskCompletionSource;
-        }
-
-        public void OnCancel(IDialogInterface dialog)
-        {
-            _taskCompletionSource?.TrySetResult(null);
-            dialog?.Dismiss();
-        }
     }
 }

src/Android/Utilities/IntentExtensions.cs

@@ -1,6 +1,5 @@
 using Android.Content;
 using Android.OS;
-using Java.Lang;
 
 namespace Bit.Droid.Utilities
 {
@@ -14,12 +13,7 @@ namespace Bit.Droid.Utilities
                 // Note: getting the bundle like this will cause to call unparcel() internally
                 var b = intent?.Extras?.GetBundle("trashstringwhichhasnousebuttocheckunparcel");
             }
-            catch (Exception ex) when
+            catch (BadParcelableException)
-            (
-                ex is BadParcelableException ||
-                ex is ClassNotFoundException ||
-                ex is RuntimeException
-            )
             {
                 intent.ReplaceExtras((Bundle)null);
             }

src/App/Abstractions/IDeviceActionService.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Bit.App.Utilities.Prompts;
 using Bit.Core.Enums;
 using Bit.Core.Models;
 
@@ -19,7 +18,6 @@ namespace Bit.App.Abstractions
         Task<string> DisplayPromptAync(string title = null, string description = null, string text = null,
             string okButtonText = null, string cancelButtonText = null, bool numericKeyboard = false,
             bool autofocus = true, bool password = false);
-        Task<ValidatablePromptResponse?> DisplayValidatablePromptAsync(ValidatablePromptConfig config);
         Task<string> DisplayAlertAsync(string title, string message, string cancel, params string[] buttons);
         Task<string> DisplayActionSheetAsync(string title, string cancel, string destruction, params string[] buttons);
 

src/App/App.csproj

@@ -145,8 +145,6 @@
     <Folder Include="Controls\DateTime\" />
     <Folder Include="Controls\IconLabelButton\" />
     <Folder Include="Controls\PasswordStrengthProgressBar\" />
-    <Folder Include="Utilities\Automation\" />
-    <Folder Include="Utilities\Prompts\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -442,7 +440,5 @@
     <None Remove="MessagePack" />
     <None Remove="MessagePack.MSBuild.Tasks" />
     <None Remove="Controls\PasswordStrengthProgressBar\" />
-    <None Remove="Utilities\Automation\" />
-    <None Remove="Utilities\Prompts\" />
   </ItemGroup>
 </Project>

src/App/App.xaml.cs

@@ -297,7 +297,7 @@ namespace Bit.App
             {
                 await _vaultTimeoutService.CheckVaultTimeoutAsync();
                 // Reset delay on every start
-                _vaultTimeoutService.DelayLockAndLogoutMs = null;
+                _vaultTimeoutService.DelayTimeoutMs = null;
             }
 
             await _configService.GetAsync();

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml

@@ -30,15 +30,13 @@
                 BackgroundColor="{DynamicResource BackgroundColor}"
                 VerticalOptions="Start"
                 RowHeight="{Binding AccountListRowHeight, Source={x:Reference _mainOverlay}}"
-                effects:ScrollViewContentInsetAdjustmentBehaviorEffect.ContentInsetAdjustmentBehavior="Never"
+                effects:ScrollViewContentInsetAdjustmentBehaviorEffect.ContentInsetAdjustmentBehavior="Never">
-                AutomationId="AccountListView">
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="view:AccountView">
                         <controls:AccountViewCell
                             Account="{Binding .}"
                             SelectAccountCommand="{Binding SelectAccountCommand, Source={x:Reference _mainOverlay}}"
                             LongPressAccountCommand="{Binding LongPressAccountCommand, Source={x:Reference _mainOverlay}}"
-                            AutomationId="AccountViewCell"
                             />
                     </DataTemplate>
                 </ListView.ItemTemplate>

src/App/Controls/AccountViewCell/AccountViewCell.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
@@ -60,23 +60,20 @@
                     Text="{Binding AccountView.Email}"
                     IsVisible="{Binding IsActive}"
                     StyleClass="accountlist-title, accountlist-title-platform"
-                    LineBreakMode="TailTruncation"
+                    LineBreakMode="TailTruncation" />
-                    AutomationId="AccountEmailLabel" />
                 <Label
                     Grid.Row="0"
                     Text="{Binding AccountView.Email}"
                     IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
                     StyleClass="accountlist-title, accountlist-title-platform"
                     TextColor="{DynamicResource MutedColor}"
-                    LineBreakMode="TailTruncation"
+                    LineBreakMode="TailTruncation" />
-                    AutomationId="AccountEmailLabel" />
                 <Label
                     Grid.Row="1"
                     IsVisible="{Binding ShowHostname}"
                     Text="{Binding AccountView.Hostname}"
                     StyleClass="accountlist-sub, accountlist-sub-platform"
-                    LineBreakMode="TailTruncation"
+                    LineBreakMode="TailTruncation" />
-                    AutomationId="AccountHostUrlLabel" />
                 <Label
                     Grid.Row="2"
                     Text="{u:I18n AccountUnlocked}"
@@ -84,8 +81,7 @@
                     StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
+                    LineBreakMode="TailTruncation" />
-                    AutomationId="AccountStatusLabel" />
                 <Label
                     Grid.Row="2"
                     Text="{u:I18n AccountLocked}"
@@ -93,8 +89,7 @@
                     StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
+                    LineBreakMode="TailTruncation" />
-                    AutomationId="AccountStatusLabel" />
                 <Label
                     Grid.Row="2"
                     Text="{u:I18n AccountLoggedOut}"
@@ -102,8 +97,7 @@
                     StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation"
+                    LineBreakMode="TailTruncation" />
-                    AutomationId="AccountStatusLabel" />
             </Grid>
 
             <controls:IconLabel
@@ -113,8 +107,7 @@
                 Margin="12,0"
                 HorizontalOptions="Center"
                 VerticalOptions="Center"
-                StyleClass="list-icon, list-icon-platform"
+                StyleClass="list-icon, list-icon-platform" />
-                AutomationId="InactiveVaultIcon" />
             <controls:IconLabel
                 Grid.Column="2"
                 Text="{Binding AuthStatusIconActive}" 
@@ -123,8 +116,7 @@
                 HorizontalOptions="Center"
                 VerticalOptions="Center"
                 StyleClass="list-icon, list-icon-platform"
-                TextColor="{DynamicResource TextColor}"
+                TextColor="{DynamicResource TextColor}"/>
-                AutomationId="ActiveVaultIcon" />
         </Grid>
 
         <Grid
@@ -155,8 +147,7 @@
                 StyleClass="accountlist-title, accountlist-title-platform"
                 LineBreakMode="TailTruncation"
                 VerticalOptions="Center"
-                Grid.Column="1"
+                Grid.Column="1" />
-                AutomationId="AddAccountButton" />
         </Grid>
     </Grid>
 </ViewCell>

src/App/Controls/CipherViewCell/CipherViewCell.xaml

@@ -9,8 +9,7 @@
     StyleClass="list-row, list-row-platform"
     RowSpacing="0"
     ColumnSpacing="0"
-    x:DataType="controls:CipherViewCellViewModel"
+    x:DataType="controls:CipherViewCellViewModel">
-    AutomationId="CipherCell">
 
     <Grid.Resources>
         <u:IconGlyphConverter x:Key="iconGlyphConverter"/>
@@ -37,8 +36,7 @@
         IsVisible="{Binding ShowIconImage, Converter={StaticResource inverseBool}}"
         Text="{Binding Cipher, Converter={StaticResource iconGlyphConverter}}"
         ShouldUpdateFontSizeDynamicallyForAccesibility="True"
-        AutomationProperties.IsInAccessibleTree="False"
+        AutomationProperties.IsInAccessibleTree="False" />
-        AutomationId="CipherTypeIcon" />
 
     <ff:CachedImage
         x:Name="_iconImage"
@@ -54,8 +52,7 @@
         Aspect="AspectFit"
         IsVisible="{Binding ShowIconImage}"
         Source="{Binding IconImageSource, Mode=OneTime}"
-        AutomationProperties.IsInAccessibleTree="False"
+        AutomationProperties.IsInAccessibleTree="False" />
-        AutomationId="CipherWebsiteIcon" />
 
     <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center" Padding="0, 7">
         <Grid.RowDefinitions>
@@ -74,8 +71,7 @@
             Grid.Column="0"
             Grid.Row="0"
             StyleClass="list-title, list-title-platform"
-            Text="{Binding Cipher.Name}"
+            Text="{Binding Cipher.Name}" />
-            AutomationId="CipherNameLabel" />
         <Label
             LineBreakMode="TailTruncation"
             Grid.Column="0"
@@ -84,8 +80,7 @@
             StyleClass="list-subtitle, list-subtitle-platform"
             Text="{Binding Cipher.SubTitle}"
             IsVisible="{Binding Source={RelativeSource Self}, Path=Text,
-                        Converter={StaticResource stringHasValueConverter}}"
+                        Converter={StaticResource stringHasValueConverter}}"/>
-            AutomationId="CipherSubTitleLabel" />
         <controls:IconLabel
             Grid.Column="1"
             Grid.Row="0"
@@ -96,8 +91,7 @@
             Text="{Binding Source={x:Static core:BitwardenIcons.Collection}}"
             IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Shared}"
+            AutomationProperties.Name="{u:I18n Shared}" />
-            AutomationId="CipherInCollectionIcon" />
         <controls:IconLabel
             Grid.Column="2"
             Grid.Row="0"
@@ -108,8 +102,7 @@
             Text="{Binding Source={x:Static core:BitwardenIcons.Paperclip}}"
             IsVisible="{Binding Cipher.HasAttachments, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Attachments}"
+            AutomationProperties.Name="{u:I18n Attachments}" />
-            AutomationId="CipherWithAttachmentsIcon" />
     </Grid>
 
     <controls:MiButton
@@ -121,7 +114,6 @@
         VerticalOptions="CenterAndExpand"
         HorizontalOptions="EndAndExpand"
         AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n Options}"
+        AutomationProperties.Name="{u:I18n Options}" />
-        AutomationId="CipherOptionsButton" />
 
 </controls:ExtendedGrid>

src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs

@@ -31,7 +31,7 @@ namespace Bit.App.Controls
         public bool ShowIconImage
         {
             get => WebsiteIconsEnabled
-                && !string.IsNullOrWhiteSpace(Cipher.LaunchUri)
+                && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri)
                 && IconImageSource != null;
         }
 
@@ -41,7 +41,7 @@ namespace Bit.App.Controls
             {
                 if (_iconImageSource == string.Empty) // default value since icon source can return null
                 {
-                    _iconImageSource = IconImageHelper.GetIconImage(Cipher);
+                    _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher);
                 }
                 return _iconImageSource;
             }

src/App/Controls/CustomLabel.cs

@@ -1,13 +0,0 @@
-using Xamarin.Forms;
-
-namespace Bit.App.Controls
-{
-    public class CustomLabel : Label
-    {
-        public CustomLabel()
-        {
-        }
-
-        public int? FontWeight { get; set; }
-    }
-}

src/App/Controls/SendViewCell/SendViewCell.xaml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <controls:ExtendedGrid xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Bit.App.Controls.SendViewCell"
@@ -54,16 +54,14 @@
             Grid.Column="0"
             Grid.Row="0"
             StyleClass="list-title, list-title-platform"
-            Text="{Binding Send.Name}"
+            Text="{Binding Send.Name}" />
-            AutomationId="SendNameLabel" />
         <Label
             LineBreakMode="TailTruncation"
             Grid.Column="0"
             Grid.Row="1"
             Grid.ColumnSpan="6"
             StyleClass="list-subtitle, list-subtitle-platform"
-            Text="{Binding Send.DisplayDate}"
+            Text="{Binding Send.DisplayDate}" />
-            AutomationId="SendDateLabel" />
         <controls:IconLabel
             Grid.Column="1"
             Grid.Row="0"
@@ -74,8 +72,7 @@
             Text="{Binding Source={x:Static core:BitwardenIcons.ExclamationTriangle}}"
             IsVisible="{Binding Send.Disabled, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Disabled}"
+            AutomationProperties.Name="{u:I18n Disabled}" />
-            AutomationId="DisabledSendLabel" />
         <controls:IconLabel
             Grid.Column="2"
             Grid.Row="0"
@@ -86,8 +83,7 @@
             Text="{Binding Source={x:Static core:BitwardenIcons.Key}}"
             IsVisible="{Binding Send.HasPassword, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Password}"
+            AutomationProperties.Name="{u:I18n Password}" />
-            AutomationId="PasswordProtectedSendLabel" />
         <controls:IconLabel
             Grid.Column="3"
             Grid.Row="0"
@@ -98,8 +94,7 @@
             Text="{Binding Source={x:Static core:BitwardenIcons.Ban}}"
             IsVisible="{Binding Send.MaxAccessCountReached, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n MaxAccessCountReached}"
+            AutomationProperties.Name="{u:I18n MaxAccessCountReached}" />
-            AutomationId="SendMaxAccessCountReachedLabel" />
         <controls:IconLabel
             Grid.Column="4"
             Grid.Row="0"
@@ -110,8 +105,7 @@
             Text="{Binding Source={x:Static core:BitwardenIcons.Clock}}"
             IsVisible="{Binding Send.Expired, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Expired}"
+            AutomationProperties.Name="{u:I18n Expired}" />
-            AutomationId="ExpiredSendLabel" />
         <controls:IconLabel
             Grid.Column="5"
             Grid.Row="0"
@@ -122,8 +116,7 @@
             Text="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
             IsVisible="{Binding Send.PendingDelete, Mode=OneTime}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n PendingDelete}"
+            AutomationProperties.Name="{u:I18n PendingDelete}" />
-            AutomationId="SendWithPendingDeletionLabel" />
     </Grid>
 
     <controls:MiButton
@@ -136,7 +129,6 @@
         VerticalOptions="CenterAndExpand"
         HorizontalOptions="EndAndExpand"
         AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n Options}"
+        AutomationProperties.Name="{u:I18n Options}" />
-        AutomationId="SendOptionsButton" />
 
 </controls:ExtendedGrid>

src/App/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml

@@ -33,8 +33,7 @@
             StyleClass="box-label"
             Grid.Row="0"
             Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
-            AutomationId="BooleanCustomFieldNameLabel" />
         <Label
             Text="{Binding Field.Name, Mode=OneWay}"
             IsVisible="{Binding IsEditing}"
@@ -50,15 +49,13 @@
             Grid.Row="1"
             Grid.Column="0"
             Margin="0, 5, 0, 0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"  />
-            AutomationId="BooleanCustomFieldValueLabel" />
         <Switch
             IsToggled="{Binding BooleanValue}"
             IsVisible="{Binding IsEditing}"
             Grid.Row="0"
             Grid.Column="1"
-            Grid.RowSpan="2"
+            Grid.RowSpan="2" />
-            AutomationId="BooleanCustomFieldValueToggle" />
         <controls:IconButton 
             StyleClass="box-row-button, box-row-button-platform"
             Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"

src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml

@@ -31,8 +31,7 @@
             Text="{Binding Field.Name, Mode=OneWay}"
             StyleClass="box-label"
             Grid.Row="0"
-            Grid.Column="0"
+            Grid.Column="0" />
-            AutomationId="HiddenCustomFieldNameLabel" />
         <StackLayout
             Grid.Row="1"
             Grid.Column="0"
@@ -40,8 +39,7 @@
             <controls:MonoLabel
                 Text="{Binding ValueText, Mode=OneWay}"
                 StyleClass="box-value"
-                IsVisible="{Binding ShowHiddenValue}"
+                IsVisible="{Binding ShowHiddenValue}" />
-                AutomationId="HiddenCustomFieldValueLabel" />
             <controls:MonoLabel
                 Text="{Binding Field.MaskedValue, Mode=OneWay}"
                 StyleClass="box-value"
@@ -58,8 +56,7 @@
             IsSpellCheckEnabled="False"
             IsTextPredictionEnabled="False"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}"
+            AutomationProperties.Name="{Binding Field.Name}">
-            AutomationId="HiddenCustomFieldValueEntry">
             <Entry.Keyboard>
                 <Keyboard x:FactoryMethod="Create">
                     <x:Arguments>
@@ -77,8 +74,7 @@
             Grid.Column="1"
             Grid.RowSpan="2"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n ToggleVisibility}"
+            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-            AutomationId="HiddenCustomFieldShowValueButton" />
         <controls:IconButton
             StyleClass="box-row-button, box-row-button-platform"
             Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"

src/App/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml

@@ -29,15 +29,13 @@
             Text="{Binding Field.Name, Mode=OneWay}"
             StyleClass="box-label"
             Grid.Row="0"
-            Grid.Column="0"
+            Grid.Column="0" />
-            AutomationId="LinkedCustomFieldNameLabel" />
         <controls:IconLabel
             Text="{Binding ValueText, Mode=OneWay}"
             StyleClass="box-value"
             Grid.Row="1"
             Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
-            AutomationId="LinkedCustomFieldValueLabel" />
         <StackLayout
             StyleClass="box-row, box-row-input"
             IsVisible="{Binding IsEditing}">
@@ -46,8 +44,7 @@
                 ItemsSource="{Binding LinkedFieldOptions, Mode=OneTime}"
                 SelectedIndex="{Binding LinkedFieldOptionSelectedIndex}"
                 ItemDisplayBinding="{Binding Key}"
-                StyleClass="box-value"
+                StyleClass="box-value" />
-                AutomationId="LinkedCustomFieldValuePicker" />
         </StackLayout>
         <controls:IconButton 
             StyleClass="box-row-button, box-row-button-platform"
@@ -58,8 +55,7 @@
             Grid.Column="1"
             Grid.RowSpan="2"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}"
+            AutomationProperties.Name="{u:I18n Options}" />
-            AutomationId="LinkedCustomFieldOptionsButton" />
     </Grid>
     <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
 </StackLayout>

src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml

@@ -29,15 +29,13 @@
             Text="{Binding Field.Name, Mode=OneWay}"
             StyleClass="box-label"
             Grid.Row="0"
-            Grid.Column="0"
+            Grid.Column="0" />
-            AutomationId="TextCustomFieldNameLabel" />
         <Label
             Text="{Binding ValueText, Mode=OneWay}"
             StyleClass="box-value"
             Grid.Row="1"
             Grid.Column="0"
-            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}"
+            IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
-            AutomationId="TextCustomFieldValueLabel" />
         <Entry
             Text="{Binding Field.Value}"
             StyleClass="box-value"
@@ -45,8 +43,7 @@
             Grid.Column="0"
             IsVisible="{Binding IsEditing}"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{Binding Field.Name}"
+            AutomationProperties.Name="{Binding Field.Name}" />
-            AutomationId="TextCustomFieldValueEntry" />
         <controls:IconButton
             StyleClass="box-row-button, box-row-button-platform"
             Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -56,8 +53,7 @@
             Grid.Column="1"
             Grid.RowSpan="2"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Copy}"
+            AutomationProperties.Name="{u:I18n Copy}" />
-            AutomationId="TextCustomFieldCopyValue" />
         <controls:IconButton 
             StyleClass="box-row-button, box-row-button-platform"
             Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
@@ -67,8 +63,7 @@
             Grid.Column="1"
             Grid.RowSpan="2"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Options}"
+            AutomationProperties.Name="{u:I18n Options}" />
-            AutomationId="TextCustomFieldOptionsButton" />
     </Grid>
     <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
 </StackLayout>

src/App/Pages/Accounts/EnvironmentPage.xaml

@@ -95,6 +95,14 @@
                 <Label
                     Text="{u:I18n CustomEnvironmentFooter}"
                     StyleClass="box-footer-label" />
+                <StackLayout StyleClass="box-row">
+                    <Button Text="{u:I18n LoadFromFile}"
+                            StyleClass="btn-primary"
+                            Command="{Binding LoadFromFileCommand}" />
+                    <Button Text="{u:I18n Clear}"
+                            StyleClass="btn-secondary"
+                            Command="{Binding ClearCommand}" />
+                </StackLayout>
             </StackLayout>
         </StackLayout>
     </ScrollView>

src/App/Pages/Accounts/EnvironmentPageViewModel.cs

@@ -1,11 +1,15 @@
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
+using Newtonsoft.Json;
 using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -27,9 +31,13 @@ namespace Bit.App.Pages
             IconsUrl = _environmentService.IconsUrl;
             NotificationsUrls = _environmentService.NotificationsUrl;
             SubmitCommand = new AsyncCommand(SubmitAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
+            LoadFromFileCommand = new AsyncCommand(LoadEnvironmentsFromFile, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
+            ClearCommand = new Command(ClearAllUrls);
         }
 
         public ICommand SubmitCommand { get; }
+        public ICommand LoadFromFileCommand { get; }
+        public ICommand ClearCommand { get; }
         public string BaseUrl { get; set; }
         public string ApiUrl { get; set; }
         public string IdentityUrl { get; set; }
@@ -87,5 +95,75 @@ namespace Bit.App.Pages
             _logger.Value.Exception(ex);
             Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok);
         }
+
+        private async Task LoadEnvironmentsFromFile()
+        {
+            try
+            {
+                string jsonString;
+                var result = await FilePicker.PickAsync(new PickOptions
+                {
+                    PickerTitle = "This a test to pick files"
+                });
+                if (result != null)
+                {
+                    if (result.FileName.EndsWith("json", StringComparison.OrdinalIgnoreCase) ||
+                        result.FileName.EndsWith("txt", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var stream = await result.OpenReadAsync();
+                        using (var reader = new System.IO.StreamReader(stream))
+                        {
+                            jsonString = reader.ReadToEnd();
+                        }
+                        var envUrls = JsonConvert.DeserializeObject<EnvironmentsData>(jsonString);
+                        BaseUrl = envUrls.Base;
+                        ApiUrl = envUrls.Api;
+                        IdentityUrl = envUrls.Identity;
+                        WebVaultUrl = envUrls.Vault;
+                        IconsUrl = envUrls.Icons;
+                        NotificationsUrls = envUrls.Notifications;
+                        NotifyUrlsChanged();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+        }
+
+        private void ClearAllUrls()
+        {
+            BaseUrl = string.Empty;
+            ApiUrl = string.Empty;
+            IdentityUrl = string.Empty;
+            WebVaultUrl = string.Empty;
+            IconsUrl = string.Empty;
+            NotificationsUrls = string.Empty;
+            NotifyUrlsChanged();
+        }
+
+        private void NotifyUrlsChanged() {
+            TriggerPropertyChanged(nameof(BaseUrl), new[]
+                        {
+                            nameof(ApiUrl),
+                            nameof(IdentityUrl),
+                            nameof(WebVaultUrl),
+                            nameof(IconsUrl),
+                            nameof(NotificationsUrls)
+                        });
+        }
+    }
+
+    public class EnvironmentsData
+    {
+        public string Base { get; set; }
+        public string Admin { get; set; }
+        public string Api { get; set; }
+        public string Identity { get; set; }
+        public string Icons { get; set; }
+        public string Notifications { get; set; }
+        public string Sso { get; set; }
+        public string Vault { get; set; }
     }
 }

src/App/Pages/Accounts/HomePage.xaml

@@ -23,8 +23,7 @@
             Priority="-1"
             UseOriginalImage="True"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
+            AutomationProperties.Name="{u:I18n Account}" />
-            AutomationId="AccountIconButton" />
         <ToolbarItem x:Name="_closeButton" Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"/>
     </ContentPage.ToolbarItems>
 

src/App/Pages/Accounts/LockPage.xaml

@@ -24,8 +24,7 @@
                 Priority="-1"
                 UseOriginalImage="True"
                 AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}"
+                AutomationProperties.Name="{u:I18n Account}" />
-                AutomationId="AccountIconButton" />
     </ContentPage.ToolbarItems>
     
     <ContentPage.Resources>
@@ -73,7 +72,7 @@
                                 Grid.Column="0"
                                 ReturnType="Go"
                                 ReturnCommand="{Binding SubmitCommand}" 
-                                AutomationId="PinEntry" />
+                                AutomationId="PinEntry"/>
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -84,7 +83,7 @@
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}" 
                                 AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PinVisibilityToggle" />
+                                AutomationId="PinVisibilityToggle"/>
                         </Grid>
                         <Grid
                             x:Name="_passwordGrid"
@@ -115,7 +114,7 @@
                                 Grid.Column="0"
                                 ReturnType="Go"
                                 ReturnCommand="{Binding SubmitCommand}"
-                                AutomationId="MasterPasswordEntry" />
+                                AutomationId="MasterPasswordEntry"/>
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
                                 Text="{Binding ShowPasswordIcon}"
@@ -154,7 +153,7 @@
                             Text="{u:I18n Unlock}"
                             StyleClass="btn-primary"
                             Clicked="Unlock_Clicked"
-                            AutomationId="UnlockVaultButton" />
+                            AutomationId="UnlockVaultButton"/>
                     </StackLayout>
                 </StackLayout>
             </ScrollView>

src/App/Pages/Accounts/LoginPage.xaml

@@ -24,8 +24,7 @@
                 Priority="-1"
                 UseOriginalImage="True"
                 AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}"
+                AutomationProperties.Name="{u:I18n Account}" />
-                AutomationId="AccountIconButton" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>
@@ -35,7 +34,7 @@
                 x:Name="_moreItem" x:Key="moreItem"
                  AutomationProperties.IsInAccessibleTree="True"
                  AutomationProperties.Name="{u:I18n Options}"
-                 AutomationId="OptionsButton" />
+                 AutomationId="OptionsButton"/>
             <ToolbarItem Text="{u:I18n GetPasswordHint}"
                 x:Key="getPasswordHint"
                 x:Name="_getPasswordHint"

src/App/Pages/Accounts/LoginPasswordlessPage.xaml

@@ -32,8 +32,7 @@
                 <Label
                     Text="{Binding LogInAttemptByLabel}"
                     FontSize="Small"
-                    Margin="0,0,0,24"
+                    Margin="0,0,0,24"/>
-                    AutomationId="LogInAttemptByLabel" />
                 <Label
                     Text="{u:I18n FingerprintPhrase}"
                     FontSize="Small"
@@ -42,8 +41,7 @@
                     FormattedText="{Binding LoginRequest.FingerprintPhrase}"
                     FontSize="Medium"
                     TextColor="{DynamicResource FingerprintPhrase}"
-                    Margin="0,0,0,27"
+                    Margin="0,0,0,27"/>
-                    AutomationId="FingerprintValueLabel" />
                 <Label
                     Text="{u:I18n DeviceType}"
                     FontSize="Small"
@@ -51,8 +49,7 @@
                 <Label
                     Text="{Binding LoginRequest.DeviceType}"
                     FontSize="Small"
-                    Margin="0,0,0,21"
+                    Margin="0,0,0,21"/>
-                    AutomationId="DeviceTypeValueLabel" />
                 <Label
                     Text="{u:I18n IpAddress}"
                     IsVisible="{Binding ShowIpAddress}"
@@ -62,8 +59,7 @@
                     Text="{Binding LoginRequest.IpAddress}"
                     IsVisible="{Binding ShowIpAddress}"
                     FontSize="Small"
-                    Margin="0,0,0,21"
+                    Margin="0,0,0,21"/>
-                    AutomationId="IpAddressValueLabel" />
                 <Label
                     Text="{u:I18n Time}"
                     FontSize="Small"
@@ -71,8 +67,7 @@
                 <Label
                     Text="{Binding TimeOfRequestText}"
                     FontSize="Small"
-                    Margin="0,0,0,57"
+                    Margin="0,0,0,57"/>
-                    AutomationId="TimeOfRequestValueLabel" />
             </StackLayout>
         </ScrollView>
 
@@ -80,13 +75,11 @@
                 Text="{u:I18n ConfirmLogIn}"
                 Command="{Binding AcceptRequestCommand}"
                 Margin="0,0,0,17"
-                StyleClass="btn-primary"
+                StyleClass="btn-primary"/>
-                AutomationId="ConfirmLoginButton" />
         <Button
                 Text="{u:I18n DenyLogIn}"
                 Command="{Binding RejectRequestCommand}"
-                StyleClass="btn-secundary"
+                StyleClass="btn-secundary"/>
-                AutomationId="DenyLoginButton" />
 
     </StackLayout>
 </pages:BaseContentPage>

src/App/Pages/Accounts/LoginPasswordlessRequestPage.xaml

@@ -24,8 +24,7 @@
                 Text="{u:I18n LogInInitiated}"
                 FontSize="Title"
                 FontAttributes="Bold"
-                Margin="0,14,0,21"
+                Margin="0,14,0,21"/>
-                AutomationId="LogInInitiatedLabel" />
             <Label
                 Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
                 FontSize="Small"
@@ -41,15 +40,13 @@
             <controls:MonoLabel
                 FormattedText="{Binding FingerprintPhrase}"
                 FontSize="Medium"
-                TextColor="{DynamicResource FingerprintPhrase}"
+                TextColor="{DynamicResource FingerprintPhrase}"/>
-                AutomationId="FingerprintPhraseValue" />
             <Label
                 Text="{u:I18n ResendNotification}"
                 StyleClass="text-md"
                 HorizontalOptions="Start"
                 Margin="0,40,0,0"
-                TextColor="{DynamicResource HyperlinkColor}"
+                TextColor="{DynamicResource HyperlinkColor}">
-                AutomationId="ResendNotificationButton">
                 <Label.GestureRecognizers>
                     <TapGestureRecognizer Command="{Binding CreatePasswordlessLoginCommand}" />
                 </Label.GestureRecognizers>
@@ -67,8 +64,7 @@
                     VerticalTextAlignment="End"
                     VerticalOptions="CenterAndExpand"
                     Margin="5, 0"
-                    TextColor="{DynamicResource HyperlinkColor}"
+                    TextColor="{DynamicResource HyperlinkColor}">
-                    AutomationId="ViewAllLoginOptionsButton">
                     <Label.GestureRecognizers>
                         <TapGestureRecognizer Command="{Binding CloseCommand}" />
                     </Label.GestureRecognizers>

src/App/Pages/Generator/GeneratorHistoryPage.xaml

@@ -27,8 +27,7 @@
                          Clicked="Clear_Clicked"
                          Order="Secondary"
                          x:Name="_clearItem"
-                         x:Key="clearItem"
+                         x:Key="clearItem" />
-                         AutomationId="ClearPasswordList" />
             <ToolbarItem Icon="more_vert.png"
                          AutomationProperties.IsInAccessibleTree="True"
                          AutomationProperties.Name="{u:I18n Options}"
@@ -44,8 +43,7 @@
                Margin="20, 0"
                VerticalOptions="CenterAndExpand"
                HorizontalOptions="CenterAndExpand"
-               HorizontalTextAlignment="Center"
+               HorizontalTextAlignment="Center"></Label>
-               AutomationId="NoPasswordsDisplayedLabel"></Label>
         <controls:ExtendedCollectionView
                   IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                   ItemsSource="{Binding History}"
@@ -58,8 +56,7 @@
                         StyleClass="list-row, list-row-platform"
                         Padding="10"
                         RowSpacing="0"
-                        ColumnSpacing="10"
+                        ColumnSpacing="10">
-                        AutomationId="GeneratedPasswordRow">
 
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -74,14 +71,12 @@
                             Grid.Column="0"
                             Grid.Row="0"
                             StyleClass="list-title, list-title-platform, text-html"
-                            Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}"
+                            Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
-                            AutomationId="GeneratedPasswordValue" />
                         <Label LineBreakMode="TailTruncation"
                             Grid.Column="0"
                             Grid.Row="1"
                             StyleClass="list-subtitle, list-subtitle-platform"
-                            Text="{Binding Date, Mode=OneWay, Converter={StaticResource dateTime}}"
+                            Text="{Binding Date, Mode=OneWay, Converter={StaticResource dateTime}}" />
-                            AutomationId="GeneratedPasswordDateLabel" />
                         <controls:IconButton
                             StyleClass="list-row-button, list-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Paste}}"
@@ -91,8 +86,7 @@
                             Grid.Column="1"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CopyPassword}"
+                            AutomationProperties.Name="{u:I18n CopyPassword}" />
-                            AutomationId="CopyPasswordValueButton" />
                     </Grid>
                 </DataTemplate>
             </CollectionView.ItemTemplate>

src/App/Pages/Generator/GeneratorPage.xaml

@@ -71,8 +71,7 @@
                         <Label
                             Text="{u:I18n PasswordGeneratorPolicyInEffect}"
                             StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Center"
+                            HorizontalTextAlignment="Center" />
-                            AutomationId="PasswordGeneratorPolicyInEffectLabel" />
                     </Frame>
                 </Grid>
                 <Grid IsVisible="{Binding IsUsername, Converter={StaticResource inverseBool}}"
@@ -83,24 +82,21 @@
                         x:Name="lblPassword"
                         StyleClass="text-lg, text-html"
                         Text="{Binding ColoredPassword, Mode=OneWay}"
-                        Margin="0, 20"
+                        Margin="0, 20" />
-                        AutomationId="GeneratedPasswordLabel" />
                     <controls:IconButton 
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                         Command="{Binding CopyCommand}"
                         Grid.Column="1"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n CopyPassword}"
+                        AutomationProperties.Name="{u:I18n CopyPassword}" />
-                        AutomationId="CopyValueButton" />
                     <controls:IconButton 
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
                         Command="{Binding RegenerateCommand}"
                         Grid.Column="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n GeneratePassword}"
+                        AutomationProperties.Name="{u:I18n GeneratePassword}" />
-                        AutomationId="RegenerateValueButton" />
                 </Grid>
                 <Grid IsVisible="{Binding IsUsername}"
                         StyleClass="box-row"                  
@@ -111,24 +107,21 @@
                         StyleClass="text-lg, text-html"
                         Text="{Binding ColoredUsername, Mode=OneWay}"
                         Margin="0, 20"
-                        HorizontalOptions="Start"
+                        HorizontalOptions="Start" />
-                        AutomationId="GeneratedPasswordLabel" />
                     <controls:IconButton 
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                         Command="{Binding CopyCommand}"
                         Grid.Column="1"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n CopyUsername}"
+                        AutomationProperties.Name="{u:I18n CopyUsername}" />
-                        AutomationId="CopyValueButton" />
                     <controls:IconButton 
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
                         Command="{Binding RegenerateUsernameCommand}"
                         Grid.Column="2"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n GenerateUsername}"
+                        AutomationProperties.Name="{u:I18n GenerateUsername}" />
-                        AutomationId="RegenerateValueButton" />
                 </Grid>
                 <BoxView StyleClass="box-row-separator"/>
                 <StackLayout StyleClass="box"
@@ -142,8 +135,7 @@
                         ItemsSource="{Binding GeneratorTypeOptions, Mode=OneTime}"
                         SelectedItem="{Binding GeneratorTypeSelected}"
                         ItemDisplayBinding="{Binding ., Converter={StaticResource localizableEnum}}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="GeneratorTypePicker" />
                 </StackLayout>
                 <Label Text="{u:I18n Options, Header=True}"
                        StyleClass="box-header, box-header-platform"
@@ -169,8 +161,7 @@
                         ItemsSource="{Binding UsernameTypeOptions, Mode=OneTime}"
                         SelectedItem="{Binding UsernameTypeSelected}"
                         ItemDisplayBinding="{Binding ., Converter={StaticResource localizableEnum}}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="UsernameTypePicker" />
                     <Label
                         StyleClass="box-footer-label"
                         Text="{Binding UsernameTypeDescriptionLabel}" />
@@ -181,8 +172,7 @@
                             StyleClass="box-label" />
                         <Entry x:Name="_plusAddressedEmailEntry"
                             Text="{Binding PlusAddressedEmail}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="PlusAddressedEmailEntry" />
                         <Label IsVisible="{Binding ShowUsernameEmailType}"
                             Text="{u:I18n EmailType}"
                             StyleClass="box-label"
@@ -213,8 +203,7 @@
                         <Entry
                             x:Name="_catchAllEmailDomainNameEntry"
                             Text="{Binding CatchAllEmailDomain}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="CatchAllEmailDomainEntry" />
                         <Label IsVisible="{Binding ShowUsernameEmailType}"
                             Text="{u:I18n EmailType}"
                             StyleClass="box-label" 
@@ -247,27 +236,26 @@
                             ItemsSource="{Binding ForwardedEmailServiceTypeOptions, Mode=OneTime}"
                             SelectedItem="{Binding ForwardedEmailServiceSelected}"
                             ItemDisplayBinding="{Binding ., Converter={StaticResource localizableEnum}}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="ServiceTypePicker" />
+                        <!--ANONADDY OPTIONS-->
-                        <Grid 
+                        <Grid IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                               Grid.RowDefinitions="Auto,*"
                               Grid.ColumnDefinitions="*,Auto">
                             <Label
                                 Margin="0,10,0,0"
-                                Text="{Binding ForwardedEmailApiSecretLabel}"
+                                Text="{u:I18n APIAccessToken}"
                                 StyleClass="box-label"/>
                             <Entry
-                                Text="{Binding ForwardedEmailApiSecret}"
+                                x:Name="_anonAddyApiAccessTokenEntry"
-                                IsPassword="{Binding ShowForwardedEmailApiSecret, Converter={StaticResource inverseBool}}"
+                                Text="{Binding AnonAddyApiAccessToken}"
-                                Grid.Row="1"
+                                IsPassword="{Binding ShowAnonAddyApiAccessToken, Converter={StaticResource inverseBool}}"
-                                AutomationId="ForwardedEmailApiSecretEntry" />
+                                Grid.Row="1"/>
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowForwardedEmailApiSecret, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Text="{Binding ShowAnonAddyApiAccessToken, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
                                 Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
                                 Grid.Row="1"
-                                Grid.Column="1"
+                                Grid.Column="1"/>
-                                AutomationId="ShowForwardedEmailApiSecretButton" />
                         </Grid>
                         <Label IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                             Text="{u:I18n DomainNameRequiredParenthesis}"
@@ -276,8 +264,91 @@
                         <Entry IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
                             x:Name="_anonAddyDomainNameEntry"
                             Text="{Binding AnonAddyDomainName}"
+                            StyleClass="box-value"/>
+                        <!--FIREFOX RELAY OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.FirefoxRelay}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIAccessToken}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_firefoxRelayApiAccessTokenEntry"
+                                Text="{Binding FirefoxRelayApiAccessToken}"
                                 StyleClass="box-value"
-                            AutomationId="AnonAddyDomainNameEntry" />
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowFirefoxRelayApiAccessToken, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowFirefoxRelayApiAccessToken, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
+                        <!--SIMPLELOGIN OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.SimpleLogin}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIKeyRequiredParenthesis}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_simpleLoginApiKeyEntry"
+                                Text="{Binding SimpleLoginApiKey}"
+                                StyleClass="box-value" 
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowSimpleLoginApiKey, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton 
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowSimpleLoginApiKey, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
+                        <!--DUCKDUCKGO OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.DuckDuckGo}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIKeyRequiredParenthesis}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_duckDuckGoApiAccessTokenEntry"
+                                Text="{Binding DuckDuckGoApiKey}"
+                                StyleClass="box-value"
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowDuckDuckGoApiKey, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowDuckDuckGoApiKey, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
+                        <!--FASTMAIL OPTIONS-->
+                        <Grid StyleClass="box-row, box-row-input"
+                              IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.Fastmail}}"
+                              Grid.RowDefinitions="Auto,*"
+                              Grid.ColumnDefinitions="*,Auto">
+                            <Label
+                                Text="{u:I18n APIKeyRequiredParenthesis}"
+                                StyleClass="box-label"/>
+                            <Entry
+                                x:Name="_fastmailApiAccessTokenEntry"
+                                Text="{Binding FastmailApiKey}"
+                                StyleClass="box-value"
+                                Grid.Row="1"
+                                IsPassword="{Binding ShowFastmailApiKey, Converter={StaticResource inverseBool}}"/>
+                            <controls:IconButton
+                                StyleClass="box-row-button, box-row-button-platform"
+                                Text="{Binding ShowFastmailApiKey, Converter={StaticResource iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Command="{Binding ToggleForwardedEmailHiddenValueCommand}"
+                                Grid.Row="1"
+                                Grid.Column="1"/>
+                        </Grid>
                     </StackLayout>                    
                     <!--RANDOM WORD OPTIONS-->
                     <Grid IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}">
@@ -288,8 +359,7 @@
                         <Switch
                             IsToggled="{Binding CapitalizeRandomWordUsername}"
                             StyleClass="box-value"
-                            HorizontalOptions="End"
+                            HorizontalOptions="End" />
-                            AutomationId="CapitalizeRandomWordUsernameToggle" />
                     </Grid>
                     <BoxView IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}"
                         StyleClass="box-row-separator" />
@@ -301,8 +371,7 @@
                         <Switch
                             IsToggled="{Binding IncludeNumberRandomWordUsername}"
                             StyleClass="box-value"
-                            HorizontalOptions="End"
+                            HorizontalOptions="End" />
-                            AutomationId="IncludeNumberRandomWordUsernameToggle" />
                     </Grid>
                     <BoxView IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}"
                         StyleClass="box-row-separator" />
@@ -317,8 +386,7 @@
                             x:Name="_passwordTypePicker"
                             ItemsSource="{Binding PasswordTypeOptions, Mode=OneTime}"
                             SelectedIndex="{Binding PasswordTypeSelectedIndex}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="PasswordTypePicker" />
                     </StackLayout>
                     <StackLayout Spacing="0"
                                  Padding="0"
@@ -335,14 +403,12 @@
                                 HorizontalOptions="FillAndExpand"
                                 HorizontalTextAlignment="End"
                                 VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
+                                VerticalTextAlignment="Center" />
-                                AutomationId="NumberOfWordsLabel" />
                             <controls:ExtendedStepper
                                 Value="{Binding NumWords}"
                                 Maximum="20"
                                 Minimum="3"
-                                Increment="1"
+                                Increment="1" />
-                                AutomationId="NumberOfWordsStepper" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-input">
@@ -353,8 +419,7 @@
                                 Text="{Binding WordSeparator}"
                                 IsSpellCheckEnabled="False"
                                 IsTextPredictionEnabled="False"
-                                StyleClass="box-value"
+                                StyleClass="box-value">
-                                AutomationId="WordSeparatorEntry">
                                 <Entry.Effects>
                                     <effects:NoEmojiKeyboardEffect />
                                 </Entry.Effects>
@@ -370,8 +435,7 @@
                                 IsEnabled="{Binding EnforcedPolicyOptions.Capitalize,
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
-                                HorizontalOptions="End"
+                                HorizontalOptions="End" />
-                                AutomationId="CapitalizePassphraseToggle" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
@@ -384,8 +448,7 @@
                                 IsEnabled="{Binding EnforcedPolicyOptions.IncludeNumber,
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
-                                HorizontalOptions="End"
+                                HorizontalOptions="End" />
-                                AutomationId="IncludeNumbersToggle" />
                         </StackLayout>
                     </StackLayout>
                     <StackLayout Spacing="0" Padding="0" IsVisible="{Binding IsPassword}">
@@ -399,8 +462,7 @@
                                 StyleClass="box-sub-label"
                                 VerticalOptions="CenterAndExpand"
                                 HorizontalTextAlignment="End"
-                                WidthRequest="50"
+                                WidthRequest="50" />
-                                AutomationId="PasswordLengthLabel" />
                             <controls:ExtendedSlider
                                 DragCompleted="LengthSlider_DragCompleted"
                                 Value="{Binding Length}"
@@ -409,8 +471,7 @@
                                 VerticalOptions="CenterAndExpand"
                                 HorizontalOptions="FillAndExpand"
                                 Maximum="128"
-                                Minimum="5"
+                                Minimum="5" />
-                                AutomationId="PasswordLengthSlider" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
@@ -427,8 +488,7 @@
                                 StyleClass="box-value"
                                 HorizontalOptions="End" 
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n UppercaseAtoZ}"
+                                AutomationProperties.Name="{u:I18n UppercaseAtoZ}"/>
-                                AutomationId="UppercaseAtoZToggle" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
@@ -445,8 +505,7 @@
                                 StyleClass="box-value"
                                 HorizontalOptions="End"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}"
+                                AutomationProperties.Name="{u:I18n LowercaseAtoZ}"/>
-                                AutomationId="LowercaseAtoZToggle" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
@@ -463,8 +522,7 @@
                                 StyleClass="box-value"
                                 HorizontalOptions="End" 
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n NumbersZeroToNine}"
+                                AutomationProperties.Name="{u:I18n NumbersZeroToNine}"/>
-                                AutomationId="NumbersZeroToNineToggle" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
@@ -481,8 +539,7 @@
                                 StyleClass="box-value"
                                 HorizontalOptions="End"
                                 AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n SpecialCharacters}"
+                                AutomationProperties.Name="{u:I18n SpecialCharacters}"/>
-                                AutomationId="SpecialCharactersToggle" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-stepper">
@@ -497,14 +554,12 @@
                                 HorizontalOptions="FillAndExpand"
                                 HorizontalTextAlignment="End"
                                 VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
+                                VerticalTextAlignment="Center" />
-                                AutomationId="MinNumberValueLabel" />
                             <controls:ExtendedStepper
                                 Value="{Binding MinNumber}"
                                 Maximum="5"
                                 Minimum="0"
-                                Increment="1"
+                                Increment="1" />
-                                AutomationId="MinNumberStepper" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-stepper">
@@ -519,14 +574,12 @@
                                 HorizontalOptions="FillAndExpand"
                                 HorizontalTextAlignment="End"
                                 VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
+                                VerticalTextAlignment="Center" />
-                                AutomationId="MinSpecialValueLabel" />
                             <controls:ExtendedStepper
                                 Value="{Binding MinSpecial}"
                                 Maximum="5"
                                 Minimum="0"
-                                Increment="1"
+                                Increment="1" />
-                                AutomationId="MinSpecialStepper" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout StyleClass="box-row, box-row-switch">
@@ -537,8 +590,7 @@
                             <Switch
                                 IsToggled="{Binding AvoidAmbiguousChars}"
                                 StyleClass="box-value"
-                                HorizontalOptions="End"
+                                HorizontalOptions="End" />
-                                AutomationId="AvoidAmbiguousCharsToggle" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                     </StackLayout>

src/App/Pages/Generator/GeneratorPageViewModel.cs

@@ -8,7 +8,6 @@ using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
-using Bit.Core.Exceptions;
 using Bit.Core.Models.Domain;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -24,7 +23,7 @@ namespace Bit.App.Pages
         private readonly IUsernameGenerationService _usernameGenerationService;
         private readonly ITokenService _tokenService;
         private readonly IDeviceActionService _deviceActionService;
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
+        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
 
         private PasswordGenerationOptions _options;
         private UsernameGenerationOptions _usernameOptions;
@@ -50,7 +49,11 @@ namespace Bit.App.Pages
         private bool _doneIniting;
         private bool _showTypePicker;
         private string _emailWebsite;
-        private bool _showForwardedEmailApiSecret;
+        private bool _showFirefoxRelayApiAccessToken;
+        private bool _showAnonAddyApiAccessToken;
+        private bool _showSimpleLoginApiKey;
+        private bool _showDuckDuckGoApiKey;
+        private bool _showFastmailApiKey;
         private bool _editMode;
 
         public GeneratorPageViewModel()
@@ -93,7 +96,7 @@ namespace Bit.App.Pages
             UsernameTypePromptHelpCommand = new Command(UsernameTypePromptHelp);
             RegenerateCommand = new AsyncCommand(RegenerateAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
             RegenerateUsernameCommand = new AsyncCommand(RegenerateUsernameAsync, onException: ex => OnSubmitException(ex), allowsMultipleExecutions: false);
-            ToggleForwardedEmailHiddenValueCommand = new Command(() => ShowForwardedEmailApiSecret = !ShowForwardedEmailApiSecret);
+            ToggleForwardedEmailHiddenValueCommand = new AsyncCommand(ToggleForwardedEmailHiddenValueAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
             CopyCommand = new AsyncCommand(CopyAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
             CloseCommand = new AsyncCommand(CloseAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
         }
@@ -412,6 +415,7 @@ namespace Bit.App.Pages
 
         public string UsernameTypeDescriptionLabel => GetUsernameTypeLabelDescription(UsernameTypeSelected);
 
+
         public ForwardedEmailServiceType ForwardedEmailServiceSelected
         {
             get => _usernameOptions.ServiceType;
@@ -421,11 +425,7 @@ namespace Bit.App.Pages
                 {
                     _usernameOptions.ServiceType = value;
                     Username = Constants.DefaultUsernameGenerated;
-                    TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected), new string[]
+                    TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
-                    {
-                        nameof(ForwardedEmailApiSecret),
-                        nameof(ForwardedEmailApiSecretLabel)
-                    });
                     SaveUsernameOptionsAsync(false).FireAndForget();
                 }
             }
@@ -445,104 +445,27 @@ namespace Bit.App.Pages
             }
         }
 
-        public string ForwardedEmailApiSecret
+        public string AnonAddyApiAccessToken
         {
-            get
+            get => _usernameOptions.AnonAddyApiAccessToken;
-            {
-                switch (ForwardedEmailServiceSelected)
-                {
-                    case ForwardedEmailServiceType.AnonAddy:
-                        return _usernameOptions.AnonAddyApiAccessToken;
-                    case ForwardedEmailServiceType.DuckDuckGo:
-                        return _usernameOptions.DuckDuckGoApiKey;
-                    case ForwardedEmailServiceType.Fastmail:
-                        return _usernameOptions.FastMailApiKey;
-                    case ForwardedEmailServiceType.FirefoxRelay:
-                        return _usernameOptions.FirefoxRelayApiAccessToken;
-                    case ForwardedEmailServiceType.SimpleLogin:
-                        return _usernameOptions.SimpleLoginApiKey;
-                    default:
-                        return null;
-                }
-            }
             set
             {
-                bool changed = false;
-                switch (ForwardedEmailServiceSelected)
-                {
-                    case ForwardedEmailServiceType.AnonAddy:
                 if (_usernameOptions.AnonAddyApiAccessToken != value)
                 {
                     _usernameOptions.AnonAddyApiAccessToken = value;
-                            changed = true;
+                    TriggerPropertyChanged(nameof(AnonAddyApiAccessToken));
-                        }
-                        break;
-                    case ForwardedEmailServiceType.DuckDuckGo:
-                        if (_usernameOptions.DuckDuckGoApiKey != value)
-                        {
-                            _usernameOptions.DuckDuckGoApiKey = value;
-                            changed = true;
-                        }
-                        break;
-                    case ForwardedEmailServiceType.Fastmail:
-                        if (_usernameOptions.FastMailApiKey != value)
-                        {
-                            _usernameOptions.FastMailApiKey = value;
-                            changed = true;
-                        }
-                        break;
-                    case ForwardedEmailServiceType.FirefoxRelay:
-                        if (_usernameOptions.FirefoxRelayApiAccessToken != value)
-                        {
-                            _usernameOptions.FirefoxRelayApiAccessToken = value;
-                            changed = true;
-                        }
-                        break;
-                    case ForwardedEmailServiceType.SimpleLogin:
-                        if (_usernameOptions.SimpleLoginApiKey != value)
-                        {
-                            _usernameOptions.SimpleLoginApiKey = value;
-                            changed = true;
-                        }
-                        break;
-                    default:
-                        break;
-                }
-
-                if (changed)
-                {
-                    TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
                     SaveUsernameOptionsAsync(false).FireAndForget();
                 }
             }
         }
 
-        public string ForwardedEmailApiSecretLabel
+        public bool ShowAnonAddyApiAccessToken
         {
             get
             {
-                switch (ForwardedEmailServiceSelected)
+                return _showAnonAddyApiAccessToken;
-                {
-                    case ForwardedEmailServiceType.AnonAddy:
-                    case ForwardedEmailServiceType.FirefoxRelay:
-                        return AppResources.APIAccessToken;
-                    case ForwardedEmailServiceType.DuckDuckGo:
-                    case ForwardedEmailServiceType.Fastmail:
-                    case ForwardedEmailServiceType.SimpleLogin:
-                        return AppResources.APIKeyRequiredParenthesis;
-                    default:
-                        return null;
             }
-            }
+            set => SetProperty(ref _showAnonAddyApiAccessToken, value);
-        }
-
-        public bool ShowForwardedEmailApiSecret
-        {
-            get
-            {
-                return _showForwardedEmailApiSecret;
-            }
-            set => SetProperty(ref _showForwardedEmailApiSecret, value);
         }
 
         public string AnonAddyDomainName
@@ -559,6 +482,99 @@ namespace Bit.App.Pages
             }
         }
 
+        public string FirefoxRelayApiAccessToken
+        {
+            get => _usernameOptions.FirefoxRelayApiAccessToken;
+            set
+            {
+                if (_usernameOptions.FirefoxRelayApiAccessToken != value)
+                {
+                    _usernameOptions.FirefoxRelayApiAccessToken = value;
+                    TriggerPropertyChanged(nameof(FirefoxRelayApiAccessToken));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowFirefoxRelayApiAccessToken
+        {
+            get
+            {
+                return _showFirefoxRelayApiAccessToken;
+            }
+            set => SetProperty(ref _showFirefoxRelayApiAccessToken, value);
+        }
+
+        public string SimpleLoginApiKey
+        {
+            get => _usernameOptions.SimpleLoginApiKey;
+            set
+            {
+                if (_usernameOptions.SimpleLoginApiKey != value)
+                {
+                    _usernameOptions.SimpleLoginApiKey = value;
+                    TriggerPropertyChanged(nameof(SimpleLoginApiKey));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowSimpleLoginApiKey
+        {
+            get
+            {
+                return _showSimpleLoginApiKey;
+            }
+            set => SetProperty(ref _showSimpleLoginApiKey, value);
+        }
+
+        public string DuckDuckGoApiKey
+        {
+            get => _usernameOptions.DuckDuckGoApiKey;
+            set
+            {
+                if (_usernameOptions.DuckDuckGoApiKey != value)
+                {
+                    _usernameOptions.DuckDuckGoApiKey = value;
+                    TriggerPropertyChanged(nameof(DuckDuckGoApiKey));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowDuckDuckGoApiKey
+        {
+            get
+            {
+                return _showDuckDuckGoApiKey;
+            }
+            set => SetProperty(ref _showDuckDuckGoApiKey, value);
+        }
+
+
+        public string FastmailApiKey
+        {
+            get => _usernameOptions.FastMailApiKey;
+            set
+            {
+                if (_usernameOptions.FastMailApiKey != value)
+                {
+                    _usernameOptions.FastMailApiKey = value;
+                    TriggerPropertyChanged(nameof(FastmailApiKey));
+                    SaveUsernameOptionsAsync(false).FireAndForget();
+                }
+            }
+        }
+
+        public bool ShowFastmailApiKey
+        {
+            get
+            {
+                return _showFastmailApiKey;
+            }
+            set => SetProperty(ref _showFastmailApiKey, value);
+        }
+
         public bool CapitalizeRandomWordUsername
         {
             get => _usernameOptions.CapitalizeRandomWordUsername;
@@ -791,9 +807,12 @@ namespace Bit.App.Pages
             TriggerPropertyChanged(nameof(PlusAddressedEmailTypeSelected));
             TriggerPropertyChanged(nameof(IncludeNumberRandomWordUsername));
             TriggerPropertyChanged(nameof(CapitalizeRandomWordUsername));
-            TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
+            TriggerPropertyChanged(nameof(SimpleLoginApiKey));
-            TriggerPropertyChanged(nameof(ForwardedEmailApiSecretLabel));
+            TriggerPropertyChanged(nameof(FirefoxRelayApiAccessToken));
             TriggerPropertyChanged(nameof(AnonAddyDomainName));
+            TriggerPropertyChanged(nameof(AnonAddyApiAccessToken));
+            TriggerPropertyChanged(nameof(DuckDuckGoApiKey));
+            TriggerPropertyChanged(nameof(FastmailApiKey));
             TriggerPropertyChanged(nameof(CatchAllEmailDomain));
             TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
             TriggerPropertyChanged(nameof(UsernameTypeSelected));
@@ -826,25 +845,17 @@ namespace Bit.App.Pages
         {
             _logger.Value.Exception(ex);
 
-            string message = AppResources.GenericErrorMessage;
-
             if (IsUsername && UsernameTypeSelected == UsernameType.ForwardedEmailAlias)
             {
-                if (ex is ForwardedEmailInvalidSecretException)
+                await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(
-                {
+                    AppResources.AnErrorHasOccurred, string.Format(AppResources.UnknownXErrorMessage, ForwardedEmailServiceSelected), AppResources.Ok));
-                    message = ForwardedEmailServiceSelected == ForwardedEmailServiceType.AnonAddy || ForwardedEmailServiceSelected == ForwardedEmailServiceType.FirefoxRelay
-                                ? AppResources.InvalidAPIToken
-                                : AppResources.InvalidAPIKey;
             }
             else
             {
-                    message = string.Format(AppResources.UnknownXErrorMessage, ForwardedEmailServiceSelected);
+                await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok));
             }
         }
 
-            await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(AppResources.AnErrorHasOccurred, message, AppResources.Ok));
-        }
-
         private string GetUsernameTypeLabelDescription(UsernameType value)
         {
             switch (value)
@@ -859,5 +870,27 @@ namespace Bit.App.Pages
                     return string.Empty;
             }
         }
+
+        private async Task ToggleForwardedEmailHiddenValueAsync()
+        {
+            switch (ForwardedEmailServiceSelected)
+            {
+                case ForwardedEmailServiceType.AnonAddy:
+                    ShowAnonAddyApiAccessToken = !ShowAnonAddyApiAccessToken;
+                    break;
+                case ForwardedEmailServiceType.FirefoxRelay:
+                    ShowFirefoxRelayApiAccessToken = !ShowFirefoxRelayApiAccessToken;
+                    break;
+                case ForwardedEmailServiceType.SimpleLogin:
+                    ShowSimpleLoginApiKey = !ShowSimpleLoginApiKey;
+                    break;
+                case ForwardedEmailServiceType.DuckDuckGo:
+                    ShowDuckDuckGoApiKey = !ShowDuckDuckGoApiKey;
+                    break;
+                case ForwardedEmailServiceType.Fastmail:
+                    ShowFastmailApiKey = !ShowFastmailApiKey;
+                    break;
+            }
+        }
     }
 }

src/App/Pages/Send/SendAddEditPage.xaml

@@ -71,8 +71,7 @@
                             <Label
                                 Text="{u:I18n SendDisabledWarning}"
                                 StyleClass="text-muted, text-sm, text-bold"
-                                HorizontalTextAlignment="Center"
+                                HorizontalTextAlignment="Center" />
-                                AutomationId="SendDisabledWarningMessageLabel" />
                         </Frame>
                         <Frame
                             IsVisible="{Binding SendOptionsPolicyInEffect}"
@@ -84,8 +83,7 @@
                             <Label
                                 Text="{u:I18n SendOptionsPolicyInEffect}"
                                 StyleClass="text-muted, text-sm, text-bold"
-                                HorizontalTextAlignment="Center"
+                                HorizontalTextAlignment="Center" />
-                                AutomationId="SendOptionsPolicyInEffectLabel" />
                         </Frame>
                         <StackLayout StyleClass="box-row">
                             <Label
@@ -95,8 +93,7 @@
                                 x:Name="_nameEntry"
                                 Text="{Binding Send.Name}"
                                 IsEnabled="{Binding SendEnabled}"
-                                StyleClass="box-value"
+                                StyleClass="box-value" />
-                                AutomationId="SendNameEntry" />
                             <Label
                                 Text="{u:I18n NameInfo}"
                                 StyleClass="box-footer-label"
@@ -126,7 +123,6 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n File}"
                                     AutomationProperties.HelpText="{Binding FileTypeAccessibilityLabel}"
-                                    AutomationId="SendFileButton"
                                     Grid.Column="0">
                                 </Button>
                                 <Button
@@ -139,7 +135,6 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n Text}"
                                     AutomationProperties.HelpText="{Binding TextTypeAccessibilityLabel}"
-                                    AutomationId="SendTextButton"
                                     Grid.Column="1">
                                 </Button>
                             </Grid>
@@ -157,14 +152,12 @@
                                     Text="{Binding Send.File.FileName, Mode=OneWay}"
                                     StyleClass="box-value"
                                     VerticalTextAlignment="Center"
-                                    HorizontalOptions="StartAndExpand"
+                                    HorizontalOptions="StartAndExpand" />
-                                    AutomationId="SendFileNameLabel" />
                                 <Label
                                     Text="{Binding Send.File.SizeName, Mode=OneWay}"
                                     StyleClass="box-sub-label"
                                     HorizontalTextAlignment="End"
-                                    VerticalTextAlignment="Center"
+                                    VerticalTextAlignment="Center" />
-                                    AutomationId="SendFileSizeLabel" />
                             </StackLayout>
                             <StackLayout
                                 IsVisible="{Binding EditMode, Converter={StaticResource inverseBool}}"
@@ -175,23 +168,20 @@
                                     LineBreakMode="CharacterWrap"
                                     StyleClass="text-sm, text-muted"
                                     HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Center"
+                                    HorizontalTextAlignment="Center" />
-                                    AutomationId="SendNoFileChosenLabel" />
                                 <Label
                                     IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
                                     Text="{Binding FileName}"
                                     LineBreakMode="CharacterWrap"
                                     StyleClass="text-sm, text-muted"
                                     HorizontalOptions="FillAndExpand"
-                                    HorizontalTextAlignment="Center"
+                                    HorizontalTextAlignment="Center" />
-                                    AutomationId="SendCurrentFileNameLabel" />
                                 <Button
                                     Text="{u:I18n ChooseFile}"
                                     IsVisible="{Binding IsAddFromShare, Converter={StaticResource inverseBool}}"
                                     IsEnabled="{Binding SendEnabled}"
                                     StyleClass="box-button-row"
-                                    Clicked="ChooseFile_Clicked"
+                                    Clicked="ChooseFile_Clicked" />
-                                    AutomationId="SendChooseFileButton" />
                                 <Label
                                     Margin="0, 5, 0, 0"
                                     Text="{u:I18n MaxFileSize}"
@@ -218,7 +208,6 @@
                                 IsEnabled="{Binding SendEnabled}"
                                 StyleClass="box-value"
                                 Margin="{Binding EditorMargins}" 
-                                AutomationId="SendTextContentEntry"
                                 effects:ScrollEnabledEffect.IsScrollEnabled="false" >
                                 <Editor.Behaviors>
                                     <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
@@ -246,8 +235,7 @@
                                     IsToggled="{Binding Send.Text.Hidden}"
                                     IsEnabled="{Binding SendEnabled}"
                                     HorizontalOptions="End"
-                                    Margin="10,0,0,0"
+                                    Margin="10,0,0,0" />
-                                    AutomationId="SendHideTextByDefaultToggle" />
                             </StackLayout>
                         </StackLayout>
                         <StackLayout
@@ -261,8 +249,7 @@
                                 IsToggled="{Binding ShareOnSave}"
                                 IsEnabled="{Binding SendEnabled}"
                                 HorizontalOptions="End"
-                                Margin="10,0,0,0"
+                                Margin="10,0,0,0" />
-                                AutomationId="SendShareSendAfterSaveToggle" />
                         </StackLayout>
                         <StackLayout
                             Orientation="Horizontal"
@@ -276,24 +263,21 @@
                                 StyleClass="box-row-button"
                                 TextColor="{DynamicResource PrimaryColor}"
                                 Margin="0"
-                                AutomationProperties.IsInAccessibleTree="False"
+                                AutomationProperties.IsInAccessibleTree="False"/>
-                                AutomationId="SendShowHideOptionsButton" />
                             <controls:IconButton
                                 x:Name="_btnOptionsUp"
                                 Text="{Binding Source={x:Static core:BitwardenIcons.ChevronUp}}"
                                 StyleClass="box-row-button"
                                 TextColor="{DynamicResource PrimaryColor}"
                                 IsVisible="{Binding ShowOptions}" 
-                                AutomationProperties.IsInAccessibleTree="False"
+                                AutomationProperties.IsInAccessibleTree="False"/>
-                                AutomationId="SendOptionsDisplayed" />
                             <controls:IconButton
                                 x:Name="_btnOptionsDown"
                                 Text="{Binding Source={x:Static core:BitwardenIcons.AngleDown}}"
                                 StyleClass="box-row-button"
                                 TextColor="{DynamicResource PrimaryColor}"
                                 IsVisible="{Binding ShowOptions, Converter={StaticResource inverseBool}}" 
-                                AutomationProperties.IsInAccessibleTree="False"
+                                AutomationProperties.IsInAccessibleTree="False"/>
-                                AutomationId="SendOptionsHidden" />
                         </StackLayout>
                         <StackLayout IsVisible="{Binding ShowOptions}">
                             <StackLayout
@@ -310,8 +294,7 @@
                                     IsEnabled="{Binding SendEnabled}"
                                     StyleClass="box-value"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n DeletionTime}"
+                                    AutomationProperties.Name="{u:I18n DeletionTime}" />
-                                    AutomationId="SendDeletionOptionsPicker" />
                                 <Grid
                                     IsVisible="{Binding ShowDeletionCustomPickers}"
                                     Margin="0,5,0,0">
@@ -325,16 +308,14 @@
                                         IsEnabled="{Binding SendEnabled}"
                                         AutomationProperties.IsInAccessibleTree="True"
                                         AutomationProperties.Name="{u:I18n DeletionDate}"
-                                        Grid.Column="0"
+                                        Grid.Column="0" />
-                                        AutomationId="SendCustomDeletionDatePicker" />
                                     <controls:ExtendedTimePicker
                                         NullableTime="{Binding DeletionDateTimeViewModel.Time, Mode=TwoWay}"
                                         Format="t"
                                         IsEnabled="{Binding SendEnabled}"
                                         AutomationProperties.IsInAccessibleTree="True"
                                         AutomationProperties.Name="{u:I18n DeletionTime}"
-                                        Grid.Column="1"
+                                        Grid.Column="1" />
-                                        AutomationId="SendCustomDeletionTimePicker" />
                                 </Grid>
                                 <Label
                                     Text="{u:I18n DeletionDateInfo}"
@@ -353,8 +334,7 @@
                                     IsEnabled="{Binding SendEnabled}"
                                     StyleClass="box-value"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n ExpirationTime}"
+                                    AutomationProperties.Name="{u:I18n ExpirationTime}" />
-                                    AutomationId="SendExpirationOptionsPicker" />
                                 <Grid
                                     IsVisible="{Binding ShowExpirationCustomPickers}"
                                     Margin="0,5,0,0">
@@ -369,8 +349,7 @@
                                         IsEnabled="{Binding SendEnabled}"
                                         AutomationProperties.IsInAccessibleTree="True"
                                         AutomationProperties.Name="{u:I18n ExpirationDate}"
-                                        Grid.Column="0"
+                                        Grid.Column="0" />
-                                        AutomationId="SendCustomExpirationDatePicker" />
                                     <controls:ExtendedTimePicker
                                         NullableTime="{Binding ExpirationDateTimeViewModel.Time, Mode=TwoWay}"
                                         PlaceHolder="--:-- --"
@@ -378,8 +357,7 @@
                                         IsEnabled="{Binding SendEnabled}"
                                         AutomationProperties.IsInAccessibleTree="True"
                                         AutomationProperties.Name="{u:I18n ExpirationTime}"
-                                        Grid.Column="1"
+                                        Grid.Column="1" />
-                                        AutomationId="SendCustomExpirationTimePicker" />
                                 </Grid>
                                 <StackLayout
                                     Orientation="Horizontal"
@@ -396,8 +374,7 @@
                                         FontSize="{Binding SegmentedButtonFontSize}"
                                         IsEnabled="{Binding SendEnabled}"
                                         StyleClass="box-row-button"
-                                        Clicked="ClearExpirationDate_Clicked"
+                                        Clicked="ClearExpirationDate_Clicked" />
-                                        AutomationId="SendClearExpirationDateButton" />
                                 </StackLayout>
                             </StackLayout>
                             <StackLayout
@@ -416,15 +393,13 @@
                                         Keyboard="Numeric"
                                         MaxLength="9"
                                         TextChanged="OnMaxAccessCountTextChanged"
-                                        HorizontalOptions="FillAndExpand"
+                                        HorizontalOptions="FillAndExpand" />
-                                        AutomationId="SendMaxAccessCountEntry" />
                                     <controls:ExtendedStepper
                                         x:Name="_maxAccessCountStepper"
                                         Value="{Binding MaxAccessCount}"
                                         Maximum="999999999"
                                         IsEnabled="{Binding SendEnabled}"
-                                        Margin="10,0,0,0"
+                                        Margin="10,0,0,0" />
-                                        AutomationId="SendMaxAccessCountStepper" />
                                 </StackLayout>
                                 <Label
                                     Text="{u:I18n MaximumAccessCountInfo}"
@@ -444,8 +419,7 @@
                                     <Label
                                         Text="{Binding Send.AccessCount, Mode=OneWay}"
                                         StyleClass="box-label"
-                                        VerticalTextAlignment="Center"
+                                        VerticalTextAlignment="Center" />
-                                        AutomationId="SendCurrentAccessCountLabel" />
                                 </StackLayout>
                             </StackLayout>
                             <StackLayout
@@ -462,8 +436,7 @@
                                         StyleClass="box-value"
                                         IsSpellCheckEnabled="False"
                                         IsTextPredictionEnabled="False"
-                                        HorizontalOptions="FillAndExpand"
+                                        HorizontalOptions="FillAndExpand" />
-                                        AutomationId="SendNewPasswordEntry" />
                                     <controls:IconButton
                                         IsEnabled="{Binding SendEnabled}"
                                         StyleClass="box-row-button, box-row-button-platform"
@@ -472,8 +445,7 @@
                                         Margin="10,0,0,0"
                                         AutomationProperties.IsInAccessibleTree="True"
                                         AutomationProperties.Name="{u:I18n ToggleVisibility}"
-                                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
-                                        AutomationId="SendShowHidePasswordButton" />
                                 </StackLayout>
                                 <Label
                                     Text="{u:I18n PasswordInfo}"
@@ -492,8 +464,7 @@
                                     IsEnabled="{Binding SendEnabled}"
                                     StyleClass="box-value"
                                     Margin="{Binding EditorMargins}"
-                                    effects:ScrollEnabledEffect.IsScrollEnabled="false"
+                                    effects:ScrollEnabledEffect.IsScrollEnabled="false" >
-                                    AutomationId="SendNotesEntry">
                                     <Editor.Behaviors>
                                         <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
                                     </Editor.Behaviors>
@@ -521,8 +492,7 @@
                                     IsToggled="{Binding Send.HideEmail}"
                                     IsEnabled="{Binding DisableHideEmailControl, Converter={StaticResource inverseBool}}"
                                     HorizontalOptions="End"
-                                    Margin="10,0,0,0"
+                                    Margin="10,0,0,0" />
-                                    AutomationId="SendHideEmailSwitch" />
                             </StackLayout>
                             <StackLayout
                                 StyleClass="box-row, box-row-switch"
@@ -536,8 +506,7 @@
                                     IsToggled="{Binding Send.Disabled}"
                                     IsEnabled="{Binding SendEnabled}"
                                     HorizontalOptions="End"
-                                    Margin="10,0,0,0"
+                                    Margin="10,0,0,0" />
-                                    AutomationId="SendDeactivateSwitch" />
                             </StackLayout>
                         </StackLayout>
 

src/App/Pages/Send/SendAddOnlyPage.xaml

@@ -25,8 +25,7 @@
             Priority="-2"
             UseOriginalImage="True"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
+            AutomationProperties.Name="{u:I18n Account}" />
-            AutomationId="AccountIconButton" />
         <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" x:Name="_closeItem" />
         <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" x:Name="_saveItem"/>
     </ContentPage.ToolbarItems>

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml

@@ -44,15 +44,13 @@
                 <controls:SendViewCell
                     Send="{Binding Send}"
                     ButtonCommand="{Binding BindingContext.SendOptionsCommand, Source={x:Reference _page}}"
-                    ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}"
+                    ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}" />
-                    AutomationId="SendCell" />
             </DataTemplate>
 
             <DataTemplate x:Key="sendGroupTemplate"
                           x:DataType="pages:SendGroupingsPageListItem">
                 <controls:ExtendedStackLayout Orientation="Horizontal" 
-                                              StyleClass="list-row, list-row-platform"
+                                              StyleClass="list-row, list-row-platform">
-                                              AutomationId="{Binding AutomationId}">
                     <controls:IconLabel Text="{Binding Icon, Mode=OneWay}"
                                       HorizontalOptions="Start"
                                       VerticalOptions="Center"
@@ -66,14 +64,12 @@
                            LineBreakMode="TailTruncation"
                            HorizontalOptions="FillAndExpand"
                            VerticalOptions="CenterAndExpand"
-                           StyleClass="list-title"
+                           StyleClass="list-title" />
-                           AutomationId="SendFilterNameLabel" />
                     <Label Text="{Binding ItemCount, Mode=OneWay}"
                            HorizontalOptions="End"
                            VerticalOptions="CenterAndExpand"
                            HorizontalTextAlignment="End"
-                           StyleClass="list-sub"
+                           StyleClass="list-sub" />
-                           AutomationId="SendFilterCountLabel" />
                 </controls:ExtendedStackLayout>
             </DataTemplate>
 

src/App/Pages/Send/SendGroupingsPage/SendGroupingsPageListItem.cs

@@ -66,27 +66,5 @@ namespace Bit.App.Pages
                 return _icon;
             }
         }
-
-        public string AutomationId
-        {
-            get
-            {
-                if (_name != null)
-                {
-                    return "SendItem";
-                }
-                if (Type != null)
-                {
-                    switch (Type.Value)
-                    {
-                        case SendType.Text:
-                            return "SendTextFilter";
-                        case SendType.File:
-                            return "SendFileFilter";
-                    }
-                }
-                return null;
-            }
-        }
     }
 }

src/App/Pages/Send/SendsPage.xaml

@@ -59,8 +59,7 @@
                Margin="20, 0"
                VerticalOptions="CenterAndExpand"
                HorizontalOptions="CenterAndExpand"
-               HorizontalTextAlignment="Center"
+               HorizontalTextAlignment="Center" />
-               AutomationId="NoSendDisplayedLabel" />
         <controls:ExtendedCollectionView
                IsVisible="{Binding ShowList}"
                ItemsSource="{Binding Sends}"
@@ -68,15 +67,13 @@
                SelectionMode="Single"
                SelectionChanged="RowSelected"
                StyleClass="list, list-platform"
-               ExtraDataForLogging="Sends Page"
+               ExtraDataForLogging="Sends Page">
-               AutomationId="SendCellList">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="views:SendView">
                     <controls:SendViewCell
                         Send="{Binding .}"
                         ButtonCommand="{Binding BindingContext.SendOptionsCommand, Source={x:Reference _page}}"
-                        ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}"
+                        ShowOptions="{Binding BindingContext.SendEnabled, Source={x:Reference _page}}" />
-                        AutomationId="SendCell" />
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </controls:ExtendedCollectionView>

src/App/Pages/Settings/BlockAutofillUrisPage.xaml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.BlockAutofillUrisPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    xmlns:controls="clr-namespace:Bit.App.Controls"
-    xmlns:u="clr-namespace:Bit.App.Utilities"
-    xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
-    x:DataType="pages:BlockAutofillUrisPageViewModel"
-    Title="{u:I18n BlockAutoFill}">
-    <ContentPage.BindingContext>
-        <pages:BlockAutofillUrisPageViewModel />
-    </ContentPage.BindingContext>
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <u:InverseBoolConverter x:Key="inverseBool" />
-        </ResourceDictionary>
-    </ContentPage.Resources>
-    <StackLayout Orientation="Vertical">
-        <Image
-            x:Name="_emptyUrisPlaceholder"
-            HorizontalOptions="Center"
-            WidthRequest="120"
-            HeightRequest="120"
-            Margin="0,100,0,0"
-            IsVisible="{Binding ShowList, Converter={StaticResource inverseBool}}"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n ThereAreNoBlockedURIs}" />
-        <controls:CustomLabel
-            StyleClass="box-label-regular"
-            Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
-            FontWeight="500"
-            HorizontalTextAlignment="Center"
-            Margin="14,10,14,0"/>
-        <controls:ExtendedCollectionView
-            ItemsSource="{Binding BlockedUris}"
-            IsVisible="{Binding ShowList}"
-            VerticalOptions="FillAndExpand"
-            Margin="0,5,0,0"
-            SelectionMode="None"
-            StyleClass="list, list-platform"
-            ExtraDataForLogging="Blocked Autofill Uris"
-            AutomationId="BlockedUrisCellList">
-            <CollectionView.ItemTemplate>
-                <DataTemplate x:DataType="pages:BlockAutofillUriItemViewModel">
-                    <StackLayout
-                        Orientation="Vertical"
-                        AutomationId="BlockedUriCell">
-                        <StackLayout
-                            Orientation="Horizontal">
-                            <controls:CustomLabel
-                                VerticalOptions="Center"
-                                StyleClass="box-label-regular"
-                                Text="{Binding Uri}"
-                                MaxLines="2"
-                                LineBreakMode="TailTruncation"
-                                FontWeight="500"
-                                Margin="15,0,0,0"
-                                HorizontalOptions="StartAndExpand"/>
-                            <controls:IconButton
-                                StyleClass="box-row-button-muted, box-row-button-platform"
-                                Text="{Binding Source={x:Static core:BitwardenIcons.PencilSquare}}"
-                                Command="{Binding EditUriCommand}"
-                                Margin="5,0,15,0"
-                                AutomationProperties.IsInAccessibleTree="True"
-                                AutomationProperties.Name="{u:I18n EditURI}"
-                                AutomationId="EditUriButton" />
-                        </StackLayout>
-                        <BoxView StyleClass="box-row-separator" />
-                    </StackLayout>
-                </DataTemplate>
-            </CollectionView.ItemTemplate>
-        </controls:ExtendedCollectionView>
-        <Button
-            Text="{u:I18n NewBlockedURI}"
-            Command="{Binding AddUriCommand}"
-            VerticalOptions="End"
-            HeightRequest="40"
-            Opacity="0.8"
-            Margin="14,5,14,10"
-            AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n NewBlockedURI}"
-            AutomationId="NewBlockedUriButton" />
-    </StackLayout>
-</pages:BaseContentPage>

src/App/Pages/Settings/BlockAutofillUrisPage.xaml.cs

@@ -1,44 +0,0 @@
-using System.Threading.Tasks;
-using Bit.App.Styles;
-using Bit.App.Utilities;
-using Bit.Core.Utilities;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public partial class BlockAutofillUrisPage : BaseContentPage, IThemeDirtablePage
-    {
-        private readonly BlockAutofillUrisPageViewModel _vm;
-
-        public BlockAutofillUrisPage()
-        {
-            InitializeComponent();
-
-            _vm = BindingContext as BlockAutofillUrisPageViewModel;
-            _vm.Page = this;
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            _vm.InitAsync().FireAndForget(_ => Navigation.PopAsync());
-
-            UpdatePlaceholder();
-        }
-
-        public override async Task UpdateOnThemeChanged()
-        {
-            await base.UpdateOnThemeChanged();
-
-            UpdatePlaceholder();
-        }
-
-        private void UpdatePlaceholder()
-        {
-            MainThread.BeginInvokeOnMainThread(() =>
-                _emptyUrisPlaceholder.Source = ImageSource.FromFile(ThemeManager.UsingLightTheme ? "empty_uris_placeholder" : "empty_uris_placeholder_dark"));
-        }
-    }
-}

src/App/Pages/Settings/BlockAutofillUrisPageViewModel.cs

@@ -1,186 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.App.Abstractions;
-using Bit.App.Resources;
-using Bit.Core;
-using Bit.Core.Abstractions;
-using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace Bit.App.Pages
-{
-    public class BlockAutofillUrisPageViewModel : BaseViewModel
-    {
-        private const char URI_SEPARARTOR = ',';
-        private const string URI_FORMAT = "https://domain.com";
-
-        private readonly IStateService _stateService;
-        private readonly IDeviceActionService _deviceActionService;
-
-        public BlockAutofillUrisPageViewModel()
-        {
-            _stateService = ServiceContainer.Resolve<IStateService>();
-            _deviceActionService = ServiceContainer.Resolve<IDeviceActionService>();
-
-            AddUriCommand = new AsyncCommand(AddUriAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-
-            EditUriCommand = new AsyncCommand<BlockAutofillUriItemViewModel>(EditUriAsync,
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
-        }
-
-        public ObservableRangeCollection<BlockAutofillUriItemViewModel> BlockedUris { get; set; } = new ObservableRangeCollection<BlockAutofillUriItemViewModel>();
-
-        public bool ShowList => BlockedUris.Any();
-
-        public ICommand AddUriCommand { get; }
-
-        public ICommand EditUriCommand { get; }
-
-        public async Task InitAsync()
-        {
-            var blockedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
-            if (blockedUrisList?.Any() != true)
-            {
-                return;
-            }
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                BlockedUris.AddRange(blockedUrisList.OrderBy(uri => uri).Select(u => new BlockAutofillUriItemViewModel(u, EditUriCommand)).ToList());
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-        }
-
-        private async Task AddUriAsync()
-        {
-            var response = await _deviceActionService.DisplayValidatablePromptAsync(new Utilities.Prompts.ValidatablePromptConfig
-            {
-                Title = AppResources.NewUri,
-                Subtitle = AppResources.EnterURI,
-                ValueSubInfo = string.Format(AppResources.FormatXSeparateMultipleURIsWithAComma, URI_FORMAT),
-                OkButtonText = AppResources.Save,
-                ValidateText = text => ValidateUris(text, true)
-            });
-            if (response?.Text is null)
-            {
-                return;
-            }
-
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                foreach (var uri in response.Value.Text.Split(URI_SEPARARTOR).Where(s => !string.IsNullOrEmpty(s)))
-                {
-                    var cleanedUri = uri.Replace(Environment.NewLine, string.Empty).Trim();
-                    BlockedUris.Add(new BlockAutofillUriItemViewModel(cleanedUri, EditUriCommand));
-                }
-
-                BlockedUris = new ObservableRangeCollection<BlockAutofillUriItemViewModel>(BlockedUris.OrderBy(b => b.Uri));
-                TriggerPropertyChanged(nameof(BlockedUris));
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-            await UpdateAutofillBlacklistedUrisAsync();
-            _deviceActionService.Toast(AppResources.URISaved);
-        }
-
-        private async Task EditUriAsync(BlockAutofillUriItemViewModel uriItemViewModel)
-        {
-            var response = await _deviceActionService.DisplayValidatablePromptAsync(new Utilities.Prompts.ValidatablePromptConfig
-            {
-                Title = AppResources.EditURI,
-                Subtitle = AppResources.EnterURI,
-                Text = uriItemViewModel.Uri,
-                ValueSubInfo = string.Format(AppResources.FormatX, URI_FORMAT),
-                OkButtonText = AppResources.Save,
-                ThirdButtonText = AppResources.Remove,
-                ValidateText = text => ValidateUris(text, false)
-            });
-            if (response is null)
-            {
-                return;
-            }
-
-            if (response.Value.ExecuteThirdAction)
-            {
-                await MainThread.InvokeOnMainThreadAsync(() =>
-                {
-                    BlockedUris.Remove(uriItemViewModel);
-                    TriggerPropertyChanged(nameof(ShowList));
-                });
-                await UpdateAutofillBlacklistedUrisAsync();
-                _deviceActionService.Toast(AppResources.URIRemoved);
-                return;
-            }
-
-            var cleanedUri = response.Value.Text.Replace(Environment.NewLine, string.Empty).Trim();
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-                BlockedUris.Remove(uriItemViewModel);
-                BlockedUris.Add(new BlockAutofillUriItemViewModel(cleanedUri, EditUriCommand));
-                BlockedUris = new ObservableRangeCollection<BlockAutofillUriItemViewModel>(BlockedUris.OrderBy(b => b.Uri));
-                TriggerPropertyChanged(nameof(BlockedUris));
-                TriggerPropertyChanged(nameof(ShowList));
-            });
-            await UpdateAutofillBlacklistedUrisAsync();
-            _deviceActionService.Toast(AppResources.URISaved);
-        }
-
-        private string ValidateUris(string uris, bool allowMultipleUris)
-        {
-            if (string.IsNullOrWhiteSpace(uris))
-            {
-                return string.Format(AppResources.FormatX, URI_FORMAT);
-            }
-
-            if (!allowMultipleUris && uris.Contains(URI_SEPARARTOR))
-            {
-                return AppResources.CannotEditMultipleURIsAtOnce;
-            }
-
-            foreach (var uri in uris.Split(URI_SEPARARTOR).Where(u => !string.IsNullOrWhiteSpace(u)))
-            {
-                var cleanedUri = uri.Replace(Environment.NewLine, string.Empty).Trim();
-                if (!cleanedUri.StartsWith("http://") && !cleanedUri.StartsWith("https://") &&
-                    !cleanedUri.StartsWith(Constants.AndroidAppProtocol))
-                {
-                    return AppResources.InvalidFormatUseHttpsHttpOrAndroidApp;
-                }
-
-                if (!Uri.TryCreate(cleanedUri, UriKind.Absolute, out var _))
-                {
-                    return AppResources.InvalidURI;
-                }
-
-                if (BlockedUris.Any(uriItem => uriItem.Uri == cleanedUri))
-                {
-                    return string.Format(AppResources.TheURIXIsAlreadyBlocked, cleanedUri);
-                }
-            }
-
-            return null;
-        }
-
-        private async Task UpdateAutofillBlacklistedUrisAsync()
-        {
-            await _stateService.SetAutofillBlacklistedUrisAsync(BlockedUris.Any() ? BlockedUris.Select(bu => bu.Uri).ToList() : null);
-        }
-    }
-
-    public class BlockAutofillUriItemViewModel : ExtendedViewModel
-    {
-        public BlockAutofillUriItemViewModel(string uri, ICommand editUriCommand)
-        {
-            Uri = uri;
-            EditUriCommand = new Command(() => editUriCommand.Execute(this));
-        }
-
-        public string Uri { get; }
-
-        public ICommand EditUriCommand { get; }
-    }
-}

src/App/Pages/Settings/FolderAddEditPage.xaml

@@ -13,13 +13,8 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Cancel}"
+        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-                     Clicked="Close_Clicked"
+        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" />
-                     Order="Primary"
-                     Priority="-1" />
-        <ToolbarItem Text="{u:I18n Save}"
-                     Clicked="Save_Clicked"
-                     Order="Primary" />
         <ToolbarItem Text="{u:I18n Delete}"
                      Clicked="Delete_Clicked"
                      Order="Secondary"
@@ -48,8 +43,7 @@
                         StyleClass="box-value"
                         x:Name="_nameEntry"
                         ReturnType="Go"
-                        ReturnCommand="{Binding SubmitCommand}"
+                        ReturnCommand="{Binding SubmitCommand}" />
-                        AutomationId="FolderNameEntry" />
                 </StackLayout>
             </StackLayout>
         </StackLayout>

src/App/Pages/Settings/FoldersPage.xaml

@@ -31,8 +31,7 @@
                        Margin="20, 0"
                        VerticalOptions="CenterAndExpand"
                        HorizontalOptions="CenterAndExpand"
-                       HorizontalTextAlignment="Center"
+                       HorizontalTextAlignment="Center"></Label>
-                       AutomationId="NoFoldersLabel"></Label>
                 <controls:ExtendedCollectionView
                           IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                           ItemsSource="{Binding Folders}"
@@ -45,12 +44,10 @@
                         <DataTemplate x:DataType="views:FolderView">
                             <controls:ExtendedStackLayout
                                 StyleClass="list-row, list-row-platform"
-                                Padding="10"
+                                Padding="10">
-                                AutomationId="FolderCell">
                                 <Label LineBreakMode="TailTruncation"
                                         StyleClass="list-title, list-title-platform"
-                                        Text="{Binding Name, Mode=OneWay}"
+                                        Text="{Binding Name, Mode=OneWay}" />
-                                        AutomationId="FolderName" />
                             </controls:ExtendedStackLayout>
                         </DataTemplate>
                     </CollectionView.ItemTemplate>

src/App/Pages/Settings/OptionsPage.xaml

@@ -27,8 +27,7 @@
                         x:Name="_themePicker"
                         ItemsSource="{Binding ThemeOptions, Mode=OneTime}"
                         SelectedIndex="{Binding ThemeSelectedIndex}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="ThemeSelectorPicker" />
                 </StackLayout>
                 <Label
                     StyleClass="box-footer-label"
@@ -45,8 +44,7 @@
                         x:Name="_autoDarkThemePicker"
                         ItemsSource="{Binding AutoDarkThemeOptions, Mode=OneTime}"
                         SelectedIndex="{Binding AutoDarkThemeSelectedIndex}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="DefaultDarkThemePicker" />
                 </StackLayout>
                 <Label
                     StyleClass="box-footer-label"
@@ -61,8 +59,7 @@
                         x:Name="_uriMatchPicker"
                         ItemsSource="{Binding UriMatchOptions, Mode=OneTime}"
                         SelectedIndex="{Binding UriMatchSelectedIndex}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="DefaultUriMatchDetectionPicker" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n DefaultUriMatchDetectionDescription}"
@@ -77,8 +74,7 @@
                         x:Name="_clearClipboardPicker"
                         ItemsSource="{Binding ClearClipboardOptions, Mode=OneTime}"
                         SelectedIndex="{Binding ClearClipboardSelectedIndex}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="ClearClipboardPicker" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n ClearClipboardDescription}"
@@ -94,8 +90,7 @@
                         ItemsSource="{Binding LocalesOptions, Mode=OneTime}"
                         SelectedItem="{Binding SelectedLocale}"
                         ItemDisplayBinding="{Binding Value}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="LanguagePicker" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n LanguageChangeRequiresAppRestart}"
@@ -110,8 +105,7 @@
                     <Switch
                         IsToggled="{Binding AutoTotpCopy}"
                         StyleClass="box-value"
-                        HorizontalOptions="End"
+                        HorizontalOptions="End" />
-                        AutomationId="CopyTotpAutomaticallyToggle" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n CopyTotpAutomaticallyDescription}"
@@ -126,8 +120,7 @@
                     <Switch
                         IsToggled="{Binding Favicon}"
                         StyleClass="box-value"
-                        HorizontalOptions="End"
+                        HorizontalOptions="End" />
-                        AutomationId="ShowWebsiteIconsToggle" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n ShowWebsiteIconsDescription}"
@@ -153,14 +146,22 @@
                     StyleClass="box-footer-label, box-footer-label-switch" />
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowAndroidAutofillSettings}">
-                <StackLayout.GestureRecognizers>
+                <StackLayout StyleClass="box-row, box-row-input">
-                    <TapGestureRecognizer Command="{Binding GoToBlockAutofillUrisCommand}" />
-                </StackLayout.GestureRecognizers>
                     <Label
-                    Text="{u:I18n BlockAutoFill}"
+                        Text="{u:I18n AutofillBlockedUris}"
-                    StyleClass="box-label-regular" />
+                        StyleClass="box-label" />
+                    <Editor
+                        x:Name="_autofillBlockedUrisEditor"
+                        Text="{Binding AutofillBlockedUris}"
+                        StyleClass="box-value"
+                        AutoSize="TextChanges"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        Keyboard="Url"
+                        Unfocused="AutofillBlockedUrisEditor_Unfocused" />
+                </StackLayout>
                 <Label
-                    Text="{u:I18n AutoFillWillNotBeOfferedForTheseURIs}"
+                    Text="{u:I18n AutofillBlockedUrisDescription}"
                     StyleClass="box-footer-label" />
             </StackLayout>
         </StackLayout>

src/App/Pages/Settings/OptionsPage.xaml.cs

@@ -1,4 +1,6 @@
-using Bit.Core.Abstractions;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.Core.Abstractions;
 using Bit.Core.Utilities;
 using Xamarin.Forms;
 using Xamarin.Forms.PlatformConfiguration;
@@ -42,6 +44,17 @@ namespace Bit.App.Pages
             await _vm.InitAsync();
         }
 
+        protected async override void OnDisappearing()
+        {
+            base.OnDisappearing();
+            await _vm.UpdateAutofillBlockedUris();
+        }
+
+        private async void AutofillBlockedUrisEditor_Unfocused(object sender, FocusEventArgs e)
+        {
+            await _vm.UpdateAutofillBlockedUris();
+        }
+
         private async void Close_Clicked(object sender, System.EventArgs e)
         {
             if (DoOnce())

src/App/Pages/Settings/OptionsPageViewModel.cs

@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Resources;
 using Bit.App.Utilities;
+using Bit.Core;
 using Bit.Core.Abstractions;
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -20,6 +19,7 @@ namespace Bit.App.Pages
         private readonly IPlatformUtilsService _platformUtilsService;
 
         private bool _autofillSavePrompt;
+        private string _autofillBlockedUris;
         private bool _favicon;
         private bool _autoTotpCopy;
         private int _clearClipboardSelectedIndex;
@@ -84,10 +84,6 @@ namespace Bit.App.Pages
                 new KeyValuePair<string, string>(null, AppResources.DefaultSystem)
             };
             LocalesOptions.AddRange(_i18nService.LocaleNames.ToList());
-
-            GoToBlockAutofillUrisCommand = new AsyncCommand(() => Page.Navigation.PushAsync(new BlockAutofillUrisPage()),
-                onException: ex => HandleException(ex),
-                allowsMultipleExecutions: false);
         }
 
         public List<KeyValuePair<int?, string>> ClearClipboardOptions { get; set; }
@@ -196,18 +192,25 @@ namespace Bit.App.Pages
             }
         }
 
+        public string AutofillBlockedUris
+        {
+            get => _autofillBlockedUris;
+            set => SetProperty(ref _autofillBlockedUris, value);
+        }
+
         public bool ShowAndroidAutofillSettings
         {
             get => _showAndroidAutofillSettings;
             set => SetProperty(ref _showAndroidAutofillSettings, value);
         }
 
-        public ICommand GoToBlockAutofillUrisCommand { get; }
-
         public async Task InitAsync()
         {
             AutofillSavePrompt = !(await _stateService.GetAutofillDisableSavePromptAsync()).GetValueOrDefault();
 
+            var blockedUrisList = await _stateService.GetAutofillBlacklistedUrisAsync();
+            AutofillBlockedUris = blockedUrisList != null ? string.Join(", ", blockedUrisList) : null;
+
             AutoTotpCopy = !(await _stateService.GetDisableAutoTotpCopyAsync() ?? false);
 
             Favicon = !(await _stateService.GetDisableFaviconAsync()).GetValueOrDefault();
@@ -285,6 +288,41 @@ namespace Bit.App.Pages
             }
         }
 
+        public async Task UpdateAutofillBlockedUris()
+        {
+            if (_inited)
+            {
+                if (string.IsNullOrWhiteSpace(AutofillBlockedUris))
+                {
+                    await _stateService.SetAutofillBlacklistedUrisAsync(null);
+                    AutofillBlockedUris = null;
+                    return;
+                }
+                try
+                {
+                    var csv = AutofillBlockedUris;
+                    var urisList = new List<string>();
+                    foreach (var uri in csv.Split(','))
+                    {
+                        if (string.IsNullOrWhiteSpace(uri))
+                        {
+                            continue;
+                        }
+                        var cleanedUri = uri.Replace(System.Environment.NewLine, string.Empty).Trim();
+                        if (!cleanedUri.StartsWith("http://") && !cleanedUri.StartsWith("https://") &&
+                            !cleanedUri.StartsWith(Constants.AndroidAppProtocol))
+                        {
+                            continue;
+                        }
+                        urisList.Add(cleanedUri);
+                    }
+                    await _stateService.SetAutofillBlacklistedUrisAsync(urisList);
+                    AutofillBlockedUris = string.Join(", ", urisList);
+                }
+                catch { }
+            }
+        }
+
         private async Task UpdateCurrentLocaleAsync()
         {
             if (!_inited)

src/App/Pages/Settings/SettingsPage/SettingsPage.xaml

@@ -32,21 +32,19 @@
                             StyleClass="text-muted, text-sm, text-bold"
                             HorizontalTextAlignment="Center" />
                     </Frame>
-                    <controls:CustomLabel IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
+                    <Label IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
                            Text="{Binding Name, Mode=OneWay}"
                            LineBreakMode="{Binding LineBreakMode}"
                            HorizontalOptions="StartAndExpand"
                            VerticalOptions="CenterAndExpand"
-                           StyleClass="list-title"
+                           StyleClass="list-title"/>
-                           AutomationId="{Binding AutomationIdSettingName}" />
+                    <Label Text="{Binding SubLabel, Mode=OneWay}"
-                    <controls:CustomLabel  Text="{Binding SubLabel, Mode=OneWay}"
                            IsVisible="{Binding ShowSubLabel}"
                            HorizontalOptions="End"
                            HorizontalTextAlignment="End"
                            VerticalOptions="CenterAndExpand"
                            TextColor="{Binding SubLabelColor}"
-                           StyleClass="list-sub"
+                           StyleClass="list-sub" />
-                           AutomationId="{Binding AutomationIdSettingStatus}" />
                 </controls:ExtendedStackLayout>
             </DataTemplate>
             <DataTemplate
@@ -59,8 +57,7 @@
                         Padding="10"
                         HasShadow="False"
                         BackgroundColor="Transparent"
-                        BorderColor="{DynamicResource PrimaryColor}"
+                        BorderColor="{DynamicResource PrimaryColor}">
-                        AutomationId="SettingActivePolicyTextLabel">
                         <Label
                             Text="{Binding Name, Mode=OneWay}"
                             StyleClass="text-muted, text-sm, text-bold"
@@ -78,8 +75,7 @@
                                 VerticalOptions="Center"
                                 FontSize="Small"
                                 TextColor="{Binding SubLabelColor}"
-                                StyleClass="list-sub" Margin="-5"
+                                StyleClass="list-sub" Margin="-5"/>
-                                AutomationId="SettingCustomVaultTimeoutPicker" />
                     <controls:ExtendedStackLayout.GestureRecognizers>
 			            <TapGestureRecognizer Tapped="ActivateTimePicker"/>
 		            </controls:ExtendedStackLayout.GestureRecognizers>

src/App/Pages/Settings/SettingsPage/SettingsPageListItem.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Globalization;
 using System.Threading.Tasks;
 using Bit.App.Resources;
 using Bit.App.Utilities;
-using Bit.App.Utilities.Automation;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -24,29 +22,5 @@ namespace Bit.App.Pages
         public Color SubLabelColor => SubLabelTextEnabled ?
             ThemeManager.GetResourceColor("SuccessColor") :
             ThemeManager.GetResourceColor("MutedColor");
-
-        public string AutomationIdSettingName
-        {
-            get
-            {
-                return AutomationIdsHelper.AddSuffixFor(
-                    UseFrame ? "EnabledPolicy"
-                             : AutomationIdsHelper.ToEnglishTitleCase(Name)
-                    , SuffixType.Cell);
-            }
-        }
-
-        public string AutomationIdSettingStatus
-        {
-            get
-            {
-                if (UseFrame)
-                {
-                    return null;
-                }
-
-                return AutomationIdsHelper.AddSuffixFor(AutomationIdsHelper.ToEnglishTitleCase(Name), SuffixType.SettingValue);
-            }
-        }
     }
 }

src/App/Pages/Vault/AttachmentsPage.xaml

@@ -33,25 +33,23 @@
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row" Padding="10, 20"
                              IsVisible="{Binding HasAttachments, Converter={StaticResource inverseBool}}">
-                    <Label Text="{u:I18n NoAttachments}" HorizontalTextAlignment="Center" AutomationId="NoAttachmentsLabel" />
+                    <Label Text="{u:I18n NoAttachments}" HorizontalTextAlignment="Center" />
                 </StackLayout>
-                <controls:RepeaterView ItemsSource="{Binding Attachments}" IsVisible="{Binding HasAttachments}" AutomationId="AttachmentsList">
+                <controls:RepeaterView ItemsSource="{Binding Attachments}" IsVisible="{Binding HasAttachments}">
                     <controls:RepeaterView.ItemTemplate>
                         <DataTemplate x:DataType="views:AttachmentView">
                             <StackLayout Spacing="0" Padding="0">
-                                <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10" AutomationId="AttachmentRow">
+                                <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10">
                                     <Label
                                         Text="{Binding FileName, Mode=OneWay}"
                                         StyleClass="box-value"
                                         VerticalTextAlignment="Center"
-                                        HorizontalOptions="StartAndExpand"
+                                        HorizontalOptions="StartAndExpand" />
-                                        AutomationId="AttachmentFileNameLabel" />
                                     <Label
                                         Text="{Binding SizeName, Mode=OneWay}"
                                         StyleClass="box-sub-label"
                                         HorizontalTextAlignment="End"
-                                        VerticalTextAlignment="Center"
+                                        VerticalTextAlignment="Center" />
-                                        AutomationId="AttachmentFileSizeLabel" />
                                     <controls:IconButton 
                                         StyleClass="box-row-button, box-row-button-platform"
                                         Text="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
@@ -59,8 +57,7 @@
                                         CommandParameter="{Binding .}"
                                         VerticalOptions="Center"
                                         AutomationProperties.IsInAccessibleTree="True"
-                                        AutomationProperties.Name="{u:I18n Delete}"
+                                        AutomationProperties.Name="{u:I18n Delete}" />
-                                        AutomationId="AttachmentDeleteButton" />
                                 </StackLayout>
                                 <BoxView StyleClass="box-row-separator" />
                             </StackLayout>
@@ -80,20 +77,17 @@
                         LineBreakMode="CharacterWrap"
                         StyleClass="text-sm, text-muted"
                         HorizontalOptions="FillAndExpand"
-                        HorizontalTextAlignment="Center"
+                        HorizontalTextAlignment="Center" />
-                        AutomationId="NoFileChosenLabel" />
                     <Label
                         IsVisible="{Binding FileName, Converter={StaticResource notNull}}"
                         Text="{Binding FileName}"
                         LineBreakMode="CharacterWrap"
                         StyleClass="text-sm, text-muted"
                         HorizontalOptions="FillAndExpand"
-                        HorizontalTextAlignment="Center"
+                        HorizontalTextAlignment="Center" />
-                        AutomationId="NewAttachmentNameLabel" />
                 </StackLayout>
                 <Button Text="{u:I18n ChooseFile}" StyleClass="box-button-row"
-                        Clicked="ChooseFile_Clicked"
+                        Clicked="ChooseFile_Clicked"></Button>
-                        AutomationId="ChooseFileButton"></Button>
                 <Label
                     Margin="0, 10, 0, 0"
                     Text="{u:I18n MaxFileSize}"

src/App/Pages/Vault/AttachmentsPageViewModel.cs

@@ -156,7 +156,7 @@ namespace Bit.App.Pages
             // Prevent Android from locking if vault timeout set to "immediate"
             if (Device.RuntimePlatform == Device.Android)
             {
-                _vaultTimeoutService.DelayLockAndLogoutMs = 60000;
+                _vaultTimeoutService.DelayTimeoutMs = 60000;
             }
             await _fileService.SelectFileAsync();
         }

src/App/Pages/Vault/BaseCipherViewModel.cs

@@ -37,8 +37,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _cipher, value, additionalPropertyNames: AdditionalPropertiesToRaiseOnCipherChanged);
         }
 
-        public string CreationDate => string.Format(AppResources.CreatedX, Cipher.CreationDate.ToShortDateString());
-
         public AsyncCommand CheckPasswordCommand { get; }
 
         protected async Task CheckPasswordAsync()

src/App/Pages/Vault/CipherAddEditPage.xaml

@@ -57,16 +57,16 @@
                          x:Key="deleteItem" />
             
             <DataTemplate x:Key="TextCustomFieldDataTemplate">
-                <il:TextCustomFieldItemLayout AutomationId="TextCustomFieldItem" />
+                <il:TextCustomFieldItemLayout />
             </DataTemplate>
             <DataTemplate x:Key="BooleanCustomFieldDataTemplate">
-                <il:BooleanCustomFieldItemLayout AutomationId="BooleanCustomFieldItem" />
+                <il:BooleanCustomFieldItemLayout />
             </DataTemplate>
             <DataTemplate x:Key="HiddenCustomFieldDataTemplate">
-                <il:HiddenCustomFieldItemLayout AutomationId="HiddenCustomFieldItem" />
+                <il:HiddenCustomFieldItemLayout />
             </DataTemplate>
             <DataTemplate x:Key="LinkedCustomFieldDataTemplate">
-                <il:LinkedCustomFieldItemLayout AutomationId="LinkedCustomFieldItem" />
+                <il:LinkedCustomFieldItemLayout />
             </DataTemplate>
 
             <dts:CustomFieldItemTemplateSelector x:Key="CustomFieldItemTemplateSelector"
@@ -100,8 +100,7 @@
                         <Label
                             Text="{u:I18n PersonalOwnershipPolicyInEffect}"
                             StyleClass="text-muted, text-sm, text-bold"
-                            HorizontalTextAlignment="Center"
+                            HorizontalTextAlignment="Center" />
-                            AutomationId="PersonalOwnershipPolicyLabel"/>
                     </Frame>
                 </Grid>
                 <StackLayout StyleClass="box-row-header">
@@ -117,8 +116,7 @@
                         x:Name="_typePicker"
                         ItemsSource="{Binding TypeOptions, Mode=OneTime}"
                         SelectedIndex="{Binding TypeSelectedIndex}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="ItemTypePicker" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-input">
                     <Label
@@ -129,8 +127,7 @@
                         Text="{Binding Cipher.Name}"
                         StyleClass="box-value"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Name}"
+                        AutomationProperties.Name="{u:I18n Name}" />
-                        AutomationId="ItemNameEntry" />
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsLogin}" Spacing="0" Padding="0">
                     <Grid StyleClass="box-row, box-row-input"
@@ -145,8 +142,7 @@
                             StyleClass="box-value" 
                             Grid.Row="1"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}"
+                            AutomationProperties.Name="{u:I18n Username}"/>
-                            AutomationId="LoginUsernameEntry" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
@@ -154,8 +150,7 @@
                             Grid.Column="1"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n GenerateUsername}"
+                            AutomationProperties.Name="{u:I18n GenerateUsername}" />
-                            AutomationId="GenerateUsernameButton" />
                     </Grid>
                     <Grid StyleClass="box-row, box-row-input">
                         <Grid.RowDefinitions>
@@ -185,8 +180,7 @@
                             IsTextPredictionEnabled="False"
                             IsEnabled="{Binding Cipher.ViewPassword}"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Password}"
+                            AutomationProperties.Name="{u:I18n Password}"/>
-                            AutomationId="LoginPasswordEntry" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
@@ -196,8 +190,7 @@
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
                             AutomationProperties.Name="{u:I18n CheckPassword}"
-                            IsVisible="{Binding Cipher.ViewPassword}"
+                            IsVisible="{Binding Cipher.ViewPassword}" />
-                            AutomationId="CheckPasswordButton" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowPasswordIcon}"
@@ -208,8 +201,7 @@
                             AutomationProperties.IsInAccessibleTree="True"
                             AutomationProperties.Name="{u:I18n ToggleVisibility}"
                             AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                            IsVisible="{Binding Cipher.ViewPassword}"
+                            IsVisible="{Binding Cipher.ViewPassword}" />
-                            AutomationId="ViewPasswordButton" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
@@ -219,21 +211,9 @@
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
                             AutomationProperties.Name="{u:I18n GeneratePassword}"
-                            IsVisible="{Binding Cipher.ViewPassword}"
+                            IsVisible="{Binding Cipher.ViewPassword}" />
-                            AutomationId="RegeneratePasswordButton" />
                     </Grid>
 
-                    <Label
-                        Text="{u:I18n Passkey}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"
-                        IsVisible="{Binding ShowPasskeyInfo}"/>
-                    <Entry
-                        Text="{u:I18n AvailableForTwoStepLogin}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted"
-                        IsVisible="{Binding ShowPasskeyInfo}" />
-
                     <Grid StyleClass="box-row, box-row-input">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -267,8 +247,7 @@
                                 Padding="0,15"
                                 HorizontalOptions="Center"
                                 VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center"
+                                VerticalTextAlignment="Center" />
-                                AutomationId="SetupTotpButton" />
                         </Frame>
                         <controls:MonoEntry
                             x:Name="_loginTotpEntry"
@@ -283,8 +262,7 @@
                             Grid.Column="0"
                             Grid.ColumnSpan="{Binding TotpColumnSpan}"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n AuthenticatorKey}"
+                            AutomationProperties.Name="{u:I18n AuthenticatorKey}" />
-                            AutomationId="LoginTotpEntry" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -294,8 +272,7 @@
                             Grid.Column="1"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CopyTotp}"
+                            AutomationProperties.Name="{u:I18n CopyTotp}" />
-                            AutomationId="CopyTotpValueButton" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding Source={x:Static core:BitwardenIcons.Camera}}"
@@ -305,8 +282,7 @@
                             Grid.RowSpan="2"
                             IsVisible="{Binding HasTotpValue}"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ScanQrTitle}"
+                            AutomationProperties.Name="{u:I18n ScanQrTitle}" />
-                            />
                     </Grid>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
@@ -317,8 +293,7 @@
                         <Entry
                             x:Name="_cardholderNameEntry"
                             Text="{Binding Cipher.Card.CardholderName}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="CardholderNameEntry" />
                     </StackLayout>
                     <Grid StyleClass="box-row, box-row-input">
                         <Grid.RowDefinitions>
@@ -344,8 +319,7 @@
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Number}"
+                            AutomationProperties.Name="{u:I18n Number}" />
-                            AutomationId="CardNumberEntry" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowCardNumberIcon}"
@@ -354,8 +328,7 @@
                             Grid.Column="1"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ToggleVisibility}"
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                            AutomationId="ShowCardNumberButton" />
                     </Grid>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -365,8 +338,7 @@
                             x:Name="_cardBrandPicker"
                             ItemsSource="{Binding CardBrandOptions, Mode=OneTime}"
                             SelectedIndex="{Binding CardBrandSelectedIndex}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="CardBrandPicker" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -376,8 +348,7 @@
                             x:Name="_cardExpMonthPicker"
                             ItemsSource="{Binding CardExpMonthOptions, Mode=OneTime}"
                             SelectedIndex="{Binding CardExpMonthSelectedIndex}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="CardExpirationMonthPicker" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -389,8 +360,7 @@
                             StyleClass="box-value"
                             Keyboard="Numeric"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ExpirationYear}"
+                            AutomationProperties.Name="{u:I18n ExpirationYear}" />
-                            AutomationId="CardExpirationYearEntry" />
                     </StackLayout>
                     <Grid StyleClass="box-row, box-row-input">
                         <Grid.RowDefinitions>
@@ -417,8 +387,7 @@
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SecurityCode}"
+                            AutomationProperties.Name="{u:I18n SecurityCode}" />
-                            AutomationId="CardSecurityCodeEntry" />
                         <controls:IconButton 
                             StyleClass="box-row-button, box-row-button-platform"
                             Text="{Binding ShowCardCodeIcon}"
@@ -427,8 +396,7 @@
                             Grid.Column="1"
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ToggleVisibility}"
+                            AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                            AutomationId="CardShowSecurityCodeButton" />
                     </Grid>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding IsIdentity}" Spacing="0" Padding="0">
@@ -440,8 +408,7 @@
                             x:Name="_identityTitlePicker"
                             ItemsSource="{Binding IdentityTitleOptions, Mode=OneTime}"
                             SelectedIndex="{Binding IdentityTitleSelectedIndex}"
-                            StyleClass="box-value"
+                            StyleClass="box-value" />
-                            AutomationId="IdentityTitlePicker" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -452,8 +419,7 @@
                             Text="{Binding Cipher.Identity.FirstName}"
                             StyleClass="box-value,capitalize-word-input"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n FirstName}"
+                            AutomationProperties.Name="{u:I18n FirstName}"/>
-                            AutomationId="IdentityFirstNameEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -464,8 +430,7 @@
                             Text="{Binding Cipher.Identity.MiddleName}"
                             StyleClass="box-value,capitalize-word-input"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n MiddleName}"
+                            AutomationProperties.Name="{u:I18n MiddleName}" />
-                            AutomationId="IdentityMiddleNameEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -476,8 +441,7 @@
                             Text="{Binding Cipher.Identity.LastName}"
                             StyleClass="box-value,capitalize-word-input"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LastName}"
+                            AutomationProperties.Name="{u:I18n LastName}" />
-                            AutomationId="IdentityLastNameEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -488,8 +452,7 @@
                             Text="{Binding Cipher.Identity.Username}"
                             StyleClass="box-value"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Username}"
+                            AutomationProperties.Name="{u:I18n Username}" />
-                            AutomationId="IdentityUsernameEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -500,8 +463,7 @@
                             Text="{Binding Cipher.Identity.Company}"
                             StyleClass="box-value" 
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Company}"
+                            AutomationProperties.Name="{u:I18n Company}"/>
-                            AutomationId="IdentityCompanyEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -512,8 +474,7 @@
                             Text="{Binding Cipher.Identity.SSN}"
                             StyleClass="box-value" 
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n SSN}"
+                            AutomationProperties.Name="{u:I18n SSN}"/>
-                            AutomationId="IdentitySsnEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -524,8 +485,7 @@
                             Text="{Binding Cipher.Identity.PassportNumber}"
                             StyleClass="box-value" 
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n PassportNumber}"
+                            AutomationProperties.Name="{u:I18n PassportNumber}"/>
-                            AutomationId="IdentityPassportNumberEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -536,8 +496,7 @@
                             Text="{Binding Cipher.Identity.LicenseNumber}"
                             StyleClass="box-value"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n LicenseNumber}"
+                            AutomationProperties.Name="{u:I18n LicenseNumber}" />
-                            AutomationId="IdentityLicenseNumberEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -549,8 +508,7 @@
                             Text="{Binding Cipher.Identity.Email}"
                             StyleClass="box-value" 
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Email}"
+                            AutomationProperties.Name="{u:I18n Email}"/>
-                            AutomationId="IdentityEmailEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -562,8 +520,7 @@
                             Keyboard="Telephone"
                             StyleClass="box-value"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Phone}"
+                            AutomationProperties.Name="{u:I18n Phone}" />
-                            AutomationId="IdentityPhoneEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -574,8 +531,7 @@
                             Text="{Binding Cipher.Identity.Address1}"
                             StyleClass="box-value" 
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address1}"
+                            AutomationProperties.Name="{u:I18n Address1}"/>
-                            AutomationId="IdentityAddressOneEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -586,8 +542,7 @@
                             Text="{Binding Cipher.Identity.Address2}"
                             StyleClass="box-value"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address2}"
+                            AutomationProperties.Name="{u:I18n Address2}" />
-                            AutomationId="IdentityAddressTwoEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -598,8 +553,7 @@
                             Text="{Binding Cipher.Identity.Address3}"
                             StyleClass="box-value"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Address3}"
+                            AutomationProperties.Name="{u:I18n Address3}" />
-                            AutomationId="IdentityAddressThreeEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -610,8 +564,7 @@
                             Text="{Binding Cipher.Identity.City}"
                             StyleClass="box-value,capitalize-sentence-input"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n CityTown}"
+                            AutomationProperties.Name="{u:I18n CityTown}" />
-                            AutomationId="IdentityCityEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -622,8 +575,7 @@
                             Text="{Binding Cipher.Identity.State}"
                             StyleClass="box-value,capitalize-sentence-input"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n StateProvince}"
+                            AutomationProperties.Name="{u:I18n StateProvince}" />
-                            AutomationId="IdentityStateEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -634,8 +586,7 @@
                             Text="{Binding Cipher.Identity.PostalCode}"
                             StyleClass="box-value"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n ZipPostalCode}"
+                            AutomationProperties.Name="{u:I18n ZipPostalCode}" />
-                            AutomationId="IdentityPostalCodeEntry" />
                     </StackLayout>
                     <StackLayout StyleClass="box-row, box-row-input">
                         <Label
@@ -646,42 +597,9 @@
                             Text="{Binding Cipher.Identity.Country}"
                             StyleClass="box-value,capitalize-sentence-input"
                             AutomationProperties.IsInAccessibleTree="True"
-                            AutomationProperties.Name="{u:I18n Country}"
+                            AutomationProperties.Name="{u:I18n Country}" />
-                            AutomationId="IdentityCountryEntry" />
                     </StackLayout>
                 </StackLayout>
-
-                <StackLayout IsVisible="{Binding IsFido2Key}" Spacing="0" Padding="0">
-                    <Label
-                        Text="{u:I18n Username}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        x:Name="_fido2KeyUsernameEntry"
-                        Text="{Binding Cipher.Fido2Key.UserName}"
-                        StyleClass="box-value" 
-                        Grid.Row="1"/>
-                    <Label
-                        Text="{u:I18n Passkey}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        Text="{Binding CreationDate}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted" />
-                    <Label
-                        Text="{u:I18n Application}"
-                        StyleClass="box-label"
-                        Margin="0,10,0,0"/>
-                    <Entry
-                        Text="{Binding Cipher.Fido2Key.LaunchUri}"
-                        IsEnabled="False"
-                        StyleClass="box-value,text-muted" />
-                    <Label
-                        Text="{u:I18n YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey}"
-                        StyleClass="box-sub-label" />
-                </StackLayout>
-
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding IsLogin}">
                 <StackLayout StyleClass="box-row-header">
@@ -691,7 +609,7 @@
                 <controls:RepeaterView ItemsSource="{Binding Uris}">
                     <controls:RepeaterView.ItemTemplate>
                         <DataTemplate x:DataType="views:LoginUriView">
-                            <Grid StyleClass="box-row, box-row-input" AutomationId="UriListGrid" >
+                            <Grid StyleClass="box-row, box-row-input">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -712,8 +630,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n URI}"
+                                    AutomationProperties.Name="{u:I18n URI}" />
-                                    AutomationId="LoginUriEntry" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Cog}}"
@@ -723,15 +640,13 @@
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n Options}"
+                                    AutomationProperties.Name="{u:I18n Options}" />
-                                    AutomationId="LoginUriOptionsButton" />
                             </Grid>
                         </DataTemplate>
                     </controls:RepeaterView.ItemTemplate>
                 </controls:RepeaterView>
                 <Button Text="{u:I18n NewUri}" StyleClass="box-button-row"
-                        Clicked="NewUri_Clicked"
+                        Clicked="NewUri_Clicked"></Button>
-                        AutomationId="LoginAddNewUriButton"></Button>
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
@@ -746,8 +661,7 @@
                         x:Name="_folderPicker"
                         ItemsSource="{Binding FolderOptions, Mode=OneTime}"
                         SelectedIndex="{Binding FolderSelectedIndex}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="FolderPicker" />
                 </StackLayout>
                 <StackLayout StyleClass="box-row, box-row-switch">
                     <Label
@@ -757,8 +671,7 @@
                     <Switch
                         IsToggled="{Binding Cipher.Favorite}"
                         StyleClass="box-value"
-                        HorizontalOptions="End"
+                        HorizontalOptions="End" />
-                        AutomationId="ItemFavoriteToggle" />
                 </StackLayout>
                 <StackLayout x:Name="_passwordPrompt" StyleClass="box-row, box-row-switch">
                     <Label
@@ -776,8 +689,7 @@
                         IsToggled="{Binding PasswordPrompt}"
                         Toggled="PasswordPrompt_Toggled"
                         StyleClass="box-value"
-                        HorizontalOptions="End"
+                        HorizontalOptions="End" />
-                        AutomationId="MasterPasswordRepromptToggle" />
                 </StackLayout>
                 <BoxView StyleClass="box-row-separator" />
             </StackLayout>
@@ -794,8 +706,7 @@
                         effects:ScrollEnabledEffect.IsScrollEnabled="false"
                         Text="{Binding Cipher.Notes}"
                         AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Notes}"
+                        AutomationProperties.Name="{u:I18n Notes}" >
-                        AutomationId="ItemNotesEntry">
                         <Editor.Behaviors>
                             <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
                         </Editor.Behaviors>
@@ -814,11 +725,9 @@
                 <StackLayout
                     Spacing="0"
                     BindableLayout.ItemsSource="{Binding Fields}"
-                    BindableLayout.ItemTemplateSelector="{StaticResource CustomFieldItemTemplateSelector}"
+                    BindableLayout.ItemTemplateSelector="{StaticResource CustomFieldItemTemplateSelector}" />
-                    AutomationId="CustomFieldsList" />
                 <Button Text="{u:I18n NewCustomField}" StyleClass="box-button-row"
-                        Clicked="NewField_Clicked"
+                        Clicked="NewField_Clicked"></Button>
-                        AutomationId="NewCustomFieldButton"></Button>
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowOwnershipOptions}">
                 <StackLayout StyleClass="box-row-header">
@@ -833,8 +742,7 @@
                         x:Name="_ownershipPicker"
                         ItemsSource="{Binding OwnershipOptions, Mode=OneTime}"
                         SelectedIndex="{Binding OwnershipSelectedIndex}"
-                        StyleClass="box-value"
+                        StyleClass="box-value" />
-                        AutomationId="ItemOwnershipPicker" />
                 </StackLayout>
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowCollections}">
@@ -845,8 +753,7 @@
                 <StackLayout Spacing="0" Padding="0"
                                 IsVisible="{Binding HasCollections, Converter={StaticResource inverseBool}}">
                     <StackLayout StyleClass="box-row, box-row-switch">
-                        <Label Text="{u:I18n NoCollectionsToList}"
+                        <Label Text="{u:I18n NoCollectionsToList}" />
-                               AutomationId="NoCollectionsToListLabel" />
                     </StackLayout>
                     <BoxView StyleClass="box-row-separator" />
                 </StackLayout>
@@ -856,17 +763,15 @@
                     <controls:RepeaterView.ItemTemplate>
                         <DataTemplate x:DataType="pages:CollectionViewModel">
                             <StackLayout Spacing="0" Padding="0">
-                                <StackLayout StyleClass="box-row, box-row-switch" AutomationId="CollectionItemCell">
+                                <StackLayout StyleClass="box-row, box-row-switch">
                                     <Label
                                         Text="{Binding Collection.Name}"
                                         StyleClass="box-label-regular"
-                                        HorizontalOptions="StartAndExpand"
+                                        HorizontalOptions="StartAndExpand" />
-                                        AutomationId="CollectionItemNameLabel" />
                                     <Switch
                                         IsToggled="{Binding Checked}"
                                         StyleClass="box-value"
-                                        HorizontalOptions="End"
+                                        HorizontalOptions="End"/>
-                                        AutomationId="CollectionItemSwitch" />
                                 </StackLayout>
                                 <BoxView StyleClass="box-row-separator" />
                             </StackLayout>
@@ -876,4 +781,5 @@
             </StackLayout>
         </StackLayout>
     </ScrollView>
+
 </pages:BaseContentPage>

src/App/Pages/Vault/CipherAddEditPageViewModel.cs

@@ -88,6 +88,7 @@ namespace Bit.App.Pages
             _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
             _accountsManager = ServiceContainer.Resolve<IAccountsManager>();
 
+
             GeneratePasswordCommand = new Command(GeneratePassword);
             TogglePasswordCommand = new Command(TogglePassword);
             ToggleCardNumberCommand = new Command(ToggleCardNumber);
@@ -296,7 +297,6 @@ namespace Bit.App.Pages
         public bool IsIdentity => Cipher?.Type == CipherType.Identity;
         public bool IsCard => Cipher?.Type == CipherType.Card;
         public bool IsSecureNote => Cipher?.Type == CipherType.SecureNote;
-        public bool IsFido2Key => Cipher?.Type == CipherType.Fido2Key;
         public bool ShowUris => IsLogin && Cipher.Login.HasUris;
         public bool ShowAttachments => Cipher.HasAttachments;
         public string ShowPasswordIcon => ShowPassword ? BitwardenIcons.EyeSlash : BitwardenIcons.Eye;
@@ -309,7 +309,6 @@ namespace Bit.App.Pages
         public string PasswordVisibilityAccessibilityText => ShowPassword ? AppResources.PasswordIsVisibleTapToHide : AppResources.PasswordIsNotVisibleTapToShow;
         public bool HasTotpValue => IsLogin && !string.IsNullOrEmpty(Cipher?.Login?.Totp);
         public string SetupTotpText => $"{BitwardenIcons.Camera} {AppResources.SetupTotp}";
-        public bool ShowPasskeyInfo => Cipher?.Login?.Fido2Key != null && !CloneMode;
 
         public void Init()
         {
@@ -368,11 +367,6 @@ namespace Bit.App.Pages
                         {
                             Cipher.OrganizationId = OrganizationId;
                         }
-                        if (Cipher.Type == CipherType.Login)
-                        {
-                            // passkeys can't be cloned
-                            Cipher.Login.Fido2Key = null;
-                        }
                     }
                     if (appOptions?.OtpData != null && Cipher.Type == CipherType.Login)
                     {

src/App/Pages/Vault/CipherDetailsPage.xaml

@@ -45,20 +45,20 @@
                          x:Name="_attachmentsItem" x:Key="attachmentsItem" />
             <ToolbarItem Text="{u:I18n Delete}" Clicked="Delete_Clicked" Order="Secondary" IsDestructive="True"
                          x:Name="_deleteItem" x:Key="deleteItem" />
-            <ToolbarItem Text="{u:I18n Clone}" Command="{Binding CloneCommand}" Order="Secondary"
+            <ToolbarItem Text="{u:I18n Clone}" Clicked="Clone_Clicked" Order="Secondary"
                          x:Name="_cloneItem" x:Key="cloneItem" />
 
             <DataTemplate x:Key="TextCustomFieldDataTemplate">
-                <il:TextCustomFieldItemLayout AutomationId="TextCustomFieldItem" />
+                <il:TextCustomFieldItemLayout />
             </DataTemplate>
             <DataTemplate x:Key="BooleanCustomFieldDataTemplate">
-                <il:BooleanCustomFieldItemLayout AutomationId="BooleanCustomFieldItem" />
+                <il:BooleanCustomFieldItemLayout />
             </DataTemplate>
             <DataTemplate x:Key="HiddenCustomFieldDataTemplate">
-                <il:HiddenCustomFieldItemLayout AutomationId="HiddenCustomFieldItem" />
+                <il:HiddenCustomFieldItemLayout />
             </DataTemplate>
             <DataTemplate x:Key="LinkedCustomFieldDataTemplate">
-                <il:LinkedCustomFieldItemLayout AutomationId="LinkedCustomFieldItem" />
+                <il:LinkedCustomFieldItemLayout />
             </DataTemplate>
 
             <dts:CustomFieldItemTemplateSelector x:Key="CustomFieldItemTemplateSelector"
@@ -69,26 +69,23 @@
 
             <ScrollView x:Key="scrollView" x:Name="_scrollView">
                 <StackLayout Spacing="20" x:Name="_mainLayout">
-                    <StackLayout StyleClass="box" AutomationId="ItemInformationSection">
+                    <StackLayout StyleClass="box">
                         <StackLayout StyleClass="box-row-header">
                             <Label Text="{u:I18n ItemInformation, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <StackLayout StyleClass="box-row" AutomationId="ItemRow">
+                        <StackLayout StyleClass="box-row">
                             <Label
                                 Text="{u:I18n Name}"
-                                StyleClass="box-label"
+                                StyleClass="box-label" />
-                                AutomationId="ItemName" />
                             <Label
                                 Text="{Binding Cipher.Name, Mode=OneWay}"
-                                StyleClass="box-value"
+                                StyleClass="box-value" />
-                                AutomationId="ItemValue" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                         <StackLayout IsVisible="{Binding IsLogin}" Spacing="0" Padding="0">
                             <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}"
+                                  IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}">
-                                  AutomationId="ItemRow">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -101,14 +98,12 @@
                                     Text="{u:I18n Username}"
                                     StyleClass="box-label"
                                     Grid.Row="0"
-                                    Grid.Column="0"
+                                    Grid.Column="0" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Login.Username, Mode=OneWay}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
-                                    Grid.Column="0"
+                                    Grid.Column="0" />
-                                    AutomationId="ItemValue" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -118,14 +113,12 @@
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyUsername}"
+                                    AutomationProperties.Name="{u:I18n CopyUsername}" />
-                                    AutomationId="CopyValueButton" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}" />
                             <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}"
+                                  IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}">
-                                  AutomationId="ItemRow">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -140,23 +133,20 @@
                                     Text="{u:I18n Password}"
                                     StyleClass="box-label"
                                     Grid.Row="0"
-                                    Grid.Column="0"
+                                    Grid.Column="0" />
-                                    AutomationId="ItemName" />
                                 <controls:MonoLabel
                                     Text="{Binding Cipher.Login.MaskedPassword, Mode=OneWay}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0"
-                                    IsVisible="{Binding ShowPassword, Converter={StaticResource inverseBool}}"
+                                    IsVisible="{Binding ShowPassword, Converter={StaticResource inverseBool}}" />
-                                    AutomationId="ItemValue" />
                                 <controls:MonoLabel
                                     Text="{Binding ColoredPassword, Mode=OneWay}"
                                     StyleClass="box-value, text-html"
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     LineBreakMode="CharacterWrap"
-                                    IsVisible="{Binding ShowPassword}"
+                                    IsVisible="{Binding ShowPassword}" />
-                                    AutomationId="ItemValue" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
@@ -166,8 +156,7 @@
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n CheckPassword}"
-                                    IsVisible="{Binding Cipher.ViewPassword}"
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
-                                    AutomationId="CheckPasswordButton" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowPasswordIcon}"
@@ -178,8 +167,7 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                     AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                    IsVisible="{Binding Cipher.ViewPassword}"
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
-                                    AutomationId="ShowValueButton" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -190,24 +178,11 @@
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n CopyPassword}"
-                                    IsVisible="{Binding Cipher.ViewPassword}"
+                                    IsVisible="{Binding Cipher.ViewPassword}" />
-                                    AutomationId="CopyValueButton" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}" />
-                            <Label
+                            <Grid StyleClass="box-row" IsVisible="{Binding ShowTotp}">
-                                Text="{u:I18n Passkey}"
-                                StyleClass="box-label"
-                                Margin="0,10,0,0"
-                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}"/>
-                            <Entry
-                                Text="{u:I18n AvailableForTwoStepLogin}"
-                                IsEnabled="False"
-                                StyleClass="box-value,text-muted"
-                                IsVisible="{Binding Cipher.Login.Fido2Key, Converter={StaticResource notNull}}" />
-                            <Grid StyleClass="box-row"
-                                  IsVisible="{Binding ShowTotp}"
-                                  AutomationId="ItemRow">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -222,8 +197,7 @@
                                     Text="{u:I18n VerificationCodeTotp}"
                                     StyleClass="box-label"
                                     Grid.Row="0"
-                                    Grid.Column="0"
+                                    Grid.Column="0" />
-                                    AutomationId="ItemName" />
                                 <controls:MonoLabel
                                     Text="{Binding TotpCodeFormatted, Mode=OneWay}"
                                     IsVisible="{Binding ShowUpgradePremiumTotpText, Converter={StaticResource inverseBool}}"
@@ -231,16 +205,14 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     VerticalTextAlignment="Start"
-                                    VerticalOptions="Start"
+                                    VerticalOptions="Start" />
-                                    AutomationId="ItemValue" />
                                 <controls:CircularProgressbarView
                                     Progress="{Binding TotpProgress}"
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
                                     HorizontalOptions="FillAndExpand"
-                                    VerticalOptions="FillAndExpand"
+                                    VerticalOptions="FillAndExpand" />
-                                    AutomationId="LoginTotpProgressBar" />
                                 <Label
                                     Text="{Binding TotpSec, Mode=OneWay}"
                                     Style="{DynamicResource textTotp}"
@@ -262,8 +234,7 @@
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyTotp}"
+                                    AutomationProperties.Name="{u:I18n CopyTotp}" />
-                                    AutomationId="CopyValueButton" />
                                 <Label
                                     Text="{u:I18n PremiumSubscriptionRequired}"
                                     StyleClass="box-footer-label"
@@ -271,29 +242,24 @@
                                     Margin="0,5,0,2"
                                     Grid.Column="0"
                                     Grid.Row="1"
-                                    HorizontalOptions="FillAndExpand"
+                                    HorizontalOptions="FillAndExpand" />
-                                    AutomationId="ShowUpgradePremiumTotpLabel" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowTotp}" />
                         </StackLayout>
                         <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Card.CardholderName, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Card.CardholderName, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n CardholderName}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Card.CardholderName, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Card.CardholderName, Converter={StaticResource stringHasValue}}" />
                             <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Card.Number, Converter={StaticResource stringHasValue}}"
+                                  IsVisible="{Binding Cipher.Card.Number, Converter={StaticResource stringHasValue}}">
-                                  AutomationId="ItemRow">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -307,22 +273,19 @@
                                     Text="{u:I18n Number}"
                                     StyleClass="box-label"
                                     Grid.Row="0"
-                                    Grid.Column="0"
+                                    Grid.Column="0" />
-                                    AutomationId="ItemName" />
                                 <controls:MonoLabel
                                     Text="{Binding Cipher.Card.MaskedNumber, Mode=OneWay}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0"
-                                    IsVisible="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}"
+                                    IsVisible="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}" />
-                                    AutomationId="ItemValue" />
                                 <controls:MonoLabel
                                     Text="{Binding Cipher.Card.Number, Mode=OneWay}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0"
-                                    IsVisible="{Binding ShowCardNumber}"
+                                    IsVisible="{Binding ShowCardNumber}" />
-                                    AutomationId="ItemValue" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowCardNumberIcon}"
@@ -331,8 +294,7 @@
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n ToggleVisibility}"
+                                    AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                                    AutomationId="ShowValueButton" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -342,42 +304,34 @@
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyNumber}"
+                                    AutomationProperties.Name="{u:I18n CopyNumber}" />
-                                    AutomationId="CopyValueButton" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Card.Number, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Card.Brand, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Card.Brand, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n Brand}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Card.Brand, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Card.Brand, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Card.Expiration, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Card.Expiration, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n Expiration}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Card.Expiration, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Card.Expiration, Converter={StaticResource stringHasValue}}" />
                             <Grid StyleClass="box-row"
-                                  IsVisible="{Binding Cipher.Card.Code, Converter={StaticResource stringHasValue}}"
+                                  IsVisible="{Binding Cipher.Card.Code, Converter={StaticResource stringHasValue}}">
-                                  AutomationId="ItemRow">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -391,22 +345,19 @@
                                     Text="{u:I18n SecurityCode}"
                                     StyleClass="box-label"
                                     Grid.Row="0"
-                                    Grid.Column="0"
+                                    Grid.Column="0" />
-                                    AutomationId="ItemName" />
                                 <controls:MonoLabel
                                     Text="{Binding Cipher.Card.MaskedCode, Mode=OneWay}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0"
-                                    IsVisible="{Binding ShowCardCode, Converter={StaticResource inverseBool}}"
+                                    IsVisible="{Binding ShowCardCode, Converter={StaticResource inverseBool}}" />
-                                    AutomationId="ItemValue" />
                                 <controls:MonoLabel
                                     Text="{Binding Cipher.Card.Code, Mode=OneWay}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0"
-                                    IsVisible="{Binding ShowCardCode}"
+                                    IsVisible="{Binding ShowCardCode}" />
-                                    AutomationId="ItemValue" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowCardCodeIcon}"
@@ -415,8 +366,7 @@
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n ToggleVisibility}"
+                                    AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                                    AutomationId="ShowValueButton" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -426,228 +376,138 @@
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopySecurityCode}"
+                                    AutomationProperties.Name="{u:I18n CopySecurityCode}" />
-                                    AutomationId="CopyValueButton" />
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Card.Code, Converter={StaticResource stringHasValue}}" />
                         </StackLayout>
                         <StackLayout IsVisible="{Binding IsIdentity}" Spacing="0" Padding="0">
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.FullName, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.FullName, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n IdentityName}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.FullName, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.FullName, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Username, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.Username, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n Username}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Username, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.Username, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Company, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.Company, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n Company}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Company, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.Company, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.SSN, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.SSN, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n SSN}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.SSN, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.SSN, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.PassportNumber, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.PassportNumber, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n PassportNumber}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.PassportNumber, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.PassportNumber, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.LicenseNumber, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.LicenseNumber, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n LicenseNumber}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.LicenseNumber, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.LicenseNumber, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Email, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.Email, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n Email}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Email, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.Email, Converter={StaticResource stringHasValue}}" />
                             <StackLayout StyleClass="box-row"
-                                         IsVisible="{Binding Cipher.Identity.Phone, Converter={StaticResource stringHasValue}}"
+                                         IsVisible="{Binding Cipher.Identity.Phone, Converter={StaticResource stringHasValue}}">
-                                         AutomationId="ItemRow" >
                                 <Label
                                     Text="{u:I18n Phone}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Phone, Mode=OneWay}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="ItemValue" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Identity.Phone, Converter={StaticResource stringHasValue}}" />
-                            <StackLayout StyleClass="box-row" IsVisible="{Binding ShowIdentityAddress}"
+                            <StackLayout StyleClass="box-row" IsVisible="{Binding ShowIdentityAddress}">
-                                         AutomationId="ItemRow">
                                 <Label
                                     Text="{u:I18n Address}"
-                                    StyleClass="box-label"
+                                    StyleClass="box-label" />
-                                    AutomationId="ItemName" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Address1, Mode=OneWay}"
                                     IsVisible="{Binding Cipher.Identity.Address1, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="IdentityAddressOneLabel" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Address2, Mode=OneWay}"
                                     IsVisible="{Binding Cipher.Identity.Address2, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="IdentityAddressTwoLabel" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Address3, Mode=OneWay}"
                                     IsVisible="{Binding Cipher.Identity.Address3, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="IdentityAddressThreeLabel" />
                                 <Label
                                     Text="{Binding Cipher.Identity.FullAddressPart2, Mode=OneWay}"
                                     IsVisible="{Binding Cipher.Identity.FullAddressPart2, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="IdentityFullAddressPartTwoLabel" />
                                 <Label
                                     Text="{Binding Cipher.Identity.Country, Mode=OneWay}"
                                     IsVisible="{Binding Cipher.Identity.Country, Converter={StaticResource stringHasValue}}"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value" />
-                                    AutomationId="IdentityCountryLabel" />
                             </StackLayout>
                             <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowIdentityAddress}" />
                         </StackLayout>
-                        <StackLayout
-                            IsVisible="{Binding IsFido2Key}"
-                            Spacing="0"
-                            Padding="0"
-                            Margin="0,10,0,0">
-                            <Label
-                                Text="{u:I18n Username}"
-                                StyleClass="box-label" />
-                            <Label
-                                Text="{Binding Cipher.Fido2Key.UserName, Mode=OneWay}"
-                                StyleClass="box-value" />
-                            <BoxView StyleClass="box-row-separator" Margin="0,10,0,0" />
-                            <Label
-                                Text="{u:I18n Passkey}"
-                                StyleClass="box-label"
-                                Margin="0,10,0,0" />
-                            <Label
-                                Text="{Binding CreationDate, Mode=OneWay}"
-                                StyleClass="box-value" />
-                            <BoxView StyleClass="box-row-separator" Margin="0,10,0,0" />
-                            <Grid
-                                StyleClass="box-row"
-                                RowDefinitions="Auto,*,Auto"
-                                ColumnDefinitions="*,Auto,Auto">
-                                <Label
-                                    Text="{u:I18n Application}"
-                                    StyleClass="box-label" />
-                                <Label
-                                    Grid.Row="1"
-                                    Text="{Binding Cipher.Fido2Key.LaunchUri, Mode=OneWay}"
-                                    StyleClass="box-value" />
-                                <controls:IconButton
-                                    StyleClass="box-row-button, box-row-button-platform"
-                                    Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
-                                    Command="{Binding LaunchUriCommand}"
-                                    CommandParameter="{Binding Cipher.Fido2Key}"
-                                    Grid.Column="1"
-                                    Grid.RowSpan="2"
-                                    VerticalOptions="End"
-                                    IsVisible="{Binding Cipher.Fido2Key.CanLaunch, Mode=OneWay}"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n Launch}" />
-                                <controls:IconButton
-                                    StyleClass="box-row-button, box-row-button-platform"
-                                    Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
-                                    Command="{Binding CopyCommand}"
-                                    CommandParameter="Fido2KeyApplication"
-                                    Grid.Column="2"
-                                    Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
-                                    AutomationProperties.Name="{u:I18n CopyApplication}" />
-                                <BoxView
-                                    StyleClass="box-row-separator"
-                                    Margin="0,3,0,0"
-                                    Grid.Row="2"
-                                    Grid.ColumnSpan="3" />
-                            </Grid>
-                        </StackLayout>
                     </StackLayout>
                     <StackLayout StyleClass="box" IsVisible="{Binding ShowUris}">
                         <StackLayout StyleClass="box-row-header">
                             <Label Text="{u:I18n URIs, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}" AutomationId="CipherUriContainer">
+                        <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}">
                             <controls:RepeaterView.ItemTemplate>
                                 <DataTemplate x:DataType="views:LoginUriView">
                                     <StackLayout Spacing="0" Padding="0">
-                                        <Grid StyleClass="box-row" AutomationId="UriRow">
+                                        <Grid StyleClass="box-row">
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="*" />
@@ -673,8 +533,7 @@
                                                 Text="{Binding HostOrUri, Mode=OneWay}"
                                                 StyleClass="box-value"
                                                 Grid.Row="1"
-                                                Grid.Column="0"
+                                                Grid.Column="0" />
-                                                AutomationId="UriValue" />
                                             <controls:IconButton
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding Source={x:Static core:BitwardenIcons.ShareSquare}}"
@@ -685,8 +544,7 @@
                                                 Grid.RowSpan="2"
                                                 IsVisible="{Binding CanLaunch, Mode=OneWay}"
                                                 AutomationProperties.IsInAccessibleTree="True"
-                                                AutomationProperties.Name="{u:I18n Launch}"
+                                                AutomationProperties.Name="{u:I18n Launch}" />
-                                                AutomationId="LaunchUriButton" />
                                             <controls:IconButton
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -696,8 +554,7 @@
                                                 Grid.Column="2"
                                                 Grid.RowSpan="2"
                                                 AutomationProperties.IsInAccessibleTree="True"
-                                                AutomationProperties.Name="{u:I18n Copy}"
+                                                AutomationProperties.Name="{u:I18n Copy}" />
-                                                AutomationId="CopyUriButton" />
                                         </Grid>
                                         <BoxView StyleClass="box-row-separator" />
                                     </StackLayout>
@@ -711,15 +568,14 @@
                             <Label Text="{u:I18n Notes, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <StackLayout StyleClass="box-row" AutomationId="NotesRow">
+                        <StackLayout StyleClass="box-row">
                             <controls:SelectableLabel
                                 Text="{Binding Cipher.Notes, Mode=OneWay}"
-                                StyleClass="box-value"
+                                StyleClass="box-value" />
-                                AutomationId="CipherNotesLabel" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                     </StackLayout>
-                    <StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}" AutomationId="CustomFieldsContainer">
+                    <StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}">
                         <StackLayout StyleClass="box-row-header">
                             <Label Text="{u:I18n CustomFields, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
@@ -734,23 +590,21 @@
                             <Label Text="{u:I18n Attachments, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}" AutomationId="CipherAttachmentsContainer">
+                        <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}">
                             <controls:RepeaterView.ItemTemplate>
                                 <DataTemplate x:DataType="views:AttachmentView">
                                     <StackLayout Spacing="0" Padding="0">
-                                        <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10" AutomationId="CipherAttachment">
+                                        <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10">
                                             <Label
                                                 Text="{Binding FileName, Mode=OneWay}"
                                                 StyleClass="box-value"
                                                 VerticalTextAlignment="Center"
-                                                HorizontalOptions="StartAndExpand"
+                                                HorizontalOptions="StartAndExpand" />
-                                                AutomationId="CipherAttachmentFileNameLabel" />
                                             <Label
                                                 Text="{Binding SizeName, Mode=OneWay}"
                                                 StyleClass="box-sub-label"
                                                 HorizontalTextAlignment="End"
-                                                VerticalTextAlignment="Center"
+                                                VerticalTextAlignment="Center" />
-                                                AutomationId="CipherAttachmentFileSizeLabel" />
                                             <controls:IconButton
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding Source={x:Static core:BitwardenIcons.Download}}"
@@ -758,8 +612,7 @@
                                                 CommandParameter="{Binding .}"
                                                 VerticalOptions="Center"
                                                 AutomationProperties.IsInAccessibleTree="True"
-                                                AutomationProperties.Name="{u:I18n Download}"
+                                                AutomationProperties.Name="{u:I18n Download}" />
-                                                AutomationId="CipherAttachmentDownloadButton" />
                                         </StackLayout>
                                         <BoxView StyleClass="box-row-separator" />
                                     </StackLayout>
@@ -769,20 +622,17 @@
                     </StackLayout>
                     <StackLayout StyleClass="box-bottom">
                         <Label FormattedText="{Binding UpdatedText}"
-                               StyleClass="box-footer-label"
+                               StyleClass="box-footer-label" />
-                               AutomationId="CipherUpdatedDateLabel" />
                         <Label FormattedText="{Binding PasswordUpdatedText}"
                                StyleClass="box-footer-label"
-                               IsVisible="{Binding Cipher.PasswordRevisionDisplayDate, Converter={StaticResource notNull}}"
+                               IsVisible="{Binding Cipher.PasswordRevisionDisplayDate, Converter={StaticResource notNull}}">
-                               AutomationId="CipherUpdatedPasswordDateLabel">
                             <Label.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="PasswordHistory_Tapped" />
                             </Label.GestureRecognizers>
                         </Label>
                         <Label FormattedText="{Binding PasswordHistoryText}"
                                StyleClass="box-footer-label"
-                               IsVisible="{Binding Cipher.HasPasswordHistory}"
+                               IsVisible="{Binding Cipher.HasPasswordHistory}">
-                               AutomationId="CipherPasswordHistoryLabel">
                             <Label.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="PasswordHistory_Tapped" />
                             </Label.GestureRecognizers>
@@ -812,7 +662,6 @@
             AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
             AutomationProperties.IsInAccessibleTree="True"
             AutomationProperties.Name="{u:I18n EditItem}"
-            AutomationId="CipherEditButton"
             IsVisible="{Binding CanEdit}">
             <Button.Effects>
                 <effects:FabShadowEffect />

src/App/Pages/Vault/CipherDetailsPage.xaml.cs

@@ -204,7 +204,20 @@ namespace Bit.App.Pages
             }
         }
 
-        private async void More_Clicked(object sender, EventArgs e)
+        private async void Clone_Clicked(object sender, System.EventArgs e)
+        {
+            if (DoOnce())
+            {
+                if (!await _vm.PromptPasswordAsync())
+                {
+                    return;
+                }
+                var page = new CipherAddEditPage(_vm.CipherId, cloneMode: true, cipherDetailsPage: this);
+                await Navigation.PushModalAsync(new NavigationPage(page));
+            }
+        }
+
+        private async void More_Clicked(object sender, System.EventArgs e)
         {
             if (!DoOnce())
             {
@@ -213,12 +226,8 @@ namespace Bit.App.Pages
 
             var options = new List<string> { AppResources.Attachments };
             if (_vm.Cipher.OrganizationId == null)
-            {
-                if (_vm.CanClone)
             {
                 options.Add(AppResources.Clone);
-                }
-
                 options.Add(AppResources.MoveToOrganization);
             }
             else
@@ -258,7 +267,8 @@ namespace Bit.App.Pages
             }
             else if (selection == AppResources.Clone)
             {
-                _vm.CloneCommand.Execute(null);
+                var page = new CipherAddEditPage(_vm.CipherId, cloneMode: true, cipherDetailsPage: this);
+                await Navigation.PushModalAsync(new NavigationPage(page));
             }
         }
 
@@ -292,13 +302,13 @@ namespace Bit.App.Pages
                 {
                     ToolbarItems.Remove(_collectionsItem);
                 }
-                if (_vm.CanClone && !ToolbarItems.Contains(_cloneItem))
+                if (!ToolbarItems.Contains(_cloneItem))
                 {
                     ToolbarItems.Insert(1, _cloneItem);
                 }
                 if (!ToolbarItems.Contains(_shareItem))
                 {
-                    ToolbarItems.Insert(_vm.CanClone ? 2 : 1, _shareItem);
+                    ToolbarItems.Insert(2, _shareItem);
                 }
             }
             else

src/App/Pages/Vault/CipherDetailsPageViewModel.cs

@@ -68,8 +68,7 @@ namespace Bit.App.Pages
             CopyCommand = new AsyncCommand<string>((id) => CopyAsync(id, null), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
             CopyUriCommand = new AsyncCommand<LoginUriView>(uriView => CopyAsync("LoginUri", uriView.Uri), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
             CopyFieldCommand = new AsyncCommand<FieldView>(field => CopyAsync(field.Type == FieldType.Hidden ? "H_FieldValue" : "FieldValue", field.Value), onException: ex => _logger.Exception(ex), allowsMultipleExecutions: false);
-            LaunchUriCommand = new Command<ILaunchableView>(LaunchUri);
+            LaunchUriCommand = new Command<LoginUriView>(LaunchUri);
-            CloneCommand = new AsyncCommand(CloneAsync, onException: ex => HandleException(ex), allowsMultipleExecutions: false);
             TogglePasswordCommand = new Command(TogglePassword);
             ToggleCardNumberCommand = new Command(ToggleCardNumber);
             ToggleCardCodeCommand = new Command(ToggleCardCode);
@@ -82,7 +81,6 @@ namespace Bit.App.Pages
         public ICommand CopyUriCommand { get; set; }
         public ICommand CopyFieldCommand { get; set; }
         public Command LaunchUriCommand { get; set; }
-        public ICommand CloneCommand { get; set; }
         public Command TogglePasswordCommand { get; set; }
         public Command ToggleCardNumberCommand { get; set; }
         public Command ToggleCardCodeCommand { get; set; }
@@ -148,7 +146,6 @@ namespace Bit.App.Pages
         public bool IsIdentity => Cipher?.Type == Core.Enums.CipherType.Identity;
         public bool IsCard => Cipher?.Type == Core.Enums.CipherType.Card;
         public bool IsSecureNote => Cipher?.Type == Core.Enums.CipherType.SecureNote;
-        public bool IsFido2Key => Cipher?.Type == Core.Enums.CipherType.Fido2Key;
         public FormattedString ColoredPassword => GeneratedValueFormatter.Format(Cipher.Login.Password);
         public FormattedString UpdatedText
         {
@@ -249,7 +246,6 @@ namespace Bit.App.Pages
         public double TotpProgress => string.IsNullOrEmpty(TotpSec) ? 0 : double.Parse(TotpSec) * 100 / _totpInterval;
         public bool IsDeleted => Cipher.IsDeleted;
         public bool CanEdit => !Cipher.IsDeleted;
-        public bool CanClone => Cipher.IsClonable;
 
         public async Task<bool> LoadAsync(Action finishedLoadingAction = null)
         {
@@ -409,6 +405,12 @@ namespace Bit.App.Pages
                     AppResources.InternetConnectionRequiredTitle);
                 return false;
             }
+            var confirmed = await _platformUtilsService.ShowDialogAsync(AppResources.DoYouReallyWantToRestoreCipher,
+                null, AppResources.Yes, AppResources.Cancel);
+            if (!confirmed)
+            {
+                return false;
+            }
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.Restoring);
@@ -643,11 +645,6 @@ namespace Bit.App.Pages
                 text = Cipher.Card.Code;
                 name = AppResources.SecurityCode;
             }
-            else if (id == "Fido2KeyApplication")
-            {
-                text = Cipher.Fido2Key?.LaunchUri;
-                name = AppResources.Application;
-            }
 
             if (text != null)
             {
@@ -671,25 +668,14 @@ namespace Bit.App.Pages
             }
         }
 
-        private void LaunchUri(ILaunchableView launchableView)
+        private void LaunchUri(LoginUriView uri)
         {
-            if (launchableView.CanLaunch && (Page as BaseContentPage).DoOnce())
+            if (uri.CanLaunch && (Page as BaseContentPage).DoOnce())
             {
-                _platformUtilsService.LaunchUri(launchableView.LaunchUri);
+                _platformUtilsService.LaunchUri(uri.LaunchUri);
             }
         }
 
-        private async Task CloneAsync()
-        {
-            if (!await CanCloneAsync() || !await PromptPasswordAsync())
-            {
-                return;
-            }
-
-            var page = new CipherAddEditPage(CipherId, cloneMode: true, cipherDetailsPage: Page as CipherDetailsPage);
-            await Page.Navigation.PushModalAsync(new NavigationPage(page));
-        }
-
         public async Task<bool> PromptPasswordAsync()
         {
             if (Cipher.Reprompt == CipherRepromptType.None || _passwordReprompted)
@@ -699,21 +685,5 @@ namespace Bit.App.Pages
 
             return _passwordReprompted = await _passwordRepromptService.ShowPasswordPromptAsync();
         }
-
-        private async Task<bool> CanCloneAsync()
-        {
-            if (Cipher.Type == CipherType.Fido2Key)
-            {
-                await _platformUtilsService.ShowDialogAsync(AppResources.PasskeyWillNotBeCopied);
-                return false;
-            }
-
-            if (Cipher.Type == CipherType.Login && Cipher.Login?.Fido2Key != null)
-            {
-                return await _platformUtilsService.ShowDialogAsync(AppResources.ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem, AppResources.PasskeyWillNotBeCopied, AppResources.Yes, AppResources.No);
-            }
-
-            return true;
-        }
     }
 }

src/App/Pages/Vault/CipherSelectionPage.xaml

@@ -19,8 +19,7 @@
             Priority="-1"
             UseOriginalImage="True"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
+            AutomationProperties.Name="{u:I18n Account}" />
-            AutomationId="AccountIconButton" />
         <ToolbarItem IconImageSource="search.png" Clicked="Search_Clicked"
                      AutomationProperties.IsInAccessibleTree="True"
                      AutomationProperties.Name="{u:I18n Search}" />

src/App/Pages/Vault/CiphersPage.xaml

@@ -41,8 +41,7 @@
                     HorizontalOptions="FillAndExpand"
                     TextChanged="SearchBar_TextChanged"
                     SearchButtonPressed="SearchBar_SearchButtonPressed"
-                    Placeholder="{Binding PageTitle}"
+                    Placeholder="{Binding PageTitle}" />
-                    AutomationId="SearchBar" />
             </StackLayout>
             <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform"
                      x:Name="_separator" x:Key="separator" />
@@ -92,8 +91,7 @@
                 Source="empty_items_state" />
             <Label
                 Text="{u:I18n ThereAreNoItemsThatMatchTheSearch}"
-                HorizontalTextAlignment="Center"
+                HorizontalTextAlignment="Center" />
-                AutomationId="NoSearchResultsLabel" />
             <Button
                 Text="{u:I18n AddAnItem}"
                 Command="{Binding AddCipherCommand}"
@@ -106,8 +104,7 @@
                 SelectionMode="Single"
                 SelectionChanged="RowSelected"
                 StyleClass="list, list-platform"
-                ExtraDataForLogging="Ciphers Page"
+                ExtraDataForLogging="Ciphers Page">
-                AutomationId="CipherList">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="views:CipherView">
                     <controls:CipherViewCell

src/App/Pages/Vault/CiphersPageViewModel.cs

@@ -208,11 +208,6 @@ namespace Bit.App.Pages
             }
             else if (selection == AppResources.Autofill || selection == AppResources.AutofillAndSave)
             {
-                if (cipher.Reprompt != CipherRepromptType.None && !await _passwordRepromptService.ShowPasswordPromptAsync())
-                {
-                    return;
-                }
-
                 if (selection == AppResources.AutofillAndSave)
                 {
                     var uris = cipher.Login?.Uris?.ToList();

src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml

@@ -25,8 +25,7 @@
             Priority="-1"
             UseOriginalImage="True"
             AutomationProperties.IsInAccessibleTree="True"
-            AutomationProperties.Name="{u:I18n Account}"
+            AutomationProperties.Name="{u:I18n Account}" />
-            AutomationId="AccountIconButton" />
         <ToolbarItem Icon="search.png" Clicked="Search_Clicked"
                      AutomationProperties.IsInAccessibleTree="True"
                      AutomationProperties.Name="{u:I18n Search}" />
@@ -60,14 +59,13 @@
                 <controls:AuthenticatorViewCell 
                     Cipher="{Binding Cipher}"
                     WebsiteIconsEnabled="{Binding BindingContext.WebsiteIconsEnabled, Source={x:Reference _page}}"
-                    TotpSec="{Binding TotpSec}" />
+                    TotpSec="{Binding TotpSec}"/>
             </DataTemplate>
 
             <DataTemplate x:Key="groupTemplate"
                           x:DataType="pages:GroupingsPageListItem">
                 <controls:ExtendedStackLayout Orientation="Horizontal" 
-                                                StyleClass="list-row, list-row-platform"
+                                                StyleClass="list-row, list-row-platform">
-                                                AutomationId="{Binding AutomationId}">
                     <controls:IconLabel Text="{Binding Icon, Mode=OneWay}"
                                         HorizontalOptions="Start"
                                         VerticalOptions="Center"
@@ -81,14 +79,12 @@
                             LineBreakMode="TailTruncation"
                             HorizontalOptions="FillAndExpand"
                             VerticalOptions="CenterAndExpand"
-                            StyleClass="list-title"
+                            StyleClass="list-title"/>
-                            AutomationId="ItemNameLabel" />
                     <Label Text="{Binding ItemCount, Mode=OneWay}"
                             HorizontalOptions="End"
                             VerticalOptions="CenterAndExpand"
                             HorizontalTextAlignment="End"
-                            StyleClass="list-sub"
+                            StyleClass="list-sub"/>
-                            AutomationId="ItemCountLabel" />
                 </controls:ExtendedStackLayout>
             </DataTemplate>
 
@@ -99,8 +95,7 @@
                     Spacing="0"
                     Padding="0"
                     VerticalOptions="FillAndExpand"
-                    StyleClass="list-row-header-container, list-row-header-container-platform"
+                    StyleClass="list-row-header-container, list-row-header-container-platform">
-                    AutomationId="{Binding AutomationId}">
                     <BoxView
                         StyleClass="list-section-separator-top, list-section-separator-top-platform" />
                     <StackLayout StyleClass="list-row-header, list-row-header-platform">
@@ -109,8 +104,7 @@
                             StyleClass="list-header, list-header-platform" />
                         <Label
                             Text="{Binding ItemCount}"
-                            StyleClass="list-header-sub"
+                            StyleClass="list-header-sub" />
-                            AutomationId="SectionItemCount" />
                     </StackLayout>
                     <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
                 </StackLayout>
@@ -153,8 +147,7 @@
                     IsVisible="{Binding ShowNoData}">
                     <Label
                         Text="{Binding NoDataText}"
-                        HorizontalTextAlignment="Center"
+                        HorizontalTextAlignment="Center"></Label>
-                        AutomationId="NoDataDisplayed"></Label>
                     <Button
                         Text="{u:I18n AddAnItem}"
                         Clicked="AddButton_Clicked"

src/App/Pages/Vault/GroupingsPage/GroupingsPageHeaderListItem.cs

@@ -1,6 +1,4 @@
-using Bit.App.Utilities.Automation;
+namespace Bit.App.Pages
-
-namespace Bit.App.Pages
 {
     public class GroupingsPageHeaderListItem : IGroupingsPageListItem
     {
@@ -12,12 +10,5 @@ namespace Bit.App.Pages
 
         public string Title { get; }
         public string ItemCount { get; set; }
-        public string AutomationId
-        {
-            get
-            {
-                return AutomationIdsHelper.AddSuffixFor(AutomationIdsHelper.ToEnglishTitleCase(Title), SuffixType.Header);
-            }
-        }
     }
 }

src/App/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Bit.App.Utilities.Automation;
 
 namespace Bit.App.Pages
 {
@@ -33,6 +32,5 @@ namespace Bit.App.Pages
         public string Name { get; set; }
         public string NameShort => string.IsNullOrWhiteSpace(Name) || Name.Length == 0 ? "-" : Name[0].ToString();
         public string ItemCount { get; set; }
-        public string AutomationId => AutomationIdsHelper.AddSuffixFor(NameShort, SuffixType.ListGroup);
     }
 }

src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs

@@ -1,5 +1,4 @@
 using Bit.App.Resources;
-using Bit.App.Utilities.Automation;
 using Bit.Core;
 using Bit.Core.Enums;
 using Bit.Core.Models.View;
@@ -60,9 +59,6 @@ namespace Bit.App.Pages
                         case CipherType.Identity:
                             _name = AppResources.TypeIdentity;
                             break;
-                        case CipherType.Fido2Key:
-                            _name = AppResources.Passkey;
-                            break;
                         default:
                             break;
                     }
@@ -111,9 +107,6 @@ namespace Bit.App.Pages
                         case CipherType.Identity:
                             _icon = BitwardenIcons.IdCard;
                             break;
-                        case CipherType.Fido2Key:
-                            _icon = BitwardenIcons.Passkey;
-                            break;
                         default:
                             _icon = BitwardenIcons.Globe;
                             break;
@@ -122,38 +115,5 @@ namespace Bit.App.Pages
                 return _icon;
             }
         }
-
-        public string AutomationId
-        {
-            get
-            {
-                if (Type != null)
-                {
-                    return AutomationIdsHelper.AddSuffixFor(System.Enum.GetName(typeof(CipherType), Type.Value), SuffixType.Filter);
-                }
-
-                if (IsTrash)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("Trash", SuffixType.Filter);
-                }
-
-                if (Folder != null)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("Folder", SuffixType.Filter);
-                }
-
-                if (Collection != null)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("Collection", SuffixType.Filter);
-                }
-
-                if (IsTotpCode)
-                {
-                    return AutomationIdsHelper.AddSuffixFor("TOTP", SuffixType.ListItem);
-                }
-
-                return null;
-            }
-        }
     }
 }

src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs

@@ -235,18 +235,35 @@ namespace Bit.App.Pages
                 {
                     AddTotpGroupItem(groupedItems, uppercaseGroupNames);
 
-                    var types = new CipherType[] { CipherType.Login, CipherType.Card, CipherType.Identity, CipherType.SecureNote };
+                    groupedItems.Add(new GroupingsPageListGroup(
-                    var typesGroup = new GroupingsPageListGroup(AppResources.Types, types.Length, uppercaseGroupNames, !hasFavorites);
+                        AppResources.Types, 4, uppercaseGroupNames, !hasFavorites)
-                    foreach (CipherType t in types)
                     {
-                        typesGroup.Add(new GroupingsPageListItem
+                        new GroupingsPageListItem
                         {
-                            Type = t,
+                            Type = CipherType.Login,
-                            ItemCount = _typeCounts.GetValueOrDefault(t).ToString("N0")
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.Login) ?
+                                _typeCounts[CipherType.Login] : 0).ToString("N0")
+                        },
+                        new GroupingsPageListItem
+                        {
+                            Type = CipherType.Card,
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.Card) ?
+                                _typeCounts[CipherType.Card] : 0).ToString("N0")
+                        },
+                        new GroupingsPageListItem
+                        {
+                            Type = CipherType.Identity,
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.Identity) ?
+                                _typeCounts[CipherType.Identity] : 0).ToString("N0")
+                        },
+                        new GroupingsPageListItem
+                        {
+                            Type = CipherType.SecureNote,
+                            ItemCount = (_typeCounts.ContainsKey(CipherType.SecureNote) ?
+                                _typeCounts[CipherType.SecureNote] : 0).ToString("N0")
+                        },
                     });
                 }
-                    groupedItems.Add(typesGroup);
-                }
                 if (NestedFolders?.Any() ?? false)
                 {
                     var folderListItems = NestedFolders.Select(f =>
@@ -313,8 +330,6 @@ namespace Bit.App.Pages
                         items.AddRange(itemGroup);
                     }
 
-                    Device.BeginInvokeOnMainThread(() =>
-                    {
                     if (Device.RuntimePlatform == Device.iOS)
                     {
                         // HACK: [PS-536] Fix to avoid blank list after back navigation on unlocking with previous page info
@@ -322,7 +337,6 @@ namespace Bit.App.Pages
                         GroupedItems.Clear();
                     }
                     GroupedItems.ReplaceRange(items);
-                    });
                 }
                 else
                 {
@@ -342,8 +356,6 @@ namespace Bit.App.Pages
                         items.AddRange(itemGroup);
                     }
 
-                    Device.BeginInvokeOnMainThread(() =>
-                    {
                     if (groupedItems.Any())
                     {
                         if (Device.RuntimePlatform == Device.iOS)
@@ -359,7 +371,6 @@ namespace Bit.App.Pages
                     {
                         GroupedItems.Clear();
                     }
-                    });
                 }
             }
             finally
@@ -367,12 +378,9 @@ namespace Bit.App.Pages
                 _doingLoad = false;
                 Loaded = true;
                 Loading = false;
-                Device.BeginInvokeOnMainThread(() =>
-                {
                 ShowNoData = (MainPage && !HasCiphers) || !groupedItems.Any();
                 ShowList = !ShowNoData;
                 DisableRefreshing();
-                });
             }
         }
 
@@ -567,9 +575,7 @@ namespace Bit.App.Pages
                 }
                 else if (Type != null)
                 {
-                    Filter = c => !c.IsDeleted
+                    Filter = c => c.Type == Type.Value && !c.IsDeleted;
-                                  &&
-                                  Type.Value.IsEqualToOrCanSignIn(c.Type);
                 }
                 else if (FolderId != null)
                 {
@@ -636,11 +642,14 @@ namespace Bit.App.Pages
                         NoFolderCiphers.Add(c);
                     }
 
-                    // Fido2Key ciphers should be counted as Login ciphers
+                    if (_typeCounts.ContainsKey(c.Type))
-                    var countType = c.Type == CipherType.Fido2Key ? CipherType.Login : c.Type;
+                    {
-                    _typeCounts[countType] = _typeCounts.TryGetValue(countType, out var currentTypeCount)
+                        _typeCounts[c.Type] = _typeCounts[c.Type] + 1;
-                                                ? currentTypeCount + 1
+                    }
-                                                : 1;
+                    else
+                    {
+                        _typeCounts.Add(c.Type, 1);
+                    }
                 }
 
                 if (c.IsDeleted)

src/App/Pages/Vault/SharePage.xaml

@@ -15,7 +15,7 @@
 
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem Text="{u:I18n Move}" Command="{Binding MoveCommand}" />
+        <ToolbarItem Text="{u:I18n Move}" Clicked="Save_Clicked" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>

src/App/Pages/Vault/SharePage.xaml.cs

@@ -32,6 +32,19 @@ namespace Bit.App.Pages
             await LoadOnAppearedAsync(_scrollView, true, () => _vm.LoadAsync());
         }
 
+        protected override void OnDisappearing()
+        {
+            base.OnDisappearing();
+        }
+
+        private async void Save_Clicked(object sender, System.EventArgs e)
+        {
+            if (DoOnce())
+            {
+                await _vm.SubmitAsync();
+            }
+        }
+
         private async void Close_Clicked(object sender, System.EventArgs e)
         {
             if (DoOnce())

src/App/Pages/Vault/SharePageViewModel.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Input;
 using Bit.App.Abstractions;
 using Bit.App.Resources;
 using Bit.Core.Abstractions;
@@ -9,7 +8,6 @@ using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.View;
 using Bit.Core.Utilities;
-using Xamarin.CommunityToolkit.ObjectModel;
 
 namespace Bit.App.Pages
 {
@@ -36,8 +34,6 @@ namespace Bit.App.Pages
             Collections = new ExtendedObservableCollection<CollectionViewModel>();
             OrganizationOptions = new List<KeyValuePair<string, string>>();
             PageTitle = AppResources.MoveToOrganization;
-
-            MoveCommand = new AsyncCommand(MoveAsync, onException: ex => HandleException(ex), allowsMultipleExecutions: false);
         }
 
         public string CipherId { get; set; }
@@ -66,8 +62,6 @@ namespace Bit.App.Pages
             set => SetProperty(ref _hasOrganizations, value);
         }
 
-        public ICommand MoveCommand { get; }
-
         public async Task LoadAsync()
         {
             var allCollections = await _collectionService.GetAllDecryptedAsync();
@@ -90,7 +84,7 @@ namespace Bit.App.Pages
             FilterCollections();
         }
 
-        public async Task<bool> MoveAsync()
+        public async Task<bool> SubmitAsync()
         {
             var selectedCollectionIds = Collections?.Where(c => c.Checked).Select(c => c.Collection.Id);
             if (!selectedCollectionIds?.Any() ?? true)
@@ -113,15 +107,8 @@ namespace Bit.App.Pages
             try
             {
                 await _deviceActionService.ShowLoadingAsync(AppResources.Saving);
-                var error = await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
+                await _cipherService.ShareWithServerAsync(cipherView, OrganizationId, checkedCollectionIds);
                 await _deviceActionService.HideLoadingAsync();
-
-                if (error == ICipherService.ShareWithServerError.DuplicatedPasskeyInOrg)
-                {
-                    _platformUtilsService.ShowToast(null, null, AppResources.ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey);
-                    return false;
-                }
-
                 var movedItemToOrgText = string.Format(AppResources.MovedItemToOrg, cipherView.Name,
                    (await _organizationService.GetAsync(OrganizationId)).Name);
                 _platformUtilsService.ShowToast("success", null, movedItemToOrgText);

src/App/Resources/AppResources.Designer.cs

@@ -553,15 +553,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Application.
-        /// </summary>
-        public static string Application {
-            get {
-                return ResourceManager.GetString("Application", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Approve login requests.
         /// </summary>
@@ -805,6 +796,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: &quot;https://twitter.com, androidapp://com.twitter.android&quot;..
+        /// </summary>
+        public static string AutofillBlockedUrisDescription {
+            get {
+                return ResourceManager.GetString("AutofillBlockedUrisDescription", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Do you want to auto-fill or view this item?.
         /// </summary>
@@ -940,15 +940,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Auto-fill will not be offered for these URIs..
-        /// </summary>
-        public static string AutoFillWillNotBeOfferedForTheseURIs {
-            get {
-                return ResourceManager.GetString("AutoFillWillNotBeOfferedForTheseURIs", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Auto-fill with Bitwarden.
         /// </summary>
@@ -958,15 +949,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Available for two-step login.
-        /// </summary>
-        public static string AvailableForTwoStepLogin {
-            get {
-                return ResourceManager.GetString("AvailableForTwoStepLogin", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to A verification code was sent to your email.
         /// </summary>
@@ -1246,15 +1228,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Block auto-fill.
-        /// </summary>
-        public static string BlockAutoFill {
-            get {
-                return ResourceManager.GetString("BlockAutoFill", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Brand.
         /// </summary>
@@ -1291,15 +1264,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Cannot edit multiple URIs at once.
-        /// </summary>
-        public static string CannotEditMultipleURIsAtOnce {
-            get {
-                return ResourceManager.GetString("CannotEditMultipleURIsAtOnce", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Cannot open the app &quot;{0}&quot;..
         /// </summary>
@@ -1588,15 +1552,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Copy application.
-        /// </summary>
-        public static string CopyApplication {
-            get {
-                return ResourceManager.GetString("CopyApplication", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Copy link.
         /// </summary>
@@ -1705,15 +1660,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Created {0}.
-        /// </summary>
-        public static string CreatedX {
-            get {
-                return ResourceManager.GetString("CreatedX", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Creating account....
         /// </summary>
@@ -2092,6 +2038,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Do you really want to restore this item?.
+        /// </summary>
+        public static string DoYouReallyWantToRestoreCipher {
+            get {
+                return ResourceManager.GetString("DoYouReallyWantToRestoreCipher", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Do you really want to send to the trash?.
         /// </summary>
@@ -2191,15 +2146,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Edit URI.
-        /// </summary>
-        public static string EditURI {
-            get {
-                return ResourceManager.GetString("EditURI", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Email.
         /// </summary>
@@ -2353,15 +2299,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Enter URI.
-        /// </summary>
-        public static string EnterURI {
-            get {
-                return ResourceManager.GetString("EnterURI", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Enter the 6 digit verification code from your authenticator app..
         /// </summary>
@@ -3010,24 +2947,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Format: {0}.
-        /// </summary>
-        public static string FormatX {
-            get {
-                return ResourceManager.GetString("FormatX", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Format: {0}. Separate multiple URIs with a comma..
-        /// </summary>
-        public static string FormatXSeparateMultipleURIsWithAComma {
-            get {
-                return ResourceManager.GetString("FormatXSeparateMultipleURIsWithAComma", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Forwarded email alias.
         /// </summary>
@@ -3343,24 +3262,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid API key.
-        /// </summary>
-        public static string InvalidAPIKey {
-            get {
-                return ResourceManager.GetString("InvalidAPIKey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid API token.
-        /// </summary>
-        public static string InvalidAPIToken {
-            get {
-                return ResourceManager.GetString("InvalidAPIToken", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Invalid email address..
         /// </summary>
@@ -3370,15 +3271,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid format. Use https://, http://, or androidapp://.
-        /// </summary>
-        public static string InvalidFormatUseHttpsHttpOrAndroidApp {
-            get {
-                return ResourceManager.GetString("InvalidFormatUseHttpsHttpOrAndroidApp", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Invalid master password. Try again..
         /// </summary>
@@ -3397,15 +3289,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Invalid URI.
-        /// </summary>
-        public static string InvalidURI {
-            get {
-                return ResourceManager.GetString("InvalidURI", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Invalid verification code.
         /// </summary>
@@ -3658,6 +3541,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Load from file.
+        /// </summary>
+        public static string LoadFromFile {
+            get {
+                return ResourceManager.GetString("LoadFromFile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Loading.
         /// </summary>
@@ -4317,15 +4209,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to New blocked URI.
-        /// </summary>
-        public static string NewBlockedURI {
-            get {
-                return ResourceManager.GetString("NewBlockedURI", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to New custom field.
         /// </summary>
@@ -4813,33 +4696,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Passkey.
-        /// </summary>
-        public static string Passkey {
-            get {
-                return ResourceManager.GetString("Passkey", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Passkeys.
-        /// </summary>
-        public static string Passkeys {
-            get {
-                return ResourceManager.GetString("Passkeys", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Passkey will not be copied.
-        /// </summary>
-        public static string PasskeyWillNotBeCopied {
-            get {
-                return ResourceManager.GetString("PasskeyWillNotBeCopied", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Passphrase.
         /// </summary>
@@ -6254,24 +6110,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to The passkey will not be copied to the cloned item. Do you want to continue cloning this item?.
-        /// </summary>
-        public static string ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem {
-            get {
-                return ResourceManager.GetString("ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem", resourceCulture);
-        
-            }
-        }
-        
-        ///   Looks up a localized string similar to There are no blocked URIs.
-        /// </summary>
-        public static string ThereAreNoBlockedURIs {
-            get {
-                return ResourceManager.GetString("ThereAreNoBlockedURIs", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to There are no items in your vault that match &quot;{0}&quot;.
         /// </summary>
@@ -6290,15 +6128,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to The URI {0} is already blocked.
-        /// </summary>
-        public static string TheURIXIsAlreadyBlocked {
-            get {
-                return ResourceManager.GetString("TheURIXIsAlreadyBlocked", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to 30 days.
         /// </summary>
@@ -6326,16 +6155,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to This item cannot be shared with the organization because there is one already with the same passkey..
-        /// </summary>
-        public static string ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey {
-            get {
-                return ResourceManager.GetString("ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePassk" +
-                        "ey", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to This request is no longer valid.
         /// </summary>
@@ -6625,7 +6444,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve..
+        ///   Looks up a localized string similar to Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.
         /// </summary>
         public static string UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve {
             get {
@@ -6759,15 +6578,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to URI removed.
-        /// </summary>
-        public static string URIRemoved {
-            get {
-                return ResourceManager.GetString("URIRemoved", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to URIs.
         /// </summary>
@@ -6777,15 +6587,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to URI saved.
-        /// </summary>
-        public static string URISaved {
-            get {
-                return ResourceManager.GetString("URISaved", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to US.
         /// </summary>
@@ -7308,15 +7109,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to You cannot edit passkey application because it would invalidate the passkey.
-        /// </summary>
-        public static string YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey {
-            get {
-                return ResourceManager.GetString("YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Your account has been permanently deleted.
         /// </summary>

src/App/Resources/AppResources.af.resx

@@ -1585,6 +1585,9 @@ Skandering gebeur outomaties.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Versperde URI’s vir outovul</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Outovul sal nie vir versperde URI’s gebied word nie. Skei meerdere URI’s met ’n komma. Byvoorbeeld: “https://twitter.com, androidapp://com.twitter.android”.</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Vra om aantekening toe te voeg</value>
   </data>
@@ -2627,90 +2630,10 @@ Wil u na die rekening omskakel?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Huidige hoofwagwoord</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Hulpteks vir vra weer vir hoofwagwoord</value>
+    <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Ontgrendeling kan misluk as daar onvoldoende geheue is. Verminder u KDF-geheue-instellings om dit op te los.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Ongeldige API-sleutel</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Ongeldige API-teken</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -1585,6 +1585,9 @@
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>تعبئة العناوين المحجوبة تلقائياً</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>لن يتم عرض التعبئة التلقائية للعناوين المحجوبة. افصل عناوين متعددة بفاصلة. مثال: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>اطلب إضافة تسجيل الدخول</value>
   </data>
@@ -2628,90 +2631,10 @@
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>كلمة المرور الرئيسية الحالية</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.az.resx

@@ -1585,6 +1585,9 @@ Skan prosesi avtomatik baş tutacaq.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Əngəllənən URI-lərin avto-doldurulması</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Əngəllənən URI-lər üçün avto-doldurma təklif edilmir. Çoxlu URI-ni vergüllə ayırır. Nümunə: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Giriş əlavə etmək üçün soruş</value>
   </data>
@@ -2626,90 +2629,10 @@ Bu hesaba keçmək istəyirsiniz?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Hazırkı ana parol</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Ana parolu təkrar soruş köməyi</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Yetərsiz yaddaşa görə kilid açma uğursuz ola bilər. Həll etmək üçün KDF yaddaş tənzimləmələrinizi azaldın</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Yararsız API açarı</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Yararsız API tokeni</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Avto-doldurmanı əngəllə</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Bu URI-lər üçün avto-doldurma təklif olunmayacaq.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Yeni əngəllənən URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saxlanıldı</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Yararsız format. https://, http:// və ya androidapp:// istifadə edin</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>URI-ə düzəliş et</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>URI-ni daxil et</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Bir neçə URI-ı vergüllə ayırın.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Yararsız URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI silindi</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Əngəllənən URI yoxdur</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} artıq əngəllənib</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Bir dəfəyə bir neçə URI-a düzəliş etmək mümkün deyil</value>
   </data>
 </root>

src/App/Resources/AppResources.be.resx

@@ -1584,6 +1584,9 @@
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Аўтазапаўненне заблакіраваных URI</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Аўтазапаўненне не будзе прапаноўвацца для заблакіраваных URI. Раздзяляйце некалькі URI з дапамогай коскі. Напрыклад: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Пытацца пры дадаванні лагіна</value>
   </data>
@@ -2627,90 +2630,10 @@
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Бягучы асноўны пароль</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Дапамога з паўторным запытам асноўнага пароля</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Па прычыне недахопу памяці можа адбыцца збой разблакіроўкі. Паменшыце налады памяці KDF, каб вырашыць гэту праблему</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Памылковы ключ API</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Памылковы токен API</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Блакіраваць аўтазапаўненне</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Аўтазапаўненне для гэтых URI прапаноўвацца не будзе.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Новы заблакіраваны URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI захаваны</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Памылковы фармат. Выкарыстоўвайце https://, http:// або androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Рэдагаваць URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Увесці URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Фармат: {0}. Раздзяліце некалькі значэнняў URI коскай.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Фармат: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Памылковы URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI выдалены</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Заблакіраваных URI пакуль няма</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>Гэты URI {0} ужо заблакіраваны</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Немагчыма рэдагаваць некалькі URI адначасова</value>
-  </data>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -1585,6 +1585,9 @@
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Блокирани за авт. попълване адреси</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>За посочените блокирани адреси няма да се прави автоматично попълване. Разделяйте отделните адреси със запетая. Пример: „https://twitter.com, androidapp://com.twitter.android“.</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Питане за добавяне на запис</value>
   </data>
@@ -2627,90 +2630,10 @@ select Add TOTP to store the key safely</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Текуща главна парола</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Създадено на {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Приложение</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Копиране на приложението</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Помощ за повторното запитване за главната парола</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Отключването може да бъде неуспешно заради недостатъчно памет. Намалете настройките на паметта за KDF, за да разрешите проблема.</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Неправилен ключ за ППИ</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Неправилен идентификатор за ППИ</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Блокиране на авт. попълване</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Автоматичното попълване няма да бъде предлагано за тези адреси.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Нов блокиран адрес</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>Адресът е запазен</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Неправилен формат. Използвайте https://, http:// или androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Редактиране на адреса</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Въведете адрес</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Формат: {0}. Ако въвеждате повече адреси, разделяйте ги със запетая.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Формат: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Неправилен адрес</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>Адресът е премахнат</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Няма блокирани адреси</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>Адресът {0} вече е блокиран</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Не може да редактирате повече от един адрес едновременно</value>
-  </data>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Auto-fill blocked URIs</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ask to add login</value>
   </data>
@@ -2628,90 +2631,10 @@ Do you want to switch to this account?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -1585,6 +1585,9 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Auto-popunjavanje blokiranih URI-ja</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-popunjavanje neće biti ponuđeno za blokirane URI-je. Odvoji višestruke URI-je zarezom. Npr. „https://twitter.com, androidapp://com.twitter.android”.</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Upitaj za dodavanje prijave</value>
   </data>
@@ -2626,90 +2629,10 @@ Skeniranje će biti izvršeno automatski.</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -1585,6 +1585,9 @@ L'escaneig es farà automàticament.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Emplena automàticament els URI bloquejats</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>L'emplenament automàtic no s'oferirà per als URI bloquejats. Separeu diversos URI amb una coma. Per exemple: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Sol·licita afegir els inicis de sessió</value>
   </data>
@@ -2627,90 +2630,10 @@ Voleu canviar a aquest compte?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Contrasenya mestra actual</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Ajuda per tornar a demanar la contrasenya mestra</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>El desbloqueig pot fallar a causa de memòria insuficient. Disminueix la configuració de memòria KDF per resoldre-ho</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Clau API no vàlida</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Token API no vàlid</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
-  </data>
 </root>

src/App/Resources/AppResources.cs.resx

@@ -1585,6 +1585,9 @@ Načtení proběhne automaticky.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Automatické vyplňování blokovaných URI</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Automatické vyplňování nebude pro blokované URI nabídnuto. Více URI oddělte čárkou. Například: "https://twitter.com,androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ptát se na přidání přihlášení</value>
   </data>
@@ -2626,90 +2629,10 @@ Chcete se přepnout na tento účet?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Aktuální hlavní heslo</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Přístupový klíč</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Přístupové klíče</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Vytvořeno {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Aplikace</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Nemůžete upravovat aplikaci pro přístupové klíče, protože by to zneplatnilo přístupový klíč</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Přístupový klíč nebude zkopírován</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Přístupový klíč nebude zkopírován do duplikované položky. Chete pokračovat v duplikování této položky?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopírovat aplikaci</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Dostupné pro dvoufázové přihlášení</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Nápověda pro znovuzeptání se na hlavní heslo</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Odemknutí může selhat z důvodu nedostatku paměti. Pro vyřešení snižte nastavení paměti KDF.</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Neplatný klíč API</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Neplatný token API</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Tuto položku nelze sdílet s organizací, protože již existuje jedna se stejným přístupovým klíčem.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Blokovat automatické vyplňování</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Pro tento URI nebude nabízeno automatické vyplňování.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Nový blokovaný URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI byl uložen</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Neplatný formát. Použijte https://, http:// nebo androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Upravit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Zadat URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Formát: {0}. Oddělte více URI čárkou.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Formát: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Neplatný URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI byl odebrán</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Nejsou žádné blokované URI</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} je již blokován</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Najednou nelze upravovat více URI</value>
-  </data>
 </root>

src/App/Resources/AppResources.cy.resx

@@ -118,25 +118,25 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
-    <value>Ynghylch</value>
+    <value>About</value>
   </data>
   <data name="Add" xml:space="preserve">
-    <value>Ychwanegu</value>
+    <value>Add</value>
     <comment>Add/create a new entity (verb).</comment>
   </data>
   <data name="AddFolder" xml:space="preserve">
-    <value>Ychwanegu ffolder</value>
+    <value>Add Folder</value>
   </data>
   <data name="AddItem" xml:space="preserve">
-    <value>Ychwanegu eitem</value>
+    <value>Add Item</value>
     <comment>The title for the add item page.</comment>
   </data>
   <data name="AnErrorHasOccurred" xml:space="preserve">
-    <value>Bu gwall.</value>
+    <value>An error has occurred.</value>
     <comment>Alert title when something goes wrong.</comment>
   </data>
   <data name="Back" xml:space="preserve">
-    <value>Yn ôl</value>
+    <value>Back</value>
     <comment>Navigate back to the previous screen.</comment>
   </data>
   <data name="Bitwarden" xml:space="preserve">
@@ -148,7 +148,7 @@
     <comment>Cancel an operation.</comment>
   </data>
   <data name="Copy" xml:space="preserve">
-    <value>Copïo</value>
+    <value>Copy</value>
     <comment>Copy some value to your clipboard.</comment>
   </data>
   <data name="CopyPassword" xml:space="preserve">
@@ -160,15 +160,15 @@
     <comment>The button text that allows a user to copy the login's username to their clipboard.</comment>
   </data>
   <data name="Credits" xml:space="preserve">
-    <value>Clodrestr</value>
+    <value>Credits</value>
     <comment>Title for page that we use to give credit to resources that we use.</comment>
   </data>
   <data name="Delete" xml:space="preserve">
-    <value>Dileu</value>
+    <value>Delete</value>
     <comment>Delete an entity (verb).</comment>
   </data>
   <data name="Deleting" xml:space="preserve">
-    <value>Wrthi'n dileu...</value>
+    <value>Deleting...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="DoYouReallyWantToDelete" xml:space="preserve">
@@ -176,17 +176,17 @@
     <comment>Confirmation alert message when deleteing something.</comment>
   </data>
   <data name="Edit" xml:space="preserve">
-    <value>Golygu</value>
+    <value>Edit</value>
   </data>
   <data name="EditFolder" xml:space="preserve">
     <value>Edit folder</value>
   </data>
   <data name="Email" xml:space="preserve">
-    <value>Ebost</value>
+    <value>Email</value>
     <comment>Short label for an email address.</comment>
   </data>
   <data name="EmailAddress" xml:space="preserve">
-    <value>Cyfeiriad ebost</value>
+    <value>Email address</value>
     <comment>Full label for a email address.</comment>
   </data>
   <data name="EmailUs" xml:space="preserve">
@@ -199,11 +199,11 @@
     <value>Enter your PIN code.</value>
   </data>
   <data name="Favorites" xml:space="preserve">
-    <value>Ffefrynnau</value>
+    <value>Favorites</value>
     <comment>Title for your favorite items in the vault.</comment>
   </data>
   <data name="FileBugReport" xml:space="preserve">
-    <value>Adrodd nam</value>
+    <value>File a bug report</value>
   </data>
   <data name="FileBugReportDescription" xml:space="preserve">
     <value>Open an issue at our GitHub repository.</value>
@@ -212,7 +212,7 @@
     <value>Use your fingerprint to verify.</value>
   </data>
   <data name="Folder" xml:space="preserve">
-    <value>Ffolder</value>
+    <value>Folder</value>
     <comment>Label for a folder.</comment>
   </data>
   <data name="FolderCreated" xml:space="preserve">
@@ -226,7 +226,7 @@
     <comment>Items that have no folder specified go in this special "catch-all" folder.</comment>
   </data>
   <data name="Folders" xml:space="preserve">
-    <value>Ffolderi</value>
+    <value>Folders</value>
   </data>
   <data name="FolderUpdated" xml:space="preserve">
     <value>Folder saved</value>
@@ -236,32 +236,32 @@
     <comment>The button text that allows user to launch the website to their web browser.</comment>
   </data>
   <data name="HelpAndFeedback" xml:space="preserve">
-    <value>Cymorth ac adborth</value>
+    <value>Help and feedback</value>
   </data>
   <data name="Hide" xml:space="preserve">
-    <value>Cuddio</value>
+    <value>Hide</value>
     <comment>Hide a secret value that is currently shown (password).</comment>
   </data>
   <data name="InternetConnectionRequiredMessage" xml:space="preserve">
-    <value>Cysylltwch â'r rhyngrwyd cyn parhau.</value>
+    <value>Please connect to the internet before continuing.</value>
     <comment>Description message for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InternetConnectionRequiredTitle" xml:space="preserve">
-    <value>Mae angen cysylltiad â'r we</value>
+    <value>Internet connection required</value>
     <comment>Title for the alert when internet connection is required to continue.</comment>
   </data>
   <data name="InvalidMasterPassword" xml:space="preserve">
-    <value>Prif gyfrinair annilys. Rhowch gynnig arall arni.</value>
+    <value>Invalid master password. Try again.</value>
   </data>
   <data name="InvalidPIN" xml:space="preserve">
-    <value>PIN annilys. Rhowch gynnig arall arni.</value>
+    <value>Invalid PIN. Try again.</value>
   </data>
   <data name="Launch" xml:space="preserve">
-    <value>Lansio</value>
+    <value>Launch</value>
     <comment>The button text that allows user to launch the website to their web browser.</comment>
   </data>
   <data name="LogIn" xml:space="preserve">
-    <value>Mewngofnodi</value>
+    <value>Log In</value>
     <comment>The login button text (verb).</comment>
   </data>
   <data name="LogInNoun" xml:space="preserve">
@@ -269,11 +269,11 @@
     <comment>Title for login page. (noun)</comment>
   </data>
   <data name="LogOut" xml:space="preserve">
-    <value>Allgofnodi</value>
+    <value>Log out</value>
     <comment>The log out button text (verb).</comment>
   </data>
   <data name="LogoutConfirmation" xml:space="preserve">
-    <value>Ydych chi'n siŵr eich bod am allgofnodi?</value>
+    <value>Are you sure you want to log out?</value>
   </data>
   <data name="RemoveAccount" xml:space="preserve">
     <value>Remove account</value>
@@ -288,11 +288,11 @@
     <value>Would you like to switch to it now?</value>
   </data>
   <data name="MasterPassword" xml:space="preserve">
-    <value>Prif gyfrinair</value>
+    <value>Master password</value>
     <comment>Label for a master password.</comment>
   </data>
   <data name="More" xml:space="preserve">
-    <value>Mwy</value>
+    <value>More</value>
     <comment>Text to define that there are more options things to see.</comment>
   </data>
   <data name="MyVault" xml:space="preserve">
@@ -323,7 +323,7 @@
     <comment>Label for a password.</comment>
   </data>
   <data name="Save" xml:space="preserve">
-    <value>Cadw</value>
+    <value>Save</value>
     <comment>Button text for a save operation (verb).</comment>
   </data>
   <data name="Move" xml:space="preserve">
@@ -334,7 +334,7 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="Settings" xml:space="preserve">
-    <value>Gosodiadau</value>
+    <value>Settings</value>
     <comment>The title for the settings page.</comment>
   </data>
   <data name="Show" xml:space="preserve">
@@ -353,10 +353,10 @@
     <comment>The title for the sync page.</comment>
   </data>
   <data name="ThankYou" xml:space="preserve">
-    <value>Diolch</value>
+    <value>Thank you</value>
   </data>
   <data name="Tools" xml:space="preserve">
-    <value>Offer</value>
+    <value>Tools</value>
     <comment>The title for the tools page.</comment>
   </data>
   <data name="URI" xml:space="preserve">
@@ -367,7 +367,7 @@
     <value>Use fingerprint to unlock</value>
   </data>
   <data name="Username" xml:space="preserve">
-    <value>Enw defnyddiwr</value>
+    <value>Username</value>
     <comment>Label for a username.</comment>
   </data>
   <data name="ValidationFieldRequired" xml:space="preserve">
@@ -388,7 +388,7 @@
     <value>Verify PIN</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>Fersiwn</value>
+    <value>Version</value>
   </data>
   <data name="View" xml:space="preserve">
     <value>View</value>
@@ -407,13 +407,13 @@
     <value>Yes</value>
   </data>
   <data name="Account" xml:space="preserve">
-    <value>Cyfrif</value>
+    <value>Account</value>
   </data>
   <data name="AccountCreated" xml:space="preserve">
     <value>Your new account has been created! You may now log in.</value>
   </data>
   <data name="AddAnItem" xml:space="preserve">
-    <value>Ychwanegu eitem</value>
+    <value>Add an Item</value>
   </data>
   <data name="AppExtension" xml:space="preserve">
     <value>App extension</value>
@@ -422,7 +422,7 @@
     <value>Use the Bitwarden accessibility service to auto-fill your logins across apps and the web.</value>
   </data>
   <data name="AutofillService" xml:space="preserve">
-    <value>Gwasanaeth llenwi awtomatig</value>
+    <value>Auto-fill service</value>
   </data>
   <data name="AvoidAmbiguousCharacters" xml:space="preserve">
     <value>Avoid ambiguous characters</value>
@@ -437,41 +437,41 @@
     <value>Use Bitwarden in Safari and other apps to auto-fill your logins.</value>
   </data>
   <data name="BitwardenAutofillService" xml:space="preserve">
-    <value>Gwasanaeth llenwi awtomatig Bitwarden</value>
+    <value>Bitwarden Auto-fill Service</value>
   </data>
   <data name="BitwardenAutofillAccessibilityServiceDescription" xml:space="preserve">
     <value>Use the Bitwarden accessibility service to auto-fill your logins.</value>
   </data>
   <data name="ChangeEmail" xml:space="preserve">
-    <value>Newid ebost</value>
+    <value>Change email</value>
   </data>
   <data name="ChangeEmailConfirmation" xml:space="preserve">
     <value>You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?</value>
   </data>
   <data name="ChangeMasterPassword" xml:space="preserve">
-    <value>Newid y prif gyfrinair</value>
+    <value>Change master password</value>
   </data>
   <data name="ChangePasswordConfirmation" xml:space="preserve">
     <value>You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?</value>
   </data>
   <data name="Close" xml:space="preserve">
-    <value>Cau</value>
+    <value>Close</value>
   </data>
   <data name="Continue" xml:space="preserve">
-    <value>Parhau</value>
+    <value>Continue</value>
   </data>
   <data name="CreateAccount" xml:space="preserve">
-    <value>Creu cyfrif</value>
+    <value>Create account</value>
   </data>
   <data name="CreatingAccount" xml:space="preserve">
-    <value>Wrthi'n creu cyfrif...</value>
+    <value>Creating account...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="EditItem" xml:space="preserve">
     <value>Edit item</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
-    <value>Caniatáu cysoni awtomatig</value>
+    <value>Allow automatic syncing</value>
   </data>
   <data name="EnterEmailForHint" xml:space="preserve">
     <value>Enter your account email address to receive your master password hint.</value>
@@ -480,7 +480,7 @@
     <value>Reactivate app extension</value>
   </data>
   <data name="ExtensionAlmostDone" xml:space="preserve">
-    <value>Bron yn barod!</value>
+    <value>Almost done!</value>
   </data>
   <data name="ExtensionEnable" xml:space="preserve">
     <value>Activate app extension</value>
@@ -493,7 +493,7 @@
     <value>Get instant access to your passwords!</value>
   </data>
   <data name="ExtensionReady" xml:space="preserve">
-    <value>Rydych chi'n barod i fewngofnodi!</value>
+    <value>You're ready to log in!</value>
   </data>
   <data name="ExtensionSetup" xml:space="preserve">
     <value>Your logins are now easily accessible from Safari, Chrome, and other supported apps.</value>
@@ -511,10 +511,10 @@
     <value>Favorite</value>
   </data>
   <data name="Fingerprint" xml:space="preserve">
-    <value>Ôl bys</value>
+    <value>Fingerprint</value>
   </data>
   <data name="GeneratePassword" xml:space="preserve">
-    <value>Cynhyrchu cyfrinair</value>
+    <value>Generate password</value>
   </data>
   <data name="GetPasswordHint" xml:space="preserve">
     <value>Get your master password hint</value>
@@ -529,10 +529,10 @@
     <value>Quickly bulk import your items from other password management apps.</value>
   </data>
   <data name="LastSync" xml:space="preserve">
-    <value>Cysonwyd ddiwethaf:</value>
+    <value>Last sync:</value>
   </data>
   <data name="Length" xml:space="preserve">
-    <value>Hyd</value>
+    <value>Length</value>
   </data>
   <data name="Lock" xml:space="preserve">
     <value>Lock</value>
@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Auto-fill blocked URIs</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ask to add login</value>
   </data>
@@ -2334,7 +2337,7 @@ select Add TOTP to store the key safely</value>
     <value>Device type</value>
   </data>
   <data name="IpAddress" xml:space="preserve">
-    <value>Cyfeiriad IP</value>
+    <value>IP address</value>
   </data>
   <data name="Time" xml:space="preserve">
     <value>Time</value>
@@ -2367,7 +2370,7 @@ select Add TOTP to store the key safely</value>
     <value>Use this device to approve login requests made from other devices.</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
-    <value>Caniatáu hysbysiadau</value>
+    <value>Allow notifications</value>
   </data>
   <data name="ReceivePushNotificationsForNewLoginRequests" xml:space="preserve">
     <value>Receive push notifications for new login requests</value>
@@ -2441,7 +2444,7 @@ select Add TOTP to store the key safely</value>
     <value>Are you sure you want to overwrite the current username?</value>
   </data>
   <data name="GenerateUsername" xml:space="preserve">
-    <value>Cynhyrchu enw defnyddiwr</value>
+    <value>Generate username</value>
   </data>
   <data name="EmailType" xml:space="preserve">
     <value>Email Type</value>
@@ -2557,7 +2560,7 @@ Do you want to switch to this account?</value>
     <value>Default (System)</value>
   </data>
   <data name="Important" xml:space="preserve">
-    <value>Pwysig</value>
+    <value>Important</value>
   </data>
   <data name="YourMasterPasswordCannotBeRecoveredIfYouForgetItXCharactersMinimum" xml:space="preserve">
     <value>Your master password cannot be recovered if you forget it! {0} characters minimum.</value>
@@ -2628,90 +2631,10 @@ Do you want to switch to this account?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.da.resx

@@ -1585,6 +1585,9 @@ Skanning vil ske automatisk.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Autoudfyld blokerede URI'er</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Autoudfyldning tilbydes ikke for blokerede URI'er. Adskil flere URI'er med komma. F.eks.: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Spørg om at tilføje login</value>
   </data>
@@ -2627,90 +2630,10 @@ Vil du skifte til denne konto?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Aktuel hovedadgangskode</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Hjælp til genanmodning om hovedadgangskode</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Oplåsning kan fejle grundet utilstrækkelig hukommelse. Reducér KDF-hukommelsesindstillinger for at afhjælpe</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Ugyldig API-nøgle</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Ugyldigt API-token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Blokér autoudfyldning</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Autoudfyldning vil ikke blive tilbudt for disse URI'er.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Ny blokeret URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI gemt</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Ugyldigt format. Brug https://, http:// eller androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Redigér URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Angiv URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separér flere URI'er med komma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Ugyldig URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI fjernet</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Der er ingen blokerede URI'er</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI'en {0} er allerede blokeret</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Kan ikke redigere flere URI'er på én gang</value>
-  </data>
 </root>

src/App/Resources/AppResources.de.resx

@@ -1083,7 +1083,7 @@ Das Scannen erfolgt automatisch.</value>
     <value>Vollständiger Name</value>
   </data>
   <data name="LicenseNumber" xml:space="preserve">
-    <value>Lizenznummer</value>
+    <value>Führerscheinnummer</value>
   </data>
   <data name="March" xml:space="preserve">
     <value>März</value>
@@ -1585,6 +1585,9 @@ Das Scannen erfolgt automatisch.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Blockierte URIs automatisch ausfüllen</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-Ausfüllen wird für blockierte URIs nicht angeboten. Trenne mehrere URIs mit einem Komma. Beispiel: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Nach dem Hinzufügen von Zugangsdaten fragen</value>
   </data>
@@ -2626,90 +2629,10 @@ Möchtest du zu diesem Konto wechseln?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Aktuelles Master-Passwort</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Erstellt am {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Anwendung</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey wird nicht kopiert</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Anwendung kopieren</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Hilfe zum erneuten Abfragen des Master-Passworts</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Das Entsperren kann aufgrund von unzureichendem Arbeitsspeicher fehlschlagen. Verringere deine KDF-Speichereinstellungen, um das Problem zu beheben.</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Ungültiger API-Schlüssel</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Ungültiger API-Token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Auto-Ausfüllen blockieren</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-Ausfüllen wird für diese URIs nicht angeboten.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Neue gesperrte URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI gespeichert</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Ungültiges Format. Verwende https://, http://, oder androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>URI bearbeiten</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>URI eingeben</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Trenne mehrere URIs mit einem Komma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Ungültige URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI entfernt</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Es gibt keine gesperrten URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>Die URI {0} ist bereits gesperrt</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Es können nicht mehrere URIs auf einmal bearbeitet werden</value>
-  </data>
 </root>

src/App/Resources/AppResources.el.resx

@@ -1585,6 +1585,9 @@
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Αυτόματη συμπλήρωση μπλοκαρισμένων URIs</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Η αυτόματη συμπλήρωση δεν θα προσφερθεί για μπλοκαρισμένα URI. Ξεχωρίστε πολλαπλά URI με κόμμα. Για παράδειγμα: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ζητήστε να προσθέστε σύνδεση</value>
   </data>
@@ -2607,16 +2610,16 @@
     <value>Δεν υπάρχουν στοιχεία που να ταιριάζουν με την αναζήτηση</value>
   </data>
   <data name="US" xml:space="preserve">
-    <value>ΗΠΑ</value>
+    <value>US</value>
   </data>
   <data name="EU" xml:space="preserve">
-    <value>ΕΕ</value>
+    <value>EU</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
-    <value>Αυτο-φιλοξενούμενο</value>
+    <value>Self-hosted</value>
   </data>
   <data name="DataRegion" xml:space="preserve">
-    <value>Περιοχή δεδομένων</value>
+    <value>Data region</value>
   </data>
   <data name="Region" xml:space="preserve">
     <value>Περιοχή</value>
@@ -2627,90 +2630,10 @@
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Τρέχων κύριος κωδικός</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.en-GB.resx

@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Auto-fill blocked URIs</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ask to add login</value>
   </data>
@@ -2627,90 +2630,10 @@ Do you want to switch to this account?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.en-IN.resx

@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Auto-fill blocked URIs</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ask to add login</value>
   </data>
@@ -2641,90 +2644,10 @@ Do you want to switch to this account?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.es.resx

@@ -775,10 +775,10 @@
     <value>Activado</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>No</value>
+    <value>Apagado</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>Sí</value>
+    <value>Activado</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>Estado</value>
@@ -1585,6 +1585,9 @@ El escaneo se realizará automáticamente.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Autorellenar URIs bloqueadas</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>El autorrelleno no se ofrecerá para URIs bloqueadas. Separe múltiples URIs con una coma. Por ejemplo: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Pedir que se añada el inicio de sesión</value>
   </data>
@@ -2628,90 +2631,10 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Contraseña maestra actual</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Ayuda de volver a pedir contraseña maestra</value>
+    <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>El desbloqueo puede fallar por falta de memoria. Disminuye los ajustes de memoria KDF para resolver</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Clave API no válida</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Token de API no válido</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
-  </data>
 </root>

src/App/Resources/AppResources.et.resx

@@ -1585,6 +1585,9 @@ Skaneerimine toimub automaatselt.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Täida blokeeritud URId automaatselt</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Blokeeritud URIdele ei pakuta automaattäidet. Eralda erinevad URId komaga. Nt nagu: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Küsi "Lisa konto andmed"</value>
   </data>
@@ -2493,7 +2496,7 @@ Soovid selle konto peale lülituda?</value>
     <value>Tuleta ülemparooli vihjega meelde</value>
   </data>
   <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Sisselogimas kui {0} lehel {1}</value>
+    <value>Logging in as {0} on {1}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Pole sina?</value>
@@ -2607,19 +2610,19 @@ Soovid selle konto peale lülituda?</value>
     <value>Otsingusõnale ei vasta kirjeid</value>
   </data>
   <data name="US" xml:space="preserve">
-    <value>USA</value>
+    <value>US</value>
   </data>
   <data name="EU" xml:space="preserve">
-    <value>EL</value>
+    <value>EU</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
-    <value>Enda majutatud</value>
+    <value>Self-hosted</value>
   </data>
   <data name="DataRegion" xml:space="preserve">
-    <value>Andmete salvestamise piirkond</value>
+    <value>Data region</value>
   </data>
   <data name="Region" xml:space="preserve">
-    <value>Piirkond</value>
+    <value>Region</value>
   </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>Sinu ülemparool ei vasta ühele või rohkemale organisatsiooni poolt seatud poliitikale. Hoidlale ligipääsemiseks pead oma ülemaprooli uuendama. Jätkamisel logitakse sind praegusest sessioonist välja, mistõttu pead uuesti sisse logima. Teistes seadmetes olevad aktiivsed sessioonid aeguvad umbes ühe tunni jooksul.</value>
@@ -2627,90 +2630,10 @@ Soovid selle konto peale lülituda?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Praegune ülemparool</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Pääsukood</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Pääsukoodid</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Loodud {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Rakendus</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Pääsukoodi rakenduse muutmine ei ole võimalik, sest see muudaks pääsukoodi mitte-töötavaks</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Pääsukoodi ei kopeerita</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Pääsukoodi ei kopeerita kloonitud kirjele. Oled kindel, et soovid jätkata?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopeeri rakendus</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Saadaval kaheastmelise kinnitamise jaoks</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Avamine võib ebapiisava mälu tõttu nurjuda. Probleemi lahendamiseks vähenda KDF mälu seadeid.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Vigane API võti</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Vigane API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Seda kirjet ei saa organisatsiooniga jagada, sest sama pääsukoodiga kirje juba eksisteerib.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Automaatse täitmise keelamine</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Automaattäitmist ei pakuta nende URId-e puhul.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Uus blokeeritud URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI salvestatud</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Vale vorming. Kasuta https://, http://, või androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Muuda URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Sisesta URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Vorming: {0}. Eralda mitu URI-t komadega.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Vorming: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Vale URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI eemaldatud</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Puuduvad keelatud URI-d</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} on juba keelatud</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Mitme URI korraga muutmine ei toiminud</value>
   </data>
 </root>

src/App/Resources/AppResources.eu.resx

@@ -1584,6 +1584,9 @@
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Auto-bete blokeatutako URI-ak</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Blokeatutako URI-ei ez zaie berez auto-betetzea eskainiko. Koma batekin URI-ak bereizi. Adibidez: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Galdetu saio-hasiera gehitzeko</value>
   </data>
@@ -2612,10 +2615,10 @@ Kontu honetara aldatu nahi duzu?</value>
     <value>EU</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
-    <value>Norberak ostatatua</value>
+    <value>Self-hosted</value>
   </data>
   <data name="DataRegion" xml:space="preserve">
-    <value>Data eskualdea</value>
+    <value>Data region</value>
   </data>
   <data name="Region" xml:space="preserve">
     <value>Eskualdea</value>
@@ -2626,90 +2629,10 @@ Kontu honetara aldatu nahi duzu?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Uneko pasahitz nagusia</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>API giltza baliogabea</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>API kode baliogabia</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.fa.resx

@@ -1585,6 +1585,9 @@
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>پر کردن خودکار نشانی‌های اینترنتی مسدود شده</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>پر کردن خودکار برای نشانی‌های اینترنتی مسدود شده ارائه نمی‌شود. چندین نشانی اینترنتی را با کاما جدا کنید. به عنوان مثال: "https://twitter.com، androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>درخواست افزودن ورود به سیستم</value>
   </data>
@@ -2494,7 +2497,7 @@
     <value>دریافت یادآور کلمه عبور اصلی</value>
   </data>
   <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>درحال وارد شدن به عنوان {0} در {1}</value>
+    <value>Logging in as {0} on {1}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>شما نیستید؟</value>
@@ -2608,19 +2611,19 @@
     <value>هیچ موردی وجود ندارد که با جستجو مطابقت داشته باشد</value>
   </data>
   <data name="US" xml:space="preserve">
-    <value>امریکا</value>
+    <value>US</value>
   </data>
   <data name="EU" xml:space="preserve">
-    <value>اروپا</value>
+    <value>EU</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
-    <value>خود میزبان</value>
+    <value>Self-hosted</value>
   </data>
   <data name="DataRegion" xml:space="preserve">
-    <value>منطقه داده</value>
+    <value>Data region</value>
   </data>
   <data name="Region" xml:space="preserve">
-    <value>منطقه</value>
+    <value>Region</value>
   </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند.</value>
@@ -2628,90 +2631,10 @@
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>کلمه عبور اصلی فعلی</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>راهنمای درخواست مجدد کلمه عبور اصلی</value>
+    <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>باز کردن قفل ممکن است به دلیل حافظه ناکافی انجام شود. تنظیمات حافظه KDF خود را کاهش دهید تا حل شود.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>کلید API نامعتبر</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>توکن API نامعتبر</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.fi.resx

@@ -727,7 +727,7 @@
     <value>Näytä kohde</value>
   </data>
   <data name="WebVault" xml:space="preserve">
-    <value>Bitwarden Verkkoholvi</value>
+    <value>Bitwardenin verkkoholvi</value>
   </data>
   <data name="Lost2FAApp" xml:space="preserve">
     <value>Etkö pysty käyttämään todennussovellustasi?</value>
@@ -937,7 +937,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Tiedosto</value>
   </data>
   <data name="NoFileChosen" xml:space="preserve">
-    <value>Tiedostoa ei ole valittu.</value>
+    <value>Ei valittua tiedostoa</value>
   </data>
   <data name="NoAttachments" xml:space="preserve">
     <value>Ei liitteitä.</value>
@@ -1489,7 +1489,7 @@ Koodi luetaan automaattisesti.</value>
     <value>30 minuuttia</value>
   </data>
   <data name="SetPINDescription" xml:space="preserve">
-    <value>Aseta PIN-koodi Bitwardenin avaukselle. PIN-asetus tyhjentyy, jos kirjaudut kokonaan ulos sovelluksesta.</value>
+    <value>Aseta PIN-koodi Bitwardenin avaukselle. PIN-asetukset tyhjentyvät, jos kirjaudut kokonaan ulos sovelluksesta.</value>
   </data>
   <data name="LoggedInAsOn" xml:space="preserve">
     <value>Kirjautui palvelimelle {1} tunnuksella {0}.</value>
@@ -1585,8 +1585,11 @@ Koodi luetaan automaattisesti.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Täytä estetyt URI:t automaattisesti</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Automaattista täyttöä ei tarjota estetyille URI-osoitteille. Erota useat osoitteet pilkuilla. Esimerkiksi: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
-    <value>Kysy lisätäänkö kirjautumistieto</value>
+    <value>Kysy lisätäänkö kirjautimistieto</value>
   </data>
   <data name="AskToAddLoginDescription" xml:space="preserve">
     <value>Kysy lisätäänkö uusi kohde, jos holvissa ei vielä ole sopivaa kohdetta.</value>
@@ -1759,7 +1762,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Synkronoi holvi päivityksen yhteydessä</value>
   </data>
   <data name="EnableSyncOnRefreshDescription" xml:space="preserve">
-    <value>Holvi synkronoidaan myös alasveto-eleellä suoritettavan päivityksen yhteydessä.</value>
+    <value>Synkronoidaan holvi alasveto-eleellä.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
     <value>Yrityksen kertakirjautuminen (SSO)</value>
@@ -2364,7 +2367,7 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
     <value>Hyväksy kirjautumispyyntöjä</value>
   </data>
   <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Hyväksy kirjautumispyyntöjä tällä laitteella</value>
+    <value>Hyväksy muiden laitteiden kirjautumispyynnöt tältä laitteelta.</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
     <value>Salli ilmoitukset</value>
@@ -2539,7 +2542,7 @@ Haluatko vaihtaa tähän tiliin?</value>
     <value>Pyynnöt hylättiin</value>
   </data>
   <data name="NoPendingRequests" xml:space="preserve">
-    <value>Odottavia pyyntöjä ei ole</value>  
+    <value>Ei odottavia pyyntöjä</value>  
   </data>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Myönnä kameran käyttöoikeus skannerin käyttämiseksi</value>
@@ -2551,7 +2554,7 @@ Haluatko vaihtaa tähän tiliin?</value>
     <value>Kieleksi vaihdettiin {0}. Käynnistä sovellus uudelleen nähdäksesi muutoksen.</value>
   </data>
   <data name="LanguageChangeRequiresAppRestart" xml:space="preserve">
-    <value>Kielen vaihto vaatii sovelluksen uudelleenkäynnistyksen.</value>
+    <value>Kielen vaihto edellyttää sovelluksen uudelleenkäynnistyksen</value>
   </data>
   <data name="DefaultSystem" xml:space="preserve">
     <value>Oletus (järjestelmä)</value>
@@ -2628,90 +2631,10 @@ Haluatko vaihtaa tähän tiliin?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Nykyinen pääsalasana</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Suojausavain</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Suojausavaimet</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Luotu {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Sovellus</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>Et voi muokata suojausavainsovellusta, koska se mitätöisi avaimen.</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Suojausavainta ei kopioida</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>Suojausavainta ei kopioida kloonattuun kohteeseen. Haluatko jatkaa kloonausta?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Kopioi sovellus</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Käytettävissä kaksivaiheiseen kirjautumiseen</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Pääsalasanan uudelleenkyselyn ohje</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Lukituksen avaus voi epäonnistua riittämättömän keskusmuistin vuoksi. Korjaa madaltamalla KDF-muistiasetuksiasi.</value>
+    <value>Lukituksen avaus voi epäonnistua riittämättömän keskusmuistin vuoksi. Tämän välttämiseksi voit madaltaa KDF-muistiasetuksiasi.</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Virheellinen API-avain</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Virheellinen API-tunniste</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>Kohdetta ei voida jakaa organisaatiolle, koska siellä on jo samaa suojausavainta käyttävä kohde.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Estä automaattinen täyttö</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Automaattista täyttöä ei tarjota näille URI-osoitteille.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Uusi estetty URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI tallennettiin</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Virheellinen muoto. Käytä muotoa https://, http:// tai androidapp://.</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Muokkaa URI:a</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Syötä URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Muoto: {0}. Erota useita URI-osoitteita pilkuilla.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Muoto: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Virheellinen URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI poistettiin</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Estettyjä URI-osoitteita ei ole</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>URI {0} on jo estetty</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Useita URI-osoitteita ei ole mahdollista muokata samanaikaisesti</value>
   </data>
 </root>

src/App/Resources/AppResources.fil.resx

@@ -1585,6 +1585,9 @@ Awtomatikong itong magsa-scan.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Mga URI na hindi io-autofill-an</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Hindi iaalok ang autofill sa mga naharang na URI. Paghiwalayin ang mga URI gamit ang kuwit. Halimbawa: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Magpaalam para magdagdag ng login</value>
   </data>
@@ -2628,90 +2631,10 @@ Gusto mo bang pumunta sa account na ito?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>

src/App/Resources/AppResources.fr.resx

@@ -1585,6 +1585,9 @@ La numérisation se fera automatiquement.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Saisie automatique des URIs bloqués</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>La saisie automatique ne sera pas proposée pour les URI bloqués. Séparez plusieurs URI par une virgule. Par exemple : "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Demander pour ajouter un identifiant</value>
   </data>
@@ -2628,90 +2631,10 @@ Voulez-vous basculer vers ce compte ?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Mot de passe principal actuel</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Aide sur la ressaisie du mot de passe principal</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Le déverrouillage peut échouer en raison d'une mémoire insuffisante. Diminuez les paramètres de mémoire KDF pour y remédier</value>
   </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Clé API invalide</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Jeton API invalide</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Bloquer la saisie automatique</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>La saisie automatique ne sera pas proposée pour ces URI.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>Nouveau URI bloqué</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI enregistré</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Format invalide. Utilisez https://, http://, ou androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Modifier l'URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Saisir l'URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format : {0}. Séparez les URI multiples par une virgule.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format : {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>URI incorrect</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI supprimé</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>Il n'y a pas d'URI bloqués</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>L'URI {0} est déjà bloqué</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Impossible de modifier des URI multiples à la fois</value>
-  </data>
 </root>

src/App/Resources/AppResources.gl.resx

@@ -1585,6 +1585,9 @@ Scanning will happen automatically.</value>
   <data name="AutofillBlockedUris" xml:space="preserve">
     <value>Auto-fill blocked URIs</value>
   </data>
+  <data name="AutofillBlockedUrisDescription" xml:space="preserve">
+    <value>Auto-fill will not be offered for blocked URIs. Separate multiple URIs with a comma. For example: "https://twitter.com, androidapp://com.twitter.android".</value>
+  </data>
   <data name="AskToAddLogin" xml:space="preserve">
     <value>Ask to add login</value>
   </data>
@@ -2628,90 +2631,10 @@ Do you want to switch to this account?</value>
   <data name="CurrentMasterPassword" xml:space="preserve">
     <value>Current master password</value>
   </data>
-  <data name="Passkey" xml:space="preserve">
-    <value>Passkey</value>
-  </data>
-  <data name="Passkeys" xml:space="preserve">
-    <value>Passkeys</value>
-  </data>
-  <data name="CreatedX" xml:space="preserve">
-    <value>Created {0}</value>
-    <comment>To state the date in which the cipher was created: Created 03/21/2023</comment>
-  </data>
-  <data name="Application" xml:space="preserve">
-    <value>Application</value>
-  </data>
-  <data name="YouCannotEditPasskeyApplicationBecauseItWouldInvalidateThePasskey" xml:space="preserve">
-    <value>You cannot edit passkey application because it would invalidate the passkey</value>
-  </data>
-  <data name="PasskeyWillNotBeCopied" xml:space="preserve">
-    <value>Passkey will not be copied</value>
-  </data>
-  <data name="ThePasskeyWillNotBeCopiedToTheClonedItemDoYouWantToContinueCloningThisItem" xml:space="preserve">
-    <value>The passkey will not be copied to the cloned item. Do you want to continue cloning this item?</value>
-  </data>
-  <data name="CopyApplication" xml:space="preserve">
-    <value>Copy application</value>
-  </data>
-  <data name="AvailableForTwoStepLogin" xml:space="preserve">
-    <value>Available for two-step login</value>
-  </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
     <value>Master password re-prompt help</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
-    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve.</value>
+    <value>Unlocking may fail due to insufficient memory. Decrease your KDF memory settings to resolve</value>
-  </data>
-  <data name="InvalidAPIKey" xml:space="preserve">
-    <value>Invalid API key</value>
-  </data>
-  <data name="InvalidAPIToken" xml:space="preserve">
-    <value>Invalid API token</value>
-  </data>
-  <data name="ThisItemCannotBeSharedWithTheOrganizationBecauseThereIsOneAlreadyWithTheSamePasskey" xml:space="preserve">
-    <value>This item cannot be shared with the organization because there is one already with the same passkey.</value>
-  </data>
-  <data name="BlockAutoFill" xml:space="preserve">
-    <value>Block auto-fill</value>
-  </data>
-  <data name="AutoFillWillNotBeOfferedForTheseURIs" xml:space="preserve">
-    <value>Auto-fill will not be offered for these URIs.</value>
-  </data>
-  <data name="NewBlockedURI" xml:space="preserve">
-    <value>New blocked URI</value>
-  </data>
-  <data name="URISaved" xml:space="preserve">
-    <value>URI saved</value>
-  </data>
-  <data name="InvalidFormatUseHttpsHttpOrAndroidApp" xml:space="preserve">
-    <value>Invalid format. Use https://, http://, or androidapp://</value>
-    <comment>https://, http://, androidapp:// should not be translated</comment>
-  </data>
-  <data name="EditURI" xml:space="preserve">
-    <value>Edit URI</value>
-  </data>
-  <data name="EnterURI" xml:space="preserve">
-    <value>Enter URI</value>
-  </data>
-  <data name="FormatXSeparateMultipleURIsWithAComma" xml:space="preserve">
-    <value>Format: {0}. Separate multiple URIs with a comma.</value>
-  </data>
-  <data name="FormatX" xml:space="preserve">
-    <value>Format: {0}</value>
-  </data>
-  <data name="InvalidURI" xml:space="preserve">
-    <value>Invalid URI</value>
-  </data>
-  <data name="URIRemoved" xml:space="preserve">
-    <value>URI removed</value>
-  </data>
-  <data name="ThereAreNoBlockedURIs" xml:space="preserve">
-    <value>There are no blocked URIs</value>
-  </data>
-  <data name="TheURIXIsAlreadyBlocked" xml:space="preserve">
-    <value>The URI {0} is already blocked</value>
-  </data>
-  <data name="CannotEditMultipleURIsAtOnce" xml:space="preserve">
-    <value>Cannot edit multiple URIs at once</value>
   </data>
 </root>