diff --git a/src/view/com/lists/ListItems.tsx b/src/view/com/lists/ListItems.tsx
index 52b728cb99..32cafdb835 100644
--- a/src/view/com/lists/ListItems.tsx
+++ b/src/view/com/lists/ListItems.tsx
@@ -306,16 +306,16 @@ const ListHeader = observer(
) : (
)}
@@ -324,7 +324,7 @@ const ListHeader = observer(
type="default"
label="Edit List"
accessibilityLabel="Edit list"
- accessibilityHint="Opens a modal to edit the mutelist"
+ accessibilityHint=""
onPress={onPressEditList}
/>
)}
@@ -333,7 +333,7 @@ const ListHeader = observer(
type="default"
label="Delete List"
accessibilityLabel="Delete list"
- accessibilityHint="Deletes the mutelist"
+ accessibilityHint=""
onPress={onPressDeleteList}
/>
)}
diff --git a/src/view/com/modals/ContentFilteringSettings.tsx b/src/view/com/modals/ContentFilteringSettings.tsx
index 5db0ef5a59..91c9686845 100644
--- a/src/view/com/modals/ContentFilteringSettings.tsx
+++ b/src/view/com/modals/ContentFilteringSettings.tsx
@@ -50,7 +50,7 @@ export function Component({}: {}) {
testID="sendReportBtn"
onPress={onPressDone}
accessibilityRole="button"
- accessibilityLabel="Confirm content filtering settings"
+ accessibilityLabel="Done"
accessibilityHint="">
- List Name
+
+ List Name
+
setName(enforceLen(v, MAX_NAME))}
accessible={true}
accessibilityLabel="Name"
- accessibilityHint="Set the list's name"
+ accessibilityHint=""
+ accessibilityLabelledBy="list-name"
/>
- Description
+
+ Description
+
setDescription(enforceLen(v, MAX_DESCRIPTION))}
accessible={true}
accessibilityLabel="Description"
- accessibilityHint="Edit your list's description"
+ accessibilityHint=""
+ accessibilityLabelledBy="list-description"
/>
{isProcessing ? (
@@ -205,7 +211,7 @@ export function Component({
style={s.mt5}
onPress={onPressCancel}
accessibilityRole="button"
- accessibilityLabel="Cancel creating the mute list"
+ accessibilityLabel="Cancel"
accessibilityHint=""
onAccessibilityEscape={onPressCancel}>
diff --git a/src/view/com/modals/ListAddRemoveUser.tsx b/src/view/com/modals/ListAddRemoveUser.tsx
index a2775df9fd..91fe67c177 100644
--- a/src/view/com/modals/ListAddRemoveUser.tsx
+++ b/src/view/com/modals/ListAddRemoveUser.tsx
@@ -104,7 +104,7 @@ export const Component = observer(
accessibilityLabel={`${isSelected ? 'Remove from' : 'Add to'} ${
list.name
}`}
- accessibilityHint="Toggle their inclusion in this list"
+ accessibilityHint=""
onPress={() => onToggleSelected(list.uri)}>
@@ -172,8 +172,7 @@ export const Component = observer(
type="default"
onPress={onPressCancel}
style={styles.footerBtn}
- accessibilityRole="button"
- accessibilityLabel="Cancel this modal"
+ accessibilityLabel="Cancel"
accessibilityHint=""
onAccessibilityEscape={onPressCancel}
label="Cancel"
@@ -183,8 +182,7 @@ export const Component = observer(
type="primary"
onPress={onPressSave}
style={styles.footerBtn}
- accessibilityRole="button"
- accessibilityLabel="Save these changes"
+ accessibilityLabel="Save changes"
accessibilityHint=""
onAccessibilityEscape={onPressSave}
label="Save Changes"
diff --git a/src/view/com/util/forms/Button.tsx b/src/view/com/util/forms/Button.tsx
index 1c9b1cf516..a8f1f363f9 100644
--- a/src/view/com/util/forms/Button.tsx
+++ b/src/view/com/util/forms/Button.tsx
@@ -38,6 +38,7 @@ export function Button({
accessibilityLabel,
accessibilityHint,
accessibilityLabelledBy,
+ onAccessibilityEscape,
}: React.PropsWithChildren<{
type?: ButtonType
label?: string
@@ -48,6 +49,7 @@ export function Button({
accessibilityLabel?: string
accessibilityHint?: string
accessibilityLabelledBy?: string
+ onAccessibilityEscape?: () => void
}>) {
const theme = useTheme()
const typeOuterStyle = choose>(
@@ -142,7 +144,8 @@ export function Button({
accessibilityRole="button"
accessibilityLabel={accessibilityLabel}
accessibilityHint={accessibilityHint}
- accessibilityLabelledBy={accessibilityLabelledBy}>
+ accessibilityLabelledBy={accessibilityLabelledBy}
+ onAccessibilityEscape={onAccessibilityEscape}>
{label ? (
{label}
diff --git a/src/view/screens/Moderation.tsx b/src/view/screens/Moderation.tsx
index 29ef8b4b2e..4c52301cb6 100644
--- a/src/view/screens/Moderation.tsx
+++ b/src/view/screens/Moderation.tsx
@@ -51,8 +51,9 @@ export const ModerationScreen = withAuthRequired(
testID="contentFilteringBtn"
style={[styles.linkCard, pal.view]}
onPress={onPressContentFiltering}
+ accessibilityRole="tab"
accessibilityHint="Content filtering"
- accessibilityLabel="Opens configurable content filtering settings">
+ accessibilityLabel="">
)}
@@ -104,7 +104,7 @@ export const ProfileListScreen = withAuthRequired(
label="Edit List"
testID="editListBtn"
accessibilityLabel="Edit list"
- accessibilityHint="Opens a modal to edit the mutelist"
+ accessibilityHint=""
onPress={onPressEditList}
/>
)}
@@ -113,8 +113,8 @@ export const ProfileListScreen = withAuthRequired(
type="inverted"
label="Unsubscribe"
testID="unsubscribeListBtn"
- accessibilityLabel="Unsubscribe from this list"
- accessibilityHint="Stops muting the users included in this list"
+ accessibilityLabel="Unsubscribe from list"
+ accessibilityHint=""
onPress={onToggleSubscribed}
/>
) : (