From 3546f1a36829d4501a80fa1950c3c4df9167f9b0 Mon Sep 17 00:00:00 2001
From: Jonathan Downing <jonathan@dominantstrategies.io>
Date: Mon, 21 Aug 2023 12:39:37 -0500
Subject: [PATCH] Bugfix: window-provider should work for localhost urls. Also
 prevent undefined error in to-16 redux slice merge

---
 background/redux-slices/migrations/to-16.ts | 4 ++--
 manifest/manifest.json                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/background/redux-slices/migrations/to-16.ts b/background/redux-slices/migrations/to-16.ts
index d409011a..8950f24c 100644
--- a/background/redux-slices/migrations/to-16.ts
+++ b/background/redux-slices/migrations/to-16.ts
@@ -71,11 +71,11 @@ export default (prevState: Record<string, unknown>): NewState => {
       if (chainID === "ids" || chainID === "entities") {
         return
       }
-      Object.keys(typedPrevState.activities[address][chainID].entities).forEach(
+      Object.keys(typedPrevState.activities[address][chainID].entities??{}).forEach(
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         (_) => {
           Object.values(
-            typedPrevState.activities[address][chainID].entities
+            typedPrevState.activities[address][chainID].entities??{}
           ).forEach((activityItem) => {
             const { annotation } = activityItem
             if (
diff --git a/manifest/manifest.json b/manifest/manifest.json
index cceb83c6..575bfe3a 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -11,7 +11,7 @@
   "web_accessible_resources": [
     {
       "resources": ["window-provider.js"],
-      "matches": ["https://*/*"]
+      "matches": ["<all_urls>"]
     }
   ],
   "content_scripts": [