From f74ce9b86f976958c0642e2c55c898820f109b87 Mon Sep 17 00:00:00 2001
From: Karan Sapolia <sapoliakaran@gmail.com>
Date: Thu, 4 Apr 2019 03:56:22 +0530
Subject: [PATCH] fix(emails): Make Done button responsive after adding email

After adding new email in secondary email section, make
the done button responsive before email verification. Allow
done button to be clicked and panel to be closed. Do not
change the behavior of automatically opening panel if
secondary linked email is unverified.

fixes: #626
---
 .../app/scripts/templates/settings/emails.mustache            | 4 +---
 .../fxa-content-server/app/scripts/views/settings/emails.js   | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/fxa-content-server/app/scripts/templates/settings/emails.mustache b/packages/fxa-content-server/app/scripts/templates/settings/emails.mustache
index 87f955d6026..1b780d62983 100644
--- a/packages/fxa-content-server/app/scripts/templates/settings/emails.mustache
+++ b/packages/fxa-content-server/app/scripts/templates/settings/emails.mustache
@@ -72,9 +72,7 @@
                 {{#hasSecondaryEmail}}
                     <button type="submit" class="settings-button email-refresh primary-button enabled" title="{{ lastCheckedTime }}">{{#t}}Refresh Status{{/t}}</button>
 
-                    <button
-                        class="settings-button {{#hasSecondaryVerifiedEmail}}cancel secondary-button enabled{{/hasSecondaryVerifiedEmail}}
-                            {{^hasSecondaryVerifiedEmail}} disabled {{/hasSecondaryVerifiedEmail}}">
+                    <button class="settings-button cancel secondary-button">
                         {{#t}}Done{{/t}}
                     </button>
                 {{/hasSecondaryEmail}}
diff --git a/packages/fxa-content-server/app/scripts/views/settings/emails.js b/packages/fxa-content-server/app/scripts/views/settings/emails.js
index 57c50cdf7ab..6aa3540c7db 100644
--- a/packages/fxa-content-server/app/scripts/views/settings/emails.js
+++ b/packages/fxa-content-server/app/scripts/views/settings/emails.js
@@ -57,7 +57,6 @@ var View = FormView.extend({
       buttonClass: this._hasSecondaryEmail() ? 'secondary-button' : 'primary-button',
       emails: this._emails,
       hasSecondaryEmail: this._hasSecondaryEmail(),
-      hasSecondaryVerifiedEmail: this._hasSecondaryVerifiedEmail(),
       isPanelOpen: this.isPanelOpen(),
       lastCheckedTime: this.getLastCheckedTimeString(),
       newEmail: this.newEmail,