Review updates

tests/controllers/user.test.js

@@ -102,7 +102,7 @@ test("user unsubscribe GET request with valid token returns error", async () =>
   const validToken = "0e2cb147-2041-4e5b-8ca9-494e773b2cf0";
 
   // Set up mocks
-  const req = { fluentFormat: jest.fn(), query: { token: validToken, hash: "testHash" } };
+  const req = { fluentFormat: jest.fn(), query: { token: validToken, hash: "ad9c69bcc69b3399775d2ddbe9b0b229369fca42" } };
   const resp = httpMocks.createResponse();
 
   // Call code-under-test

views/partials/email_partials/email_button.hbs

@@ -5,12 +5,8 @@
         <table>
           <tr>
             <td class="email-button-wrapper" align="center" bgcolor="#0060df" style="width: 100%; max-width: 530px; border-radius: 2px;">
-              <a class="email-button" href="{{ scanAnotherEmailHref }}{{ verificationHref }}" rel="noopener" style="text-align: center; text-decoration: none; color: #ffffff; padding-top: 12px; padding-right: 30px; padding-left: 30px; padding-bottom: 12px; border: 1px solid #0060df; display: inline-block; font-size: 13px;">
-                {{#ifCompare whichView "===" "email_partials/email_verify"}}
-                  {{fluentFormat supportedLocales "verify-my-email" }}
-                {{else}}
-                  {{fluentFormat supportedLocales "report-scan-another-email"}}
-                {{/ifCompare}}
+              <a class="email-button" href="{{ href }}" rel="noopener" style="text-align: center; text-decoration: none; color: #ffffff; padding-top: 12px; padding-right: 30px; padding-left: 30px; padding-bottom: 12px; border: 1px solid #0060df; display: inline-block; font-size: 13px;">
+                {{fluentFormat supportedLocales fluentStringID}}
               </a>
             </td>
           </tr>

views/partials/email_partials/email_verify.hbs

@@ -12,7 +12,7 @@
   <table border="0" cellspacing="0" cellpadding="0" width="100%" style="width: 100%; padding-top: 30px; padding-bottom: 30px;">
     <tr>
       <td>
-        {{>email_partials/email_button}}
+        {{>email_partials/email_button href=verificationHref fluentStringID="verify-my-email"}}
       </td>
     </tr> 
   </table>

views/partials/email_partials/report.hbs

@@ -37,7 +37,7 @@
   <table class="table-button" border="0" cellpadding="0" cellspacing="0" width="100%" style="padding-top: 20px; padding-bottom: 20px; margin: 0px;">
     <tr>
       <td>
-        {{> email_partials/email_button}}
+        {{> email_partials/email_button href=scanAnotherEmailHref fluentStringID="report-scan-another-email"}}
       </td>
     </tr>
   </table>