diff options
Diffstat (limited to 'old-ui')
| -rw-r--r-- | old-ui/app/app.js | 6 | ||||
| -rw-r--r-- | old-ui/app/components/account-dropdowns.js | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/old-ui/app/app.js b/old-ui/app/app.js index abeb4f3f9..5c2dccc03 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -73,7 +73,7 @@ function mapStateToProps (state) { network: state.metamask.network, provider: state.metamask.provider, forgottenPassword: state.appState.forgottenPassword, - lastUnreadNotice: state.metamask.lastUnreadNotice, + nextUnreadNotice: state.metamask.nextUnreadNotice, lostAccounts: state.metamask.lostAccounts, frequentRpcList: state.metamask.frequentRpcList || [], featureFlags, @@ -460,9 +460,9 @@ App.prototype.renderPrimary = function () { }, [ h(NoticeScreen, { - notice: props.lastUnreadNotice, + notice: props.nextUnreadNotice, key: 'NoticeScreen', - onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)), + onConfirm: () => props.dispatch(actions.markNoticeRead(props.nextUnreadNotice)), }), !props.isInitialized && h('.flex-row.flex-center.flex-grow', [ diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js index 53468a1a1..262de6601 100644 --- a/old-ui/app/components/account-dropdowns.js +++ b/old-ui/app/components/account-dropdowns.js @@ -23,9 +23,10 @@ class AccountDropdowns extends Component { renderAccounts () { const { identities, selected, keyrings } = this.props + const accountOrder = keyrings.reduce((list, keyring) => list.concat(keyring.accounts), []) - return Object.keys(identities).map((key, index) => { - const identity = identities[key] + return accountOrder.map((address, index) => { + const identity = identities[address] const isSelected = identity.address === selected const simpleAddress = identity.address.substring(2).toLowerCase() |