Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix: Unable to verify email address error #3528

Merged
merged 6 commits into from
Oct 8, 2019
Merged

Conversation

bwindels
Copy link
Contributor

@bwindels bwindels commented Oct 7, 2019

Fixes element-hq/element-web#11040

Also added a dialog when server says that e-mail hasn't been verified yet.

image

@bwindels bwindels requested a review from a team October 7, 2019 15:45
@jryans jryans requested review from jryans and removed request for a team October 7, 2019 16:00
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I am a bit surprised we didn't seem to hit this in testing...

src/AddThreepid.js Show resolved Hide resolved
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
if (err.errcode === 'M_THREEPID_AUTH_FAILED') {
Modal.createTrackedDialog("E-mail hasn't been verified yet", "", ErrorDialog, {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In our strings, we consistently use "email" instead of "e-mail", so please change all these to "email".

@bwindels bwindels force-pushed the bwindels/addemailerror branch from 9716855 to 1ab19be Compare October 8, 2019 06:54
@bwindels bwindels requested a review from jryans October 8, 2019 06:57
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this! Feel free to merge after fixing strings and re-running i18n.

if (err.errcode === 'M_THREEPID_AUTH_FAILED') {
Modal.createTrackedDialog("Email hasn't been verified yet", "", ErrorDialog, {
title: _t("Your email address hasn't been verified yet"),
description: _t("Click the link in the email you received to verify, " +
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there's no subject after the "and", it's better to drop the "," according to the strange rules of English.

Suggested change
description: _t("Click the link in the email you received to verify, " +
description: _t("Click the link in the email you received to verify " +

if (err.errcode === 'M_THREEPID_AUTH_FAILED') {
Modal.createTrackedDialog("E-mail hasn't been verified yet", "", ErrorDialog, {
title: _t("Your email address hasn't been verified yet"),
description: _t("Click the link in the email you received to verify, " +
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description: _t("Click the link in the email you received to verify, " +
description: _t("Click the link in the email you received to verify " +

@bwindels bwindels merged commit 051fd0f into develop Oct 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to verify email address error
2 participants