Remove useless tooltips in label and move dropdowns

MAILWEB-3579

2 files changed, 28 insertions, 40 deletions

diff --git a/applications/mail/src/app/components/dropdown/LabelDropdown.tsx b/applications/mail/src/app/components/dropdown/LabelDropdown.tsx
index 12ce4617f9..f658a5ecf3 100644
--- a/applications/mail/src/app/components/dropdown/LabelDropdown.tsx
+++ b/applications/mail/src/app/components/dropdown/LabelDropdown.tsx
@@ -228,10 +228,6 @@ const LabelDropdown = ({ selectedIDs, labelID, onClose, onLock, breakpoints }: P
         await withLoading(handleApply());
     };
 
-    const alwaysTooltip = alwaysCheckboxDisabled
-        ? c('Context filtering disabled').t`Your selection contains only yourself as sender`
-        : undefined;
-
     return (
         <form onSubmit={handleSubmit}>
             <div className="flex flex-justify-space-between flex-align-items-center m1 mb0">
@@ -313,22 +309,20 @@ const LabelDropdown = ({ selectedIDs, labelID, onClose, onLock, breakpoints }: P
                 </ul>
             </div>
             {displayContextFiltering && (
-                <Tooltip title={alwaysTooltip}>
-                    <div className={classnames(['p1 border-top', alwaysCheckboxDisabled && 'color-disabled'])}>
-                        <Checkbox
-                            className="mr0-5"
-                            id={alwaysCheckID}
-                            checked={always}
-                            disabled={alwaysCheckboxDisabled}
-                            onChange={({ target }) => setAlways(target.checked)}
-                            data-testid="label-dropdown:always-move"
-                            data-prevent-arrow-navigation
-                        />
-                        <label htmlFor={alwaysCheckID} className="flex-item-fluid">
-                            {c('Label').t`Always label sender's emails`}
-                        </label>
-                    </div>
-                </Tooltip>
+                <div className={classnames(['p1 border-top', alwaysCheckboxDisabled && 'color-disabled'])}>
+                    <Checkbox
+                        className="mr0-5"
+                        id={alwaysCheckID}
+                        checked={always}
+                        disabled={alwaysCheckboxDisabled}
+                        onChange={({ target }) => setAlways(target.checked)}
+                        data-testid="label-dropdown:always-move"
+                        data-prevent-arrow-navigation
+                    />
+                    <label htmlFor={alwaysCheckID} className="flex-item-fluid">
+                        {c('Label').t`Always label sender's emails`}
+                    </label>
+                </div>
             )}
             <div className={classnames([!displayContextFiltering && 'py1 border-top', 'flex ml1 mr1'])}>
                 <Checkbox
diff --git a/applications/mail/src/app/components/dropdown/MoveDropdown.tsx b/applications/mail/src/app/components/dropdown/MoveDropdown.tsx
index ecb65bf812..4abb6ab7f2 100644
--- a/applications/mail/src/app/components/dropdown/MoveDropdown.tsx
+++ b/applications/mail/src/app/components/dropdown/MoveDropdown.tsx
@@ -147,10 +147,6 @@ const MoveDropdown = ({ selectedIDs, labelID, conversationMode, onClose, onLock,
     const autoFocusSearch = !breakpoints.isNarrow;
     const applyDisabled = selectedFolder?.ID === undefined;
 
-    const alwaysTooltip = alwaysCheckboxDisabled
-        ? c('Context filtering disabled').t`Your selection contains only yourself as sender`
-        : undefined;
-
     return (
         <form onSubmit={handleSubmit}>
             <div className="flex flex-justify-space-between flex-align-items-center m1 mb0">
@@ -228,22 +224,20 @@ const MoveDropdown = ({ selectedIDs, labelID, conversationMode, onClose, onLock,
                 </ul>
             </div>
             {contextFilteringFeature.feature?.Value === true && contextFilteringFeature.loading === false && (
-                <Tooltip title={alwaysTooltip}>
-                    <div className={classnames(['p1 pb0 border-top', alwaysCheckboxDisabled && 'color-disabled'])}>
-                        <Checkbox
-                            className="mr0-5"
-                            id={alwaysCheckID}
-                            checked={always}
-                            disabled={alwaysCheckboxDisabled}
-                            onChange={({ target }) => setAlways(target.checked)}
-                            data-testid="move-dropdown:always-move"
-                            data-prevent-arrow-navigation
-                        />
-                        <label htmlFor={alwaysCheckID} className="flex-item-fluid">
-                            {c('Label').t`Always move sender's emails`}
-                        </label>
-                    </div>
-                </Tooltip>
+                <div className={classnames(['p1 pb0 border-top', alwaysCheckboxDisabled && 'color-disabled'])}>
+                    <Checkbox
+                        className="mr0-5"
+                        id={alwaysCheckID}
+                        checked={always}
+                        disabled={alwaysCheckboxDisabled}
+                        onChange={({ target }) => setAlways(target.checked)}
+                        data-testid="move-dropdown:always-move"
+                        data-prevent-arrow-navigation
+                    />
+                    <label htmlFor={alwaysCheckID} className="flex-item-fluid">
+                        {c('Label').t`Always move sender's emails`}
+                    </label>
+                </div>
             )}
             <div className="m1">
                 <PrimaryButton