From 75af5b94d46d92d0ba180c0be4e3ff3830b83011 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 27 Mar 2022 14:04:45 +0100
Subject: [PATCH] Fix "Custom environment", "Options" expand/collapse controls
 - wrong accessible name, state not exposed (#1441)

* Fix "Custom environment" expand/collapse control wrong accessible name, expose state

Closes #1440

* Correct "Options" expand/collapse accname, expose state

* Remove redundant appA11yTitle
---
 src/app/accounts/environment.component.html     | 6 +-----
 src/app/vault/password-generator.component.html | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/app/accounts/environment.component.html b/src/app/accounts/environment.component.html
index 319f6917..390efbb9 100644
--- a/src/app/accounts/environment.component.html
+++ b/src/app/accounts/environment.component.html
@@ -25,11 +25,7 @@
         </div>
         <div class="box">
           <div class="box-header">
-            <button
-              type="button"
-              (click)="toggleCustom()"
-              appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-            >
+            <button type="button" (click)="toggleCustom()" [attr.aria-expanded]="showCustom">
               <i class="bwi bwi-plus-square" [hidden]="showCustom" aria-hidden="true"></i>
               <i class="bwi bwi-minus-square" [hidden]="!showCustom" aria-hidden="true"></i>
               {{ "customEnvironment" | i18n }}
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index ace7321e..8301cef5 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -26,11 +26,7 @@
         </div>
         <div class="box">
           <div class="box-header">
-            <button
-              type="button"
-              (click)="toggleOptions()"
-              appA11yTitle="{{ 'toggleVisibility' | i18n }}"
-            >
+            <button type="button" (click)="toggleOptions()" [attr.aria-expanded]="showOptions">
               <i class="bwi bwi-plus-square" aria-hidden="true" [hidden]="showOptions"></i>
               <i class="bwi bwi-minus-square" aria-hidden="true" [hidden]="!showOptions"></i>
               {{ "options" | i18n }}