chore: merge conflicts

2022-06-06 07:16:03 -05:00
parent 7102c21e4e
commit 173ea323b9
2 changed files with 6 additions and 13 deletions
--- 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)
          })