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

Merge pull request #4144 from matrix-org/travis/error-handler-invite

Ensure errors when creating a DM are raised to the user
This commit is contained in:
Travis Ralston
2020-02-28 11:04:27 -07:00
committed by GitHub
3 changed files with 7 additions and 2 deletions

View File

@@ -72,7 +72,7 @@ export default createReactClass({
<button onClick={this._onInviteNeverWarnClicked}>
{ _t('Invite anyway and never warn me again') }
</button>
<button onClick={this._onInviteClicked} autoFocus="true">
<button onClick={this._onInviteClicked} autoFocus={true}>
{ _t('Invite anyway') }
</button>
</div>

View File

@@ -564,7 +564,7 @@ export default class InviteDialog extends React.PureComponent {
return;
}
const createRoomOptions = {};
const createRoomOptions = {inlineErrors: true};
if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
// Check whether all users have uploaded device keys before.

View File

@@ -37,6 +37,8 @@ import SettingsStore from "./settings/SettingsStore";
* Default: True
* @param {bool=} opts.encryption Whether to enable encryption.
* Default: False
* @param {bool=} opts.inlineErrors True to raise errors off the promise instead of resolving to null.
* Default: False
*
* @returns {Promise} which resolves to the room id, or null if the
* action was aborted or failed.
@@ -140,6 +142,9 @@ export default function createRoom(opts) {
}
return roomId;
}, function(err) {
// Raise the error if the caller requested that we do so.
if (opts.inlineErrors) throw err;
// We also failed to join the room (this sets joining to false in RoomViewStore)
dis.dispatch({
action: 'join_room_error',