From d4e083cfaa96941fd6bf7d4101e01dbbf7829669 Mon Sep 17 00:00:00 2001
From: Daniil Senkiv <daniil.senkiv@onlyoffice.com>
Date: Wed, 22 Jan 2020 18:03:04 +0300
Subject: [PATCH] Web.Common: Layout: fixed render ProfileActions component
 after changing language

---
 web/ASC.Web.Common/src/components/Layout/index.js            | 4 ++--
 .../src/components/Layout/sub-components/profile-actions.js  | 5 ++---
 .../src/components/StudioLayout/PureStudioLayout.js          | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/ASC.Web.Common/src/components/Layout/index.js b/web/ASC.Web.Common/src/components/Layout/index.js
index 026f2d405a..4f54e54167 100644
--- a/web/ASC.Web.Common/src/components/Layout/index.js
+++ b/web/ASC.Web.Common/src/components/Layout/index.js
@@ -35,8 +35,8 @@ class Layout extends React.Component {
       hash += props.currentModuleId;
     }
     if (props.currentUser) {
-      const { id, displayName, email, avatarSmall } = props.currentUser;
-      hash += id + displayName + email + avatarSmall;
+      const { id, displayName, email, avatarSmall, cultureName } = props.currentUser;
+      hash += id + displayName + email + avatarSmall + cultureName;
     }
     if (props.availableModules) {
       for (let i = 0, l = props.availableModules.length; i < l; i++) {
diff --git a/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js b/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js
index b1db99d334..ba3ccc5524 100644
--- a/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js
+++ b/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js
@@ -12,8 +12,7 @@ class ProfileActions extends React.PureComponent {
 
     this.state = {
       opened: props.opened,
-      user: props.user,
-      userActions: props.userActions
+      user: props.user
     };
 
     this.handleClick = this.handleClick.bind(this);
@@ -95,7 +94,7 @@ class ProfileActions extends React.PureComponent {
             displayName={this.state.user.displayName}
             email={this.state.user.email}
           />
-          {this.state.userActions.map(action => (
+          {this.props.userActions.map(action => (
             <Link
               noHover={true}
               key={action.key}
diff --git a/web/ASC.Web.Common/src/components/StudioLayout/PureStudioLayout.js b/web/ASC.Web.Common/src/components/StudioLayout/PureStudioLayout.js
index 12dd680b94..f73e85eebc 100644
--- a/web/ASC.Web.Common/src/components/StudioLayout/PureStudioLayout.js
+++ b/web/ASC.Web.Common/src/components/StudioLayout/PureStudioLayout.js
@@ -6,7 +6,8 @@ import Layout from "../Layout";
 class PureStudioLayout extends React.Component {
   shouldComponentUpdate(nextProps) {
     return this.props.hasChanges !== nextProps.hasChanges ||
-    this.props.currentModuleId !== nextProps.currentModuleId;
+    this.props.currentModuleId !== nextProps.currentModuleId ||
+    this.props.language !== nextProps.language;
   }
 
   onProfileClick = () => {