Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 5 insertions, 5 deletions

diff --git a/devtools/client/application/src/actions/manifest.js b/devtools/client/application/src/actions/manifest.js
index 050fab2b89..ccb62ff13c 100644
--- a/devtools/client/application/src/actions/manifest.js
+++ b/devtools/client/application/src/actions/manifest.js
@@ -20,7 +20,7 @@ const {
 } = require("resource://devtools/client/application/src/constants.js");
 
 function fetchManifest() {
-  return async ({ dispatch, getState }) => {
+  return async ({ dispatch }) => {
     dispatch({ type: FETCH_MANIFEST_START });
     try {
       const manifest = await services.fetchManifest();
diff --git a/devtools/client/application/src/components/manifest/ManifestIssue.js b/devtools/client/application/src/components/manifest/ManifestIssue.js
index 6a9680d604..0ec25734b0 100644
--- a/devtools/client/application/src/components/manifest/ManifestIssue.js
+++ b/devtools/client/application/src/components/manifest/ManifestIssue.js
@@ -38,7 +38,7 @@ class ManifestIssue extends PureComponent {
     switch (level) {
       case MANIFEST_ISSUE_LEVELS.WARNING:
         return {
-          src: "chrome://devtools/skin/images/alert-small.svg",
+          src: "resource://devtools-shared-images/alert-small.svg",
           localizationId: "icon-warning",
         };
       case MANIFEST_ISSUE_LEVELS.ERROR:
diff --git a/devtools/client/application/src/components/service-workers/Worker.js b/devtools/client/application/src/components/service-workers/Worker.js
index bc95e084a9..51cb45c1a6 100644
--- a/devtools/client/application/src/components/service-workers/Worker.js
+++ b/devtools/client/application/src/components/service-workers/Worker.js
@@ -118,7 +118,7 @@ class Worker extends PureComponent {
     return this.props.worker.stateText;
   }
 
-  getClassNameForStatus(baseClass) {
+  getClassNameForStatus() {
     const { state } = this.props.worker;
 
     switch (state) {
diff --git a/devtools/client/application/src/middleware/event-telemetry.js b/devtools/client/application/src/middleware/event-telemetry.js
index 60129d2bde..aa4aa7b62b 100644
--- a/devtools/client/application/src/middleware/event-telemetry.js
+++ b/devtools/client/application/src/middleware/event-telemetry.js
@@ -15,7 +15,7 @@ function eventTelemetryMiddleware(telemetry) {
     telemetry.recordEvent(method, "application", null, details);
   }
 
-  return store => next => action => {
+  return () => next => action => {
     switch (action.type) {
       // ui telemetry
       case UPDATE_SELECTED_PAGE:
diff --git a/devtools/client/application/src/reducers/manifest-state.js b/devtools/client/application/src/reducers/manifest-state.js
index 61a2fa6759..1f7fbf0bb6 100644
--- a/devtools/client/application/src/reducers/manifest-state.js
+++ b/devtools/client/application/src/reducers/manifest-state.js
@@ -67,7 +67,7 @@ function _processRawManifestMembers(rawManifest) {
 
   // filter out extra metadata members (those with moz_ prefix) and icons
   const rawMembers = Object.entries(rawManifest).filter(
-    ([key, value]) => !key.startsWith("moz_") && !(key === "icons")
+    ([key]) => !key.startsWith("moz_") && !(key === "icons")
   );
 
   for (const [key, value] of rawMembers) {