From d309e9e6c5fbb7d8f8fb555960b3e3d3db753c4e Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 14 Dec 2021 20:12:49 -0500
Subject: [PATCH] ref(utils): Remove optional chaining

---
 packages/utils/src/browser.ts | 9 +++++----
 packages/utils/src/misc.ts    | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/utils/src/browser.ts b/packages/utils/src/browser.ts
index 8181e3f11759..aeb6f9a33296 100644
--- a/packages/utils/src/browser.ts
+++ b/packages/utils/src/browser.ts
@@ -77,11 +77,12 @@ function _htmlElementAsString(el: unknown, keyAttrs?: string[]): string {
   out.push(elem.tagName.toLowerCase());
 
   // Pairs of attribute keys defined in `serializeAttribute` and their values on element.
-  const keyAttrPairs = keyAttrs?.length
-    ? keyAttrs.filter(keyAttr => elem.getAttribute(keyAttr)).map(keyAttr => [keyAttr, elem.getAttribute(keyAttr)])
-    : null;
+  const keyAttrPairs =
+    keyAttrs && keyAttrs.length
+      ? keyAttrs.filter(keyAttr => elem.getAttribute(keyAttr)).map(keyAttr => [keyAttr, elem.getAttribute(keyAttr)])
+      : null;
 
-  if (keyAttrPairs?.length) {
+  if (keyAttrPairs && keyAttrPairs.length) {
     keyAttrPairs.forEach(keyAttrPair => {
       out.push(`[${keyAttrPair[0]}="${keyAttrPair[1]}"]`);
     });
diff --git a/packages/utils/src/misc.ts b/packages/utils/src/misc.ts
index 164e98950c61..c67796c50b5c 100644
--- a/packages/utils/src/misc.ts
+++ b/packages/utils/src/misc.ts
@@ -142,7 +142,7 @@ export function addExceptionMechanism(event: Event, newMechanism?: Partial<Mecha
   exceptionValue0.mechanism = { ...defaultMechanism, ...currentMechanism, ...newMechanism };
 
   if (newMechanism && 'data' in newMechanism) {
-    const mergedData = { ...currentMechanism?.data, ...newMechanism.data };
+    const mergedData = { ...(currentMechanism && currentMechanism.data), ...newMechanism.data };
     exceptionValue0.mechanism.data = mergedData;
   }
 }
@@ -261,7 +261,7 @@ export function stripUrlQueryAndFragment(urlPath: string): string {
  */
 export function checkOrSetAlreadyCaught(exception: unknown): boolean {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  if ((exception as any)?.__sentry_captured__) {
+  if (exception && (exception as any).__sentry_captured__) {
     return true;
   }