diff --git a/ui/app/pages/permissions-connect/permissions-connect.component.js b/ui/app/pages/permissions-connect/permissions-connect.component.js index 1604246a3..c4cf0dfb8 100644 --- a/ui/app/pages/permissions-connect/permissions-connect.component.js +++ b/ui/app/pages/permissions-connect/permissions-connect.component.js @@ -11,7 +11,7 @@ import PermissionPageContainer from '../../components/app/permission-page-contai import ChooseAccount from './choose-account' import PermissionsRedirect from './redirect' -const APPROVE_TIMEOUT = 1500 +const APPROVE_TIMEOUT = 1200 export default class PermissionConnect extends Component { static propTypes = { @@ -28,7 +28,7 @@ export default class PermissionConnect extends Component { addressLastConnectedMap: PropTypes.object.isRequired, lastConnectedInfo: PropTypes.object.isRequired, permissionsRequestId: PropTypes.string, - hasPermissionsRequests: PropTypes.bool.isRequired, + hasPendingPermissionsRequests: PropTypes.bool.isRequired, history: PropTypes.object.isRequired, connectPath: PropTypes.string.isRequired, confirmPermissionPath: PropTypes.string.isRequired, @@ -137,7 +137,7 @@ export default class PermissionConnect extends Component { } redirect (approved) { - const { history, hasPermissionsRequests } = this.props + const { history, hasPendingPermissionsRequests } = this.props this.setState({ redirecting: true, @@ -147,7 +147,7 @@ export default class PermissionConnect extends Component { const doRedirect = () => { if ( - !hasPermissionsRequests && + !hasPendingPermissionsRequests && 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 aaa5237b8..70fbbe008 100644 --- a/ui/app/pages/permissions-connect/permissions-connect.container.js +++ b/ui/app/pages/permissions-connect/permissions-connect.container.js @@ -32,7 +32,9 @@ const mapStateToProps = (state, ownProps) => { const permissionsRequest = permissionsRequests .find((permissionsRequest) => permissionsRequest.metadata.id === permissionsRequestId) - const hasPermissionsRequests = permissionsRequests.length > 0 + const hasPendingPermissionsRequests = permissionsRequest + ? permissionsRequests.length > 1 + : permissionsRequests.length > 0 const { metadata = {} } = permissionsRequest || {} const { origin } = metadata @@ -64,7 +66,7 @@ const mapStateToProps = (state, ownProps) => { return { permissionsRequest, permissionsRequestId, - hasPermissionsRequests, + hasPendingPermissionsRequests, accounts: accountsWithLabels, origin, newAccountNumber: accountsWithLabels.length + 1,