From c06802e6760d59e767fa5535387f0d9cb8dd275f Mon Sep 17 00:00:00 2001
From: Ivan Zhadaev <ivan.zhadaev@b12.io>
Date: Mon, 14 Oct 2024 14:35:04 +0000
Subject: [PATCH] Removed separate B12 icon from SidebarHeader

---
 .../sidebar/header/SidebarHeader.es6.js       | 32 ++++---------------
 style/layout/side-pane.scss                   | 16 ++--------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/components/layout/sidebar/header/SidebarHeader.es6.js b/components/layout/sidebar/header/SidebarHeader.es6.js
index 34619c1..3a44c77 100644
--- a/components/layout/sidebar/header/SidebarHeader.es6.js
+++ b/components/layout/sidebar/header/SidebarHeader.es6.js
@@ -6,7 +6,7 @@ import QuickActions from './QuickActions.es6.js'
 import SidebarBackButton from './SidebarBackButton.es6.js'
 import SidebarHeaderActionButton from './SidebarHeaderActionButton.es6.js'
 import Button from '../../../form/button/Button.es6.js'
-import { Home, B12Logo } from '../../../Icons.es6.js'
+import { B12Logo } from '../../../Icons.es6.js'
 
 class SidebarHeader extends React.Component {
   state = {
@@ -74,15 +74,13 @@ class SidebarHeader extends React.Component {
       quickDialog,
       showLogo,
       steps,
-      title,
-      b12Button,
-      onB12Click
+      title
     } = this.props
     const { actionsAvailable, actionsVisible } = this.state
 
     return (
       <Fragment>
-        <div className={classnames('ds-sidebar__header', { 'ds-sidebar__header--b12-home-icon': b12Button })}>
+        <div className="ds-sidebar__header">
           <div className="ds-sidebar__header-back">
             {showLogo && <B12Logo color="#6548c7" width={46} height={20} viewBox="0 0 200 80" className="ds-sidebar__header-logo" />}
 
@@ -97,20 +95,6 @@ class SidebarHeader extends React.Component {
             {!showLogo && !backButton && leftAction}
 
             {homeButton && (
-              <React.Fragment>
-                <div className="ds-sidebar__header-divider" />
-                {!isScrollingDown && (
-                  <Button
-                    small
-                    className="ds-sidebar__header-home"
-                    icon={<Home />}
-                    onClick={onHomeClick}
-                  />
-                )}
-              </React.Fragment>
-            )}
-
-            {b12Button && (
               <React.Fragment>
                 <div className="ds-sidebar__header-divider" />
                 {!isScrollingDown && (
@@ -118,7 +102,7 @@ class SidebarHeader extends React.Component {
                     small
                     className="ds-sidebar__header-home"
                     icon={<B12Logo width={30} height={20} color="#84839c" viewBox="0 0 200 80" />}
-                    onClick={onB12Click}
+                    onClick={onHomeClick}
                   />
                 )}
               </React.Fragment>
@@ -193,9 +177,7 @@ SidebarHeader.defaultProps = {
   quickActions: [],
   showLogo: false,
   quickDialog: null,
-  tabbedNavigation: null,
-  b12Button: false,
-  onB12Click: () => {}
+  tabbedNavigation: null
 }
 
 SidebarHeader.propTypes = {
@@ -220,9 +202,7 @@ SidebarHeader.propTypes = {
   onQuickActionSelected: PropTypes.func,
   showLogo: PropTypes.bool,
   quickDialog: PropTypes.element,
-  tabbedNavigation: PropTypes.element,
-  b12Button: PropTypes.bool,
-  onB12Click: PropTypes.func
+  tabbedNavigation: PropTypes.element
 }
 
 export default SidebarHeader
diff --git a/style/layout/side-pane.scss b/style/layout/side-pane.scss
index 56f063b..58f2a1b 100644
--- a/style/layout/side-pane.scss
+++ b/style/layout/side-pane.scss
@@ -80,17 +80,6 @@
       box-shadow: none;
     }
 
-    &--b12-home-icon {
-      .ds-sidebar__header-divider {
-        margin: 0 8px;
-      }
-
-      .ds-sidebar__header-home {
-        margin-left: 0;
-        padding: 0 !important;
-      }
-    }
-
     &-title {
       font-family: $ds-font-family-base;
       font-size: 20px;
@@ -118,14 +107,15 @@
       width: 1px;
       height: 16px;
       background: #eee;
-      margin: 0 spacing(xxsm);
+      margin: 0 8px;
     }
 
     &-home {
       border: 0 none !important;
       box-shadow: none !important;
       background: $ds-ui-lightest-color;
-      margin-left: -11px;
+      margin-left: 0;
+      padding: 0 !important;
 
       &:hover,
       &:focus,