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

fix: Update notification messages for verifying account #5517

Merged
merged 2 commits into from
Nov 10, 2020
Merged

fix: Update notification messages for verifying account #5517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4f0465
update-messages
sachinchauhan2889 Nov 7, 2020
7fe9527
update-test
sachinchauhan2889 Nov 10, 2020
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
2 changes: 1 addition & 1 deletion app/components/unverified-user-message.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{{#if (eq this.session.currentRouteName 'events.view.index')}}
{{t 'To make your event live, please verify your account by clicking on the confirmation link that has been emailed to you.'}}
{{else}}
{{t 'Your account is unverified.'}} {{@extraMessage}} {{t 'Please verify by clicking on the confirmation link that has been emailed to you.'}}
{{t 'Your account functionality is limited.'}} {{@extraMessage}} {{t 'To get full access to all features you need to verify your email by clicking on the confirmation link that has been emailed to you.'}}
{{/if}}
</div>
<p>{{t 'Did not get the email?'}} <a href="#" onclick={{action 'sendConfirmationMail'}}>{{t 'Please click here to resend the confirmation mail.'}}</a></p>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/verify.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{#if this.success}}
<div class="ui {{if this.isLoading 'loading'}} icon info message eight wide column center aligned">
<p>Your email has been verified successfully!{{#if (not this.session.isAuthenticated)}} Please login to continue. {{/if}}</p>
<p>Thank you, your email has been verified successfully! You now have full access to all features.{{#if (not this.session.isAuthenticated)}} Please login to continue. {{/if}}</p>
</div>
{{else}}
<div class="ui {{if this.isLoading 'loading'}} icon error message eight wide column center aligned">
<p>Error: {{this.error}}</p>
</div>
{{/if}}
{{/if}}
2 changes: 1 addition & 1 deletion tests/integration/components/unverified-user-message-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ module('Integration | Component | unverified user message', function(hooks) {
});
this.set('isMailSent', false);
await render(hbs`{{unverified-user-message session=session authManager=authManager isMailSent=isMailSent}}`);
assert.dom(this.element).includesText('Your account is unverified. Please verify by clicking on the confirmation link that has been emailed to you.');
assert.dom(this.element).includesText('Your account functionality is limited. To get full access to all features you need to verify your email by clicking on the confirmation link that has been emailed to you.');
});
});