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

fixup! only close notification in redirectFlow

Browse Source
This commit is contained in:
Erik Marks 2020-06-10 17:49:26 -07:00
parent 12d2315f18
commit 854e06b3ae
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,8 +101,16 @@ export default class PermissionConnect extends Component {
} }
componentDidUpdate (prevProps) { componentDidUpdate (prevProps) {
const { permissionsRequest, lastConnectedInfo, targetDomainMetadata } = this.props const {
const { redirecting, origin, targetDomainMetadata: savedMetadata } = this.state permissionsRequest,
lastConnectedInfo,
targetDomainMetadata,
} = this.props
const {
redirecting,
origin,
targetDomainMetadata: savedMetadata,
} = this.state
if ( if (
permissionsRequest && permissionsRequest &&
@ -118,11 +126,8 @@ export default class PermissionConnect extends Component {
const accountsLastApprovedTime = lastConnectedInfo[origin]?.lastApproved || 0 const accountsLastApprovedTime = lastConnectedInfo[origin]?.lastApproved || 0
const initialAccountsLastApprovedTime = prevProps.lastConnectedInfo[origin]?.lastApproved || 0 const initialAccountsLastApprovedTime = prevProps.lastConnectedInfo[origin]?.lastApproved || 0
if (accountsLastApprovedTime > initialAccountsLastApprovedTime) { const approved = accountsLastApprovedTime > initialAccountsLastApprovedTime
this.redirectFlow(true) this.redirect(approved)
} else {
this.redirectFlow(false)
}
} }
} }
@ -132,7 +137,7 @@ export default class PermissionConnect extends Component {
}, () => this.props.history.push(this.props.confirmPermissionPath)) }, () => this.props.history.push(this.props.confirmPermissionPath))
} }
redirectFlow (approved) { redirect (approved) {
const { history } = this.props const { history } = this.props
this.setState({ this.setState({
@ -257,7 +262,7 @@ export default class PermissionConnect extends Component {
request={permissionsRequest || {}} request={permissionsRequest || {}}
approvePermissionsRequest={(request, accounts) => { approvePermissionsRequest={(request, accounts) => {
approvePermissionsRequest(request, accounts) approvePermissionsRequest(request, accounts)
this.redirectFlow(true) this.redirect(true)
}} }}
rejectPermissionsRequest={(requestId) => this.cancelPermissionsRequest(requestId)} rejectPermissionsRequest={(requestId) => this.cancelPermissionsRequest(requestId)}
selectedIdentities={accounts.filter((account) => selectedAccountAddresses.has(account.address))} selectedIdentities={accounts.filter((account) => selectedAccountAddresses.has(account.address))}