message: dont try to enable 4S if cross-signing is disabled
diff: @@ -61,15 +61,18 @@ function UntrustedDeviceDialog(props) {
  }
  export async function verifyDevice(user, device) {
  + const cli = MatrixClientPeg.get();
  + // if cross-signing is not explicitly disabled, check if it should be enabled first.
  + if (cli.getCryptoTrustCrossSignedDevices()) {
  if (!await enable4SIfNeeded()) {
  return;
  }
  + }
  Modal.createTrackedDialog("Verification warning", "unverified session", UntrustedDeviceDialog, {
  user,
  device,
  onFinished: async (action) => {
  if (action === "sas") {
  - const cli = MatrixClientPeg.get();
  const verificationRequestPromise = cli.legacyDeviceVerification(
  user.userId,
  device.deviceId,
  @@ -95,10 +98,13 @@ export async function verifyDevice(user, device) {
  }
  export async function legacyVerifyUser(user) {
  + const cli = MatrixClientPeg.get();
  + // if cross-signing is not explicitly disabled, check if it should be enabled first.
  + if (cli.getCryptoTrustCrossSignedDevices()) {
  if (!await enable4SIfNeeded()) {
  return;
  }
  - const cli = MatrixClientPeg.get();
  + }
  const verificationRequestPromise = cli.requestVerification(user.userId);
  dis.dispatch({
  action: "set_right_panel_phase",
  