rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: merge conflicts

Browse Source
This commit is contained in:
Mo
2022-06-06 07:16:03 -05:00
parent 7102c21e4e
commit 173ea323b9
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx
View File

@@ -63,10 +63,7 @@ const ConfirmPassword: FunctionComponent<Props> = ({
setIsRegistering(true) setIsRegistering(true)
application application
.register(email, password, isEphemeral, shouldMergeLocal) .register(email, password, isEphemeral, shouldMergeLocal)
.then((res) => { .then(() => {
if (res.error) {
throw new Error(res.error.message)
}
viewControllerManager.accountMenuController.closeAccountMenu() viewControllerManager.accountMenuController.closeAccountMenu()
viewControllerManager.accountMenuController.setCurrentPane(AccountMenuPane.GeneralMenu) viewControllerManager.accountMenuController.setCurrentPane(AccountMenuPane.GeneralMenu)
}) })

14
app/assets/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
View File

@@ -90,15 +90,11 @@ const CreateAccount: FunctionComponent<Props> = ({ viewControllerManager, applic
setIsCreatingAccount(true) setIsCreatingAccount(true)
try { try {
const response = await application.register(email, password) await application.register(email, password)
if (response.error || response.data?.error) { loadPurchaseFlowUrl(application).catch((err) => {
throw new Error(response.error?.message || response.data?.error?.message) console.error(err)
} else { application.alertService.alert(err).catch(console.error)
loadPurchaseFlowUrl(application).catch((err) => { })
console.error(err)
application.alertService.alert(err).catch(console.error)
})
}
} catch (err) { } catch (err) {
console.error(err) console.error(err)
application.alertService.alert(err as string).catch(console.error) application.alertService.alert(err as string).catch(console.error)