matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

History based navigation with new right panel store (#7398)

Browse Source 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
This commit is contained in:
Timo
2022-01-05 17:25:41 +01:00
committed by GitHub
parent 6f89267a31
commit 4ab3470184
25 changed files with 248 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/verification.ts
View File

@@ -28,6 +28,7 @@ import UntrustedDeviceDialog from "./components/views/dialogs/UntrustedDeviceDia
import { GroupMember, IDevice } from "./components/views/right_panel/UserInfo";
import ManualDeviceKeyVerificationDialog from "./components/views/dialogs/ManualDeviceKeyVerificationDialog";
import RightPanelStore from "./stores/right-panel/RightPanelStore";
import { IRightPanelCardState } from "./stores/right-panel/RightPanelStoreIPanelState";
async function enable4SIfNeeded() {
const cli = MatrixClientPeg.get();
@@ -66,10 +67,7 @@ export async function verifyDevice(user: User, device: IDevice) {
device.deviceId,
VerificationMethods.SAS,
);
RightPanelStore.instance.setCard({
phase: RightPanelPhases.EncryptionPanel,
state: { member: user, verificationRequestPromise },
});
setRightPanel({ member: user, verificationRequestPromise });
} else if (action === "legacy") {
Modal.createTrackedDialog("Legacy verify session", "legacy verify session",
ManualDeviceKeyVerificationDialog,
@@ -96,10 +94,7 @@ export async function legacyVerifyUser(user: User) {
}
}
const verificationRequestPromise = cli.requestVerification(user.userId);
RightPanelStore.instance.setCard({
phase: RightPanelPhases.EncryptionPanel,
state: { member: user, verificationRequestPromise },
});
setRightPanel({ member: user, verificationRequestPromise });
}
export async function verifyUser(user: User) {
@@ -112,10 +107,21 @@ export async function verifyUser(user: User) {
return;
}
const existingRequest = pendingVerificationRequestForUser(user);
RightPanelStore.instance.setCard({
phase: RightPanelPhases.EncryptionPanel,
state: { member: user, verificationRequest: existingRequest },
});
setRightPanel({ member: user, verificationRequest: existingRequest });
}
function setRightPanel(state: IRightPanelCardState) {
if (RightPanelStore.instance.roomPhaseHistory.some((card) => (card.phase == RightPanelPhases.RoomSummary))) {
RightPanelStore.instance.pushCard(
{ phase: RightPanelPhases.EncryptionPanel, state },
);
} else {
RightPanelStore.instance.setCards([
{ phase: RightPanelPhases.RoomSummary },
{ phase: RightPanelPhases.RoomMemberInfo, state: { member: state.member } },
{ phase: RightPanelPhases.EncryptionPanel, state },
]);
}
}
export function pendingVerificationRequestForUser(user: User | RoomMember | GroupMember ) {