matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

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

Browse Source
This commit is contained in:
David Baker
2018-04-27 15:57:15 +01:00
parent efd29193b7 27b18c457e
commit 74651b93ab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/dialogs/SessionRestoreErrorDialog.js
View File

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

2
src/components/views/elements/DialogButtons.js
View File

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