Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(modale): confirmation skip verification device on login #1147

Merged
merged 1 commit into from
Oct 24, 2024
Merged

feat(modale): confirmation skip verification device on login #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions linked-dependencies/matrix-react-sdk/src/components/structures/auth/CompleteSecurity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,9 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
let skipButton;

if (!forceVerification && (phase === Phase.Intro || phase === Phase.ConfirmReset)) {
// :Tchap: cross-signing-ui - Condition to skip Phase.ConfirmSkip and its "Are you sure" modal after login for csss
const tchapOnSkipClick = phase === Phase.Intro ? this.props.onFinished : this.onSkipClick;
// end :Tchap:
skipButton = (
<AccessibleButton
// :tchap: cross-signing-ui - remove onClick={this.onSkipClick}
// add instead
onClick={tchapOnSkipClick}
// end :tchap:
onClick={this.onSkipClick}
className="mx_CompleteSecurity_skip"
aria-label={_t("encryption|verification|after_new_login|skip_verification")}
/>
Expand Down
4 changes: 4 additions & 0 deletions modules/tchap-translations/tchap_translations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,5 +877,9 @@
"auth|proconnect|error_sso_inactive": {
"en": "ProConnect is disabled for your domain",
"fr": "ProConnect est désactivé pour votre domaine"
},
"encryption|verification|verification_skip_warning": {
"en": "Without verifying, you won't have access to all your messages and may appear as untrusted to others.",
"fr": "Sans vérification, vous n'aurez pas accès à tous vos messages et votre compte n'apparaitra pas comme fiable pour les autres utilisateurs"
}
}
Loading