Merge pull request #18053 from vector-im/t3chguy/fix/18032

element-hq · Jul 19, 2021 · 7f735a6 · 7f735a6
2 parents ae2e3e8 + 331678b
commit 7f735a6
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/vector/app.tsx b/src/vector/app.tsx
@@ -73,6 +73,14 @@ function onNewScreen(screen: string, replaceLast = false) {
     const hash = '#/' + screen;
     lastLocationHashSet = hash;
 
+    // if the new hash is a substring of the old one then we are stripping fields e.g `via` so replace history
+    if (screen.startsWith("room/") &&
+        window.location.hash.includes("/$") === hash.includes("/$") && // only if both did or didn't contain event link
+        window.location.hash.startsWith(hash)
+    ) {
+        replaceLast = true;
+    }
+
     if (replaceLast) {
         window.location.replace(hash);
     } else {