imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1

Browse source 
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
This commit is contained in:
Michael Telatynski 2021-07-12 18:58:18 +01:00
commit ae6eaa5acc
19 changed files with 223 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/views/elements/AppTile.js
View file

@ -238,6 +238,7 @@ export default class AppTile extends React.Component {
case 'm.sticker':
if (this._sgWidget.widgetApi.hasCapability(MatrixCapabilities.StickerSending)) {
dis.dispatch({ action: 'post_sticker_message', data: payload.data });
dis.dispatch({ action: 'stickerpicker_close' });
} else {
console.warn('Ignoring sticker message. Invalid capability');
}