Skip to content

Commit 3b6145e

Browse files
MelvinBotsituchan
andcommitted
Consolidate accessibility announcements into single hook call
Combine two separate useAccessibilityAnnouncement calls into one that announces every 10 seconds and at expiration, per reviewer feedback. Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
1 parent 1846abf commit 3b6145e

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

  • src/components/ValidateCodeCountdown

src/components/ValidateCodeCountdown/index.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ function ValidateCodeCountdown({onCountdownFinish, ref}: ValidateCodeCountdownPr
2828
};
2929
}, [onCountdownFinish, timeRemaining]);
3030

31-
// Announce countdown start/reset for screen readers
32-
useAccessibilityAnnouncement(translate('validateCodeForm.timeRemainingAnnouncement', {timeRemaining: CONST.REQUEST_CODE_DELAY}), timeRemaining === CONST.REQUEST_CODE_DELAY, {
33-
shouldAnnounceOnNative: true,
34-
shouldAnnounceOnWeb: true,
35-
});
36-
37-
// Announce expiration for screen readers
38-
useAccessibilityAnnouncement(translate('validateCodeForm.timeExpiredAnnouncement'), timeRemaining === 0, {shouldAnnounceOnNative: true, shouldAnnounceOnWeb: true});
31+
// Announce countdown start/reset/expiration for screen readers
32+
useAccessibilityAnnouncement(
33+
timeRemaining === 1 ? translate('validateCodeForm.timeExpiredAnnouncement') : translate('validateCodeForm.timeRemainingAnnouncement', {timeRemaining: timeRemaining - 1}),
34+
timeRemaining % 10 === 1,
35+
{
36+
shouldAnnounceOnNative: true,
37+
shouldAnnounceOnWeb: true,
38+
},
39+
);
3940

4041
return (
4142
<RenderHTML

0 commit comments

Comments
 (0)