Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/Board/Board.container.js
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,13 @@ export class BoardContainer extends Component {

handleLockNotify = countdown => {
const { intl, showNotification, hideNotification } = this.props;
const quickUnlockActive = this.props.navigationSettings?.quickUnlockActive;

if (quickUnlockActive) {
hideNotification();
this.handleLockClick();
return;
}
if (countdown > 3) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Settings/Navigation/Navigation.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class Navigation extends React.Component {
</ListItemSecondaryAction>
</ListItem>
<Divider />
<ListItem disabled={true}>
<ListItem disabled={false}>
<ListItemText
className="Navigation__ListItemText"
primary={<FormattedMessage {...messages.quickUnlock} />}
Expand All @@ -256,7 +256,7 @@ class Navigation extends React.Component {
/>
<ListItemSecondaryAction>
<Switch
disabled={true}
disabled={false}
checked={this.state.quickUnlockActive}
onChange={this.toggleQuickUnlock}
value="active"
Expand Down
1 change: 0 additions & 1 deletion src/components/Settings/Navigation/Navigation.container.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { updateNavigationSettings } from '../../App/App.actions';
import Navigation from './Navigation.component';
import API from '../../../api';
import { changeLiveMode } from '../../Board/Board.actions';

export class NavigationContainer extends PureComponent {
static propTypes = {
intl: intlShape.isRequired,
Expand Down
Loading