m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Updates to account search functionality (#7637)

Browse Source
This commit is contained in:
Whymarrh Whitby 2019-12-03 23:25:00 -03:30 committed by GitHub
parent 2d6ad7f6ca
commit 03f53df3f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/controllers/permissions/index.js
View File

@ -188,7 +188,7 @@ class PermissionsController {
let error
try {
await new Promise((resolve, reject) => {
this.permissions.grantNewPermissions(origin, permissions, {}, err => err ? resolve() : reject(err))
this.permissions.grantNewPermissions(origin, permissions, {}, err => (err ? resolve() : reject(err)))
})
} catch (err) {
error = err

2
ui/app/components/app/account-menu/account-menu.component.js
View File

@ -264,7 +264,7 @@ export default class AccountMenu extends Component {
const shouldShowScrollButton = canScroll && !atAccountListBottom
this.setState({ shouldShowScrollButton})
this.setState({ shouldShowScrollButton })
}
onScroll = debounce(this.setShouldShowScrollButton, 25)

7
ui/app/components/app/account-menu/account-menu.container.js
View File

@ -1,5 +1,5 @@
import { connect } from 'react-redux'
import { compose, withProps } from 'recompose'
import { compose } from 'recompose'
import { withRouter } from 'react-router-dom'
import {
toggleAccountMenu,
@ -27,6 +27,7 @@ const SHOW_SEARCH_ACCOUNTS_MIN_COUNT = 5
function mapStateToProps (state) {
const { metamask: { isAccountMenuOpen } } = state
const accounts = getMetaMaskAccountsOrdered(state)
return {
isAccountMenuOpen,
@ -34,7 +35,8 @@ function mapStateToProps (state) {
originOfCurrentTab: getOriginOfCurrentTab(state),
selectedAddress: getSelectedAddress(state),
keyrings: getMetaMaskKeyrings(state),
accounts: getMetaMaskAccountsOrdered(state),
accounts,
shouldShowAccountsSearch: accounts.length >= SHOW_SEARCH_ACCOUNTS_MIN_COUNT,
}
}
@ -71,5 +73,4 @@ function mapDispatchToProps (dispatch) {
export default compose(
withRouter,
connect(mapStateToProps, mapDispatchToProps),
withProps(({ accounts }) => ({ shouldShowAccountsSearch: accounts.length >= SHOW_SEARCH_ACCOUNTS_MIN_COUNT}))
)(AccountMenu)

2
ui/app/selectors/selectors.js
View File

@ -131,7 +131,7 @@ export const getMetaMaskAccountsOrdered = createSelector(
(keyrings, identities, accounts) => keyrings
.reduce((list, keyring) => list.concat(keyring.accounts), [])
.filter(address => !!identities[address])
.map(address => ({ ...identities[address], ...accounts[address]}))
.map(address => ({ ...identities[address], ...accounts[address] }))
)
export function isBalanceCached (state) {