Merge branch 'release/v2.6.0' into hotfix/v2.6.1
This commit is contained in:
commit
bd48050ab8
@ -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;
|
||||
|
||||
|
@ -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 };
|
||||
|
Loading…
Reference in New Issue
Block a user