DRY logic fix from @lloan, better quailify bg function to get getCurr…

…entPageHostname
mozilla · Mar 14, 2023 · 6184ed0 · 6184ed0
1 parent 92899a1
commit 6184ed0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/js/background/background.js b/src/js/background/background.js
@@ -179,8 +179,8 @@ async function getCurrentPage() {
 
 async function getCurrentPageHostname() {
  const currentPage = await getCurrentPage();
-
- if (currentPage.url) {
+ 
+ if (currentPage && currentPage.url) {
  const url = new URL(currentPage.url);
  return url.hostname;
  }

diff --git a/src/js/popup/popup.js b/src/js/popup/popup.js
@@ -1152,11 +1152,7 @@
  const domainList = mask.used_on;
 
  // Short circuit out if there's no used_on entry
- if (
- domainList === null ||
- domainList === "" ||
- domainList === undefined
- ) {
+ if ([undefined, null, ""].includes(domainList)) {
  return false;
  }