Move condition of trash or not

browser/main/NewNoteButton/index.js

@@ -68,27 +68,23 @@ class NewNoteButton extends React.Component {
   }
 
   render () {
-    const { config, style, data, location } = this.props
+    const { config, style, data } = this.props
-    if (location.pathname === '/trashed') {
+    return (
-      return ''
+      <div className='NewNoteButton'
-    } else {
+        styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
-      return (
+        style={style}
-        <div className='NewNoteButton'
+      >
-          styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
+        <div styleName='control'>
-          style={style}
+          <button styleName='control-newNoteButton'
-        >
+            onClick={(e) => this.handleNewNoteButtonClick(e)}>
-          <div styleName='control'>
+            <i className='fa fa-pencil-square-o' />
-            <button styleName='control-newNoteButton'
+            <span styleName='control-newNoteButton-tooltip'>
-              onClick={(e) => this.handleNewNoteButtonClick(e)}>
+              Make a Note {OSX ? '⌘' : '^'} + n
-              <i className='fa fa-pencil-square-o' />
+            </span>
-              <span styleName='control-newNoteButton-tooltip'>
+          </button>
-                Make a Note {OSX ? '⌘' : '^'} + n
-              </span>
-            </button>
-          </div>
         </div>
-      )
+      </div>
-    }
+    )
   }
 }
 

browser/main/TopBar/index.js

@@ -75,7 +75,7 @@ class TopBar extends React.Component {
   }
 
   render () {
-    let { config, style, data } = this.props
+    let { config, style, data, location } = this.props
     return (
       <div className='TopBar'
         styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
@@ -108,7 +108,8 @@ class TopBar extends React.Component {
 
           </div>
         </div>
-        <NewNoteButton
+        {location.pathname === '/trashed' ? ''
+        : <NewNoteButton
           {..._.pick(this.props, [
             'dispatch',
             'data',
@@ -116,7 +117,7 @@ class TopBar extends React.Component {
             'params',
             'location'
           ])}
-        />
+        />}
       </div>
     )
   }