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

fix: purchase flow close on complete

Browse Source
This commit is contained in:
Mo
2022-11-03 06:46:07 -05:00
parent 305ffdf984
commit c4dbc5cbd2
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
View File

@@ -91,10 +91,15 @@ const CreateAccount: FunctionComponent<Props> = ({ viewControllerManager, applic
try { try {
await application.register(email, password) await application.register(email, password)
loadPurchaseFlowUrl(application).catch((err) => {
console.error(err) viewControllerManager.purchaseFlowController.closePurchaseFlow()
application.alertService.alert(err).catch(console.error)
}) if (!application.hideSubscriptionMarketing) {
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)

12
packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
View File

@@ -74,10 +74,14 @@ const SignIn: FunctionComponent<Props> = ({ viewControllerManager, application }
if (response.error || response.data?.error) { if (response.error || response.data?.error) {
throw new Error(response.error?.message || response.data?.error?.message) throw new Error(response.error?.message || response.data?.error?.message)
} else { } else {
loadPurchaseFlowUrl(application).catch((err) => { viewControllerManager.purchaseFlowController.closePurchaseFlow()
console.error(err)
application.alertService.alert(err).catch(console.error) if (!application.hideSubscriptionMarketing) {
}) loadPurchaseFlowUrl(application).catch((err) => {
console.error(err)
application.alertService.alert(err).catch(console.error)
})
}
} }
} catch (err) { } catch (err) {
console.error(err) console.error(err)