@@ -69,23 +69,14 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
6969 } ) ;
7070 }
7171
72- private getVersionInfo ( ) : { appVersion : string ; olmVersion : string | null ; cryptoVersion : string | null } {
72+ private getVersionInfo ( ) : { appVersion : string ; cryptoVersion : string } {
7373 const brand = SdkConfig . get ( ) . brand ;
7474 const appVersion = this . state . appVersion || "unknown" ;
75- const olmVersionTuple = this . context . olmVersion ;
76-
77- // New crypto version
78- const cryptoVersion = this . context . getCrypto ( ) ?. getVersion ( ) ;
79-
80- // XXXX: Remove when old crypto is gone
81- const olmVersion = olmVersionTuple
82- ? `${ olmVersionTuple [ 0 ] } .${ olmVersionTuple [ 1 ] } .${ olmVersionTuple [ 2 ] } `
83- : "<not-enabled>" ;
75+ const cryptoVersion = this . context . getCrypto ( ) ?. getVersion ( ) ?? "<not-enabled>" ;
8476
8577 return {
8678 appVersion : `${ _t ( "setting|help_about|brand_version" , { brand } ) } ${ appVersion } ` ,
87- olmVersion : olmVersionTuple ? `${ _t ( "setting|help_about|olm_version" ) } ${ olmVersion } ` : null ,
88- cryptoVersion : cryptoVersion ? `${ _t ( "setting|help_about|crypto_version" ) } ${ cryptoVersion } ` : null ,
79+ cryptoVersion : `${ _t ( "setting|help_about|crypto_version" ) } ${ cryptoVersion } ` ,
8980 } ;
9081 }
9182
@@ -226,10 +217,10 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
226217 }
227218
228219 private getVersionTextToCopy = ( ) : string => {
229- const { appVersion, olmVersion , cryptoVersion } = this . getVersionInfo ( ) ;
220+ const { appVersion, cryptoVersion } = this . getVersionInfo ( ) ;
230221 // olmVersion for old crypto, cryptoVersion for new crypto
231222 // we can only have one or the other
232- return `${ appVersion } \n${ olmVersion ?? cryptoVersion } ` ;
223+ return `${ appVersion } \n${ cryptoVersion } ` ;
233224 } ;
234225
235226 public render ( ) : React . ReactNode {
@@ -310,7 +301,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
310301 ) ;
311302 }
312303
313- const { appVersion, olmVersion , cryptoVersion } = this . getVersionInfo ( ) ;
304+ const { appVersion, cryptoVersion } = this . getVersionInfo ( ) ;
314305
315306 return (
316307 < SettingsTab >
@@ -322,7 +313,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
322313 < CopyableText getTextToCopy = { this . getVersionTextToCopy } >
323314 { appVersion }
324315 < br />
325- { olmVersion || cryptoVersion }
316+ { cryptoVersion }
326317 < br />
327318 </ CopyableText >
328319 { updateButton }
0 commit comments