Skip to content

Commit

Permalink
Merge branch 'fix/bind-join-button-on-recall' into 'master'
Browse files Browse the repository at this point in the history
Meet button is not bound if the meeting is already in progress.

See merge request kchat/webapp!559
  • Loading branch information
antonbuks committed Oct 17, 2023
2 parents 419efa5 + e908260 commit 1fb1f3c
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion actions/calls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import {isServerVersionGreaterThanOrEqualTo} from 'utils/server_version';

import {UserProfile} from '@mattermost/types/users';

import {connectedKmeetCallUrl} from 'selectors/kmeet_calls';

import {closeModal, openModal} from './views/modals';

export const showExpandedView = () => (dispatch: Dispatch<GenericAction>) => {
Expand Down Expand Up @@ -164,7 +166,11 @@ export function startOrJoinCallInChannelV2(channelID: string) {
window.open(kmeetUrl.href, '_blank', 'noopener');
}
} catch {
console.log('[calls]: Call user back.');
const url = connectedKmeetCallUrl(getState(), channelID);
if (url) {
window.open(url, '_blank', 'noopener');
}
console.log(`[calls]: Call user back. connected url: ${url}`);
}
};
}
Expand Down

0 comments on commit 1fb1f3c

Please sign in to comment.