ui issues fixed.

VAN-601,607,608,615
This commit is contained in:
adeelehsan
2021-06-15 11:20:37 +05:00
committed by Waheed Ahmed
parent f573df3ae7
commit a799ab9f27
4 changed files with 35 additions and 4 deletions

View File

@@ -647,3 +647,6 @@ select.form-control {
font-weight: 700;
}
}
.email-top-domain-suggestion-alert-link {
color: $primary !important;
}

View File

@@ -30,11 +30,11 @@ const PasswordField = (props) => {
};
const HideButton = (
<IconButton src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} variant="secondary" alt={formatMessage(messages['hide.password'])} />
<IconButton src={VisibilityOff} iconAs={Icon} onClick={setHiddenTrue} size="sm" variant="secondary" alt={formatMessage(messages['hide.password'])} />
);
const ShowButton = (
<IconButton src={Visibility} iconAs={Icon} onClick={setHiddenFalse} variant="secondary" alt={formatMessage(messages['show.password'])} />
<IconButton src={Visibility} iconAs={Icon} onClick={setHiddenFalse} size="sm" variant="secondary" alt={formatMessage(messages['show.password'])} />
);
const placement = window.innerWidth < 768 ? 'top' : 'left';
const tooltip = (

View File

@@ -20,6 +20,7 @@ const ForgotPasswordAlert = (props) => {
let message = '';
let heading = intl.formatMessage(messages['forgot.password.error.alert.title']);
const supportUrl = getConfig().PASSWORD_RESET_SUPPORT_LINK;
switch (status) {
case 'complete':
heading = intl.formatMessage(messages['confirmation.message.title']);
@@ -33,7 +34,11 @@ const ForgotPasswordAlert = (props) => {
values={{
email: <span className="data-hj-suppress">{email}</span>,
supportLink: (
<Alert.Link className="alert-link" href={getConfig().PASSWORD_RESET_SUPPORT_LINK}>
<Alert.Link
className="alert-link"
href={supportUrl}
onClick={() => { window.open(supportUrl, '_blank'); }}
>
{intl.formatMessage(messages['confirmation.support.link'])}
</Alert.Link>
),

View File

@@ -96,7 +96,26 @@ class RegistrationPage extends React.Component {
if (nextProps.registrationErrorCode) {
state.errorCode = nextProps.registrationErrorCode;
}
this.setState({ ...state });
let {
suggestedTldMessage,
suggestedTopLevelDomain,
suggestedSldMessage,
suggestedServiceLevelDomain,
} = this.state;
if (state.errors.email) {
suggestedTldMessage = '';
suggestedTopLevelDomain = '';
suggestedSldMessage = '';
suggestedServiceLevelDomain = '';
}
this.setState({
...state,
suggestedTldMessage,
suggestedTopLevelDomain,
suggestedSldMessage,
suggestedServiceLevelDomain,
});
return false;
}
@@ -319,6 +338,9 @@ class RegistrationPage extends React.Component {
}
emailLexemes = '';
domainLexemes = '';
if (payload && statusCode !== 403) {
this.props.fetchRealtimeValidations(payload);
}
} else if (payload && statusCode !== 403) {
this.props.fetchRealtimeValidations(payload);
} else {
@@ -386,6 +408,7 @@ class RegistrationPage extends React.Component {
<Alert.Link
href="#"
name="email"
className="email-top-domain-suggestion-alert-link"
onClick={e => { e.preventDefault(); this.handleSuggestionClick(e, this.state.suggestedTopLevelDomain); }}
>{this.state.suggestedTopLevelDomain}
</Alert.Link>?