aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/notice.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-06-15 01:11:35 +0800
committerGitHub <noreply@github.com>2018-06-15 01:11:35 +0800
commitd9ef72cb7ef78a1c2bf7ce119352425d72a10dc0 (patch)
tree6c14bb94e21996bdf688cc08011c8955322697ad /ui/app/components/pages/notice.js
parent11bfdf444dca3917479cff82f807cc0d4c217191 (diff)
parentd814bee578bfe931766804612ed57a545e4b21a8 (diff)
downloadtangerine-wallet-browser-d9ef72cb7ef78a1c2bf7ce119352425d72a10dc0.tar.gz
tangerine-wallet-browser-d9ef72cb7ef78a1c2bf7ce119352425d72a10dc0.tar.zst
tangerine-wallet-browser-d9ef72cb7ef78a1c2bf7ce119352425d72a10dc0.zip
Merge branch 'develop' into save-brave
Diffstat (limited to 'ui/app/components/pages/notice.js')
-rw-r--r--ui/app/components/pages/notice.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/app/components/pages/notice.js b/ui/app/components/pages/notice.js
index 2329a9147..a9077b98b 100644
--- a/ui/app/components/pages/notice.js
+++ b/ui/app/components/pages/notice.js
@@ -154,11 +154,11 @@ class Notice extends Component {
const mapStateToProps = state => {
const { metamask } = state
- const { noActiveNotices, lastUnreadNotice, lostAccounts } = metamask
+ const { noActiveNotices, nextUnreadNotice, lostAccounts } = metamask
return {
noActiveNotices,
- lastUnreadNotice,
+ nextUnreadNotice,
lostAccounts,
}
}
@@ -171,21 +171,21 @@ Notice.propTypes = {
const mapDispatchToProps = dispatch => {
return {
- markNoticeRead: lastUnreadNotice => dispatch(actions.markNoticeRead(lastUnreadNotice)),
+ markNoticeRead: nextUnreadNotice => dispatch(actions.markNoticeRead(nextUnreadNotice)),
markAccountsFound: () => dispatch(actions.markAccountsFound()),
}
}
const mergeProps = (stateProps, dispatchProps, ownProps) => {
- const { noActiveNotices, lastUnreadNotice, lostAccounts } = stateProps
+ const { noActiveNotices, nextUnreadNotice, lostAccounts } = stateProps
const { markNoticeRead, markAccountsFound } = dispatchProps
let notice
let onConfirm
if (!noActiveNotices) {
- notice = lastUnreadNotice
- onConfirm = () => markNoticeRead(lastUnreadNotice)
+ notice = nextUnreadNotice
+ onConfirm = () => markNoticeRead(nextUnreadNotice)
} else if (lostAccounts && lostAccounts.length > 0) {
notice = generateLostAccountsNotice(lostAccounts)
onConfirm = () => markAccountsFound()