diff options
author | kumavis <aaron@kumavis.me> | 2018-07-03 04:54:05 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-07-03 04:54:05 +0800 |
commit | a89902c1701f2dcc41effc06d2315e515946b2ca (patch) | |
tree | 922408cf99bcca97c956d5860ac80c2c0c472ecc /mascara/src/app/first-time/notice-screen.js | |
parent | 055346843bc90a5168151ba2adc9deacedf8afd4 (diff) | |
parent | 4c86f25f5bc4fa18847ca1b77e005afc3f37eddc (diff) | |
download | tangerine-wallet-browser-a89902c1701f2dcc41effc06d2315e515946b2ca.tar.gz tangerine-wallet-browser-a89902c1701f2dcc41effc06d2315e515946b2ca.tar.zst tangerine-wallet-browser-a89902c1701f2dcc41effc06d2315e515946b2ca.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'mascara/src/app/first-time/notice-screen.js')
-rw-r--r-- | mascara/src/app/first-time/notice-screen.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js index a449ccfa9..8cb6f1057 100644 --- a/mascara/src/app/first-time/notice-screen.js +++ b/mascara/src/app/first-time/notice-screen.js @@ -14,7 +14,7 @@ import LoadingScreen from './loading-screen' class NoticeScreen extends Component { static propTypes = { address: PropTypes.string.isRequired, - lastUnreadNotice: PropTypes.shape({ + nextUnreadNotice: PropTypes.shape({ title: PropTypes.string, date: PropTypes.string, body: PropTypes.string, @@ -31,7 +31,7 @@ class NoticeScreen extends Component { }; static defaultProps = { - lastUnreadNotice: {}, + nextUnreadNotice: {}, }; state = { @@ -47,8 +47,8 @@ class NoticeScreen extends Component { } acceptTerms = () => { - const { markNoticeRead, lastUnreadNotice, history } = this.props - markNoticeRead(lastUnreadNotice) + const { markNoticeRead, nextUnreadNotice, history } = this.props + markNoticeRead(nextUnreadNotice) .then(hasActiveNotices => { if (!hasActiveNotices) { history.push(INITIALIZE_BACKUP_PHRASE_ROUTE) @@ -72,7 +72,7 @@ class NoticeScreen extends Component { render () { const { address, - lastUnreadNotice: { title, body }, + nextUnreadNotice: { title, body }, isLoading, } = this.props const { atBottom } = this.state @@ -113,12 +113,12 @@ class NoticeScreen extends Component { } const mapStateToProps = ({ metamask, appState }) => { - const { selectedAddress, lastUnreadNotice, noActiveNotices } = metamask + const { selectedAddress, nextUnreadNotice, noActiveNotices } = metamask const { isLoading } = appState return { address: selectedAddress, - lastUnreadNotice, + nextUnreadNotice, noActiveNotices, isLoading, } |