Merge pull request #17435 from mozilla/fxa-10258

feat(glean): Fix email on "Sign in" link when pairing fails

packages/fxa-content-server/app/scripts/templates/pair/failure.mustache

@@ -16,7 +16,7 @@
 
       {{#showSigninLink}}
         <div class="button-row">
-          <button class="button primary-button mt-5" id="signin-button" target="_blank" type="button">{{#t}}Sign in{{/t}}</button>
+          <button class="button primary-button mt-5" id="signin-button" type="button">{{#t}}Sign in{{/t}}</button>
         </div>
       {{/showSigninLink}}
 

packages/fxa-content-server/app/scripts/views/pair/failure.js

@@ -23,6 +23,12 @@ class PairFailureView extends FormView {
 
   clickSignin() {
     const params = this.model.get('searchParams');
+
+    // We replace the `email` with `prefillEmail` so that the email
+    // first page gets populated correctly.
+    const email = params.get('email');
+    params.delete('email');
+    params.set('prefillEmail', email);
     window.location.href = `${window.location.origin}${params}`;
   }
 }

packages/fxa-shared/metrics/glean/web/event.ts

@@ -4,8 +4,8 @@
 
 // AUTOGENERATED BY glean_parser v14.5.2. DO NOT EDIT. DO NOT COMMIT.
 
-import StringMetricType from '@mozilla/glean/private/metrics/string';
 import BooleanMetricType from '@mozilla/glean/private/metrics/boolean';
+import StringMetricType from '@mozilla/glean/private/metrics/string';
 
 /**
  * The name of the event