Remove all usages of UNSAFE_* React methods (#9583)

test/components/views/settings/discovery/EmailAddresses-test.tsx

@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { render, screen } from "@testing-library/react";
+import { IThreepid, ThreepidMedium } from 'matrix-js-sdk/src/@types/threepids';
+
+import { EmailAddress } from '../../../../../src/components/views/settings/discovery/EmailAddresses';
+
+describe("<EmailAddress/>", () => {
+    it("should track props.email.bound changes", async () => {
+        const email: IThreepid = {
+            medium: ThreepidMedium.Email,
+            address: "foo@bar.com",
+            validated_at: 12345,
+            added_at: 12342,
+            bound: false,
+        };
+
+        const { rerender } = render(<EmailAddress email={email} />);
+        await screen.findByText("Share");
+
+        email.bound = true;
+        rerender(<EmailAddress email={{ ...email }} />);
+        await screen.findByText("Revoke");
+    });
+});

test/components/views/settings/discovery/PhoneNumbers-test.tsx

@@ -0,0 +1,40 @@
+/*
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { render, screen } from "@testing-library/react";
+import { IThreepid, ThreepidMedium } from 'matrix-js-sdk/src/@types/threepids';
+
+import { PhoneNumber } from "../../../../../src/components/views/settings/discovery/PhoneNumbers";
+
+describe("<PhoneNumber/>", () => {
+    it("should track props.msisdn.bound changes", async () => {
+        const msisdn: IThreepid = {
+            medium: ThreepidMedium.Phone,
+            address: "+441111111111",
+            validated_at: 12345,
+            added_at: 12342,
+            bound: false,
+        };
+
+        const { rerender } = render(<PhoneNumber msisdn={msisdn} />);
+        await screen.findByText("Share");
+
+        msisdn.bound = true;
+        rerender(<PhoneNumber msisdn={{ ...msisdn }} />);
+        await screen.findByText("Revoke");
+    });
+});

test/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
-import { render, RenderResult } from "@testing-library/react";
+import { render, RenderResult, screen } from "@testing-library/react";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 import userEvent from "@testing-library/user-event";
 
@@ -24,6 +24,8 @@ import { mkStubRoom, stubClient } from "../../../../../test-utils";
 import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg";
 import { EchoChamber } from "../../../../../../src/stores/local-echo/EchoChamber";
 import { RoomEchoChamber } from "../../../../../../src/stores/local-echo/RoomEchoChamber";
+import SettingsStore from "../../../../../../src/settings/SettingsStore";
+import { SettingLevel } from "../../../../../../src/settings/SettingLevel";
 
 describe("NotificatinSettingsTab", () => {
     const roomId = "!room:example.com";
@@ -55,4 +57,23 @@ describe("NotificatinSettingsTab", () => {
 
         expect(roomProps.notificationVolume).not.toBe("mentions_only");
     });
+
+    it("should show the currently chosen custom notification sound", async () => {
+        SettingsStore.setValue("notificationSound", roomId, SettingLevel.ACCOUNT, {
+            url: "mxc://server/custom-sound-123",
+            name: "custom-sound-123",
+        });
+        renderTab();
+
+        await screen.findByText("custom-sound-123");
+    });
+
+    it("should show the currently chosen custom notification sound url if no name", async () => {
+        SettingsStore.setValue("notificationSound", roomId, SettingLevel.ACCOUNT, {
+            url: "mxc://server/custom-sound-123",
+        });
+        renderTab();
+
+        await screen.findByText("http://this.is.a.url/server/custom-sound-123");
+    });
 });