imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #28236 from element-hq/t3chguy/sonar-happy

Browse source
This commit is contained in:
Michael Telatynski 2024-10-18 15:55:15 +01:00 • committed by GitHub
commit 4e93233a3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 46 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/MatrixChat.tsx
View file

@ -1317,7 +1317,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
const errCode = err.errcode || _td("error|unknown_error_code");
Modal.createDialog(ErrorDialog, {
title: _t("error_dialog|forget_room_failed", { errCode }),
description: err && err.message ? err.message : _t("invite|failed_generic"),
description: err?.message ?? _t("invite|failed_generic"),
});
});
}

3
src/components/views/dialogs/RoomUpgradeDialog.tsx
View file

@ -52,8 +52,7 @@ export default class RoomUpgradeDialog extends React.Component<IProps, IState> {
.catch((err) => {
Modal.createDialog(ErrorDialog, {
title: _t("room_settings|advanced|error_upgrade_title"),
description:
err && err.message ? err.message : _t("room_settings|advanced|error_upgrade_description"),
description: err?.message ?? _t("room_settings|advanced|error_upgrade_description"),
});
})
.finally(() => {

2
src/components/views/right_panel/UserInfo.tsx
View file

@ -725,7 +725,7 @@ export const RoomKickButton = ({
logger.error("Kick error: " + err);
Modal.createDialog(ErrorDialog, {
title: _t("user_info|error_kicking_user"),
description: err && err.message ? err.message : "Operation failed",
description: err?.message ?? "Operation failed",
});
},
)

2
src/components/views/settings/AddRemoveThreepids.tsx
View file

@ -74,7 +74,7 @@ const ExistingThreepid: React.FC<ExistingThreepidProps> = ({ mode, threepid, onC
logger.error("Unable to remove contact information: " + err);
Modal.createDialog(ErrorDialog, {
title: _t("settings|general|error_remove_3pid"),
description: err && err.message ? err.message : _t("invite|failed_generic"),
description: err?.message ?? _t("invite|failed_generic"),
});
});
},