[pull] main from mozilla-firefox:main

.cargo/config.toml.in

@@ -75,9 +75,9 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
 rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56"]
+[source."git+https://github.com/mozilla/application-services?rev=42c175c2ecb5aa39346dcd9c7b45ff02325562d8"]
 git = "https://github.com/mozilla/application-services"
-rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56"
+rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=c8d3f03cb5f889e4cab18cc1360ad0daa074f17a"]

Cargo.toml

@@ -270,21 +270,21 @@ objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca
 allocator-api2 = { git = "https://github.com/glandium/allocator-api2", rev = "ad5f3d56a5a4519eff52af4ff85293431466ef5c" }
 
 # application-services overrides to make updating them all simpler.
-context_id = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-error-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-filter_adult = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-relevancy = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-search = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-tracing-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-logins = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
-init_rust_components = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+context_id = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+error-support = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+filter_adult = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+relevancy = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+search = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+tracing-support = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+logins = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
+init_rust_components = { git = "https://github.com/mozilla/application-services", rev = "42c175c2ecb5aa39346dcd9c7b45ff02325562d8" }
 # Patched version of zip 2.4.2 to allow for reading omnijars.
 zip = { path = "third_party/rust/zip" }
 

browser/components/aboutwelcome/.eslintrc.mjs

@@ -72,7 +72,7 @@ export default [
       "guard-for-in": "error",
       "max-nested-callbacks": ["error", 4],
       "max-params": ["error", 6],
-      "max-statements": ["error", 50],
+      "max-statements": "off",
       "new-cap": ["error", { newIsCap: true, capIsNew: false }],
       "no-alert": "error",
       "no-div-regex": "error",

browser/components/aboutwelcome/content-src/aboutwelcome.jsx

@@ -35,6 +35,7 @@ class AboutWelcome extends React.PureComponent {
           mountStart: performance.getEntriesByName("mount").pop().startTime,
           domState,
           source: this.props.UTMTerm,
+          writeInMicrosurvey: this.props.write_in_microsurvey,
         });
       };
       if (document.readyState === "complete") {
@@ -65,6 +66,7 @@ class AboutWelcome extends React.PureComponent {
         addonIconURL={props.iconURL}
         themeScreenshots={props.screenshots}
         message_id={props.messageId}
+        writeInMicrosurvey={props.write_in_microsurvey}
         defaultScreens={props.screens}
         updateHistory={!props.disableHistoryUpdates}
         metricsFlowUri={this.state.metricsFlowUri}

browser/components/aboutwelcome/content-src/aboutwelcome.scss

@@ -2142,6 +2142,31 @@ html {
     }
   }
 
+  .textarea-container {
+    display: flex;
+    flex-flow: column nowrap;
+
+    .textarea-char-counter {
+      font-size: 13px;
+      color: var(--text-color-deemphasized);
+      text-align: end;
+      margin-block: -10px 4px;
+
+      &.invalid {
+        color: var(--text-color-error)
+      }
+    }
+
+    .textarea-input {
+      resize: none;
+
+      &.invalid {
+        border-color: var(--outline-color-error);
+        outline-color: var(--outline-color-error);
+      }
+    }
+  }
+
   .confirmation-checklist-section {
     display: flex;
     flex-direction: column;

browser/components/aboutwelcome/content-src/components/ActionChecklist.jsx

@@ -80,7 +80,11 @@ export const ActionChecklistProgressBar = ({ progress }) => {
   );
 };
 
-export const ActionChecklist = ({ content, message_id }) => {
+export const ActionChecklist = ({
+  content,
+  message_id,
+  writeInMicrosurvey,
+}) => {
   const tiles = content.tiles.data;
   const [progressValue, setProgressValue] = useState(0);
   const [numberOfCompletedActions, setNumberOfCompletedActions] = useState(0);
@@ -119,7 +123,12 @@ export const ActionChecklist = ({ content, message_id }) => {
     setNumberOfCompletedActions(numberOfCompletedActions + 1);
 
     AboutWelcomeUtils.handleUserAction({ type, data });
-    AboutWelcomeUtils.sendActionTelemetry(message_id, source_id);
+    AboutWelcomeUtils.sendActionTelemetry(
+      message_id,
+      source_id,
+      "CLICK_BUTTON",
+      { writeInMicrosurvey }
+    );
   }
 
   return (