Minor permissions selector refactor (#8495)

* refactor selectors

ui/app/selectors/permissions.js

@@ -1,5 +1,3 @@
-import { createSelector } from 'reselect'
-
 import {
   CAVEAT_NAMES,
 } from '../../../app/scripts/controllers/permissions/enums'
@@ -26,9 +24,8 @@ export function getPermittedAccounts (state, origin) {
  * @param {Object} state - The current state.
  * @returns {Object} Permitted accounts by origin.
  */
-export const getPermittedAccountsMap = createSelector(
-  allDomainsSelector,
-  (domains = {}) => {
+export function getPermittedAccountsByOrigin (state) {
+  const domains = allDomainsSelector(state)
   return Object.keys(domains).reduce((acc, domainKey) => {
     const accounts = getAccountsFromPermission(
       getAccountsPermissionFromDomain(domains[domainKey])
@@ -38,8 +35,7 @@ export const getPermittedAccountsMap = createSelector(
     }
     return acc
   }, {})
-  }
-)
+}
 
 // selector helpers
 
@@ -72,7 +68,7 @@ function getAccountsCaveatFromPermission (accountsPermission = {}) {
 }
 
 function allDomainsSelector (state) {
-  return state.metamask.domains
+  return state.metamask.domains || {}
 }
 
 function domainSelector (state, origin) {

ui/app/selectors/selectors.js

@@ -12,7 +12,7 @@ import {
   getAccountByAddress,
 } from '../helpers/utils/util'
 
-import { getPermittedAccountsMap } from './permissions'
+import { getPermittedAccountsByOrigin } from './permissions'
 
 export { getPermittedAccounts } from './permissions'
 
@@ -440,7 +440,7 @@ export function getAddressConnectedDomainMap (state) {
     domainMetadata,
   } = state.metamask
 
-  const accountsMap = getPermittedAccountsMap(state)
+  const accountsMap = getPermittedAccountsByOrigin(state)
   const addressConnectedIconMap = {}
 
   Object.keys(accountsMap).forEach((domainKey) => {
@@ -457,7 +457,7 @@ export function getAddressConnectedDomainMap (state) {
 }
 
 export function getPermittedAccountsForCurrentTab (state) {
-  const permittedAccountsMap = getPermittedAccountsMap(state)
+  const permittedAccountsMap = getPermittedAccountsByOrigin(state)
   const originOfCurrentTab = getOriginOfCurrentTab(state)
   return permittedAccountsMap[originOfCurrentTab] || []
 }