summaryrefslogtreecommitdiffstats
path: root/webapp/components/mfa
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-05-12 09:12:55 -0400
committerGitHub <noreply@github.com>2017-05-12 09:12:55 -0400
commit1397798f1763b0848957a8672c8d40b6243764d5 (patch)
tree5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/components/mfa
parentb1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff)
parent9d109b070037951fcd0832b785eba8a3db9a157c (diff)
downloadchat-1397798f1763b0848957a8672c8d40b6243764d5.tar.gz
chat-1397798f1763b0848957a8672c8d40b6243764d5.tar.bz2
chat-1397798f1763b0848957a8672c8d40b6243764d5.zip
Merge pull request #6401 from mattermost/merge-3.9
Merge release-3.9 branch into master
Diffstat (limited to 'webapp/components/mfa')
-rw-r--r--webapp/components/mfa/components/confirm.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/webapp/components/mfa/components/confirm.jsx b/webapp/components/mfa/components/confirm.jsx
index a6c2eda4e..6ec99ef47 100644
--- a/webapp/components/mfa/components/confirm.jsx
+++ b/webapp/components/mfa/components/confirm.jsx
@@ -8,6 +8,8 @@ import React from 'react';
import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
import {browserHistory} from 'react-router/es6';
+import {loadMe} from 'actions/user_actions.jsx';
+
export default class Confirm extends React.Component {
constructor(props) {
super(props);
@@ -25,7 +27,9 @@ export default class Confirm extends React.Component {
submit(e) {
e.preventDefault();
- browserHistory.push('/');
+ loadMe(() => {
+ browserHistory.push('/');
+ });
}
onKeyPress(e) {