mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Fix account order on unconnected account alert (#8863)
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:
parent
83fbf6608b
commit
2dbb151e0b
@ -11,7 +11,7 @@ import {
|
||||
} from '../../../../ducks/alerts/unconnected-account'
|
||||
import {
|
||||
getOriginOfCurrentTab,
|
||||
getPermittedIdentitiesForCurrentTab,
|
||||
getOrderedConnectedAccountsForActiveTab,
|
||||
getSelectedAddress,
|
||||
getSelectedIdentity,
|
||||
} from '../../../../selectors'
|
||||
@ -32,7 +32,7 @@ const UnconnectedAccountAlert = () => {
|
||||
const t = useI18nContext()
|
||||
const dispatch = useDispatch()
|
||||
const alertState = useSelector(getAlertState)
|
||||
const connectedAccounts = useSelector(getPermittedIdentitiesForCurrentTab)
|
||||
const connectedAccounts = useSelector(getOrderedConnectedAccountsForActiveTab)
|
||||
const origin = useSelector(getOriginOfCurrentTab)
|
||||
const selectedIdentity = useSelector(getSelectedIdentity)
|
||||
const selectedAddress = useSelector(getSelectedAddress)
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { forOwn } from 'lodash'
|
||||
import { getMetaMaskAccountsOrdered, getMetaMaskIdentities, getOriginOfCurrentTab, getSelectedAddress } from '.'
|
||||
import { getMetaMaskAccountsOrdered, getOriginOfCurrentTab, getSelectedAddress } from '.'
|
||||
import {
|
||||
CAVEAT_NAMES,
|
||||
} from '../../../app/scripts/controllers/permissions/enums'
|
||||
@ -119,14 +119,6 @@ export function getConnectedDomainsForSelectedAddress (state) {
|
||||
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
|
||||
* domain info. Domain info objects have the following properties:
|
||||
|
Loading…
Reference in New Issue
Block a user