diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
commit | 1494cc5e6c5943095c89e3b243b0a6152876e72c (patch) | |
tree | e34e74e79e8d41ce5903cc8d6eedf5caa19bc354 /ui/app/components/pages/home.js | |
parent | 6e563acd93cbaf20fb233a267104fc6af3384287 (diff) | |
parent | b2e64f24ecbc9e309869e678254cf755ffe11b40 (diff) | |
download | tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.gz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.zst tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.zip |
fix merge conflicts
Diffstat (limited to 'ui/app/components/pages/home.js')
-rw-r--r-- | ui/app/components/pages/home.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/app/components/pages/home.js b/ui/app/components/pages/home.js index 9110f8202..c53413d3b 100644 --- a/ui/app/components/pages/home.js +++ b/ui/app/components/pages/home.js @@ -86,9 +86,9 @@ class Home extends Component { // if (!props.noActiveNotices) { // log.debug('rendering notice screen for unread notices.') // return h(NoticeScreen, { - // notice: props.lastUnreadNotice, + // notice: props.nextUnreadNotice, // key: 'NoticeScreen', - // onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)), + // onConfirm: () => props.dispatch(actions.markNoticeRead(props.nextUnreadNotice)), // }) // } else if (props.lostAccounts && props.lostAccounts.length > 0) { // log.debug('rendering notice screen for lost accounts view.') @@ -279,7 +279,7 @@ function mapStateToProps (state) { noActiveNotices, seedWords, unapprovedTxs, - lastUnreadNotice, + nextUnreadNotice, lostAccounts, unapprovedMsgCount, unapprovedPersonalMsgCount, @@ -313,7 +313,7 @@ function mapStateToProps (state) { network: state.metamask.network, provider: state.metamask.provider, forgottenPassword: state.appState.forgottenPassword, - lastUnreadNotice, + nextUnreadNotice, lostAccounts, frequentRpcList: state.metamask.frequentRpcList || [], currentCurrency: state.metamask.currentCurrency, |