diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js index 35b3baafbd..d85b89f744 100644 --- a/src/IntegrationManager.js +++ b/src/IntegrationManager.js @@ -57,7 +57,6 @@ export default class IntegrationManager { return; } integType = 'type_' + integType; - console.warn("Current room", RoomViewStore.getRoomId()); const src = (global.im.client && global.im.client.hasCredentials()) ? global.im.client.getScalarInterfaceUrlForRoom( RoomViewStore.getRoomId(), diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js index edef56cee4..50013a1c30 100644 --- a/src/WidgetMessaging.js +++ b/src/WidgetMessaging.js @@ -198,6 +198,9 @@ export default class WidgetMessaging extends MatrixPostMessageApi { } else if (action === 'sticker_message') { dis.dispatch({action: 'sticker_message', data: event.data.widgetData, widgetId: event.data.widgetId}); } else if (action === 'integration_manager_open') { + // Close the stickerpicker + dis.dispatch({action: 'stickerpicker_close'}); + // Open the integration manager const data = event.data.widgetData; const integType = (data && data.integType) ? data.integType : null; const integId = (data && data.integId) ? data.integId : null; diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js index 780a48d848..fb9e7dc5f0 100644 --- a/src/components/views/rooms/Stickerpicker.js +++ b/src/components/views/rooms/Stickerpicker.js @@ -104,6 +104,8 @@ export default class Stickerpicker extends React.Component { if (payload.action === "user_widget_updated") { this._getStickerPickerWidget(); return; + } else if (payload.action === "stickerpicker_close") { + this.stickersMenu.close(); } }