From 150072b885e267328acd3ffe9e3a8c63aa2345a3 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Fri, 16 Sep 2022 15:53:19 +0300
Subject: [PATCH 1/2] Web: Common: fixed logo click, fixed burger styles

---
 packages/common/components/Article/styled-article.js  |  3 +++
 .../Article/sub-components/article-header.js          | 11 ++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/common/components/Article/styled-article.js b/packages/common/components/Article/styled-article.js
index 8e52490656..33bcfba041 100644
--- a/packages/common/components/Article/styled-article.js
+++ b/packages/common/components/Article/styled-article.js
@@ -165,6 +165,8 @@ const StyledArticleHeader = styled.div`
 StyledArticleHeader.defaultProps = { theme: Base };
 
 const StyledHeading = styled.div`
+  height: 24px;
+
   margin: 0;
   padding: 0;
   cursor: pointer;
@@ -191,6 +193,7 @@ const StyledHeading = styled.div`
 `;
 
 const StyledIconBox = styled.div`
+  cursor: pointer;
   display: none;
   align-items: center;
   height: 20px;
diff --git a/packages/common/components/Article/sub-components/article-header.js b/packages/common/components/Article/sub-components/article-header.js
index ca0ca183a9..045b024837 100644
--- a/packages/common/components/Article/sub-components/article-header.js
+++ b/packages/common/components/Article/sub-components/article-header.js
@@ -3,15 +3,13 @@ import PropTypes from "prop-types";
 import { useHistory, useLocation } from "react-router";
 import Loaders from "@docspace/common/components/Loaders";
 import { isTablet as isTabletUtils } from "@docspace/components/utils/device";
+import Link from "@docspace/components/link";
 import { isTablet, isMobileOnly } from "react-device-detect";
 import { inject, observer } from "mobx-react";
-import { ReactSVG } from "react-svg";
-import styled, { css } from "styled-components";
 import {
   StyledArticleHeader,
   StyledHeading,
   StyledIconBox,
-  StyledMenuIcon,
 } from "../styled-article";
 
 const ArticleHeader = ({
@@ -62,10 +60,9 @@ const ArticleHeader = ({
         <Loaders.ArticleHeader height="24px" width="211px" />
       ) : (
         <StyledHeading showText={showText} size="large">
-          <img
-            src="/static/images/logo.docspace.react.svg"
-            onClick={onLogoClick}
-          />
+          <Link href={showText ? "/" : null} onClick={onLogoClick}>
+            <img src="/static/images/logo.docspace.react.svg" />
+          </Link>
         </StyledHeading>
       )}
     </StyledArticleHeader>

From d246dc4dfd6f03825ec350454cd99b3be0e34c7a Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Fri, 16 Sep 2022 16:00:07 +0300
Subject: [PATCH 2/2] Web: Files: fixed EmptyFolderContainer crash

---
 .../src/components/EmptyContainer/EmptyFolderContainer.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js b/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
index cae300e581..a06ff01b05 100644
--- a/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
+++ b/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
@@ -92,7 +92,7 @@ export default inject(({ filesStore, selectedFolderStore }) => {
   const { navigationPath, parentId } = selectedFolderStore;
 
   let isRootRoom, isRoom, id;
-  if (navigationPath.length) {
+  if (navigationPath && navigationPath.length) {
     isRootRoom = navigationPath.at(-1).isRootRoom;
     isRoom = navigationPath.at(-1).isRoom;
     id = navigationPath.at(-1).id;