From f1a24ed6fba92eaa63853966228b731f81c28f3d Mon Sep 17 00:00:00 2001
From: Stephen Thompson <sthompson@mozilla.com>
Date: Tue, 29 Apr 2025 16:36:19 -0400
Subject: [PATCH] Address code review comments for #2758

- Use `commands.reset` insead of `commands.update`
- Do not swallow errors
---
 src/js/background/backgroundLogic.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js
index c5b53b3..01402fa 100644
--- a/src/js/background/backgroundLogic.js
+++ b/src/js/background/backgroundLogic.js
@@ -52,23 +52,19 @@ const backgroundLogic = {
    *
    * @param {{reason: runtime.OnInstalledReason, previousVersion?: string}} details
    */
-  _undoDefault820SortTabsKeyboardShortcut(details) {
+  async _undoDefault820SortTabsKeyboardShortcut(details) {
     if (details.reason === "update" && details.previousVersion === "8.2.0") {
-      browser.commands.getAll().then((commands) => {
-        const sortTabsCommand = commands.find(command => command.name === "sort_tabs");
-        if (sortTabsCommand) {
-          const previouslySuggestedKeys = [
-            "Ctrl+Comma", // "default"
-            "MacCtrl+Comma", // "mac"
-          ];
-          if (previouslySuggestedKeys.includes(sortTabsCommand.shortcut)) {
-            browser.commands.update({
-              name: "sort_tabs",
-              shortcut: "",
-            });
-          }
+      const commands = await browser.commands.getAll();
+      const sortTabsCommand = commands.find(command => command.name === "sort_tabs");
+      if (sortTabsCommand) {
+        const previouslySuggestedKeys = [
+          "Ctrl+Comma", // "default"
+          "MacCtrl+Comma", // "mac"
+        ];
+        if (previouslySuggestedKeys.includes(sortTabsCommand.shortcut)) {
+          browser.commands.reset("sort_tabs");
         }
-      }).catch(err => console.error(err));
+      }
     }
   },