From 7f1c46daaf9b8e37cd535e2404553bf76fb3c148 Mon Sep 17 00:00:00 2001
From: Soumya Himanish Mohapatra <shmiitian@gmail.com>
Date: Tue, 23 Jan 2018 01:17:10 +0530
Subject: [PATCH 1/2] syncing used instead of saving while logged in

---
 src/sidebar/panel.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/sidebar/panel.js b/src/sidebar/panel.js
index d750bf03e..22f6b4c47 100644
--- a/src/sidebar/panel.js
+++ b/src/sidebar/panel.js
@@ -122,7 +122,9 @@ ClassicEditor.create(document.querySelector('#editor'), {
               setAnimation(true); // animateSyncIcon, syncingLayout, warning
               syncingInProcess = true;
             }
-            if (! waitingToReconnect) {
+            if (! waitingToReconnect && isAuthenticated) {
+              savingIndicator.textContent = browser.i18n.getMessage('syncProgress');
+            } else if (! waitingToReconnect) {
               savingIndicator.textContent = browser.i18n.getMessage('savingChanges');
             }
             // Disable sync-action
@@ -139,7 +141,7 @@ ClassicEditor.create(document.querySelector('#editor'), {
             syncingInProcess = false;
             break;
           case 'text-saved':
-            if (! waitingToReconnect) {
+            if (! waitingToReconnect && ! isAuthenticated) {
               // persist reconnect warning, do not override with the 'saved at'
               savingIndicator.textContent = browser.i18n.getMessage('savedComplete2', formatFooterTime());
             }
@@ -285,7 +287,7 @@ function getLastSyncedTime() {
     isAuthenticated = true;
     setAnimation(false, true);
   } else {
-    savingIndicator.textContent = browser.i18n.getMessage('savedComplete2', formatFooterTime());
+    savingIndicator.textContent = browser.i18n.getMessage('changesSaved', formatFooterTime());
   }
 }
 

From 55566fafaee2aad436fb989fd0b3ee4f7e4ccea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <rhubscher@mozilla.com>
Date: Tue, 23 Jan 2018 13:22:46 +0100
Subject: [PATCH 2/2] @natim review.

---
 src/sidebar/panel.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/sidebar/panel.js b/src/sidebar/panel.js
index 22f6b4c47..b34f7bd9c 100644
--- a/src/sidebar/panel.js
+++ b/src/sidebar/panel.js
@@ -122,10 +122,12 @@ ClassicEditor.create(document.querySelector('#editor'), {
               setAnimation(true); // animateSyncIcon, syncingLayout, warning
               syncingInProcess = true;
             }
-            if (! waitingToReconnect && isAuthenticated) {
-              savingIndicator.textContent = browser.i18n.getMessage('syncProgress');
-            } else if (! waitingToReconnect) {
-              savingIndicator.textContent = browser.i18n.getMessage('savingChanges');
+            if (!waitingToReconnect) {
+              if (isAuthenticated) {
+                savingIndicator.textContent = browser.i18n.getMessage('syncProgress');
+              } else {
+                savingIndicator.textContent = browser.i18n.getMessage('savingChanges');
+              }
             }
             // Disable sync-action
             editingInProcess = true;