delint & post-rebase fixes
This commit is contained in:
parent
3dcb58f108
commit
d85b5b6e2b
2 changed files with 4 additions and 4 deletions
|
@ -526,7 +526,7 @@ export default class Registration extends React.Component<IProps, IState> {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hide the server picker once the user is doing UI Auth unless encountered a fatal server error
|
// Hide the server picker once the user is doing UI Auth unless encountered a fatal server error
|
||||||
if (this.state.phase !== PHASE_SERVER_DETAILS && this.state.doingUIAuth && !this.state.serverErrorIsFatal) {
|
if (this.state.phase !== Phase.ServerDetails && this.state.doingUIAuth && !this.state.serverErrorIsFatal) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -702,7 +702,7 @@ export default class Registration extends React.Component<IProps, IState> {
|
||||||
{ regDoneText }
|
{ regDoneText }
|
||||||
</div>;
|
</div>;
|
||||||
} else {
|
} else {
|
||||||
let yourMatrixAccountText = _t('Create your Matrix account on %(serverName)s', {
|
let yourMatrixAccountText: ReactNode = _t('Create your Matrix account on %(serverName)s', {
|
||||||
serverName: this.props.serverConfig.hsName,
|
serverName: this.props.serverConfig.hsName,
|
||||||
});
|
});
|
||||||
if (this.props.serverConfig.hsNameIsDifferent) {
|
if (this.props.serverConfig.hsNameIsDifferent) {
|
||||||
|
@ -740,7 +740,7 @@ export default class Registration extends React.Component<IProps, IState> {
|
||||||
{ errorText }
|
{ errorText }
|
||||||
{ serverDeadSection }
|
{ serverDeadSection }
|
||||||
{ this.renderServerComponent() }
|
{ this.renderServerComponent() }
|
||||||
{ this.state.phase !== PHASE_SERVER_DETAILS && <h3>
|
{ this.state.phase !== Phase.ServerDetails && <h3>
|
||||||
{yourMatrixAccountText}
|
{yourMatrixAccountText}
|
||||||
{editLink}
|
{editLink}
|
||||||
</h3> }
|
</h3> }
|
||||||
|
|
|
@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React, {ReactNode} from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import * as sdk from '../../../index';
|
import * as sdk from '../../../index';
|
||||||
import * as Email from '../../../email';
|
import * as Email from '../../../email';
|
||||||
|
|
Loading…
Reference in a new issue