src/channel/ChannelScreen.js

@@ -94,7 +94,9 @@ export default class ChannelScreen extends Component {
   }
 
   componentWillUnmount() {
-    this.disposeEnter.remove();
+    if (this.disposeEnter) {
+      this.disposeEnter.remove();
+    }
     this.props.channel.garbageCollect();
     this.props.channel.store(this.guid).markInactive();
   }

src/discovery/DiscoveryScreen.js

@@ -118,8 +118,13 @@ export default class DiscoveryScreen extends Component {
    * Dispose reactions of navigation store on unmount
    */
   componentWillUnmount() {
-    this.disposeEnter.remove();
-    this.disposeLeave.remove();
+    if (this.disposeEnter) {
+      this.disposeEnter.remove();
+    }
+
+    if (this.disposeLeave) {
+      this.disposeLeave.remove();
+    }
   }
 
   /**

src/groups/GroupViewScreen.js

@@ -137,7 +137,9 @@ export default class GroupViewScreen extends Component {
    */
   componentWillUnmount() {
     this.props.groupView.clear();
-    this.disposeEnter.remove();
+    if (this.disposeEnter) {
+      this.disposeEnter.remove();
+    }
   }
 
   /**

src/messenger/MessengerScreen.js

@@ -76,7 +76,9 @@ export default class MessengerScreen extends Component {
    */
   componentWillUnmount() {
     this.props.messengerList.unlisten();
-    this.disposeEnter.remove();
+    if (this.disposeEnter) {
+      this.disposeEnter.remove();
+    }
     //this.disposeLeave();
   }
 

src/newsfeed/NewsfeedScreen.js

@@ -87,7 +87,9 @@ export default class NewsfeedScreen extends Component {
    * Component will unmount
    */
   componentWillUnmount() {
-    this.disposeEnter.remove();
+    if (this.disposeEnter) {
+      this.disposeEnter.remove();
+    }
   }
 
   setGroupsBarRef = (r) => this.groupsBar = r;

src/notifications/NotificationsScreen.js

@@ -85,7 +85,9 @@ export default class NotificationsScreen extends Component {
   componentWillUnmount() {
     // clear data to free memory
     this.props.notifications.list.clearList();
-    this.disposeEnter.remove();
+    if (this.disposeEnter) {
+      this.disposeEnter.remove();
+    }
   }
 
   /**

src/wallet/balances/WalletBalanceTokens.js

@@ -43,7 +43,9 @@ export default class WalletBalanceTokens extends Component {
   componentWillUnmount() {
     // clear data to free memory
     this.wallet.ledger.list.clearList();
-    this.disposeEnter.remove();
+    if (this.disposeEnter) {
+      this.disposeEnter.remove();
+    }
   }
 
   render() {