From 38fe4a83dcfeebd8467d48ebf7acb4dd0bf4b773 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 31 Jul 2017 14:14:16 -0700
Subject: [PATCH] Revert notificatoins

---
 app/ui/components/sidebar/sidebar-children.js |  3 +-
 .../sidebar/sidebar-request-group-row.js      |  3 +-
 app/ui/components/toast.js                    | 52 ++++++-------------
 3 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/app/ui/components/sidebar/sidebar-children.js b/app/ui/components/sidebar/sidebar-children.js
index 440c3f1b04..b95ae7830f 100644
--- a/app/ui/components/sidebar/sidebar-children.js
+++ b/app/ui/components/sidebar/sidebar-children.js
@@ -1,6 +1,7 @@
 import React, {PureComponent, PropTypes} from 'react';
 import SidebarRequestRow from './sidebar-request-row';
 import SidebarRequestGroupRow from './sidebar-request-group-row';
+import * as models from '../../../models/index';
 
 class SidebarChildren extends PureComponent {
   _renderChildren (children) {
@@ -25,7 +26,7 @@ class SidebarChildren extends PureComponent {
         return null;
       }
 
-      if (child.doc.type === 'Request') {
+      if (child.doc.type === models.request.type) {
         return (
           <SidebarRequestRow
             key={child.doc._id}
diff --git a/app/ui/components/sidebar/sidebar-request-group-row.js b/app/ui/components/sidebar/sidebar-request-group-row.js
index d93f5148cb..d9ad5707d0 100644
--- a/app/ui/components/sidebar/sidebar-request-group-row.js
+++ b/app/ui/components/sidebar/sidebar-request-group-row.js
@@ -84,7 +84,6 @@ class SidebarRequestGroupRow extends PureComponent {
           'sidebar__item sidebar__item--big', {'sidebar__item--active': isActive}
         )}>
           {button}
-
           <div className="sidebar__actions">
             <RequestGroupActionsDropdown
               ref={this._setRequestGroupActionsDropdownRef}
@@ -99,7 +98,7 @@ class SidebarRequestGroupRow extends PureComponent {
         </div>
 
         <ul className={classnames('sidebar__list', {'sidebar__list--collapsed': isCollapsed})}>
-          {children.length > 0 ? children : (
+          {!isCollapsed && children.length > 0 ? children : (
             <SidebarRequestRow
               handleActivateRequest={misc.nullFn}
               handleDuplicateRequest={misc.nullFn}
diff --git a/app/ui/components/toast.js b/app/ui/components/toast.js
index d339110be7..b4498cdf42 100644
--- a/app/ui/components/toast.js
+++ b/app/ui/components/toast.js
@@ -45,44 +45,22 @@ class Toast extends PureComponent {
     let notification;
 
     // Try fetching user notification
-    if (isLoggedIn()) {
-      try {
-        const data = {
-          lastLaunch: stats.lastLaunch,
-          firstLaunch: stats.created,
-          launches: stats.launches,
-          platform: constants.getAppPlatform(),
-          version: constants.getAppVersion(),
-          requests: await db.count(models.request.type),
-          requestGroups: await db.count(models.requestGroup.type),
-          environments: await db.count(models.environment.type),
-          workspaces: await db.count(models.workspace.type)
-        };
+    try {
+      const data = {
+        lastLaunch: stats.lastLaunch,
+        firstLaunch: stats.created,
+        launches: stats.launches,
+        platform: constants.getAppPlatform(),
+        version: constants.getAppVersion(),
+        requests: await db.count(models.request.type),
+        requestGroups: await db.count(models.requestGroup.type),
+        environments: await db.count(models.environment.type),
+        workspaces: await db.count(models.workspace.type)
+      };
 
-        notification = await fetch.post(`/notification`, data);
-      } catch (err) {
-        console.warn('[toast] Failed to fetch user notifications', err);
-      }
-    }
-
-    // Try fetching guest version-specific notification
-    if (!notification || this._hasSeenNotification(notification)) {
-      try {
-        notification = await fetch.get(
-          `https://insomnia.rest/notifications/v${constants.getAppVersion()}.json`
-        );
-      } catch (err) {
-        console.warn('[toast] Failed to fetch version notifications', err);
-      }
-    }
-
-    // Try fetching guest generic notification
-    if (!notification || this._hasSeenNotification(notification)) {
-      try {
-        notification = await fetch.get('https://insomnia.rest/notifications/all.json');
-      } catch (err) {
-        console.warn('[toast] Failed to fetch generic notifications', err);
-      }
+      notification = await fetch.post(`/notification`, data);
+    } catch (err) {
+      console.warn('[toast] Failed to fetch user notifications', err);
     }
 
     // No new notifications