Skip to content

Improve: Moved the e2e password request to an alert instead of a popup#12172

Merged
rodrigok merged 18 commits intodevelopfrom
e2e-move-password-request-to-alert
Sep 26, 2018
Merged

Improve: Moved the e2e password request to an alert instead of a popup#12172
rodrigok merged 18 commits intodevelopfrom
e2e-move-password-request-to-alert

Conversation

@Hudell
Copy link
Contributor

@Hudell Hudell commented Sep 26, 2018

Closes #ISSUE_NUMBER

@Hudell Hudell requested a review from rodrigok September 26, 2018 18:37
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-12172 September 26, 2018 18:37 Inactive

showAlert = () => {
alerts.open({
title: TAPi18n.__('E2E_password'),
Copy link
Member

Choose a reason for hiding this comment

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

I'd say a better title is Enter your encryption password

And the text To access your encrypted private groups and direct messages, insert your encryption key should be To access your encrypted private groups and direct messages, insert your encryption password

Copy link
Contributor

@kaiiiiiiiii kaiiiiiiiii Sep 26, 2018

Choose a reason for hiding this comment

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

What about keeping it more in line with the title?
“Enter your encryption password to access your encrypted private groups and direct messages”?

The “.. insert your ...” part sounds weird to me ^^’

Copy link
Member

Choose a reason for hiding this comment

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

@kaiiiiiiiii agreed

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-12172 September 26, 2018 20:04 Inactive
…request-to-alert

# Conflicts:
#	packages/rocketchat-e2e/client/accountEncryption.html
#	packages/rocketchat-e2e/client/accountEncryption.js
#	packages/rocketchat-i18n/i18n/en.i18n.json
@rodrigok rodrigok added this to the 0.70.0 milestone Sep 26, 2018
@rodrigok rodrigok changed the title [FIX] Moved the e2e password request to an alert instead of a popup. Fix: Moved the e2e password request to an alert instead of a popup. Sep 26, 2018
@rodrigok rodrigok changed the title Fix: Moved the e2e password request to an alert instead of a popup. Improve: Moved the e2e password request to an alert instead of a popup Sep 26, 2018
@rodrigok rodrigok merged commit 17c0aae into develop Sep 26, 2018
@rodrigok rodrigok deleted the e2e-move-password-request-to-alert branch September 26, 2018 21:58
@sampaiodiego sampaiodiego mentioned this pull request Sep 28, 2018
@sampaiodiego sampaiodiego mentioned this pull request Sep 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

Comments