|
|
@ -11,7 +11,7 @@ import PermissionPageContainer from '../../components/app/permission-page-contai |
|
|
|
import ChooseAccount from './choose-account' |
|
|
|
import ChooseAccount from './choose-account' |
|
|
|
import PermissionsRedirect from './redirect' |
|
|
|
import PermissionsRedirect from './redirect' |
|
|
|
|
|
|
|
|
|
|
|
const APPROVE_TIMEOUT = 1500 |
|
|
|
const APPROVE_TIMEOUT = 1200 |
|
|
|
|
|
|
|
|
|
|
|
export default class PermissionConnect extends Component { |
|
|
|
export default class PermissionConnect extends Component { |
|
|
|
static propTypes = { |
|
|
|
static propTypes = { |
|
|
@ -28,7 +28,7 @@ export default class PermissionConnect extends Component { |
|
|
|
addressLastConnectedMap: PropTypes.object.isRequired, |
|
|
|
addressLastConnectedMap: PropTypes.object.isRequired, |
|
|
|
lastConnectedInfo: PropTypes.object.isRequired, |
|
|
|
lastConnectedInfo: PropTypes.object.isRequired, |
|
|
|
permissionsRequestId: PropTypes.string, |
|
|
|
permissionsRequestId: PropTypes.string, |
|
|
|
hasPermissionsRequests: PropTypes.bool.isRequired, |
|
|
|
hasPendingPermissionsRequests: PropTypes.bool.isRequired, |
|
|
|
history: PropTypes.object.isRequired, |
|
|
|
history: PropTypes.object.isRequired, |
|
|
|
connectPath: PropTypes.string.isRequired, |
|
|
|
connectPath: PropTypes.string.isRequired, |
|
|
|
confirmPermissionPath: PropTypes.string.isRequired, |
|
|
|
confirmPermissionPath: PropTypes.string.isRequired, |
|
|
@ -137,7 +137,7 @@ export default class PermissionConnect extends Component { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
redirect (approved) { |
|
|
|
redirect (approved) { |
|
|
|
const { history, hasPermissionsRequests } = this.props |
|
|
|
const { history, hasPendingPermissionsRequests } = this.props |
|
|
|
|
|
|
|
|
|
|
|
this.setState({ |
|
|
|
this.setState({ |
|
|
|
redirecting: true, |
|
|
|
redirecting: true, |
|
|
@ -147,7 +147,7 @@ export default class PermissionConnect extends Component { |
|
|
|
|
|
|
|
|
|
|
|
const doRedirect = () => { |
|
|
|
const doRedirect = () => { |
|
|
|
if ( |
|
|
|
if ( |
|
|
|
!hasPermissionsRequests && |
|
|
|
!hasPendingPermissionsRequests && |
|
|
|
getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION |
|
|
|
getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION |
|
|
|
) { |
|
|
|
) { |
|
|
|
global.platform.closeCurrentWindow() |
|
|
|
global.platform.closeCurrentWindow() |
|
|
|