diff options
author | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 05:51:11 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 06:07:00 +0800 |
commit | bdc4a6964ae83faa8229c50870e3bcc9b9074989 (patch) | |
tree | c1f9c0784ec55efd20358465820777f56b643e15 /mascara | |
parent | ef61ef2ce885635862bb242612dd821cb3a65b6b (diff) | |
download | tangerine-wallet-browser-bdc4a6964ae83faa8229c50870e3bcc9b9074989.tar tangerine-wallet-browser-bdc4a6964ae83faa8229c50870e3bcc9b9074989.tar.gz tangerine-wallet-browser-bdc4a6964ae83faa8229c50870e3bcc9b9074989.tar.bz2 tangerine-wallet-browser-bdc4a6964ae83faa8229c50870e3bcc9b9074989.tar.lz tangerine-wallet-browser-bdc4a6964ae83faa8229c50870e3bcc9b9074989.tar.xz tangerine-wallet-browser-bdc4a6964ae83faa8229c50870e3bcc9b9074989.tar.zst tangerine-wallet-browser-bdc4a6964ae83faa8229c50870e3bcc9b9074989.zip |
Fix merge conflicts. Refactor renderPrimary into Home component
Diffstat (limited to 'mascara')
-rw-r--r-- | mascara/src/app/first-time/notice-screen.js | 5 |
1 files changed, 1 insertions, 4 deletions
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(() => { |