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 permissions domain metadata retrieval (#8821)

Browse Source 
* delete targetDomainMetadata selector

* fix permissions connect target domain metadata handling
This commit is contained in:
Erik Marks 2020-06-16 13:48:35 -07:00 committed by GitHub
commit b0187d3247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/app/components/app/permission-page-container/permission-page-container.container.js
View File

@ -1,19 +1,14 @@
import { connect } from 'react-redux'
import PermissionPageContainer from './permission-page-container.component'
import {
getTargetDomainMetadata,
getMetaMaskIdentities,
} from '../../../selectors'
import { getMetaMaskIdentities } from '../../../selectors'
const mapStateToProps = (state, ownProps) => {
const { request, cachedOrigin, selectedIdentities } = ownProps
const targetDomainMetadata = getTargetDomainMetadata(state, request, cachedOrigin)
const { selectedIdentities } = ownProps
const allIdentities = getMetaMaskIdentities(state)
const allIdentitiesSelected = Object.keys(selectedIdentities).length === Object.keys(allIdentities).length && selectedIdentities.length > 1
return {
targetDomainMetadata,
allIdentitiesSelected,
}
}

3
ui/app/pages/permissions-connect/permissions-connect.component.js
View File

@ -206,7 +206,6 @@ export default class PermissionConnect extends Component {
const {
selectedAccountAddresses,
permissionsApproved,
origin,
redirecting,
targetDomainMetadata,
} = this.state
@ -257,7 +256,7 @@ export default class PermissionConnect extends Component {
}}
rejectPermissionsRequest={(requestId) => this.cancelPermissionsRequest(requestId)}
selectedIdentities={accounts.filter((account) => selectedAccountAddresses.has(account.address))}
cachedOrigin={origin}
targetDomainMetadata={targetDomainMetadata}
/>
)}
/>

13
ui/app/pages/permissions-connect/permissions-connect.container.js
View File

@ -6,7 +6,7 @@ import {
getNativeCurrency,
getAccountsWithLabels,
getLastConnectedInfo,
getTargetDomainMetadata,
getDomainMetadata,
getSelectedAddress,
} from '../../selectors'
@ -42,6 +42,15 @@ const mapStateToProps = (state, ownProps) => {
const { origin } = metadata
const nativeCurrency = getNativeCurrency(state)
const domainMetadata = getDomainMetadata(state)
const targetDomainMetadata = origin
? domainMetadata[origin] || {
origin,
name: (new URL(origin)).hostname,
icon: null,
}
: null
const accountsWithLabels = getAccountsWithLabels(state)
const lastConnectedInfo = getLastConnectedInfo(state) || {}
@ -63,8 +72,6 @@ const mapStateToProps = (state, ownProps) => {
throw new Error('Incorrect path for permissions-connect component')
}
const targetDomainMetadata = getTargetDomainMetadata(state, permissionsRequest, origin)
return {
permissionsRequest,
permissionsRequestId,

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

@ -287,18 +287,6 @@ export function getDomainMetadata (state) {
return state.metamask.domainMetadata
}
export function getTargetDomainMetadata (state, request, defaultOrigin) {
const domainMetadata = getDomainMetadata(state)
const { metadata: requestMetadata = {} } = request || {}
const origin = requestMetadata.origin || defaultOrigin
const hostname = (new URL(origin).hostname)
const targetDomainMetadata = (domainMetadata[origin] || { name: hostname, icon: null })
targetDomainMetadata.origin = origin
return targetDomainMetadata
}
export const getBackgroundMetaMetricState = (state) => {
return {
network: getCurrentNetworkId(state),