From 0c1fdb277adfbaa3c6bb3c154165cff0caa1d16c Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 16 Nov 2021 14:19:07 +0300
Subject: [PATCH 1/2] [SSE] Fix Bug 53730

---
 apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index a9c438569..86f633598 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -1066,6 +1066,7 @@ define([
             if (this.tooltips.foreignSelect.ref) {
                 $(this.tooltips.foreignSelect.ref).remove();
                 this.tooltips.foreignSelect.ref = undefined;
+                this.tooltips.foreignSelect.userId = undefined;
                 this.tooltips.foreignSelect.x_point = undefined;
                 this.tooltips.foreignSelect.y_point = undefined;
             }
@@ -1387,6 +1388,7 @@ define([
                             var src = $(document.createElement("div")),
                                 color = data.asc_getColor();
                             foreignSelect.ref = src;
+                            foreignSelect.userId = data.asc_getUserId();
 
                             src.addClass('username-tip');
                             src.css({
@@ -3754,6 +3756,9 @@ define([
             /** coauthoring begin **/
             var src;
             var me = this;
+            if (me.tooltips && me.tooltips.foreignSelect && (me.tooltips.foreignSelect.userId == UserId)) {
+                me.hideForeignSelectTips();
+            }
             for (var i=0; i<me.fastcoauthtips.length; i++) {
                 if (me.fastcoauthtips[i].attr('userid') == UserId) {
                     src = me.fastcoauthtips[i];

From 035acaf1f10807d6e1f685e800fab62c207a49a3 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Tue, 16 Nov 2021 14:53:54 +0300
Subject: [PATCH 2/2] [DE] Add states for Got it button. Refactoring

---
 apps/common/main/resources/less/synchronize-tip.less  | 9 +++++++++
 apps/documenteditor/forms/app/view/ApplicationView.js | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less
index 76b25504c..7db99a439 100644
--- a/apps/common/main/resources/less/synchronize-tip.less
+++ b/apps/common/main/resources/less/synchronize-tip.less
@@ -95,6 +95,15 @@
             border-radius: 2px;
             padding: 3px 12px;
             margin-top: 10px;
+            &:hover {
+                background-color: @highlight-header-button-hover-ie;
+                background-color: @highlight-header-button-hover;
+            }
+
+            &:active {
+                background-color: @highlight-header-button-pressed-ie;
+                background-color: @highlight-header-button-pressed;
+            }
         }
 
         .show-link label {
diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js
index 3f3aa3714..1486a94d8 100644
--- a/apps/documenteditor/forms/app/view/ApplicationView.js
+++ b/apps/documenteditor/forms/app/view/ApplicationView.js
@@ -27,7 +27,6 @@ define([
                             menu        : this.mnuThemes = new Common.UI.Menu({
                                 cls: 'shifted-right',
                                 menuAlign: 'tl-tr',
-                                restoreHeight: true,
                                 items: []
                             })
                         },