From 836fb50c308376e1a94ff2fd669831b375453097 Mon Sep 17 00:00:00 2001
From: maxkpower <mpower@bitwarden.com>
Date: Wed, 19 Nov 2025 17:40:41 +0100
Subject: [PATCH] resolve merge issues

---
 .../src/platform/browser/browser-api.ts       | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index 265168322fc..cfc39fa18a1 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -272,27 +272,9 @@ export class BrowserApi {
           throw new Error("[BrowserApi] Failed to remove current tab: " + error.message);
         });
       } else if (BrowserApi.isChromeApi) {
-        if (BrowserApi.isManifestVersion(3)) {
-          await chrome.tabs.remove(tabId).catch((error) => {
-            throw new Error("[BrowserApi] Failed to remove current tab: " + error.message);
-          });
-        } else {
-          // Manifest V2 uses callbacks
-          return new Promise<void>((resolve, reject) => {
-            chrome.tabs.remove(tabId, () => {
-              if (chrome.runtime.lastError) {
-                reject(
-                  new Error(
-                    "[BrowserApi] Failed to remove current tab: " +
-                      chrome.runtime.lastError.message,
-                  ),
-                );
-              } else {
-                resolve();
-              }
-            });
-          });
-        }
+        await chrome.tabs.remove(tabId).catch((error) => {
+          throw new Error("[BrowserApi] Failed to remove current tab: " + error.message);
+        });
       }
     }
   }