Commit 085d7f98 authored Sep 24, 2019 by Brian Hatchet

Merge branch 'fix/check-if-dispose-enter-is-setted-before-remove' into 'release/3.10.0'

(fix) check if dispose enter is setted before remove

See merge request !356

parents df3e37fd 92ab8cac

src/channel/ChannelScreen.js

+3 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,9 @@ export default class ChannelScreen extends Component {
		}

		componentWillUnmount() {
		if (this.disposeEnter) {
		this.disposeEnter.remove();
		}
		this.props.channel.garbageCollect();
		this.props.channel.store(this.guid).markInactive();
		}

src/discovery/DiscoveryScreen.js

+7 −2

Original line number	Diff line number	Diff line
		@@ -118,9 +118,14 @@ export default class DiscoveryScreen extends Component {
		* Dispose reactions of navigation store on unmount
		*/
		componentWillUnmount() {
		if (this.disposeEnter) {
		this.disposeEnter.remove();
		}

		if (this.disposeLeave) {
		this.disposeLeave.remove();
		}
		}

		/**
		* Adjust tiles to 1/cols size

src/groups/GroupViewScreen.js

+3 −1

Original line number	Diff line number	Diff line
		@@ -137,8 +137,10 @@ export default class GroupViewScreen extends Component {
		*/
		componentWillUnmount() {
		this.props.groupView.clear();
		if (this.disposeEnter) {
		this.disposeEnter.remove();
		}
		}

		/**
		* Load subs data

src/messenger/MessengerScreen.js

+3 −1

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

src/newsfeed/NewsfeedScreen.js

+3 −1

Original line number	Diff line number	Diff line
		@@ -87,8 +87,10 @@ export default class NewsfeedScreen extends Component {
		* Component will unmount
		*/
		componentWillUnmount() {
		if (this.disposeEnter) {
		this.disposeEnter.remove();
		}
		}

		setGroupsBarRef = (r) => this.groupsBar = r;