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

adapt encryption info to self-verification

Browse source 
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
This commit is contained in:
Bruno Windels 2020-04-02 17:51:25 +02:00
parent 081baa2359
commit cc9c5cabb3
3 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/right_panel/EncryptionPanel.js
View file

@ -112,6 +112,9 @@ const EncryptionPanel = (props) => {
const requested =
(!request && isRequesting) ||
(request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined));
const isSelfVerification = request ?
request.isSelfVerification :
member.userId === MatrixClientPeg.get().getUserId();
if (!request || requested) {
const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe);
return (<React.Fragment>
@ -120,8 +123,10 @@ const EncryptionPanel = (props) => {
isRoomEncrypted={isRoomEncrypted}
onStartVerification={onStartVerification}
member={member}
isSelfVerification={isSelfVerification}
waitingForOtherParty={requested && initiatedByMe}
waitingForNetwork={requested && !initiatedByMe} />
waitingForNetwork={requested && !initiatedByMe}
inDialog={inDialog} />
</React.Fragment>);
} else {
return (<React.Fragment>