From 173ea323b9d8511de75d014da23e498106b387bb Mon Sep 17 00:00:00 2001
From: Mo <mo@standardnotes.com>
Date: Mon, 6 Jun 2022 07:16:03 -0500
Subject: [PATCH] chore: merge conflicts

---
 .../Components/AccountMenu/ConfirmPassword.tsx     |  5 +----
 .../PurchaseFlow/Panes/CreateAccount.tsx           | 14 +++++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx
index 5eb71f147..57393893d 100644
--- a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx
+++ b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx
@@ -63,10 +63,7 @@ const ConfirmPassword: FunctionComponent<Props> = ({
         setIsRegistering(true)
         application
           .register(email, password, isEphemeral, shouldMergeLocal)
-          .then((res) => {
-            if (res.error) {
-              throw new Error(res.error.message)
-            }
+          .then(() => {
             viewControllerManager.accountMenuController.closeAccountMenu()
             viewControllerManager.accountMenuController.setCurrentPane(AccountMenuPane.GeneralMenu)
           })
diff --git a/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx b/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
index cd4847d12..d73b479ab 100644
--- a/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
+++ b/app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
@@ -90,15 +90,11 @@ const CreateAccount: FunctionComponent<Props> = ({ viewControllerManager, applic
     setIsCreatingAccount(true)
 
     try {
-      const response = await application.register(email, password)
-      if (response.error || response.data?.error) {
-        throw new Error(response.error?.message || response.data?.error?.message)
-      } else {
-        loadPurchaseFlowUrl(application).catch((err) => {
-          console.error(err)
-          application.alertService.alert(err).catch(console.error)
-        })
-      }
+      await application.register(email, password)
+      loadPurchaseFlowUrl(application).catch((err) => {
+        console.error(err)
+        application.alertService.alert(err).catch(console.error)
+      })
     } catch (err) {
       console.error(err)
       application.alertService.alert(err as string).catch(console.error)