aboutsummaryrefslogtreecommitdiffstats
path: root/mascara
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-06-19 06:11:16 +0800
committerGitHub <noreply@github.com>2018-06-19 06:11:16 +0800
commit4598554fea7b9435e5cbecc4735c479ffbadf37e (patch)
tree338aaee17d433383c9a57b385489cbc8df3f82d0 /mascara
parent39a7702c8f0aa2c2e7fdf2bcf913e76bb8b827f4 (diff)
parent0e3ecbbc4f7ab0579a33bf315af4dfafeb43f339 (diff)
downloadtangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar.gz
tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar.zst
tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.zip
Merge pull request #4603 from MetaMask/v4.8.0
V4.8.0
Diffstat (limited to 'mascara')
-rw-r--r--mascara/src/app/first-time/notice-screen.js14
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,
}