Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog

This commit is contained in:
David Baker 2018-04-27 15:57:15 +01:00
commit 74651b93ab
2 changed files with 3 additions and 3 deletions

View file

@ -68,7 +68,7 @@ export default React.createClass({
<button onClick={this._onClearStorageClick} className="danger">
{ _t("Clear Storage and Sign Out") }
</button>
</DialogButtons>
</DialogButtons>;
} else {
dialogButtons = <DialogButtons primaryButton={_t("Refresh")}
onPrimaryButtonClick={this._onRefreshClick}
@ -78,7 +78,7 @@ export default React.createClass({
<button onClick={this._onClearStorageClick} className="danger">
{ _t("Clear Storage and Sign Out") }
</button>
</DialogButtons>
</DialogButtons>;
}
return (

View file

@ -47,7 +47,7 @@ module.exports = React.createClass({
return {
hasCancel: true,
disabled: false,
}
};
},
_onCancelClick: function() {