From f65b6472ddedf2db2df9241d7fe7b3cc67bcf0a2 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Sat, 9 Jan 2016 22:48:48 -0800
Subject: [PATCH] Clean up toast logic in App.jsx

---
 common/app/App.jsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/common/app/App.jsx b/common/app/App.jsx
index 69e7d8b082..6099540c7d 100644
--- a/common/app/App.jsx
+++ b/common/app/App.jsx
@@ -46,14 +46,9 @@ export default contain(
       toast: PropTypes.object
     },
 
-    componentWillReceiveProps({ toast: nextToast }) {
+    componentWillReceiveProps({ toast: nextToast = {} }) {
       const { toast = {} } = this.props;
-      if (
-        toast &&
-        nextToast &&
-        toast.id !== nextToast.id
-      ) {
-
+      if (toast.id !== nextToast.id) {
         this.refs.toaster[nextToast.type || 'success'](
           nextToast.message,
           nextToast.title,