merge devel

This commit is contained in:
or-else
2025-02-23 11:05:57 +03:00
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -542,7 +542,7 @@ class InfoView extends React.Component {
:
view == 'qrcode' ?
<ShowQRCode
uri={Tinode.URI_TOPIC_ID_PREFIX + this.props.tinode.myUserId}
uri={Tinode.URI_TOPIC_ID_PREFIX + this.props.topic}
onCancel={this.handleBackNavigate} />
:
<div id="info-view-content" className="scrollable-panel">
+1 -1
View File
@@ -4727,7 +4727,7 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
onLaunchPermissionsEditor: this.handleLaunchPermissionsEditor,
onNavigate: this.props.onNavigate
}) : view == 'qrcode' ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_show_qrcode_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
uri: tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.URI_TOPIC_ID_PREFIX + this.props.tinode.myUserId,
uri: tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Tinode.URI_TOPIC_ID_PREFIX + this.props.topic,
onCancel: this.handleBackNavigate
}) : react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
id: "info-view-content",
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long