{t("error.generic_description")}
{t("error.open_elsewhere_description", {
brand: import.meta.env.VITE_PRODUCT_NAME || "Element Call",
diff --git a/src/UrlParams.test.ts b/src/UrlParams.test.ts
index 8e185abc..dce46754 100644
--- a/src/UrlParams.test.ts
+++ b/src/UrlParams.test.ts
@@ -110,8 +110,8 @@ describe("UrlParams", () => {
});
describe("returnToLobby", () => {
- it("is true in SPA mode", () => {
- expect(getUrlParams("?returnToLobby=false").returnToLobby).toBe(true);
+ it("is false in SPA mode", () => {
+ expect(getUrlParams("?returnToLobby=true").returnToLobby).toBe(false);
});
it("defaults to false in widget mode", () => {
diff --git a/src/UrlParams.ts b/src/UrlParams.ts
index 61b777c7..fda4a95f 100644
--- a/src/UrlParams.ts
+++ b/src/UrlParams.ts
@@ -264,7 +264,9 @@ export const getUrlParams = (
"skipLobby",
isWidget && intent === UserIntent.StartNewCall,
),
- returnToLobby: isWidget ? parser.getFlagParam("returnToLobby") : true,
+ // In SPA mode the user should always exit to the home screen when hanging
+ // up, rather than being sent back to the lobby
+ returnToLobby: isWidget ? parser.getFlagParam("returnToLobby") : false,
theme: parser.getParam("theme"),
viaServers: !isWidget ? parser.getParam("viaServers") : null,
homeserver: !isWidget ? parser.getParam("homeserver") : null,
diff --git a/src/config/Config.ts b/src/config/Config.ts
index d98bd9ec..b52acc46 100644
--- a/src/config/Config.ts
+++ b/src/config/Config.ts
@@ -13,6 +13,7 @@ import {
type ConfigOptions,
type ResolvedConfigOptions,
} from "./ConfigOptions";
+import { isFailure } from "../utils/fetch";
export class Config {
private static internalInstance: Config | undefined;
@@ -28,7 +29,20 @@ export class Config {
const internalInstance = new Config();
Config.internalInstance = internalInstance;
- Config.internalInstance.initPromise = downloadConfig("/config.json").then(
+ let fetchTarget: string;
+
+ if (
+ window.location.pathname.endsWith("/room/") ||
+ window.location.pathname.endsWith("/room")
+ ) {
+ // it looks like we are running in standalone mode so use the config at the root
+ fetchTarget = new URL("/config.json", window.location.href).href;
+ } else {
+ // otherwise we are probably running as a widget so use the config in the same directory
+ fetchTarget = "config.json";
+ }
+
+ Config.internalInstance.initPromise = downloadConfig(fetchTarget).then(
(config) => {
internalInstance.config = merge({}, DEFAULT_CONFIG, config);
},
@@ -70,18 +84,15 @@ export class Config {
private initPromise?: Promise
{error.localisedMessage ?? (
@@ -101,38 +104,16 @@ const ErrorPage: FC
@@ -199,6 +200,7 @@ export const RoomPage: FC = () => {
{groupCallState.error.messageBody}
diff --git a/src/settings/settings.ts b/src/settings/settings.ts
index 4ec0143f..ee43acc6 100644
--- a/src/settings/settings.ts
+++ b/src/settings/settings.ts
@@ -113,4 +113,8 @@ export const soundEffectVolumeSetting = new Setting = Promise<
@@ -49,7 +51,7 @@ export async function prefetchSounds(
const response = await fetch(
preferredFormat === "ogg" ? ogg : (mp3 ?? ogg),
);
- if (!response.ok) {
+ if (isFailure(response)) {
// If the sound doesn't load, it's not the end of the world. We won't play
// the sound when requested, but it's better than failing the whole application.
logger.warn(`Could not load sound ${name}, response was not okay`);
diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
index f634233e..ce104396 100644
--- a/src/state/CallViewModel.ts
+++ b/src/state/CallViewModel.ts
@@ -496,6 +496,10 @@ export class CallViewModel extends ViewModel {
}
return displaynameMap;
}),
+ // It turns out that doing the disambiguation above is rather expensive on Safari (10x slower
+ // than on Chrome/Firefox). This means it is important that we share() the result so that we
+ // don't do this work more times than we need to. This is achieve through the state() operator:
+ this.scope.state(),
);
/**
diff --git a/src/utils/displayname-integration.test.ts b/src/utils/displayname-integration.test.ts
new file mode 100644
index 00000000..8dd72d8c
--- /dev/null
+++ b/src/utils/displayname-integration.test.ts
@@ -0,0 +1,40 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE in the repository root for full details.
+*/
+
+import { afterEach, beforeAll, describe, expect, test, vi } from "vitest";
+
+import { shouldDisambiguate } from "./displayname";
+import { alice } from "./test-fixtures";
+import { mockMatrixRoom } from "./test";
+
+// Ideally these tests would be in ./displayname.test.ts but I can't figure out how to
+// just spy on the removeHiddenChars() function without impacting the other tests.
+// So, these tests are in this separate test file.
+vi.mock("matrix-js-sdk/src/utils");
+
+describe("shouldDisambiguate", () => {
+ // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+ let jsUtils: typeof import("matrix-js-sdk/src/utils");
+
+ beforeAll(async () => {
+ jsUtils = await import("matrix-js-sdk/src/utils");
+ vi.spyOn(jsUtils, "removeHiddenChars").mockImplementation((str) => str);
+ });
+ afterEach(() => {
+ vi.clearAllMocks();
+ });
+
+ test("should only call removeHiddenChars once for a single displayname", () => {
+ const room = mockMatrixRoom({});
+ shouldDisambiguate(alice, [], room);
+ expect(jsUtils.removeHiddenChars).toHaveBeenCalledTimes(1);
+ for (let i = 0; i < 10; i++) {
+ shouldDisambiguate(alice, [], room);
+ }
+ expect(jsUtils.removeHiddenChars).toHaveBeenCalledTimes(1);
+ });
+});
diff --git a/src/utils/displayname.ts b/src/utils/displayname.ts
index 32532506..0eac045d 100644
--- a/src/utils/displayname.ts
+++ b/src/utils/displayname.ts
@@ -7,12 +7,36 @@ Please see LICENSE in the repository root for full details.
import {
removeDirectionOverrideChars,
- removeHiddenChars,
+ removeHiddenChars as removeHiddenCharsUncached,
} from "matrix-js-sdk/src/utils";
import type { Room } from "matrix-js-sdk/src/matrix";
import type { CallMembership } from "matrix-js-sdk/src/matrixrtc";
+// Calling removeHiddenChars() can be slow on Safari, so we cache the results.
+// To illustrate a simple benchmark:
+// Chrome: 10,000 calls took 2.599ms
+// Safari: 10,000 calls took 242ms
+// See: https://github.com/element-hq/element-call/issues/3065
+
+const removeHiddenCharsCache = new Map