diff --git a/src/components/ExchangePage/index.js b/src/components/ExchangePage/index.js index f3f9064d..f5c7f129 100644 --- a/src/components/ExchangePage/index.js +++ b/src/components/ExchangePage/index.js @@ -41,7 +41,7 @@ class ExchangePage extends PureComponent { ] return ( - + {t('app:exchange.title')} diff --git a/src/components/StickyBackToTop.js b/src/components/StickyBackToTop.js index 9e106978..dd2533b7 100644 --- a/src/components/StickyBackToTop.js +++ b/src/components/StickyBackToTop.js @@ -49,6 +49,7 @@ class StickyBackToTop extends PureComponent { const { scrollContainer } = this.props.getGrowScroll() if (scrollContainer) { const listener = () => { + if (this._unmounted) return const { scrollTop } = scrollContainer const visible = scrollTop > this.props.scrollThreshold this.setState(previous => { @@ -59,11 +60,12 @@ class StickyBackToTop extends PureComponent { }) } scrollContainer.addEventListener('scroll', listener) - this.releaseListener = () => scrollContainer.addEventListener('scroll', listener) + this.releaseListener = () => scrollContainer.removeEventListener('scroll', listener) } } componentWillUnmount() { + this._unmounted = true this.releaseListener() }