matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into fix-self-reply

Browse Source
This commit is contained in:
Alex Gleason
2022-02-23 12:03:04 -05:00
parent 1224044876 870fb3db32
commit 01bf8b4729
4 changed files with 170 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/components/modal_root.js
View File

@@ -161,7 +161,7 @@ class ModalRoot extends React.PureComponent {
if (this.unlistenHistory) {
this.unlistenHistory();
}
if (!['FAVOURITES', 'MENTIONS', 'REACTIONS', 'REBLOGS'].includes(type)) {
if (!['FAVOURITES', 'MENTIONS', 'REACTIONS', 'REBLOGS', 'MEDIA'].includes(type)) {
const { state } = this.history.location;
if (state && state.soapboxModalKey === this._modalHistoryKey) {
this.history.goBack();