From fb4d7e8f056bdc95b284ee06b99ead5d89524bab Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Mon, 13 Jan 2025 09:01:16 -0500
Subject: [PATCH] fix broken blockedInteractionsUris state contruction (#12813)

---
 .../platform/services/browser-script-injector.service.spec.ts | 2 +-
 .../src/tools/background/fileless-importer.background.spec.ts | 2 +-
 .../src/autofill/services/domain-settings.service.spec.ts     | 2 +-
 libs/common/src/autofill/services/domain-settings.service.ts  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/browser/src/platform/services/browser-script-injector.service.spec.ts b/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
index 0919de4677..b177497305 100644
--- a/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
+++ b/apps/browser/src/platform/services/browser-script-injector.service.spec.ts
@@ -63,7 +63,7 @@ describe("ScriptInjectorService", () => {
     configService.getFeatureFlag$.mockImplementation(() => of(false));
     domainSettingsService = new DefaultDomainSettingsService(fakeStateProvider, configService);
     domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
-    domainSettingsService.blockedInteractionsUris$ = of(null);
+    domainSettingsService.blockedInteractionsUris$ = of({});
     scriptInjectorService = new BrowserScriptInjectorService(
       domainSettingsService,
       platformUtilsService,
diff --git a/apps/browser/src/tools/background/fileless-importer.background.spec.ts b/apps/browser/src/tools/background/fileless-importer.background.spec.ts
index 429a0e1218..409fac9790 100644
--- a/apps/browser/src/tools/background/fileless-importer.background.spec.ts
+++ b/apps/browser/src/tools/background/fileless-importer.background.spec.ts
@@ -39,7 +39,7 @@ describe("FilelessImporterBackground ", () => {
   let tabMock: chrome.tabs.Tab;
 
   beforeEach(() => {
-    domainSettingsService.blockedInteractionsUris$ = of(null);
+    domainSettingsService.blockedInteractionsUris$ = of({});
     policyService.policyAppliesToActiveUser$.mockImplementation(() => of(true));
     scriptInjectorService = new BrowserScriptInjectorService(
       domainSettingsService,
diff --git a/libs/common/src/autofill/services/domain-settings.service.spec.ts b/libs/common/src/autofill/services/domain-settings.service.spec.ts
index a25653f168..5c5f85e7e6 100644
--- a/libs/common/src/autofill/services/domain-settings.service.spec.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.spec.ts
@@ -29,7 +29,7 @@ describe("DefaultDomainSettingsService", () => {
 
     jest.spyOn(domainSettingsService, "getUrlEquivalentDomains");
     domainSettingsService.equivalentDomains$ = of(mockEquivalentDomains);
-    domainSettingsService.blockedInteractionsUris$ = of(null);
+    domainSettingsService.blockedInteractionsUris$ = of({});
   });
 
   describe("getUrlEquivalentDomains", () => {
diff --git a/libs/common/src/autofill/services/domain-settings.service.ts b/libs/common/src/autofill/services/domain-settings.service.ts
index aeb3af69da..7d25c4e25d 100644
--- a/libs/common/src/autofill/services/domain-settings.service.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.ts
@@ -36,7 +36,7 @@ const BLOCKED_INTERACTIONS_URIS = new KeyDefinition(
   DOMAIN_SETTINGS_DISK,
   "blockedInteractionsUris",
   {
-    deserializer: (value: NeverDomains) => value ?? null,
+    deserializer: (value: NeverDomains) => value ?? {},
   },
 );
 
@@ -131,7 +131,7 @@ export class DefaultDomainSettingsService implements DomainSettingsService {
         switchMap((featureIsEnabled) =>
           featureIsEnabled ? this.blockedInteractionsUrisState.state$ : of({} as NeverDomains),
         ),
-        map((disabledUris) => (Object.keys(disabledUris).length ? disabledUris : null)),
+        map((disabledUris) => (Object.keys(disabledUris).length ? disabledUris : {})),
       );
 
     this.equivalentDomainsState = this.stateProvider.getActive(EQUIVALENT_DOMAINS);