From 43d2d386b13cd63727e7b03021f4a073fe2bc2fd Mon Sep 17 00:00:00 2001
From: ifernandezdiaz <ifernandez+github@bitwarden.com>
Date: Fri, 16 Jun 2023 16:20:09 -0300
Subject: [PATCH] [PM-2645] Adding IDs for Account Switching elements (#2572)

* Adding IDs for Account Switching elements

* Fixing Active/Inactive vault icon IDs
---
 .../AccountSwitchingOverlayView.xaml          |  4 ++-
 .../AccountViewCell/AccountViewCell.xaml      | 29 ++++++++++++-------
 src/App/Pages/Accounts/HomePage.xaml          |  3 +-
 src/App/Pages/Accounts/LockPage.xaml          | 11 +++----
 src/App/Pages/Accounts/LoginPage.xaml         |  5 ++--
 src/App/Pages/Generator/GeneratorPage.xaml    |  2 +-
 src/App/Pages/Send/SendAddOnlyPage.xaml       |  3 +-
 src/App/Pages/Vault/CipherSelectionPage.xaml  |  3 +-
 .../Vault/GroupingsPage/GroupingsPage.xaml    |  3 +-
 9 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml b/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
index f0c52d0d4..4dba94dd1 100644
--- a/src/App/Controls/AccountSwitchingOverlay/AccountSwitchingOverlayView.xaml
+++ b/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>
diff --git a/src/App/Controls/AccountViewCell/AccountViewCell.xaml b/src/App/Controls/AccountViewCell/AccountViewCell.xaml
index 3d45cf929..9a9f53831 100644
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml
+++ b/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>
\ No newline at end of file
diff --git a/src/App/Pages/Accounts/HomePage.xaml b/src/App/Pages/Accounts/HomePage.xaml
index a4e5f9fcd..d99b965f7 100644
--- a/src/App/Pages/Accounts/HomePage.xaml
+++ b/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>
 
diff --git a/src/App/Pages/Accounts/LockPage.xaml b/src/App/Pages/Accounts/LockPage.xaml
index 561b051f5..f34a8b284 100644
--- a/src/App/Pages/Accounts/LockPage.xaml
+++ b/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>
diff --git a/src/App/Pages/Accounts/LoginPage.xaml b/src/App/Pages/Accounts/LoginPage.xaml
index fd2bb3fbd..5f93f9b0c 100644
--- a/src/App/Pages/Accounts/LoginPage.xaml
+++ b/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"
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index 92a41cf2c..53553cc3f 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -112,7 +112,7 @@
                         Text="{Binding ColoredUsername, Mode=OneWay}"
                         Margin="0, 20"
                         HorizontalOptions="Start"
-                        AutomationId="GeneratedUsernameValue" />
+                        AutomationId="GeneratedPasswordLabel" />
                     <controls:IconButton 
                         StyleClass="box-row-button, box-row-button-platform"
                         Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
diff --git a/src/App/Pages/Send/SendAddOnlyPage.xaml b/src/App/Pages/Send/SendAddOnlyPage.xaml
index ec80b96b5..844313361 100644
--- a/src/App/Pages/Send/SendAddOnlyPage.xaml
+++ b/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>
diff --git a/src/App/Pages/Vault/CipherSelectionPage.xaml b/src/App/Pages/Vault/CipherSelectionPage.xaml
index f5c8c0641..f71d3a2c2 100644
--- a/src/App/Pages/Vault/CipherSelectionPage.xaml
+++ b/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}" />
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index 40496e133..3b5c24c50 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/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}" />