Apply suggestions from code review

HazAT · kamilogorek · web-flow · commit e60fe9969c3d · 2020-05-26T16:08:36.000+02:00
Co-authored-by: Kamil Ogórek &lt;kamil.ogorek@gmail.com&gt;
diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts
@@ -3,7 +3,7 @@ import { DsnLike, Event, EventHint } from '@sentry/types';
 import { getGlobalObject, logger } from '@sentry/utils';
 
 import { BrowserBackend, BrowserOptions } from './backend';
-import { Breadcrumbs } from './integrations/index';
+import { Breadcrumbs } from './integrations';
 import { SDK_NAME, SDK_VERSION } from './version';
 
 /**
@@ -79,22 +79,20 @@ export class BrowserClient extends BaseClient<BrowserBackend, BrowserOptions> {
 
     this._processEvent(event, hint, scope)
       .then(finalEvent => {
-        // We need to check for finalEvent in case beforeSend returned null
-        eventId = finalEvent && finalEvent.event_id;
+        // We need to check for finalEvent in case beforeSend returned null.
+        if (!finalEvent) {
+          return;
+        }
+        eventId = finalEvent.event_id;
         // We do this here to not parse any requests if they are outgoing to Sentry
         // We log breadcrumbs if the integration has them enabled
-        if (finalEvent) {
-          const integration = this.getIntegration(Breadcrumbs);
-          if (integration) {
-            integration.addSentryBreadcrumb(finalEvent);
-          }
+        const integration = this.getIntegration(Breadcrumbs);
+        if (integration) {
+          integration.addSentryBreadcrumb(finalEvent);
         }
-        this._processing = false;
       })
-      .then(null, reason => {
-        logger.error(reason);
-        this._processing = false;
-      });
+      .catch(reason => logger.error(reason))
+      .finally(() => (this._processing = false));
 
     return eventId;
   }
