Merge remote-tracking branch 'origin/develop'

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-08-29 00:51:09 +07:00
commit bfc034ba7f
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2

View File

@ -18,7 +18,7 @@
import presentation from '@hcengineering/presentation'
import { getEmbeddedLabel, getMetadata, IntlString } from '@hcengineering/platform'
import { concatLink, getCurrentAccount } from '@hcengineering/core'
import { onMount } from 'svelte'
import { createEventDispatcher, onMount } from 'svelte'
import telegram from '../plugin'
import TelegramColor from './icons/TelegramColor.svelte'
@ -31,6 +31,7 @@
let isLoading = false
const url = getMetadata(telegram.metadata.BotUrl) ?? ''
const dispatch = createEventDispatcher()
onMount(() => {
void loadBotInfo()
@ -117,7 +118,9 @@
label={getEmbeddedLabel('Connect Telegram Bot')}
type="type-popup"
okLabel={presentation.string.Ok}
okAction={() => {}}
okAction={() => {
dispatch('close')
}}
showCancelButton={false}
canSave
on:close