From bdc4a6964ae83faa8229c50870e3bcc9b9074989 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Fri, 30 Mar 2018 14:51:11 -0700 Subject: Fix merge conflicts. Refactor renderPrimary into Home component --- mascara/src/app/first-time/notice-screen.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mascara') diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js index 90213fe16..a342f059c 100644 --- a/mascara/src/app/first-time/notice-screen.js +++ b/mascara/src/app/first-time/notice-screen.js @@ -42,10 +42,7 @@ class NoticeScreen extends Component { acceptTerms = () => { const { markNoticeRead, lastUnreadNotice, history } = this.props markNoticeRead(lastUnreadNotice) - .then(() => { - history.push(DEFAULT_ROUTE) - this.setState({ atBottom: false }) - }) + .then(() => history.push(DEFAULT_ROUTE)) } onScroll = debounce(() => { -- cgit v1.2.3