Skip to content

Commit 127b542

Browse files
authored
Use crypto.isCrossSigningReady in CrossSigningPanel (matrix-org#11080)
1 parent 3f52de2 commit 127b542

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/components/views/settings/CrossSigningPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
102102
const homeserverSupportsCrossSigning = await cli.doesServerSupportUnstableFeature(
103103
"org.matrix.e2e_cross_signing",
104104
);
105-
const crossSigningReady = await cli.isCrossSigningReady();
105+
const crossSigningReady = await crypto.isCrossSigningReady();
106106

107107
this.setState({
108108
crossSigningPublicKeysOnDevice,

test/components/views/settings/CrossSigningPanel-test.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ describe("<CrossSigningPanel />", () => {
5959
});
6060

6161
describe("when cross signing is ready", () => {
62-
beforeEach(() => {
63-
mockClient.isCrossSigningReady.mockResolvedValue(true);
64-
});
65-
6662
it("should render when keys are not backed up", async () => {
6763
getComponent();
6864
await flushPromises();
@@ -93,7 +89,7 @@ describe("<CrossSigningPanel />", () => {
9389

9490
describe("when cross signing is not ready", () => {
9591
beforeEach(() => {
96-
mockClient.isCrossSigningReady.mockResolvedValue(false);
92+
mocked(mockClient.getCrypto()!.isCrossSigningReady).mockResolvedValue(false);
9793
});
9894

9995
it("should render when keys are not backed up", async () => {

test/test-utils/client.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,6 @@ export const mockClientMethodsCrypto = (): Partial<
167167
userSigningKey: true,
168168
},
169169
}),
170+
isCrossSigningReady: jest.fn().mockResolvedValue(true),
170171
}),
171172
});

0 commit comments

Comments
 (0)