Prevent user from getting stuck on opt in page (#9856)

Failed metric events on the opt-in page no longer leave the user stuck
on that page. If the metric events fail, they still bubble up as errors
to be caught by Sentry and logged to the console, but the user is still
brought to the next page.

Fixes #9800

ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js

@@ -101,57 +101,59 @@ export default class MetaMetricsOptIn extends Component {
           </div>
           <div className="metametrics-opt-in__footer">
             <PageContainerFooter
-              onCancel={() => {
+              onCancel={async () => {
-                setParticipateInMetaMetrics(false).then(() => {
+                await setParticipateInMetaMetrics(false)
-                  const promise =
-                    participateInMetaMetrics === true
-                      ? metricsEvent({
-                          eventOpts: {
-                            category: 'Onboarding',
-                            action: 'Metrics Option',
-                            name: 'Metrics Opt Out',
-                          },
-                          isOptIn: true,
-                        })
-                      : Promise.resolve()
 
-                  promise.then(() => {
+                try {
-                    history.push(nextRoute)
+                  if (participateInMetaMetrics === true) {
-                  })
+                    await metricsEvent({
-                })
+                      eventOpts: {
+                        category: 'Onboarding',
+                        action: 'Metrics Option',
+                        name: 'Metrics Opt Out',
+                      },
+                      isOptIn: true,
+                    })
+                  }
+                } finally {
+                  history.push(nextRoute)
+                }
               }}
               cancelText={t('noThanks')}
               hideCancel={false}
-              onSubmit={() => {
+              onSubmit={async () => {
-                setParticipateInMetaMetrics(true).then(([_, metaMetricsId]) => {
+                const [, metaMetricsId] = await setParticipateInMetaMetrics(
-                  const promise =
+                  true,
-                    participateInMetaMetrics === false
+                )
-                      ? metricsEvent({
+                try {
-                          eventOpts: {
+                  const metrics = []
-                            category: 'Onboarding',
+                  if (participateInMetaMetrics === false) {
-                            action: 'Metrics Option',
+                    metrics.push(
-                            name: 'Metrics Opt In',
+                      metricsEvent({
-                          },
-                          isOptIn: true,
-                        })
-                      : Promise.resolve()
-
-                  promise
-                    .then(() => {
-                      return metricsEvent({
                         eventOpts: {
                           category: 'Onboarding',
-                          action: 'Import or Create',
+                          action: 'Metrics Option',
-                          name: firstTimeSelectionMetaMetricsName,
+                          name: 'Metrics Opt In',
                         },
                         isOptIn: true,
-                        metaMetricsId,
+                      }),
-                      })
+                    )
-                    })
+                  }
-                    .then(() => {
+                  metrics.push(
-                      history.push(nextRoute)
+                    metricsEvent({
-                    })
+                      eventOpts: {
-                })
+                        category: 'Onboarding',
+                        action: 'Import or Create',
+                        name: firstTimeSelectionMetaMetricsName,
+                      },
+                      isOptIn: true,
+                      metaMetricsId,
+                    }),
+                  )
+                  await Promise.all(metrics)
+                } finally {
+                  history.push(nextRoute)
+                }
               }}
               submitText={t('affirmAgree')}
               submitButtonType="primary"