From aca5f41e55741c4b030ffc5d919e29ac158c64fe Mon Sep 17 00:00:00 2001 From: Mo Date: Mon, 6 Jun 2022 07:16:03 -0500 Subject: [PATCH] fix: snjs types --- .../Components/AccountMenu/ConfirmPassword.tsx | 5 +---- .../PurchaseFlow/Panes/CreateAccount.tsx | 14 +++++--------- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 11 insertions(+), 18 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 = ({ 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 = ({ 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) diff --git a/package.json b/package.json index 8c961d81e..d55dde74e 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "@standardnotes/filepicker": "1.16.10", "@standardnotes/icons": "^1.1.8", "@standardnotes/sncrypto-web": "1.10.1", - "@standardnotes/snjs": "^2.115.3", + "@standardnotes/snjs": "^2.115.4", "@standardnotes/stylekit": "5.29.3", "@standardnotes/services": "^1.13.10", "@zip.js/zip.js": "^2.4.10", diff --git a/yarn.lock b/yarn.lock index 35cceb8d0..e75a5ca1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2489,10 +2489,10 @@ buffer "^6.0.3" libsodium-wrappers "^0.7.9" -"@standardnotes/snjs@^2.115.3": - version "2.115.3" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.115.3.tgz#d82d51c88106c2801a00e9de1edd78f434e1e21a" - integrity sha512-XXp5Z3ThU0aUvVIIbtMFomoudXFQiE1Cf/EipKz2cFuQKcVswUcegYk8qIFwUBXYN/cwBzfkRyUA2dWR6kllCg== +"@standardnotes/snjs@^2.115.4": + version "2.115.4" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.115.4.tgz#eaf206cd8ddcfd502fc01d445fcf08b8e9caaf14" + integrity sha512-9Y1Uql0d1T9USgK/TalJSXauHW6orZCDsCBBN+AytmdH12Eph6Kv0+XOcxOzc2/D7B1Syor7a3wMalQH8v1RlQ== dependencies: "@standardnotes/api" "^1.1.3" "@standardnotes/auth" "^3.19.2"