From 5238d401013812a227e3ce2070e1782938b48294 Mon Sep 17 00:00:00 2001
From: Michael <74271024+KvngMikey@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:46:24 +0100
Subject: [PATCH] [MM-59890] Migrate tooltips of
 'components/admin_console/brand_image_setting/brand_image_setting.tsx' to
 WithTooltip (#27854)

---
 .../brand_image_setting.tsx                   | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/brand_image_setting/brand_image_setting.tsx b/webapp/channels/src/components/admin_console/brand_image_setting/brand_image_setting.tsx
index fe44a88f92..f20ec2f4ad 100644
--- a/webapp/channels/src/components/admin_console/brand_image_setting/brand_image_setting.tsx
+++ b/webapp/channels/src/components/admin_console/brand_image_setting/brand_image_setting.tsx
@@ -9,8 +9,7 @@ import {Client4} from 'mattermost-redux/client';
 import {uploadBrandImage, deleteBrandImage} from 'actions/admin_actions.jsx';
 
 import FormError from 'components/form_error';
-import OverlayTrigger from 'components/overlay_trigger';
-import Tooltip from 'components/tooltip';
+import WithTooltip from 'components/with_tooltip';
 
 import {Constants} from 'utils/constants';
 
@@ -193,19 +192,14 @@ export default class BrandImageSetting extends React.PureComponent<Props, State>
             let overlay;
             if (!this.props.disabled) {
                 overlay = (
-                    <OverlayTrigger
-                        delayShow={Constants.OVERLAY_TIME_DELAY}
+                    <WithTooltip
+                        id='removeIcon'
+                        title={
+                            <FormattedMessage
+                                id='admin.team.removeBrandImage'
+                                defaultMessage='Remove brand image'
+                            />}
                         placement='right'
-                        overlay={
-                            <Tooltip id='removeIcon'>
-                                <div aria-hidden={true}>
-                                    <FormattedMessage
-                                        id='admin.team.removeBrandImage'
-                                        defaultMessage='Remove brand image'
-                                    />
-                                </div>
-                            </Tooltip>
-                        }
                     >
                         <button
                             type='button'
@@ -214,7 +208,7 @@ export default class BrandImageSetting extends React.PureComponent<Props, State>
                         >
                             <span aria-hidden={true}>{'×'}</span>
                         </button>
-                    </OverlayTrigger>
+                    </WithTooltip>
                 );
             }
             img = (