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

Merge branch 'develop' into travis/3pid-invites

Browse source
This commit is contained in:
Travis Ralston 2020-09-14 11:50:08 -06:00
commit 61e8d3e3d7
8 changed files with 130 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/stores/WidgetStore.ts
View file

@ -167,7 +167,9 @@ export default class WidgetStore extends AsyncStoreWithClient<IState> {
// the only case it will go to three is if you have two and then a Jitsi gets added
const roomId = this.getRoomId(widgetId);
const roomInfo = this.getRoom(roomId);
return roomInfo && Object.keys(roomInfo.pinned).length < 2;
return roomInfo && Object.keys(roomInfo.pinned).filter(k => {
return roomInfo.widgets.some(app => app.id === k);
}).length < 2;
}
public pinWidget(widgetId: string) {