m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix account order on unconnected account alert (#8863)

Browse Source 
The account list on the unconnected account alert was in the wrong
order; they were in the order provided by the permissions controller
rather than by last active.

The accounts are now sorted correctly; first by last active, second by
the keyring controller order.

The `getPermittedIdentitiesForCurrentTab` selector was removed because
it is no longer used.
This commit is contained in:
Mark Stacey 2020-06-25 21:05:42 -03:00 committed by GitHub
parent 83fbf6608b
commit 2dbb151e0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/components/app/alerts/unconnected-account-alert/unconnected-account-alert.js
View File

@ -11,7 +11,7 @@ import {
} from '../../../../ducks/alerts/unconnected-account' } from '../../../../ducks/alerts/unconnected-account'
import { import {
getOriginOfCurrentTab, getOriginOfCurrentTab,
getPermittedIdentitiesForCurrentTab, getOrderedConnectedAccountsForActiveTab,
getSelectedAddress, getSelectedAddress,
getSelectedIdentity, getSelectedIdentity,
} from '../../../../selectors' } from '../../../../selectors'
@ -32,7 +32,7 @@ const UnconnectedAccountAlert = () => {
const t = useI18nContext() const t = useI18nContext()
const dispatch = useDispatch() const dispatch = useDispatch()
const alertState = useSelector(getAlertState) const alertState = useSelector(getAlertState)
const connectedAccounts = useSelector(getPermittedIdentitiesForCurrentTab) const connectedAccounts = useSelector(getOrderedConnectedAccountsForActiveTab)
const origin = useSelector(getOriginOfCurrentTab) const origin = useSelector(getOriginOfCurrentTab)
const selectedIdentity = useSelector(getSelectedIdentity) const selectedIdentity = useSelector(getSelectedIdentity)
const selectedAddress = useSelector(getSelectedAddress) const selectedAddress = useSelector(getSelectedAddress)

10
ui/app/selectors/permissions.js
View File

@ -1,5 +1,5 @@
import { forOwn } from 'lodash' import { forOwn } from 'lodash'
import { getMetaMaskAccountsOrdered, getMetaMaskIdentities, getOriginOfCurrentTab, getSelectedAddress } from '.' import { getMetaMaskAccountsOrdered, getOriginOfCurrentTab, getSelectedAddress } from '.'
import { import {
CAVEAT_NAMES, CAVEAT_NAMES,
} from '../../../app/scripts/controllers/permissions/enums' } from '../../../app/scripts/controllers/permissions/enums'
@ -119,14 +119,6 @@ export function getConnectedDomainsForSelectedAddress (state) {
return connectedDomains return connectedDomains
} }
export function getPermittedIdentitiesForCurrentTab (state) {
const permittedAccounts = getPermittedAccountsForCurrentTab(state)
const identities = getMetaMaskIdentities(state)
return permittedAccounts
.map((address) => identities[address])
.filter((identity) => Boolean(identity))
}
/** /**
* Returns an object mapping addresses to objects mapping origins to connected * Returns an object mapping addresses to objects mapping origins to connected
* domain info. Domain info objects have the following properties: * domain info. Domain info objects have the following properties: