[PM-2287] Add trust device to master password unlock. Change trust device method. Remove email from SSO login page.

# Conflicts:
#	src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs
#	src/App/Resources/AppResources.resx

.github/workflows/build.yml

@@ -793,7 +793,7 @@ jobs:
           done
 
       - name: Upload Sources
-        uses: crowdin/github-action@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
+        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
         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@ecd7eb0ef6f3cfa16293c79e9cbc4bc5b5fd9c49 # v1.4.9
+        uses: crowdin/github-action@965d501f160af7b1f88aed4c29154b0caf1e94b9 # v1.9.0
         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 # v2.2.2
+        uses: yogevbd/enforce-label-action@a3c219da6b8fa73f6ba62b68ff09c469b3a1c024 # 2.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@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
         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@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
         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@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
         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@575b1e4167df67acf7e692af784566618b23c71e  # v2.17.10
+        uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615  # v2.27.0
         with:
           workflow: build.yml
           workflow_conclusion: success

src/Android/Android.csproj

@@ -159,6 +159,7 @@
     <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" />

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,14 @@ 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 => FieldIsPassword(f)).ToList();
-                    if (!_passwordFields.Any())
-                    {
-                        _passwordFields = Fields.Where(f => FieldHasPasswordTerms(f)).ToList();
-                    }
+                    _passwordFields = Fields.Where(f => FieldHasPasswordTerms(f)).ToList();
                 }
                 return _passwordFields;
             }
@@ -87,24 +86,26 @@ namespace Bit.Droid.Autofill
                     {
                         _usernameFields.AddRange(HintToFieldsMap[View.AutofillHintUsername]);
                     }
+                    if (_usernameFields.Any())
+                    {
+                        return _usernameFields;
+                    }
                 }
-                else
-                {
-                    foreach (var passwordField in PasswordFields)
-                    {
-                        var usernameField = Fields.TakeWhile(f => f.AutofillId != passwordField.AutofillId)
-                            .LastOrDefault();
-                        if (usernameField != null)
-                        {
-                            _usernameFields.Add(usernameField);
-                        }
-                    }
 
-                    if (!_usernameFields.Any())
+                foreach (var passwordField in PasswordFields)
+                {
+                    var usernameField = Fields.TakeWhile(f => f.AutofillId != passwordField.AutofillId)
+                        .LastOrDefault();
+                    if (usernameField != null)
                     {
-                        _usernameFields = Fields.Where(f => FieldIsUsername(f)).ToList();
+                        _usernameFields.Add(usernameField);
                     }
                 }
+
+                if (!_usernameFields.Any())
+                {
+                    _usernameFields = Fields.Where(f => FieldIsUsername(f)).ToList();
+                }
                 return _usernameFields;
             }
         }

src/Android/MainActivity.cs

@@ -44,7 +44,6 @@ namespace Bit.Droid
         private IAppIdService _appIdService;
         private IEventService _eventService;
         private IPushNotificationListenerService _pushNotificationListenerService;
-        private IVaultTimeoutService _vaultTimeoutService;
         private ILogger _logger;
         private PendingIntent _eventUploadPendingIntent;
         private AppOptions _appOptions;
@@ -69,7 +68,6 @@ 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;
@@ -234,7 +232,6 @@ 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/Renderers/CustomLabelRenderer.cs

@@ -0,0 +1,31 @@
+using System;
+using Bit.App.Controls;
+using System.ComponentModel;
+using Xamarin.Forms.Platform.Android;
+using Android.Content;
+using Xamarin.Forms;
+using Bit.Droid.Renderers;
+
+[assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))]
+namespace Bit.Droid.Renderers
+{
+    public class CustomLabelRenderer : LabelRenderer
+    {
+        public CustomLabelRenderer(Context context)
+            : base(context)
+        { }
+
+        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/App/App.csproj

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

src/App/App.xaml.cs

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

src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml

@@ -30,13 +30,15 @@
                 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,20 +60,23 @@
                     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}"
@@ -81,7 +84,8 @@
                     StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation" />
+                    LineBreakMode="TailTruncation"
+                    AutomationId="AccountStatusLabel" />
                 <Label
                     Grid.Row="2"
                     Text="{u:I18n AccountLocked}"
@@ -89,7 +93,8 @@
                     StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation" />
+                    LineBreakMode="TailTruncation"
+                    AutomationId="AccountStatusLabel" />
                 <Label
                     Grid.Row="2"
                     Text="{u:I18n AccountLoggedOut}"
@@ -97,7 +102,8 @@
                     StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
-                    LineBreakMode="TailTruncation" />
+                    LineBreakMode="TailTruncation"
+                    AutomationId="AccountStatusLabel" />
             </Grid>
 
             <controls:IconLabel
@@ -107,7 +113,8 @@
                 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}" 
@@ -116,7 +123,8 @@
                 HorizontalOptions="Center"
                 VerticalOptions="Center"
                 StyleClass="list-icon, list-icon-platform"
-                TextColor="{DynamicResource TextColor}"/>
+                TextColor="{DynamicResource TextColor}"
+                AutomationId="ActiveVaultIcon" />
         </Grid>
 
         <Grid
@@ -147,7 +155,8 @@
                 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,7 +9,8 @@
     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"/>
@@ -36,7 +37,8 @@
         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"
@@ -52,7 +54,8 @@
         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>
@@ -71,7 +74,8 @@
             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"
@@ -80,7 +84,8 @@
             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"
@@ -91,7 +96,8 @@
             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"
@@ -102,7 +108,8 @@
             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
@@ -114,6 +121,7 @@
         VerticalOptions="CenterAndExpand"
         HorizontalOptions="EndAndExpand"
         AutomationProperties.IsInAccessibleTree="True"
-        AutomationProperties.Name="{u:I18n Options}" />
+        AutomationProperties.Name="{u:I18n Options}"
+        AutomationId="CipherOptionsButton" />
 
 </controls:ExtendedGrid>

src/App/Controls/CustomLabel.cs

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

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,14 +54,16 @@
             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"
@@ -72,7 +74,8 @@
             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"
@@ -83,7 +86,8 @@
             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"
@@ -94,7 +98,8 @@
             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"
@@ -105,7 +110,8 @@
             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"
@@ -116,7 +122,8 @@
             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
@@ -129,6 +136,7 @@
         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,7 +33,8 @@
             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}"
@@ -49,13 +50,15 @@
             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,7 +31,8 @@
             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"
@@ -39,7 +40,8 @@
             <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"
@@ -56,7 +58,8 @@
             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>
@@ -74,7 +77,8 @@
             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,13 +29,15 @@
             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}">
@@ -44,7 +46,8 @@
                 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"
@@ -55,7 +58,8 @@
             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,13 +29,15 @@
             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"
@@ -43,7 +45,8 @@
             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}}"
@@ -53,7 +56,8 @@
             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}}"
@@ -63,7 +67,8 @@
             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/HomePage.xaml

@@ -23,7 +23,8 @@
             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,7 +24,8 @@
                 Priority="-1"
                 UseOriginalImage="True"
                 AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}" />
+                AutomationProperties.Name="{u:I18n Account}"
+                AutomationId="AccountIconButton" />
     </ContentPage.ToolbarItems>
     
     <ContentPage.Resources>
@@ -72,7 +73,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}"
@@ -83,7 +84,7 @@
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{u:I18n ToggleVisibility}" 
                                 AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                AutomationId="PinVisibilityToggle"/>
+                                AutomationId="PinVisibilityToggle" />
                         </Grid>
                         <Grid
                             x:Name="_passwordGrid"
@@ -114,7 +115,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}"
@@ -153,7 +154,7 @@
                             Text="{u:I18n Unlock}"
                             StyleClass="btn-primary"
                             Clicked="Unlock_Clicked"
-                            AutomationId="UnlockVaultButton"/>
+                            AutomationId="UnlockVaultButton" />
                     </StackLayout>
                 </StackLayout>
             </ScrollView>

src/App/Pages/Accounts/LockPageViewModel.cs

@@ -33,7 +33,7 @@ namespace Bit.App.Pages
         private readonly WeakEventManager<int?> _secretEntryFocusWeakEventManager = new WeakEventManager<int?>();
         private readonly IPolicyService _policyService;
         private readonly IPasswordGenerationService _passwordGenerationService;
-
+        private IDeviceTrustCryptoService _deviceTrustCryptoService;
         private string _email;
         private string _masterPassword;
         private string _pin;
@@ -65,6 +65,7 @@ namespace Bit.App.Pages
             _watchDeviceService = ServiceContainer.Resolve<IWatchDeviceService>();
             _policyService = ServiceContainer.Resolve<IPolicyService>();
             _passwordGenerationService = ServiceContainer.Resolve<IPasswordGenerationService>();
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
 
             PageTitle = AppResources.VerifyMasterPassword;
             TogglePasswordCommand = new Command(TogglePassword);
@@ -454,6 +455,11 @@ namespace Bit.App.Pages
             {
                 await _cryptoService.SetKeyAsync(key);
             }
+            if (await _deviceTrustCryptoService.GetUserTrustDeviceChoiceForDecryptionAsync())
+            {
+                await _deviceTrustCryptoService.TrustDeviceAsync();
+                await _deviceTrustCryptoService.SetUserTrustDeviceChoiceForDecryptionAsync(false);
+            }
             await DoContinueAsync();
         }
 

src/App/Pages/Accounts/LoginApproveDevicePage.xaml

@@ -0,0 +1,76 @@
+<?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.LoginApproveDevicePage"
+    xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:u="clr-namespace:Bit.App.Utilities"
+    x:DataType="pages:LoginApproveDeviceViewModel"
+    x:Name="_page"
+    Title="{Binding PageTitle}">
+    
+    <ContentPage.BindingContext>
+        <pages:LoginApproveDeviceViewModel />
+    </ContentPage.BindingContext>
+
+    <StackLayout Padding="10, 10">
+        <StackLayout Padding="5, 10" Orientation="Horizontal">
+            <StackLayout HorizontalOptions="FillAndExpand">
+                <Label
+                    StyleClass="text-md"
+                    Text="{u:I18n RememberThisDevice}"/>
+                <Label
+                    StyleClass="box-sub-label"
+                    Text="{u:I18n TurnOffUsingPublicDevice}"/>
+            </StackLayout>
+            <Switch
+                Scale="0.8"
+                IsToggled="{Binding RememberThisDevice}"
+                VerticalOptions="Center"/>
+        </StackLayout>
+        <StackLayout Margin="0, 20, 0, 0">
+            <Button
+                x:Name="_continue"
+                Text="{u:I18n Continue}" 
+                StyleClass="btn-primary"
+                Command="{Binding ContinueCommand}"
+                IsVisible="{Binding ContinueEnabled}"/>
+            <Button
+                x:Name="_approveWithMyOtherDevice"
+                Text="{u:I18n ApproveWithMyOtherDevice}" 
+                StyleClass="btn-primary"
+                Command="{Binding ApproveWithMyOtherDeviceCommand}"
+                IsVisible="{Binding ApproveWithMyOtherDeviceEnabled}"/>
+            <Button
+                x:Name="_requestAdminApproval"
+                Text="{u:I18n RequestAdminApproval}" 
+                StyleClass="box-button-row"
+                Command="{Binding RequestAdminApprovalCommand}"
+                IsVisible="{Binding RequestAdminApprovalEnabled}"/>
+            <Button
+                x:Name="_approveWithMasterPassword"
+                Text="{u:I18n ApproveWithMasterPassword}" 
+                StyleClass="box-button-row"
+                Command="{Binding ApproveWithMasterPasswordCommand}"
+                IsVisible="{Binding ApproveWithMasterPasswordEnabled}"/>
+            <Label
+                Text="{Binding LoggingInAsText}"
+                StyleClass="text-sm"
+                Margin="0,40,0,0"
+                AutomationId="LoggingInAsLabel"
+                />
+            <Label
+                Text="{u:I18n NotYou}"
+                StyleClass="text-md"
+                HorizontalOptions="Start"
+                TextColor="{DynamicResource HyperlinkColor}"
+                AutomationId="NotYouLabel">
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer Tapped="Cancel_Clicked" />
+                </Label.GestureRecognizers>
+            </Label>
+        </StackLayout>
+    </StackLayout>
+</pages:BaseContentPage>
+
+

src/App/Pages/Accounts/LoginApproveDevicePage.xaml.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.App.Models;
+using Bit.App.Utilities;
+using Bit.Core.Enums;
+using Bit.Core.Utilities;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public partial class LoginApproveDevicePage : BaseContentPage
+    {
+
+        private readonly LoginApproveDeviceViewModel _vm;
+        private readonly AppOptions _appOptions;
+
+        public LoginApproveDevicePage(AppOptions appOptions = null)
+        {
+            InitializeComponent();
+            _vm = BindingContext as LoginApproveDeviceViewModel;
+            _vm.LogInWithMasterPassword = () => StartLogInWithMasterPassword().FireAndForget();
+            _vm.LogInWithDeviceAction = () => StartLoginWithDeviceAsync().FireAndForget();
+            _vm.RequestAdminApprovalAction = () => RequestAdminApprovalAsync().FireAndForget();
+            _vm.CloseAction = () => { Navigation.PopModalAsync(); };
+            _vm.Page = this;
+            _appOptions = appOptions;
+        }
+
+        protected override void OnAppearing()
+        {
+            _vm.InitAsync();
+        }
+
+        private void Cancel_Clicked(object sender, EventArgs e)
+        {
+            if (DoOnce())
+            {
+                _vm.CloseAction();
+            }
+        }
+
+        private async Task StartLogInWithMasterPassword()
+        {
+            var page = new LockPage(_appOptions);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private async Task StartLoginWithDeviceAsync()
+        {
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+
+        private async Task RequestAdminApprovalAsync()
+        {
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AdminApproval, _appOptions);
+            await Navigation.PushModalAsync(new NavigationPage(page));
+        }
+    }
+}
+

src/App/Pages/Accounts/LoginApproveDeviceViewModel.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Bit.App.Abstractions;
+using Bit.App.Resources;
+using Bit.App.Utilities.AccountManagement;
+using Bit.Core.Abstractions;
+using Bit.Core.Enums;
+using Bit.Core.Models.Request;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Xamarin.CommunityToolkit.ObjectModel;
+using Xamarin.Essentials;
+using Xamarin.Forms;
+
+namespace Bit.App.Pages
+{
+    public class LoginApproveDeviceViewModel : BaseViewModel
+    {
+        private bool _rememberThisDevice;
+        private bool _approveWithMyOtherDeviceEnabled;
+        private bool _requestAdminApprovalEnabled;
+        private bool _approveWithMasterPasswordEnabled;
+        private bool _continueEnabled;
+        private string _email;
+        private readonly IStateService _stateService;
+        private readonly IApiService _apiService;
+        private IDeviceTrustCryptoService _deviceTrustCryptoService;
+
+        public ICommand ApproveWithMyOtherDeviceCommand { get; }
+        public ICommand RequestAdminApprovalCommand { get; }
+        public ICommand ApproveWithMasterPasswordCommand { get; }
+        public ICommand ContinueCommand { get; }
+
+        public Action LogInWithMasterPassword { get; set; }
+        public Action LogInWithDeviceAction { get; set; }
+        public Action RequestAdminApprovalAction { get; set; }
+        public Action CloseAction { get; set; }
+
+        public LoginApproveDeviceViewModel()
+        {
+            _stateService = ServiceContainer.Resolve<IStateService>();
+            _apiService = ServiceContainer.Resolve<IApiService>();
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
+
+            PageTitle = AppResources.LoggedIn;
+
+            ApproveWithMyOtherDeviceCommand = new AsyncCommand(() => CheckDeviceTrustAndInvoke(LogInWithDeviceAction),
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            RequestAdminApprovalCommand = new AsyncCommand(() => CheckDeviceTrustAndInvoke(RequestAdminApprovalAction),
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            ApproveWithMasterPasswordCommand = new AsyncCommand(() => CheckDeviceTrustAndInvoke(LogInWithMasterPassword),
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+
+            ContinueCommand = new AsyncCommand(InitAsync,
+                onException: ex => HandleException(ex),
+                allowsMultipleExecutions: false);
+        }
+
+        public string LoggingInAsText => string.Format(AppResources.LoggingInAsX, Email);
+
+        public bool RememberThisDevice
+        {
+            get => _rememberThisDevice;
+            set => SetProperty(ref _rememberThisDevice, value);
+        }
+
+        public bool ApproveWithMyOtherDeviceEnabled
+        {
+            get => _approveWithMyOtherDeviceEnabled;
+            set => SetProperty(ref _approveWithMyOtherDeviceEnabled, value);
+        }
+
+        public bool RequestAdminApprovalEnabled
+        {
+            get => _requestAdminApprovalEnabled;
+            set => SetProperty(ref _requestAdminApprovalEnabled, value);
+        }
+
+        public bool ApproveWithMasterPasswordEnabled
+        {
+            get => _approveWithMasterPasswordEnabled;
+            set => SetProperty(ref _approveWithMasterPasswordEnabled, value);
+        }
+
+        public bool ContinueEnabled
+        {
+            get => _continueEnabled;
+            set => SetProperty(ref _continueEnabled, value);
+        }
+
+        public string Email
+        {
+            get => _email;
+            set => SetProperty(ref _email, value, additionalPropertyNames:
+                new string[] {
+                    nameof(LoggingInAsText)
+                });
+        }
+
+        public async Task InitAsync()
+        {
+            try
+            {
+                Email = await _stateService.GetRememberedEmailAsync();
+                var decryptOptions = await _stateService.GetAccountDecryptionOptions();
+                RequestAdminApprovalEnabled = decryptOptions != null && decryptOptions.TrustedDeviceOption != null && decryptOptions.TrustedDeviceOption.HasAdminApproval;
+                ApproveWithMasterPasswordEnabled = decryptOptions != null && decryptOptions.HasMasterPassword;
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+
+            try
+            {
+                ApproveWithMyOtherDeviceEnabled = await _apiService.GetDevicesExistenceByTypes(DeviceTypeExtensions.GetDesktopAndMobileTypes().ToArray());
+            }
+            catch (Exception ex)
+            {
+                HandleException(ex);
+            }
+
+            // TODO: Change this expression to, Appear if the browser is trusted and shared the key with the app
+            ContinueEnabled = !RequestAdminApprovalEnabled && !ApproveWithMasterPasswordEnabled && !ApproveWithMyOtherDeviceEnabled;
+        }
+
+        private async Task CheckDeviceTrustAndInvoke(Action action)
+        {
+            await _deviceTrustCryptoService.SetUserTrustDeviceChoiceForDecryptionAsync(RememberThisDevice);
+            await Device.InvokeOnMainThreadAsync(action);
+        }
+    }
+}
+

src/App/Pages/Accounts/LoginPage.xaml

@@ -24,7 +24,8 @@
                 Priority="-1"
                 UseOriginalImage="True"
                 AutomationProperties.IsInAccessibleTree="True"
-                AutomationProperties.Name="{u:I18n Account}" />
+                AutomationProperties.Name="{u:I18n Account}"
+                AutomationId="AccountIconButton" />
     </ContentPage.ToolbarItems>
 
     <ContentPage.Resources>
@@ -34,7 +35,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/LoginPage.xaml.cs

@@ -4,6 +4,7 @@ using Bit.App.Models;
 using Bit.App.Utilities;
 using Bit.Core;
 using Bit.Core.Abstractions;
+using Bit.Core.Enums;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Xamarin.CommunityToolkit.ObjectModel;
@@ -135,7 +136,7 @@ namespace Bit.App.Pages
 
         private async Task StartLoginWithDeviceAsync()
         {
-            var page = new LoginPasswordlessRequestPage(_vm.Email, _appOptions);
+            var page = new LoginPasswordlessRequestPage(_vm.Email, AuthRequestType.AuthenticateAndUnlock, _appOptions);
             await Navigation.PushModalAsync(new NavigationPage(page));
         }
 

src/App/Pages/Accounts/LoginPasswordlessPage.xaml

@@ -32,7 +32,8 @@
                 <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"
@@ -41,7 +42,8 @@
                     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"
@@ -49,7 +51,8 @@
                 <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}"
@@ -59,7 +62,8 @@
                     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"
@@ -67,7 +71,8 @@
                 <Label
                     Text="{Binding TimeOfRequestText}"
                     FontSize="Small"
-                    Margin="0,0,0,57"/>
+                    Margin="0,0,0,57"
+                    AutomationId="TimeOfRequestValueLabel" />
             </StackLayout>
         </ScrollView>
 
@@ -75,11 +80,13 @@
                 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

@@ -21,16 +21,17 @@
         <StackLayout
             Padding="7, 0, 7, 20">
             <Label
-                Text="{u:I18n LogInInitiated}"
+                Text="{Binding Tittle}"
                 FontSize="Title"
                 FontAttributes="Bold"
-                Margin="0,14,0,21"/>
+                Margin="0,14,0,21"
+                AutomationId="LogInInitiatedLabel" />
             <Label
-                Text="{u:I18n ANotificationHasBeenSentToYourDevice}"
+                Text="{Binding SubTittle}"
                 FontSize="Small"
                 Margin="0,0,0,10"/>
             <Label
-                Text="{u:I18n PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice}"
+                Text="{Binding Description}"
                 FontSize="Small"
                 Margin="0,0,0,24"/>
             <Label
@@ -40,13 +41,16 @@
             <controls:MonoLabel
                 FormattedText="{Binding FingerprintPhrase}"
                 FontSize="Medium"
-                TextColor="{DynamicResource FingerprintPhrase}"/>
+                TextColor="{DynamicResource FingerprintPhrase}"
+                AutomationId="FingerprintPhraseValue" />
             <Label
                 Text="{u:I18n ResendNotification}"
+                IsVisible="{Binding ResendNotificationVisible}"
                 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>
@@ -55,7 +59,7 @@
                 Orientation="Horizontal"
                 Margin="0,30,0,0">
                 <Label
-                    Text="{u:I18n NeedAnotherOption}"
+                    Text="{Binding OtherOptions}"
                     FontSize="Small"
                     VerticalTextAlignment="End"/>
                 <Label
@@ -64,7 +68,8 @@
                     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/Accounts/LoginPasswordlessRequestPage.xaml.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.App.Models;
 using Bit.App.Utilities;
+using Bit.Core.Enums;
 using Xamarin.Forms;
 
 namespace Bit.App.Pages
@@ -12,13 +13,14 @@ namespace Bit.App.Pages
         private LoginPasswordlessRequestViewModel _vm;
         private readonly AppOptions _appOptions;
 
-        public LoginPasswordlessRequestPage(string email, AppOptions appOptions = null)
+        public LoginPasswordlessRequestPage(string email, AuthRequestType authRequestType, AppOptions appOptions = null)
         {
             InitializeComponent();
             _appOptions = appOptions;
             _vm = BindingContext as LoginPasswordlessRequestViewModel;
             _vm.Page = this;
             _vm.Email = email;
+            _vm.AuthRequestType = authRequestType;
             _vm.StartTwoFactorAction = () => Device.BeginInvokeOnMainThread(async () => await StartTwoFactorAsync());
             _vm.LogInSuccessAction = () => Device.BeginInvokeOnMainThread(async () => await LogInSuccessAsync());
             _vm.UpdateTempPasswordAction = () => Device.BeginInvokeOnMainThread(async () => await UpdateTempPasswordAsync());

src/App/Pages/Accounts/LoginPasswordlessRequestViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -32,6 +33,7 @@ namespace Bit.App.Pages
         private IPlatformUtilsService _platformUtilsService;
         private IEnvironmentService _environmentService;
         private ILogger _logger;
+        private IDeviceTrustCryptoService _deviceTrustCryptoService;
 
         protected override II18nService i18nService => _i18nService;
         protected override IEnvironmentService environmentService => _environmentService;
@@ -44,6 +46,7 @@ namespace Bit.App.Pages
         private string _email;
         private string _requestId;
         private string _requestAccessCode;
+        private AuthRequestType _authRequestType;
         // Item1 publicKey, Item2 privateKey
         private Tuple<byte[], byte[]> _requestKeyPair;
 
@@ -57,6 +60,7 @@ namespace Bit.App.Pages
             _i18nService = ServiceContainer.Resolve<II18nService>();
             _stateService = ServiceContainer.Resolve<IStateService>();
             _logger = ServiceContainer.Resolve<ILogger>();
+            _deviceTrustCryptoService = ServiceContainer.Resolve<IDeviceTrustCryptoService>();
 
             PageTitle = AppResources.LogInWithAnotherDevice;
 
@@ -77,6 +81,70 @@ namespace Bit.App.Pages
         public ICommand CreatePasswordlessLoginCommand { get; }
         public ICommand CloseCommand { get; }
 
+        public string Tittle
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.LogInInitiated;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.AdminApprovalRequested;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
+        public string SubTittle
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.ANotificationHasBeenSentToYourDevice;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.YourRequestHasBeenSentToYourAdmin;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
+        public string Description
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.PleaseMakeSureYourVaultIsUnlockedAndTheFingerprintPhraseMatchesOnTheOtherDevice;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.YouWillBeNotifiedOnceApproved;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
+        public string OtherOptions
+        {
+            get
+            {
+                switch (_authRequestType)
+                {
+                    case AuthRequestType.AuthenticateAndUnlock:
+                        return AppResources.NeedAnotherOption;
+                    case AuthRequestType.AdminApproval:
+                        return AppResources.TroubleLoggingIn;
+                    default:
+                        return string.Empty;
+                };
+            }
+        }
+
         public string FingerprintPhrase
         {
             get => _fingerprintPhrase;
@@ -89,6 +157,21 @@ namespace Bit.App.Pages
             set => SetProperty(ref _email, value);
         }
 
+        public AuthRequestType AuthRequestType
+        {
+            get => _authRequestType;
+            set => SetProperty(ref _authRequestType, value, additionalPropertyNames: new string[]
+            {
+                nameof(Tittle),
+                nameof(SubTittle),
+                nameof(Description),
+                nameof(OtherOptions),
+                nameof(ResendNotificationVisible)
+            });
+        }
+
+        public bool ResendNotificationVisible => AuthRequestType == AuthRequestType.AuthenticateAndUnlock;
+
         public void StartCheckLoginRequestStatus()
         {
             try
@@ -154,6 +237,11 @@ namespace Bit.App.Pages
                 else
                 {
                     _syncService.FullSyncAsync(true).FireAndForget();
+                    if (await _deviceTrustCryptoService.GetUserTrustDeviceChoiceForDecryptionAsync())
+                    {
+                        await _deviceTrustCryptoService.TrustDeviceAsync();
+                        await _deviceTrustCryptoService.SetUserTrustDeviceChoiceForDecryptionAsync(false);
+                    }
                     LogInSuccessAction?.Invoke();
                 }
             }
@@ -168,7 +256,7 @@ namespace Bit.App.Pages
         {
             await Device.InvokeOnMainThreadAsync(() => _deviceActionService.ShowLoadingAsync(AppResources.Loading));
 
-            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email);
+            var response = await _authService.PasswordlessCreateLoginRequestAsync(_email, AuthRequestType);
             if (response != null)
             {
                 FingerprintPhrase = response.FingerprintPhrase;

src/App/Pages/Accounts/LoginSsoPage.xaml.cs

@@ -110,6 +110,11 @@ namespace Bit.App.Pages
         {
             RestoreAppOptionsFromCopy();
             await AppHelpers.ClearPreviousPage();
+
+            // Just for testing the screen
+            Application.Current.MainPage = new NavigationPage(new LoginApproveDevicePage(_appOptions));
+            return;
+
             if (await _vaultTimeoutService.IsLockedAsync())
             {
                 Application.Current.MainPage = new NavigationPage(new LockPage(_appOptions));

src/App/Pages/Generator/GeneratorHistoryPage.xaml

@@ -27,7 +27,8 @@
                          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}"
@@ -43,7 +44,8 @@
                Margin="20, 0"
                VerticalOptions="CenterAndExpand"
                HorizontalOptions="CenterAndExpand"
-               HorizontalTextAlignment="Center"></Label>
+               HorizontalTextAlignment="Center"
+               AutomationId="NoPasswordsDisplayedLabel"></Label>
         <controls:ExtendedCollectionView
                   IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                   ItemsSource="{Binding History}"
@@ -56,7 +58,8 @@
                         StyleClass="list-row, list-row-platform"
                         Padding="10"
                         RowSpacing="0"
-                        ColumnSpacing="10">
+                        ColumnSpacing="10"
+                        AutomationId="GeneratedPasswordRow">
 
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -71,12 +74,14 @@
                             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}}"
@@ -86,7 +91,8 @@
                             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,7 +71,8 @@
                         <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}}"
@@ -82,21 +83,24 @@
                         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"                  
@@ -107,21 +111,24 @@
                         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"
@@ -135,7 +142,8 @@
                         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"
@@ -161,7 +169,8 @@
                         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}" />
@@ -172,7 +181,8 @@
                             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"
@@ -203,7 +213,8 @@
                         <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" 
@@ -236,26 +247,27 @@
                             ItemsSource="{Binding ForwardedEmailServiceTypeOptions, Mode=OneTime}"
                             SelectedItem="{Binding ForwardedEmailServiceSelected}"
                             ItemDisplayBinding="{Binding ., Converter={StaticResource localizableEnum}}"
-                            StyleClass="box-value" />
-                        <!--ANONADDY OPTIONS-->
-                        <Grid IsVisible="{Binding ForwardedEmailServiceSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:ForwardedEmailServiceType.AnonAddy}}"
-                              Grid.RowDefinitions="Auto,*"
-                              Grid.ColumnDefinitions="*,Auto">
+                            StyleClass="box-value"
+                            AutomationId="ServiceTypePicker" />
+                        <Grid 
+                            Grid.RowDefinitions="Auto,*"
+                            Grid.ColumnDefinitions="*,Auto">
                             <Label
                                 Margin="0,10,0,0"
-                                Text="{u:I18n APIAccessToken}"
+                                Text="{Binding ForwardedEmailApiSecretLabel}"
                                 StyleClass="box-label"/>
                             <Entry
-                                x:Name="_anonAddyApiAccessTokenEntry"
-                                Text="{Binding AnonAddyApiAccessToken}"
-                                IsPassword="{Binding ShowAnonAddyApiAccessToken, Converter={StaticResource inverseBool}}"
-                                Grid.Row="1"/>
+                                Text="{Binding ForwardedEmailApiSecret}"
+                                IsPassword="{Binding ShowForwardedEmailApiSecret, Converter={StaticResource inverseBool}}"
+                                Grid.Row="1"
+                                AutomationId="ForwardedEmailApiSecretEntry" />
                             <controls:IconButton
                                 StyleClass="box-row-button, box-row-button-platform"
-                                Text="{Binding ShowAnonAddyApiAccessToken, Converter={StaticResource inverseBool, iconGlyphConverter}, ConverterParameter={x:Static u:BooleanGlyphType.Eye}}"
+                                Text="{Binding ShowForwardedEmailApiSecret, 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}"
@@ -264,91 +276,8 @@
                         <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"
-                                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>
+                            StyleClass="box-value"
+                            AutomationId="AnonAddyDomainNameEntry" />
                     </StackLayout>                    
                     <!--RANDOM WORD OPTIONS-->
                     <Grid IsVisible="{Binding UsernameTypeSelected, Converter={StaticResource enumToBool}, ConverterParameter={x:Static enums:UsernameType.RandomWord}}">
@@ -359,7 +288,8 @@
                         <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" />
@@ -371,7 +301,8 @@
                         <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" />
@@ -386,7 +317,8 @@
                             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"
@@ -403,12 +335,14 @@
                                 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">
@@ -419,7 +353,8 @@
                                 Text="{Binding WordSeparator}"
                                 IsSpellCheckEnabled="False"
                                 IsTextPredictionEnabled="False"
-                                StyleClass="box-value">
+                                StyleClass="box-value"
+                                AutomationId="WordSeparatorEntry">
                                 <Entry.Effects>
                                     <effects:NoEmojiKeyboardEffect />
                                 </Entry.Effects>
@@ -435,7 +370,8 @@
                                 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">
@@ -448,7 +384,8 @@
                                 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}">
@@ -462,7 +399,8 @@
                                 StyleClass="box-sub-label"
                                 VerticalOptions="CenterAndExpand"
                                 HorizontalTextAlignment="End"
-                                WidthRequest="50" />
+                                WidthRequest="50"
+                                AutomationId="PasswordLengthLabel" />
                             <controls:ExtendedSlider
                                 DragCompleted="LengthSlider_DragCompleted"
                                 Value="{Binding Length}"
@@ -471,7 +409,8 @@
                                 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">
@@ -488,7 +427,8 @@
                                 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">
@@ -505,7 +445,8 @@
                                 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">
@@ -522,7 +463,8 @@
                                 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">
@@ -539,7 +481,8 @@
                                 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">
@@ -554,12 +497,14 @@
                                 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">
@@ -574,12 +519,14 @@
                                 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">
@@ -590,7 +537,8 @@
                             <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,6 +8,7 @@ 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;
@@ -23,7 +24,7 @@ namespace Bit.App.Pages
         private readonly IUsernameGenerationService _usernameGenerationService;
         private readonly ITokenService _tokenService;
         private readonly IDeviceActionService _deviceActionService;
-        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>("logger");
+        readonly LazyResolve<ILogger> _logger = new LazyResolve<ILogger>();
 
         private PasswordGenerationOptions _options;
         private UsernameGenerationOptions _usernameOptions;
@@ -49,11 +50,7 @@ namespace Bit.App.Pages
         private bool _doneIniting;
         private bool _showTypePicker;
         private string _emailWebsite;
-        private bool _showFirefoxRelayApiAccessToken;
-        private bool _showAnonAddyApiAccessToken;
-        private bool _showSimpleLoginApiKey;
-        private bool _showDuckDuckGoApiKey;
-        private bool _showFastmailApiKey;
+        private bool _showForwardedEmailApiSecret;
         private bool _editMode;
 
         public GeneratorPageViewModel()
@@ -96,7 +93,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 AsyncCommand(ToggleForwardedEmailHiddenValueAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
+            ToggleForwardedEmailHiddenValueCommand = new Command(() => ShowForwardedEmailApiSecret = !ShowForwardedEmailApiSecret);
             CopyCommand = new AsyncCommand(CopyAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
             CloseCommand = new AsyncCommand(CloseAsync, onException: ex => _logger.Value.Exception(ex), allowsMultipleExecutions: false);
         }
@@ -415,7 +412,6 @@ namespace Bit.App.Pages
 
         public string UsernameTypeDescriptionLabel => GetUsernameTypeLabelDescription(UsernameTypeSelected);
 
-
         public ForwardedEmailServiceType ForwardedEmailServiceSelected
         {
             get => _usernameOptions.ServiceType;
@@ -425,7 +421,11 @@ namespace Bit.App.Pages
                 {
                     _usernameOptions.ServiceType = value;
                     Username = Constants.DefaultUsernameGenerated;
-                    TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
+                    TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected), new string[]
+                    {
+                        nameof(ForwardedEmailApiSecret),
+                        nameof(ForwardedEmailApiSecretLabel)
+                    });
                     SaveUsernameOptionsAsync(false).FireAndForget();
                 }
             }
@@ -445,27 +445,104 @@ namespace Bit.App.Pages
             }
         }
 
-        public string AnonAddyApiAccessToken
+        public string ForwardedEmailApiSecret
         {
-            get => _usernameOptions.AnonAddyApiAccessToken;
+            get
+            {
+                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
             {
-                if (_usernameOptions.AnonAddyApiAccessToken != value)
+                bool changed = false;
+                switch (ForwardedEmailServiceSelected)
                 {
-                    _usernameOptions.AnonAddyApiAccessToken = value;
-                    TriggerPropertyChanged(nameof(AnonAddyApiAccessToken));
+                    case ForwardedEmailServiceType.AnonAddy:
+                        if (_usernameOptions.AnonAddyApiAccessToken != value)
+                        {
+                            _usernameOptions.AnonAddyApiAccessToken = value;
+                            changed = true;
+                        }
+                        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 bool ShowAnonAddyApiAccessToken
+        public string ForwardedEmailApiSecretLabel
         {
             get
             {
-                return _showAnonAddyApiAccessToken;
+                switch (ForwardedEmailServiceSelected)
+                {
+                    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
@@ -482,99 +559,6 @@ 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;
@@ -807,12 +791,9 @@ namespace Bit.App.Pages
             TriggerPropertyChanged(nameof(PlusAddressedEmailTypeSelected));
             TriggerPropertyChanged(nameof(IncludeNumberRandomWordUsername));
             TriggerPropertyChanged(nameof(CapitalizeRandomWordUsername));
-            TriggerPropertyChanged(nameof(SimpleLoginApiKey));
-            TriggerPropertyChanged(nameof(FirefoxRelayApiAccessToken));
+            TriggerPropertyChanged(nameof(ForwardedEmailApiSecret));
+            TriggerPropertyChanged(nameof(ForwardedEmailApiSecretLabel));
             TriggerPropertyChanged(nameof(AnonAddyDomainName));
-            TriggerPropertyChanged(nameof(AnonAddyApiAccessToken));
-            TriggerPropertyChanged(nameof(DuckDuckGoApiKey));
-            TriggerPropertyChanged(nameof(FastmailApiKey));
             TriggerPropertyChanged(nameof(CatchAllEmailDomain));
             TriggerPropertyChanged(nameof(ForwardedEmailServiceSelected));
             TriggerPropertyChanged(nameof(UsernameTypeSelected));
@@ -845,15 +826,23 @@ namespace Bit.App.Pages
         {
             _logger.Value.Exception(ex);
 
+            string message = AppResources.GenericErrorMessage;
+
             if (IsUsername && UsernameTypeSelected == UsernameType.ForwardedEmailAlias)
             {
-                await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(
-                    AppResources.AnErrorHasOccurred, string.Format(AppResources.UnknownXErrorMessage, ForwardedEmailServiceSelected), AppResources.Ok));
-            }
-            else
-            {
-                await Device.InvokeOnMainThreadAsync(() => Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.GenericErrorMessage, AppResources.Ok));
+                if (ex is ForwardedEmailInvalidSecretException)
+                {
+                    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, message, AppResources.Ok));
         }
 
         private string GetUsernameTypeLabelDescription(UsernameType value)
@@ -870,27 +859,5 @@ 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,7 +71,8 @@
                             <Label
                                 Text="{u:I18n SendDisabledWarning}"
                                 StyleClass="text-muted, text-sm, text-bold"
-                                HorizontalTextAlignment="Center" />
+                                HorizontalTextAlignment="Center"
+                                AutomationId="SendDisabledWarningMessageLabel" />
                         </Frame>
                         <Frame
                             IsVisible="{Binding SendOptionsPolicyInEffect}"
@@ -83,7 +84,8 @@
                             <Label
                                 Text="{u:I18n SendOptionsPolicyInEffect}"
                                 StyleClass="text-muted, text-sm, text-bold"
-                                HorizontalTextAlignment="Center" />
+                                HorizontalTextAlignment="Center"
+                                AutomationId="SendOptionsPolicyInEffectLabel" />
                         </Frame>
                         <StackLayout StyleClass="box-row">
                             <Label
@@ -93,7 +95,8 @@
                                 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"
@@ -123,6 +126,7 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n File}"
                                     AutomationProperties.HelpText="{Binding FileTypeAccessibilityLabel}"
+                                    AutomationId="SendFileButton"
                                     Grid.Column="0">
                                 </Button>
                                 <Button
@@ -135,6 +139,7 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n Text}"
                                     AutomationProperties.HelpText="{Binding TextTypeAccessibilityLabel}"
+                                    AutomationId="SendTextButton"
                                     Grid.Column="1">
                                 </Button>
                             </Grid>
@@ -152,12 +157,14 @@
                                     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}}"
@@ -168,20 +175,23 @@
                                     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}"
@@ -207,7 +217,8 @@
                                 Text="{Binding Send.Text.Text}"
                                 IsEnabled="{Binding SendEnabled}"
                                 StyleClass="box-value"
-                                Margin="{Binding EditorMargins}" 
+                                Margin="{Binding EditorMargins}"
+                                AutomationId="SendTextContentEntry"
                                 effects:ScrollEnabledEffect.IsScrollEnabled="false" >
                                 <Editor.Behaviors>
                                     <behaviors:EditorPreventAutoBottomScrollingOnFocusedBehavior ParentScrollView="{x:Reference _scrollView}" />
@@ -235,7 +246,8 @@
                                     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
@@ -249,7 +261,8 @@
                                 IsToggled="{Binding ShareOnSave}"
                                 IsEnabled="{Binding SendEnabled}"
                                 HorizontalOptions="End"
-                                Margin="10,0,0,0" />
+                                Margin="10,0,0,0"
+                                AutomationId="SendShareSendAfterSaveToggle" />
                         </StackLayout>
                         <StackLayout
                             Orientation="Horizontal"
@@ -263,21 +276,24 @@
                                 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
@@ -294,7 +310,8 @@
                                     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">
@@ -308,14 +325,16 @@
                                         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}"
@@ -334,7 +353,8 @@
                                     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">
@@ -349,7 +369,8 @@
                                         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="--:-- --"
@@ -357,7 +378,8 @@
                                         IsEnabled="{Binding SendEnabled}"
                                         AutomationProperties.IsInAccessibleTree="True"
                                         AutomationProperties.Name="{u:I18n ExpirationTime}"
-                                        Grid.Column="1" />
+                                        Grid.Column="1"
+                                        AutomationId="SendCustomExpirationTimePicker" />
                                 </Grid>
                                 <StackLayout
                                     Orientation="Horizontal"
@@ -374,7 +396,8 @@
                                         FontSize="{Binding SegmentedButtonFontSize}"
                                         IsEnabled="{Binding SendEnabled}"
                                         StyleClass="box-row-button"
-                                        Clicked="ClearExpirationDate_Clicked" />
+                                        Clicked="ClearExpirationDate_Clicked"
+                                        AutomationId="SendClearExpirationDateButton" />
                                 </StackLayout>
                             </StackLayout>
                             <StackLayout
@@ -393,13 +416,15 @@
                                         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}"
@@ -419,7 +444,8 @@
                                     <Label
                                         Text="{Binding Send.AccessCount, Mode=OneWay}"
                                         StyleClass="box-label"
-                                        VerticalTextAlignment="Center" />
+                                        VerticalTextAlignment="Center"
+                                        AutomationId="SendCurrentAccessCountLabel" />
                                 </StackLayout>
                             </StackLayout>
                             <StackLayout
@@ -436,7 +462,8 @@
                                         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"
@@ -445,7 +472,8 @@
                                         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}"
@@ -464,7 +492,8 @@
                                     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>
@@ -492,7 +521,8 @@
                                     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"
@@ -506,7 +536,8 @@
                                     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,7 +25,8 @@
             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,13 +44,15 @@
                 <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"
@@ -64,12 +66,14 @@
                            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,5 +66,27 @@ 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,7 +59,8 @@
                Margin="20, 0"
                VerticalOptions="CenterAndExpand"
                HorizontalOptions="CenterAndExpand"
-               HorizontalTextAlignment="Center" />
+               HorizontalTextAlignment="Center"
+               AutomationId="NoSendDisplayedLabel" />
         <controls:ExtendedCollectionView
                IsVisible="{Binding ShowList}"
                ItemsSource="{Binding Sends}"
@@ -67,13 +68,15 @@
                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/FolderAddEditPage.xaml

@@ -13,8 +13,13 @@
     </ContentPage.BindingContext>
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" />
+        <ToolbarItem Text="{u:I18n Cancel}"
+                     Clicked="Close_Clicked"
+                     Order="Primary"
+                     Priority="-1" />
+        <ToolbarItem Text="{u:I18n Save}"
+                     Clicked="Save_Clicked"
+                     Order="Primary" />
         <ToolbarItem Text="{u:I18n Delete}"
                      Clicked="Delete_Clicked"
                      Order="Secondary"
@@ -43,7 +48,8 @@
                         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,7 +31,8 @@
                        Margin="20, 0"
                        VerticalOptions="CenterAndExpand"
                        HorizontalOptions="CenterAndExpand"
-                       HorizontalTextAlignment="Center"></Label>
+                       HorizontalTextAlignment="Center"
+                       AutomationId="NoFoldersLabel"></Label>
                 <controls:ExtendedCollectionView
                           IsVisible="{Binding ShowNoData, Converter={StaticResource inverseBool}}"
                           ItemsSource="{Binding Folders}"
@@ -44,10 +45,12 @@
                         <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,7 +27,8 @@
                         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"
@@ -44,7 +45,8 @@
                         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"
@@ -59,7 +61,8 @@
                         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}"
@@ -74,7 +77,8 @@
                         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}"
@@ -90,7 +94,8 @@
                         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}"
@@ -105,7 +110,8 @@
                     <Switch
                         IsToggled="{Binding AutoTotpCopy}"
                         StyleClass="box-value"
-                        HorizontalOptions="End" />
+                        HorizontalOptions="End"
+                        AutomationId="CopyTotpAutomaticallyToggle" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n CopyTotpAutomaticallyDescription}"
@@ -120,7 +126,8 @@
                     <Switch
                         IsToggled="{Binding Favicon}"
                         StyleClass="box-value"
-                        HorizontalOptions="End" />
+                        HorizontalOptions="End"
+                        AutomationId="ShowWebsiteIconsToggle" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n ShowWebsiteIconsDescription}"

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

@@ -32,19 +32,21 @@
                             StyleClass="text-muted, text-sm, text-bold"
                             HorizontalTextAlignment="Center" />
                     </Frame>
-                    <Label IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
+                    <controls:CustomLabel IsVisible="{Binding UseFrame, Converter={StaticResource inverseBool}}"
                            Text="{Binding Name, Mode=OneWay}"
                            LineBreakMode="{Binding LineBreakMode}"
                            HorizontalOptions="StartAndExpand"
                            VerticalOptions="CenterAndExpand"
-                           StyleClass="list-title"/>
-                    <Label Text="{Binding SubLabel, Mode=OneWay}"
+                           StyleClass="list-title"
+                           AutomationId="{Binding AutomationIdSettingName}" />
+                    <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
@@ -57,7 +59,8 @@
                         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"
@@ -75,7 +78,8 @@
                                 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,7 +1,9 @@
 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
@@ -22,5 +24,29 @@ 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,23 +33,25 @@
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row" Padding="10, 20"
                              IsVisible="{Binding HasAttachments, Converter={StaticResource inverseBool}}">
-                    <Label Text="{u:I18n NoAttachments}" HorizontalTextAlignment="Center" />
+                    <Label Text="{u:I18n NoAttachments}" HorizontalTextAlignment="Center" AutomationId="NoAttachmentsLabel" />
                 </StackLayout>
-                <controls:RepeaterView ItemsSource="{Binding Attachments}" IsVisible="{Binding HasAttachments}">
+                <controls:RepeaterView ItemsSource="{Binding Attachments}" IsVisible="{Binding HasAttachments}" AutomationId="AttachmentsList">
                     <controls:RepeaterView.ItemTemplate>
                         <DataTemplate x:DataType="views:AttachmentView">
                             <StackLayout Spacing="0" Padding="0">
-                                <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10">
+                                <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10" AutomationId="AttachmentRow">
                                     <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}}"
@@ -57,7 +59,8 @@
                                         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>
@@ -77,17 +80,20 @@
                         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"></Button>
+                        Clicked="ChooseFile_Clicked"
+                        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.DelayTimeoutMs = 60000;
+                _vaultTimeoutService.DelayLockAndLogoutMs = 60000;
             }
             await _fileService.SelectFileAsync();
         }

src/App/Pages/Vault/CipherAddEditPage.xaml

@@ -57,16 +57,16 @@
                          x:Key="deleteItem" />
             
             <DataTemplate x:Key="TextCustomFieldDataTemplate">
-                <il:TextCustomFieldItemLayout />
+                <il:TextCustomFieldItemLayout AutomationId="TextCustomFieldItem" />
             </DataTemplate>
             <DataTemplate x:Key="BooleanCustomFieldDataTemplate">
-                <il:BooleanCustomFieldItemLayout />
+                <il:BooleanCustomFieldItemLayout AutomationId="BooleanCustomFieldItem" />
             </DataTemplate>
             <DataTemplate x:Key="HiddenCustomFieldDataTemplate">
-                <il:HiddenCustomFieldItemLayout />
+                <il:HiddenCustomFieldItemLayout AutomationId="HiddenCustomFieldItem" />
             </DataTemplate>
             <DataTemplate x:Key="LinkedCustomFieldDataTemplate">
-                <il:LinkedCustomFieldItemLayout />
+                <il:LinkedCustomFieldItemLayout AutomationId="LinkedCustomFieldItem" />
             </DataTemplate>
 
             <dts:CustomFieldItemTemplateSelector x:Key="CustomFieldItemTemplateSelector"
@@ -100,7 +100,8 @@
                         <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">
@@ -116,7 +117,8 @@
                         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
@@ -127,7 +129,8 @@
                         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"
@@ -142,7 +145,8 @@
                             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}}"
@@ -150,7 +154,8 @@
                             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>
@@ -180,7 +185,8 @@
                             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}}"
@@ -190,7 +196,8 @@
                             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}"
@@ -201,7 +208,8 @@
                             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}}"
@@ -211,7 +219,8 @@
                             Grid.RowSpan="2"
                             AutomationProperties.IsInAccessibleTree="True"
                             AutomationProperties.Name="{u:I18n GeneratePassword}"
-                            IsVisible="{Binding Cipher.ViewPassword}" />
+                            IsVisible="{Binding Cipher.ViewPassword}"
+                            AutomationId="RegeneratePasswordButton" />
                     </Grid>
 
                     <Grid StyleClass="box-row, box-row-input">
@@ -247,7 +256,8 @@
                                 Padding="0,15"
                                 HorizontalOptions="Center"
                                 VerticalOptions="FillAndExpand"
-                                VerticalTextAlignment="Center" />
+                                VerticalTextAlignment="Center"
+                                AutomationId="SetupTotpButton" />
                         </Frame>
                         <controls:MonoEntry
                             x:Name="_loginTotpEntry"
@@ -262,7 +272,8 @@
                             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}}"
@@ -272,7 +283,8 @@
                             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}}"
@@ -282,7 +294,8 @@
                             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">
@@ -293,7 +306,8 @@
                         <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>
@@ -319,7 +333,8 @@
                             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}"
@@ -328,7 +343,8 @@
                             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
@@ -338,7 +354,8 @@
                             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
@@ -348,7 +365,8 @@
                             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
@@ -360,7 +378,8 @@
                             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>
@@ -387,7 +406,8 @@
                             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}"
@@ -396,7 +416,8 @@
                             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">
@@ -408,7 +429,8 @@
                             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
@@ -419,7 +441,8 @@
                             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
@@ -430,7 +453,8 @@
                             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
@@ -441,7 +465,8 @@
                             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
@@ -452,7 +477,8 @@
                             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
@@ -463,7 +489,8 @@
                             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
@@ -474,7 +501,8 @@
                             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
@@ -485,7 +513,8 @@
                             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
@@ -496,7 +525,8 @@
                             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
@@ -508,7 +538,8 @@
                             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
@@ -520,7 +551,8 @@
                             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
@@ -531,7 +563,8 @@
                             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
@@ -542,7 +575,8 @@
                             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
@@ -553,7 +587,8 @@
                             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
@@ -564,7 +599,8 @@
                             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
@@ -575,7 +611,8 @@
                             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
@@ -586,7 +623,8 @@
                             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
@@ -597,7 +635,8 @@
                             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>
@@ -609,7 +648,7 @@
                 <controls:RepeaterView ItemsSource="{Binding Uris}">
                     <controls:RepeaterView.ItemTemplate>
                         <DataTemplate x:DataType="views:LoginUriView">
-                            <Grid StyleClass="box-row, box-row-input">
+                            <Grid StyleClass="box-row, box-row-input" AutomationId="UriListGrid" >
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -630,7 +669,8 @@
                                     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}}"
@@ -640,13 +680,15 @@
                                     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"></Button>
+                        Clicked="NewUri_Clicked"
+                        AutomationId="LoginAddNewUriButton"></Button>
             </StackLayout>
             <StackLayout StyleClass="box">
                 <StackLayout StyleClass="box-row-header">
@@ -661,7 +703,8 @@
                         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
@@ -671,7 +714,8 @@
                     <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
@@ -689,7 +733,8 @@
                         IsToggled="{Binding PasswordPrompt}"
                         Toggled="PasswordPrompt_Toggled"
                         StyleClass="box-value"
-                        HorizontalOptions="End" />
+                        HorizontalOptions="End"
+                        AutomationId="MasterPasswordRepromptToggle" />
                 </StackLayout>
                 <BoxView StyleClass="box-row-separator" />
             </StackLayout>
@@ -706,7 +751,8 @@
                         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>
@@ -725,9 +771,11 @@
                 <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"></Button>
+                        Clicked="NewField_Clicked"
+                        AutomationId="NewCustomFieldButton"></Button>
             </StackLayout>
             <StackLayout StyleClass="box" IsVisible="{Binding ShowOwnershipOptions}">
                 <StackLayout StyleClass="box-row-header">
@@ -742,7 +790,8 @@
                         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}">
@@ -753,7 +802,8 @@
                 <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>
@@ -763,15 +813,17 @@
                     <controls:RepeaterView.ItemTemplate>
                         <DataTemplate x:DataType="pages:CollectionViewModel">
                             <StackLayout Spacing="0" Padding="0">
-                                <StackLayout StyleClass="box-row, box-row-switch">
+                                <StackLayout StyleClass="box-row, box-row-switch" AutomationId="CollectionItemCell">
                                     <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>
@@ -781,5 +833,4 @@
             </StackLayout>
         </StackLayout>
     </ScrollView>
-
 </pages:BaseContentPage>

src/App/Pages/Vault/CipherDetailsPage.xaml

@@ -49,16 +49,16 @@
                          x:Name="_cloneItem" x:Key="cloneItem" />
 
             <DataTemplate x:Key="TextCustomFieldDataTemplate">
-                <il:TextCustomFieldItemLayout />
+                <il:TextCustomFieldItemLayout AutomationId="TextCustomFieldItem" />
             </DataTemplate>
             <DataTemplate x:Key="BooleanCustomFieldDataTemplate">
-                <il:BooleanCustomFieldItemLayout />
+                <il:BooleanCustomFieldItemLayout AutomationId="BooleanCustomFieldItem" />
             </DataTemplate>
             <DataTemplate x:Key="HiddenCustomFieldDataTemplate">
-                <il:HiddenCustomFieldItemLayout />
+                <il:HiddenCustomFieldItemLayout AutomationId="HiddenCustomFieldItem" />
             </DataTemplate>
             <DataTemplate x:Key="LinkedCustomFieldDataTemplate">
-                <il:LinkedCustomFieldItemLayout />
+                <il:LinkedCustomFieldItemLayout AutomationId="LinkedCustomFieldItem" />
             </DataTemplate>
 
             <dts:CustomFieldItemTemplateSelector x:Key="CustomFieldItemTemplateSelector"
@@ -69,23 +69,26 @@
 
             <ScrollView x:Key="scrollView" x:Name="_scrollView">
                 <StackLayout Spacing="20" x:Name="_mainLayout">
-                    <StackLayout StyleClass="box">
+                    <StackLayout StyleClass="box" AutomationId="ItemInformationSection">
                         <StackLayout StyleClass="box-row-header">
                             <Label Text="{u:I18n ItemInformation, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <StackLayout StyleClass="box-row">
+                        <StackLayout StyleClass="box-row" AutomationId="ItemRow">
                             <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="*" />
@@ -98,12 +101,14 @@
                                     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}}"
@@ -113,12 +118,14 @@
                                     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="*" />
@@ -133,20 +140,23 @@
                                     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}}"
@@ -156,7 +166,8 @@
                                     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}"
@@ -167,7 +178,8 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                     AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
-                                    IsVisible="{Binding Cipher.ViewPassword}" />
+                                    IsVisible="{Binding Cipher.ViewPassword}"
+                                    AutomationId="ViewValueButton" />
                                 <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
@@ -178,11 +190,14 @@
                                     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}}" />
-                            <Grid StyleClass="box-row" IsVisible="{Binding ShowTotp}">
+                            <Grid StyleClass="box-row"
+                                  IsVisible="{Binding ShowTotp}"
+                                  AutomationId="ItemRow">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
@@ -197,7 +212,8 @@
                                     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}}"
@@ -205,14 +221,16 @@
                                     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}"
@@ -234,7 +252,8 @@
                                     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"
@@ -242,24 +261,29 @@
                                     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="*" />
@@ -273,19 +297,22 @@
                                     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}"
@@ -294,7 +321,8 @@
                                     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}}"
@@ -304,34 +332,42 @@
                                     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="*" />
@@ -345,19 +381,22 @@
                                     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}"
@@ -366,7 +405,8 @@
                                     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}}"
@@ -376,124 +416,156 @@
                                     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>
@@ -503,11 +575,11 @@
                             <Label Text="{u:I18n URIs, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}">
+                        <controls:RepeaterView ItemsSource="{Binding Cipher.Login.Uris}" AutomationId="CipherUriContainer">
                             <controls:RepeaterView.ItemTemplate>
                                 <DataTemplate x:DataType="views:LoginUriView">
                                     <StackLayout Spacing="0" Padding="0">
-                                        <Grid StyleClass="box-row">
+                                        <Grid StyleClass="box-row" AutomationId="UriRow">
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="*" />
@@ -533,7 +605,8 @@
                                                 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}}"
@@ -544,7 +617,8 @@
                                                 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}}"
@@ -554,7 +628,8 @@
                                                 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>
@@ -568,14 +643,15 @@
                             <Label Text="{u:I18n Notes, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <StackLayout StyleClass="box-row">
+                        <StackLayout StyleClass="box-row" AutomationId="NotesRow">
                             <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}">
+                    <StackLayout StyleClass="box" IsVisible="{Binding Cipher.HasFields}" AutomationId="CustomFieldsContainer">
                         <StackLayout StyleClass="box-row-header">
                             <Label Text="{u:I18n CustomFields, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
@@ -590,21 +666,23 @@
                             <Label Text="{u:I18n Attachments, Header=True}"
                                    StyleClass="box-header, box-header-platform" />
                         </StackLayout>
-                        <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}">
+                        <controls:RepeaterView ItemsSource="{Binding Cipher.Attachments}" AutomationId="CipherAttachmentsContainer">
                             <controls:RepeaterView.ItemTemplate>
                                 <DataTemplate x:DataType="views:AttachmentView">
                                     <StackLayout Spacing="0" Padding="0">
-                                        <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10">
+                                        <StackLayout Orientation="Horizontal" StyleClass="box-row" Spacing="10" AutomationId="CipherAttachment">
                                             <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}}"
@@ -612,7 +690,8 @@
                                                 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>
@@ -622,17 +701,20 @@
                     </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>
@@ -662,6 +744,7 @@
             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/CipherSelectionPage.xaml

@@ -19,7 +19,8 @@
             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,7 +41,8 @@
                     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" />
@@ -91,7 +92,8 @@
                 Source="empty_items_state" />
             <Label
                 Text="{u:I18n ThereAreNoItemsThatMatchTheSearch}"
-                HorizontalTextAlignment="Center" />
+                HorizontalTextAlignment="Center"
+                AutomationId="NoSearchResultsLabel" />
             <Button
                 Text="{u:I18n AddAnItem}"
                 Command="{Binding AddCipherCommand}"
@@ -104,7 +106,8 @@
                 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/GroupingsPage/GroupingsPage.xaml

@@ -25,7 +25,8 @@
             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}" />
@@ -59,13 +60,14 @@
                 <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"
@@ -79,12 +81,14 @@
                             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>
 
@@ -95,7 +99,8 @@
                     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">
@@ -104,7 +109,8 @@
                             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>
@@ -147,7 +153,8 @@
                     IsVisible="{Binding ShowNoData}">
                     <Label
                         Text="{Binding NoDataText}"
-                        HorizontalTextAlignment="Center"></Label>
+                        HorizontalTextAlignment="Center"
+                        AutomationId="NoDataDisplayed"></Label>
                     <Button
                         Text="{u:I18n AddAnItem}"
                         Clicked="AddButton_Clicked"

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

@@ -1,4 +1,6 @@
-namespace Bit.App.Pages
+using Bit.App.Utilities.Automation;
+
+namespace Bit.App.Pages
 {
     public class GroupingsPageHeaderListItem : IGroupingsPageListItem
     {
@@ -10,5 +12,12 @@
 
         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,4 +1,5 @@
 using System.Collections.Generic;
+using Bit.App.Utilities.Automation;
 
 namespace Bit.App.Pages
 {
@@ -32,5 +33,6 @@ 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,4 +1,5 @@
 using Bit.App.Resources;
+using Bit.App.Utilities.Automation;
 using Bit.Core;
 using Bit.Core.Enums;
 using Bit.Core.Models.View;
@@ -115,5 +116,38 @@ 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/Resources/AppResources.Designer.cs

@@ -418,6 +418,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Admin approval requested.
+        /// </summary>
+        public static string AdminApprovalRequested {
+            get {
+                return ResourceManager.GetString("AdminApprovalRequested", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to All.
         /// </summary>
@@ -562,6 +571,24 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Approve with master password.
+        /// </summary>
+        public static string ApproveWithMasterPassword {
+            get {
+                return ResourceManager.GetString("ApproveWithMasterPassword", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Approve with my other device.
+        /// </summary>
+        public static string ApproveWithMyOtherDevice {
+            get {
+                return ResourceManager.GetString("ApproveWithMyOtherDevice", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to April.
         /// </summary>
@@ -3262,6 +3289,24 @@ 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>
@@ -3568,6 +3613,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Logged in!.
+        /// </summary>
+        public static string LoggedIn {
+            get {
+                return ResourceManager.GetString("LoggedIn", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Logged in as {0} on {1}..
         /// </summary>
@@ -3586,6 +3640,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Logging in as {0}.
+        /// </summary>
+        public static string LoggingInAsX {
+            get {
+                return ResourceManager.GetString("LoggingInAsX", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Logging in as {0} on {1}.
         /// </summary>
@@ -5174,6 +5237,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Remember this device.
+        /// </summary>
+        public static string RememberThisDevice {
+            get {
+                return ResourceManager.GetString("RememberThisDevice", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Remove.
         /// </summary>
@@ -5246,6 +5318,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Request admin approval.
+        /// </summary>
+        public static string RequestAdminApproval {
+            get {
+                return ResourceManager.GetString("RequestAdminApproval", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Request one-time password.
         /// </summary>
@@ -6236,6 +6317,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Trouble logging in?.
+        /// </summary>
+        public static string TroubleLoggingIn {
+            get {
+                return ResourceManager.GetString("TroubleLoggingIn", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Try again.
         /// </summary>
@@ -6245,6 +6335,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Turn off using a public device.
+        /// </summary>
+        public static string TurnOffUsingPublicDevice {
+            get {
+                return ResourceManager.GetString("TurnOffUsingPublicDevice", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 20 seconds.
         /// </summary>
@@ -6435,7 +6534,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 {
@@ -7127,6 +7226,24 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Your request has been sent to your admin..
+        /// </summary>
+        public static string YourRequestHasBeenSentToYourAdmin {
+            get {
+                return ResourceManager.GetString("YourRequestHasBeenSentToYourAdmin", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You will be notified once approved. .
+        /// </summary>
+        public static string YouWillBeNotifiedOnceApproved {
+            get {
+                return ResourceManager.GetString("YouWillBeNotifiedOnceApproved", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to To continue, hold your YubiKey NEO against the back of the device or insert your YubiKey into your device&apos;s USB port, then touch its button..
         /// </summary>

src/App/Resources/AppResources.af.resx

@@ -2634,6 +2634,12 @@ Wil u na die rekening omskakel?</value>
     <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>
 </root>

src/App/Resources/AppResources.ar.resx

@@ -2635,6 +2635,12 @@
     <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>
 </root>

src/App/Resources/AppResources.az.resx

@@ -2633,6 +2633,12 @@ Bu hesaba keçmək istəyirsiniz?</value>
     <value>Ana parolu təkrar soruş köməyi</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>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>
+  </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>
 </root>

src/App/Resources/AppResources.be.resx

@@ -2636,4 +2636,10 @@
   <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>
 </root>

src/App/Resources/AppResources.bg.resx

@@ -2636,4 +2636,10 @@ select Add TOTP to store the key safely</value>
   <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>
 </root>

src/App/Resources/AppResources.bn.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.bs.resx

@@ -2633,6 +2633,12 @@ Skeniranje će biti izvršeno automatski.</value>
     <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>
 </root>

src/App/Resources/AppResources.ca.resx

@@ -2636,4 +2636,10 @@ Voleu canviar a aquest compte?</value>
   <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>
 </root>

src/App/Resources/AppResources.cs.resx

@@ -2635,4 +2635,10 @@ Chcete se přepnout na tento účet?</value>
   <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>
 </root>

src/App/Resources/AppResources.cy.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.da.resx

@@ -2636,4 +2636,10 @@ Vil du skifte til denne konto?</value>
   <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>
 </root>

src/App/Resources/AppResources.de.resx

@@ -2635,4 +2635,10 @@ Möchtest du zu diesem Konto wechseln?</value>
   <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>
 </root>

src/App/Resources/AppResources.el.resx

@@ -2610,16 +2610,16 @@
     <value>Δεν υπάρχουν στοιχεία που να ταιριάζουν με την αναζήτηση</value>
   </data>
   <data name="US" xml:space="preserve">
-    <value>US</value>
+    <value>ΗΠΑ</value>
   </data>
   <data name="EU" xml:space="preserve">
-    <value>EU</value>
+    <value>ΕΕ</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
+    <value>Αυτο-φιλοξενούμενο</value>
   </data>
   <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
+    <value>Περιοχή δεδομένων</value>
   </data>
   <data name="Region" xml:space="preserve">
     <value>Περιοχή</value>
@@ -2634,6 +2634,12 @@
     <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>
 </root>

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

@@ -2634,6 +2634,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

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

@@ -2648,6 +2648,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.es.resx

@@ -775,10 +775,10 @@
     <value>Activado</value>
   </data>
   <data name="Off" xml:space="preserve">
-    <value>Apagado</value>
+    <value>No</value>
   </data>
   <data name="On" xml:space="preserve">
-    <value>Activado</value>
+    <value>Sí</value>
   </data>
   <data name="Status" xml:space="preserve">
     <value>Estado</value>
@@ -2632,9 +2632,15 @@ seleccione Agregar TOTP para almacenar la clave de forma segura</value>
     <value>Contraseña maestra actual</value>
   </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
+    <value>Ayuda de volver a pedir contraseña maestra</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>
 </root>

src/App/Resources/AppResources.et.resx

@@ -2496,7 +2496,7 @@ Soovid selle konto peale lülituda?</value>
     <value>Tuleta ülemparooli vihjega meelde</value>
   </data>
   <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+    <value>Sisselogimas kui {0} lehel {1}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>Pole sina?</value>
@@ -2610,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>US</value>
+    <value>USA</value>
   </data>
   <data name="EU" xml:space="preserve">
-    <value>EU</value>
+    <value>EL</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
+    <value>Enda majutatud</value>
   </data>
   <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
+    <value>Andmete salvestamise piirkond</value>
   </data>
   <data name="Region" xml:space="preserve">
-    <value>Region</value>
+    <value>Piirkond</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>
@@ -2634,6 +2634,12 @@ Soovid selle konto peale lülituda?</value>
     <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>Vigane API võti</value>
+  </data>
+  <data name="InvalidAPIToken" xml:space="preserve">
+    <value>Vigane API token</value>
   </data>
 </root>

src/App/Resources/AppResources.eu.resx

@@ -2633,6 +2633,12 @@ Kontu honetara aldatu nahi duzu?</value>
     <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>
 </root>

src/App/Resources/AppResources.fa.resx

@@ -2497,7 +2497,7 @@
     <value>دریافت یادآور کلمه عبور اصلی</value>
   </data>
   <data name="LoggingInAsXOnY" xml:space="preserve">
-    <value>Logging in as {0} on {1}</value>
+    <value>درحال وارد شدن به عنوان {0} در {1}</value>
   </data>
   <data name="NotYou" xml:space="preserve">
     <value>شما نیستید؟</value>
@@ -2611,19 +2611,19 @@
     <value>هیچ موردی وجود ندارد که با جستجو مطابقت داشته باشد</value>
   </data>
   <data name="US" xml:space="preserve">
-    <value>US</value>
+    <value>امریکا</value>
   </data>
   <data name="EU" xml:space="preserve">
-    <value>EU</value>
+    <value>اروپا</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
-    <value>Self-hosted</value>
+    <value>خود میزبان</value>
   </data>
   <data name="DataRegion" xml:space="preserve">
-    <value>Data region</value>
+    <value>منطقه داده</value>
   </data>
   <data name="Region" xml:space="preserve">
-    <value>Region</value>
+    <value>منطقه</value>
   </data>
   <data name="UpdateWeakMasterPasswordWarning" xml:space="preserve">
     <value>کلمه عبور اصلی شما با یک یا چند سیاست سازمان‌تان مطابقت ندارد. برای دسترسی به گاوصندوق، باید همین حالا کلمه عبور اصلی خود را به‌روز کنید. در صورت ادامه، شما از نشست فعلی خود خارج می‌شوید و باید دوباره وارد سیستم شوید. نشست فعال در دستگاه های دیگر ممکن است تا یک ساعت همچنان فعال باقی بمانند.</value>
@@ -2632,9 +2632,15 @@
     <value>کلمه عبور اصلی فعلی</value>
   </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
+    <value>راهنمای درخواست مجدد کلمه عبور اصلی</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>باز کردن قفل ممکن است به دلیل حافظه ناکافی انجام شود. تنظیمات حافظه KDF خود را کاهش دهید تا حل شود.</value>
+  </data>
+  <data name="InvalidAPIKey" xml:space="preserve">
+    <value>کلید API نامعتبر</value>
+  </data>
+  <data name="InvalidAPIToken" xml:space="preserve">
+    <value>کلید توکن API نامعتبر</value>
   </data>
 </root>

src/App/Resources/AppResources.fi.resx

@@ -937,7 +937,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Tiedosto</value>
   </data>
   <data name="NoFileChosen" xml:space="preserve">
-    <value>Ei valittua tiedostoa</value>
+    <value>Tiedostoa ei ole valittu.</value>
   </data>
   <data name="NoAttachments" xml:space="preserve">
     <value>Ei liitteitä.</value>
@@ -1762,7 +1762,7 @@ Koodi luetaan automaattisesti.</value>
     <value>Synkronoi holvi päivityksen yhteydessä</value>
   </data>
   <data name="EnableSyncOnRefreshDescription" xml:space="preserve">
-    <value>Synkronoidaan holvi alasveto-eleellä.</value>
+    <value>Holvi synkronoidaan myös alasveto-eleellä suoritettavan päivityksen yhteydessä.</value>
   </data>
   <data name="LogInSso" xml:space="preserve">
     <value>Yrityksen kertakirjautuminen (SSO)</value>
@@ -2367,7 +2367,7 @@ turvallisesti valitsemalla "Lisää TOTP"</value>
     <value>Hyväksy kirjautumispyyntöjä</value>
   </data>
   <data name="UseThisDeviceToApproveLoginRequestsMadeFromOtherDevices" xml:space="preserve">
-    <value>Hyväksy muiden laitteiden kirjautumispyynnöt tältä laitteelta.</value>
+    <value>Hyväksy laitteiden kirjautumispyyntöjä tältä laitteelta</value>
   </data>
   <data name="AllowNotifications" xml:space="preserve">
     <value>Salli ilmoitukset</value>
@@ -2542,7 +2542,7 @@ Haluatko vaihtaa tähän tiliin?</value>
     <value>Pyynnöt hylättiin</value>
   </data>
   <data name="NoPendingRequests" xml:space="preserve">
-    <value>Ei odottavia pyyntöjä</value>  
+    <value>Odottavia pyyntöjä ei ole</value>  
   </data>
   <data name="EnableCamerPermissionToUseTheScanner" xml:space="preserve">
     <value>Myönnä kameran käyttöoikeus skannerin käyttämiseksi</value>
@@ -2554,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 edellyttää sovelluksen uudelleenkäynnistyksen</value>
+    <value>Kielen vaihto vaatii sovelluksen uudelleenkäynnistyksen.</value>
   </data>
   <data name="DefaultSystem" xml:space="preserve">
     <value>Oletus (järjestelmä)</value>
@@ -2635,6 +2635,12 @@ Haluatko vaihtaa tähän tiliin?</value>
     <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. Tämän välttämiseksi voit madaltaa KDF-muistiasetuksiasi.</value>
+    <value>Lukituksen avaus voi epäonnistua riittämättömän keskusmuistin vuoksi. Korjaa madaltamalla 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>
 </root>

src/App/Resources/AppResources.fil.resx

@@ -2635,6 +2635,12 @@ Gusto mo bang pumunta sa account na ito?</value>
     <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>
 </root>

src/App/Resources/AppResources.fr.resx

@@ -2637,4 +2637,10 @@ Voulez-vous basculer vers ce compte ?</value>
   <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>
 </root>

src/App/Resources/AppResources.gl.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.he.resx

@@ -2637,6 +2637,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.hi.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.hr.resx

@@ -2632,6 +2632,12 @@
     <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>
 </root>

src/App/Resources/AppResources.hu.resx

@@ -2635,4 +2635,10 @@ Szeretnénk átváltani erre a fiókra?</value>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>A feloldás meghiúsulhat, mert nincs elegendő memória. A megoldáshoz csökkentsül a KDF memóriabeállításait.</value>
   </data>
+  <data name="InvalidAPIKey" xml:space="preserve">
+    <value>Érvénytelen API kulcs</value>
+  </data>
+  <data name="InvalidAPIToken" xml:space="preserve">
+    <value>Érvénytelen API vezérjel</value>
+  </data>
 </root>

src/App/Resources/AppResources.id.resx

@@ -2634,6 +2634,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.it.resx

@@ -2613,7 +2613,7 @@ Vuoi passare a questo account?</value>
     <value>US</value>
   </data>
   <data name="EU" xml:space="preserve">
-    <value>UE</value>
+    <value>EU</value>
   </data>
   <data name="SelfHosted" xml:space="preserve">
     <value>Self-hosted</value>
@@ -2631,9 +2631,15 @@ Vuoi passare a questo account?</value>
     <value>Password principale corrente</value>
   </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Auto per chiedere la password principale di nuovo</value>
+    <value>Aiuto per chiedere la password principale di nuovo</value>
   </data>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Lo sblocco potrebbe fallire a causa di memoria insufficiente. Riduci le impostazioni della memoria KDF per risolvere il problema</value>
   </data>
+  <data name="InvalidAPIKey" xml:space="preserve">
+    <value>Chiave API non valida</value>
+  </data>
+  <data name="InvalidAPIToken" xml:space="preserve">
+    <value>Token API non valido</value>
+  </data>
 </root>

src/App/Resources/AppResources.ja.resx

@@ -2636,4 +2636,10 @@
   <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>
 </root>

src/App/Resources/AppResources.ka.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.kn.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.ko.resx

@@ -2634,6 +2634,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.lt.resx

@@ -2635,6 +2635,12 @@ Ar norite pereiti prie šios paskyros?</value>
     <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>
 </root>

src/App/Resources/AppResources.lv.resx

@@ -2636,4 +2636,10 @@ Vai pārslēgties uz šo kontu?</value>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Atslēgšana var neizdoties nepietiekamas atmiņas dēļ. Lai to novērstu, jāsamazina KDF atmiņas iestatījmi</value>
   </data>
+  <data name="InvalidAPIKey" xml:space="preserve">
+    <value>Nederīga API atslēga</value>
+  </data>
+  <data name="InvalidAPIToken" xml:space="preserve">
+    <value>Nederīga API pilnvara</value>
+  </data>
 </root>

src/App/Resources/AppResources.ml.resx

@@ -2634,6 +2634,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.my.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.nb.resx

@@ -2635,6 +2635,12 @@ Vil du bytte til denne kontoen?</value>
     <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>
 </root>

src/App/Resources/AppResources.ne.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.nl.resx

@@ -2636,4 +2636,10 @@ Wilt u naar dit account wisselen?</value>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Ontgrendelen kan mislukken als er onvoldoende geheugen is. Verminder je KDF-geheugeninstellingen om dit op te lossen</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>
 </root>

src/App/Resources/AppResources.nn.resx

@@ -176,10 +176,10 @@
     <comment>Confirmation alert message when deleteing something.</comment>
   </data>
   <data name="Edit" xml:space="preserve">
-    <value>Rei</value>
+    <value>Rediger</value>
   </data>
   <data name="EditFolder" xml:space="preserve">
-    <value>Rei mappa</value>
+    <value>Rediger mappe</value>
   </data>
   <data name="Email" xml:space="preserve">
     <value>E-post</value>
@@ -468,7 +468,7 @@
     <comment>Message shown when interacting with the server</comment>
   </data>
   <data name="EditItem" xml:space="preserve">
-    <value>Rei oppføring</value>
+    <value>Rediger oppføringa</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
     <value>Slå på sjølvverkande synkronisering</value>
@@ -1235,10 +1235,10 @@ Skanning skjer automatisk.</value>
     <value>Grunndomene</value>
   </data>
   <data name="Default" xml:space="preserve">
-    <value>Default</value>
+    <value>Standard</value>
   </data>
   <data name="Exact" xml:space="preserve">
-    <value>Exact</value>
+    <value>Nøyaktig</value>
   </data>
   <data name="Host" xml:space="preserve">
     <value>Host</value>
@@ -1249,7 +1249,7 @@ Skanning skjer automatisk.</value>
     <comment>A programming term, also known as 'RegEx'.</comment>
   </data>
   <data name="StartsWith" xml:space="preserve">
-    <value>Starts with</value>
+    <value>Startar med</value>
   </data>
   <data name="URIMatchDetection" xml:space="preserve">
     <value>URI match detection</value>
@@ -1272,7 +1272,7 @@ Skanning skjer automatisk.</value>
     <value>Hold your Yubikey near the top of the device.</value>
   </data>
   <data name="TryAgain" xml:space="preserve">
-    <value>Try again</value>
+    <value>Prøv igjen</value>
   </data>
   <data name="YubiKeyInstructionIos" xml:space="preserve">
     <value>To continue, hold your YubiKey NEO against the back of the device.</value>
@@ -1281,7 +1281,7 @@ Skanning skjer automatisk.</value>
     <value>The accessibility service may be helpful to use when apps do not support the standard auto-fill service.</value>
   </data>
   <data name="DatePasswordUpdated" xml:space="preserve">
-    <value>Password updated</value>
+    <value>Passordet er oppdatert</value>
     <comment>ex. Date this password was updated</comment>
   </data>
   <data name="DateUpdated" xml:space="preserve">
@@ -1289,13 +1289,13 @@ Skanning skjer automatisk.</value>
     <comment>ex. Date this item was updated</comment>
   </data>
   <data name="AutofillActivated" xml:space="preserve">
-    <value>AutoFill activated!</value>
+    <value>Autoutfylling aktivert!</value>
   </data>
   <data name="MustLogInMainAppAutofill" xml:space="preserve">
-    <value>You must log into the main Bitwarden app before you can use AutoFill.</value>
+    <value>Du må logge deg inn på Bitwarden-hovudappen før du kan bruke autoutfylling.</value>
   </data>
   <data name="AutofillSetup" xml:space="preserve">
-    <value>Your logins are now easily accessible right from your keyboard while logging into apps and websites.</value>
+    <value>Innloggingane dine er no lett tilgjengelege frå tastaturet når du loggar deg inn på appar og nettstadar.</value>
   </data>
   <data name="AutofillSetup2" xml:space="preserve">
     <value>We recommend disabling any other AutoFill apps under Settings if you do not plan to use them.</value>
@@ -2006,7 +2006,7 @@ Skanning skjer automatisk.</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="EditSend" xml:space="preserve">
-    <value>Rei Send</value>
+    <value>Rediger Send</value>
     <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
   </data>
   <data name="AddSend" xml:space="preserve">
@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>Kunne ikkje låse opp på grunn av utilstrekkeleg minnekapasitet. Reduser KDF-minne-innstillingane for å løyse dette</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>
 </root>

src/App/Resources/AppResources.or.resx

@@ -2635,6 +2635,12 @@ Do you want to switch to this account?</value>
     <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>
 </root>

src/App/Resources/AppResources.pl.resx

@@ -2636,4 +2636,10 @@ Czy chcesz przełączyć się na to konto?</value>
   <data name="UnlockingMayFailDueToInsufficientMemoryDecreaseYourKDFMemorySettingsToResolve" xml:space="preserve">
     <value>Odblokowanie może się nie powieść z powodu niewystarczającej ilości pamięci. Zmniejsz ustawienia pamięci KDF, aby to rozwiązać</value>
   </data>
+  <data name="InvalidAPIKey" xml:space="preserve">
+    <value>Nieprawidłowy klucz API</value>
+  </data>
+  <data name="InvalidAPIToken" xml:space="preserve">
+    <value>Nieprawidłowy token API.</value>
+  </data>
 </root>

src/App/Resources/AppResources.pt-BR.resx

@@ -2632,9 +2632,15 @@ Você deseja mudar para esta conta?</value>
     <value>Senha mestra atual</value>
   </data>
   <data name="MasterPasswordRePromptHelp" xml:space="preserve">
-    <value>Master password re-prompt help</value>
+    <value>Ajuda com Nova solicitação de senha mestra</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>O desbloqueio pode falhar devido à memória insuficiente. Diminua suas configurações de memória KDF para resolver.</value>
+  </data>
+  <data name="InvalidAPIKey" xml:space="preserve">
+    <value>Chave da API inválida</value>
+  </data>
+  <data name="InvalidAPIToken" xml:space="preserve">
+    <value>Token de API inválido</value>
   </data>
 </root>