From f796c59cefc683585cbf8193431d2dfcfd2e3c9b Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 23 Oct 2023 16:33:00 +1100
Subject: [PATCH] chore: add missing accessibilityIds for menu buttons/radio

---
 stylesheets/_session_conversation.scss                     | 2 +-
 ts/components/buttons/PanelButton.tsx                      | 2 +-
 .../right-panel/overlay/OverlayRightPanelSettings.tsx      | 7 ++++++-
 .../overlay/disappearing-messages/TimeOptions.tsx          | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index a09024d73..9b50aa63b 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -27,7 +27,7 @@
   transform: translateX(100%);
   will-change: transform;
   width: 25vw;
-  min-width: 300px; // because the disappear messages don't render will with less than this, and 25% can be less than that
+  min-width: 300px; // because the disappear messages don't render well with less than this, and 25vw can be less than that
   z-index: 5;
 
   background-color: var(--background-primary-color);
diff --git a/ts/components/buttons/PanelButton.tsx b/ts/components/buttons/PanelButton.tsx
index 6cd31dbf3..e4644c0c0 100644
--- a/ts/components/buttons/PanelButton.tsx
+++ b/ts/components/buttons/PanelButton.tsx
@@ -100,7 +100,7 @@ export type PanelButtonProps = {
   disabled?: boolean;
   children: ReactNode;
   onClick: (...args: Array<any>) => void;
-  dataTestId?: string;
+  dataTestId: string;
   style?: CSSProperties;
 };
 
diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
index 263fa6bb4..4fb93b780 100644
--- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
+++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
@@ -281,7 +281,7 @@ export const OverlayRightPanelSettings = () => {
           </div>
           <SpacerLG />
         </>
-      )}{' '}
+      )}
       <PanelButtonGroup>
         {showUpdateGroupNameButton && (
           <PanelIconButton
@@ -290,6 +290,7 @@ export const OverlayRightPanelSettings = () => {
             }}
             text={isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
             iconType={null}
+            dataTestId="edit-group"
           />
         )}
         {showAddRemoveModeratorsButton && (
@@ -300,6 +301,7 @@ export const OverlayRightPanelSettings = () => {
                 showAddModeratorsByConvoId(selectedConvoKey);
               }}
               text={window.i18n('addModerators')}
+              dataTestId="add-moderators"
             />
             <PanelIconButton
               iconType={null}
@@ -307,6 +309,7 @@ export const OverlayRightPanelSettings = () => {
                 showRemoveModeratorsByConvoId(selectedConvoKey);
               }}
               text={window.i18n('removeModerators')}
+              dataTestId="remove-moderators"
             />
           </>
         )}
@@ -318,6 +321,7 @@ export const OverlayRightPanelSettings = () => {
               void showUpdateGroupMembersByConvoId(selectedConvoKey);
             }}
             text={window.i18n('groupMembers')}
+            dataTestId="group-members"
           />
         )}
 
@@ -325,6 +329,7 @@ export const OverlayRightPanelSettings = () => {
           <PanelIconButton
             iconType={'timer50'}
             text={window.i18n('disappearingMessages')}
+            dataTestId="disappearing-messages"
             onClick={() => {
               dispatch(setRightOverlayMode('disappearing-messages'));
             }}
diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx
index 9590447c4..d7600a113 100644
--- a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx
+++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx
@@ -34,7 +34,7 @@ export const TimeOptions = (props: TimerOptionsProps) => {
                 setSelected(option.value);
               }}
               disabled={disabled}
-              dataTestId={`disappear-time-${option.value}-option`}
+              dataTestId={option.name.replace(' ', '-')} // we want just "1-minute", etc as accessibility id
             />
           );
         })}