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

fix lint & other cleanup

Browse source
This commit is contained in:
Bruno Windels 2020-03-26 16:54:31 +01:00
parent 9b54d15fcd
commit 34b0c1b1e7
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,11 @@ const EncryptionPanel = (props) => {
let cancelButton; let cancelButton;
if (request && request.pending) { if (request && request.pending) {
const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
cancelButton = <AccessibleButton className="mx_EncryptionPanel_cancel" onClick={onCancel} title={_t('Cancel')}></AccessibleButton>; cancelButton = (<AccessibleButton
className="mx_EncryptionPanel_cancel"
onClick={onCancel}
title={_t('Cancel')}
></AccessibleButton>);
} }
const onStartVerification = useCallback(async () => { const onStartVerification = useCallback(async () => {
@ -110,7 +114,7 @@ const EncryptionPanel = (props) => {
(request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined)); (request && (phase === PHASE_REQUESTED || phase === PHASE_UNSENT || phase === undefined));
if (!request || requested) { if (!request || requested) {
const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe); const initiatedByMe = (!request && isRequesting) || (request && request.initiatedByMe);
return <React.Fragment> return (<React.Fragment>
{cancelButton} {cancelButton}
<EncryptionInfo <EncryptionInfo
isRoomEncrypted={isRoomEncrypted} isRoomEncrypted={isRoomEncrypted}
@ -118,9 +122,9 @@ const EncryptionPanel = (props) => {
member={member} member={member}
waitingForOtherParty={requested && initiatedByMe} waitingForOtherParty={requested && initiatedByMe}
waitingForNetwork={requested && !initiatedByMe} /> waitingForNetwork={requested && !initiatedByMe} />
</React.Fragment>; </React.Fragment>);
} else { } else {
return <React.Fragment> return (<React.Fragment>
{cancelButton} {cancelButton}
<VerificationPanel <VerificationPanel
isRoomEncrypted={isRoomEncrypted} isRoomEncrypted={isRoomEncrypted}
@ -130,7 +134,7 @@ const EncryptionPanel = (props) => {
request={request} request={request}
key={request.channel.transactionId} key={request.channel.transactionId}
phase={phase} /> phase={phase} />
</React.Fragment>; </React.Fragment>);
} }
}; };
EncryptionPanel.propTypes = { EncryptionPanel.propTypes = {