From 0d5ded6d01fdb5dc7eba98a6cb50af7f84877261 Mon Sep 17 00:00:00 2001
From: Mark Erikson <mark@isquaredsoftware.com>
Date: Fri, 9 Jul 2021 19:21:50 -0400
Subject: [PATCH] Try marking errors in catch blocks

---
 src/components/connectAdvanced.tsx |  4 ++--
 src/hooks/useSelector.ts           | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/connectAdvanced.tsx b/src/components/connectAdvanced.tsx
index d9d4aa4d1..5c6a44531 100644
--- a/src/components/connectAdvanced.tsx
+++ b/src/components/connectAdvanced.tsx
@@ -113,9 +113,9 @@ function subscribeUpdates(
         latestStoreState,
         lastWrapperProps.current
       )
-    } catch (e) {
+    } catch (e: unknown) {
       error = e
-      lastThrownError = e
+      lastThrownError = e as Error | null
     }
 
     if (!error) {
diff --git a/src/hooks/useSelector.ts b/src/hooks/useSelector.ts
index c6be70ba4..1c836d273 100644
--- a/src/hooks/useSelector.ts
+++ b/src/hooks/useSelector.ts
@@ -50,9 +50,11 @@ function useSelectorWithStoreAndSubscription<TStoreState, TSelectedState>(
     } else {
       selectedState = latestSelectedState.current
     }
-  } catch (err) {
+  } catch (err: unknown) {
     if (latestSubscriptionCallbackError.current) {
-      err.message += `\nThe error may be correlated with this previous error:\n${latestSubscriptionCallbackError.current.stack}\n\n`
+      ;(
+        err as Error
+      ).message += `\nThe error may be correlated with this previous error:\n${latestSubscriptionCallbackError.current.stack}\n\n`
     }
 
     throw err
@@ -77,12 +79,12 @@ function useSelectorWithStoreAndSubscription<TStoreState, TSelectedState>(
 
         latestSelectedState.current = newSelectedState
         latestStoreState.current = newStoreState
-      } catch (err) {
+      } catch (err: unknown) {
         // we ignore all errors here, since when the component
         // is re-rendered, the selectors are called again, and
         // will throw again, if neither props nor store state
         // changed
-        latestSubscriptionCallbackError.current = err
+        latestSubscriptionCallbackError.current = err as Error
       }
 
       forceRender()