diff --git a/ui/app/pages/permissions-connect/permissions-connect.component.js b/ui/app/pages/permissions-connect/permissions-connect.component.js index 4119e04a6..ada2ba017 100644 --- a/ui/app/pages/permissions-connect/permissions-connect.component.js +++ b/ui/app/pages/permissions-connect/permissions-connect.component.js @@ -26,7 +26,7 @@ export default class PermissionConnect extends Component { addressLastConnectedMap: PropTypes.object.isRequired, lastConnectedInfo: PropTypes.object.isRequired, permissionsRequestId: PropTypes.string, - hasPendingPermissionsRequests: PropTypes.bool.isRequired, + hasAdditionalPermissionsRequests: PropTypes.bool.isRequired, history: PropTypes.object.isRequired, connectPath: PropTypes.string.isRequired, confirmPermissionPath: PropTypes.string.isRequired, @@ -143,10 +143,10 @@ export default class PermissionConnect extends Component { } _doRedirect () { - const { history, hasPendingPermissionsRequests } = this.props + const { history, hasAdditionalPermissionsRequests } = this.props if ( - !hasPendingPermissionsRequests && + !hasAdditionalPermissionsRequests && getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION ) { global.platform.closeCurrentWindow() diff --git a/ui/app/pages/permissions-connect/permissions-connect.container.js b/ui/app/pages/permissions-connect/permissions-connect.container.js index 30a76ec55..31116fd15 100644 --- a/ui/app/pages/permissions-connect/permissions-connect.container.js +++ b/ui/app/pages/permissions-connect/permissions-connect.container.js @@ -34,7 +34,8 @@ const mapStateToProps = (state, ownProps) => { const permissionsRequest = permissionsRequests .find((permissionsRequest) => permissionsRequest.metadata.id === permissionsRequestId) - const hasPendingPermissionsRequests = permissionsRequest + // used to determine whether to redirect or show the next permissions request + const hasAdditionalPermissionsRequests = permissionsRequest ? permissionsRequests.length > 1 : permissionsRequests.length > 0 @@ -82,7 +83,7 @@ const mapStateToProps = (state, ownProps) => { return { permissionsRequest, permissionsRequestId, - hasPendingPermissionsRequests, + hasAdditionalPermissionsRequests, accounts: accountsWithLabels, currentAddress, origin,