1 files changed, 26 insertions, 4 deletions
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 194f990f..3a5bb4e3 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -162,19 +162,41 @@ Template.changeLanguagePopup.events({
 
 Template.changeSettingsPopup.helpers({
   showDesktopDragHandles() {
-    return Meteor.user().hasShowDesktopDragHandles();
+    import { Cookies } from 'meteor/ostrio:cookies';
+    const cookies = new Cookies();
+    if (cookies.has('showDesktopDragHandles')) {
+      return true;
+    } else {
+      return false;
+    }
   },
   hiddenSystemMessages() {
-    return Meteor.user().hasHiddenSystemMessages();
+    const currentUser = Meteor.user();
+    if (currentUser) {
+      return Meteor.user().hasHiddenSystemMessages();
+    } else {
+      return false;
+    }
   },
   showCardsCountAt() {
-    return Meteor.user().getLimitToShowCardsCount();
+    const currentUser = Meteor.user();
+    if (currentUser) {
+      return Meteor.user().getLimitToShowCardsCount();
+    } else {
+      return false;
+    }
   },
 });
 
 Template.changeSettingsPopup.events({
   'click .js-toggle-desktop-drag-handles'() {
-    Meteor.call('toggleDesktopDragHandles');
+    import { Cookies } from 'meteor/ostrio:cookies';
+    const cookies = new Cookies();
+    if (cookies.has('showDesktopDragHandles')) {
+      cookies.remove('showDesktopDragHandles'); //true
+    } else {
+      cookies.set('showDesktopDragHandles', 'true'); //true
+    }
   },
   'click .js-toggle-system-messages'() {
     Meteor.call('toggleSystemMessages');