Merge branch 'release/v2.6.0' into hotfix/v2.6.1

This commit is contained in:
Alexey Safronov 2024-07-26 14:20:10 +04:00
commit bd48050ab8
2 changed files with 2 additions and 2 deletions

View File

@ -114,7 +114,7 @@ export default inject<TStore>(({ dialogsStore, infoPanelStore }) => {
const { infoPanelSelection } = infoPanelStore;
const { setLinkParams, setEditLinkPanelIsVisible } = dialogsStore;
const { id, roomType, security } = infoPanelSelection!;
const { EditRoom } = security!;
const { EditRoom } = security || {};
const isFormRoom = roomType === RoomsType.FormRoom;

View File

@ -369,7 +369,7 @@ class AuthStore {
login = async (user: TUser, hash: string, session = true) => {
try {
const response = (await api.user.login(user, hash, session)) as {
const response = (await api.user.login(user, hash, "", session)) as {
token: string;
tfa: string;
error: { message: unknown };