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

Add config setting to disable bulk unverified sessions nag (#9657)

Browse source 
* test bulk unverified sessions toast behaviour

* unverified sessions toast text tweak

* only show bulk unverified sessions toast when current device is verified

* add Setting for BulkUnverifiedSessionsReminder

* add build config for BulkUnverifiedSessionsReminder

* add more assertions for show/hide toast, fix strict errors

* fix strict error
This commit is contained in:
Kerry 2022-12-02 16:24:45 +13:00 • committed by GitHub
parent 5742c24114
commit 81098b9914
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/DeviceListener-test.ts
View file

@ -34,6 +34,7 @@ import { Action } from "../src/dispatcher/actions";
import SettingsStore from "../src/settings/SettingsStore";
import { SettingLevel } from "../src/settings/SettingLevel";
import { getMockClientWithEventEmitter, mockPlatformPeg } from "./test-utils";
import { UIFeature } from "../src/settings/UIFeature";
// don't litter test console with logs
jest.mock("matrix-js-sdk/src/logger");
@ -399,6 +400,9 @@ describe('DeviceListener', () => {
// all devices verified by default
mockClient!.checkDeviceTrust.mockReturnValue(deviceTrustVerified);
mockClient!.deviceId = currentDevice.deviceId;
jest.spyOn(SettingsStore, 'getValue').mockImplementation(
settingName => settingName === UIFeature.BulkUnverifiedSessionsReminder,
);
});
describe('bulk unverified sessions toasts', () => {
it('hides toast when cross signing is not ready', async () => {
@ -414,6 +418,24 @@ describe('DeviceListener', () => {
expect(BulkUnverifiedSessionsToast.showToast).not.toHaveBeenCalled();
});
it('hides toast when feature is disabled', async () => {
// BulkUnverifiedSessionsReminder set to false
jest.spyOn(SettingsStore, 'getValue').mockReturnValue(false);
// currentDevice, device2 are verified, device3 is unverified
// ie if reminder was enabled it should be shown
mockClient!.checkDeviceTrust.mockImplementation((_userId, deviceId) => {
switch (deviceId) {
case currentDevice.deviceId:
case device2.deviceId:
return deviceTrustVerified;
default:
return deviceTrustUnverified;
}
});
await createAndStart();
expect(BulkUnverifiedSessionsToast.hideToast).toHaveBeenCalled();
});
it('hides toast when current device is unverified', async () => {
// device2 verified, current and device3 unverified
mockClient!.checkDeviceTrust.mockImplementation((_userId, deviceId) => {