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

fix: snjs types

Browse Source
This commit is contained in:
Mo
2022-06-06 07:16:03 -05:00
parent 366f9671b3
commit aca5f41e55
4 changed files with 11 additions and 18 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)

2
package.json
View File

@@ -74,7 +74,7 @@
"@standardnotes/filepicker": "1.16.10", "@standardnotes/filepicker": "1.16.10",
"@standardnotes/icons": "^1.1.8", "@standardnotes/icons": "^1.1.8",
"@standardnotes/sncrypto-web": "1.10.1", "@standardnotes/sncrypto-web": "1.10.1",
"@standardnotes/snjs": "^2.115.3", "@standardnotes/snjs": "^2.115.4",
"@standardnotes/stylekit": "5.29.3", "@standardnotes/stylekit": "5.29.3",
"@standardnotes/services": "^1.13.10", "@standardnotes/services": "^1.13.10",
"@zip.js/zip.js": "^2.4.10", "@zip.js/zip.js": "^2.4.10",

8
yarn.lock
View File

@@ -2489,10 +2489,10 @@
buffer "^6.0.3" buffer "^6.0.3"
libsodium-wrappers "^0.7.9" libsodium-wrappers "^0.7.9"
"@standardnotes/snjs@^2.115.3": "@standardnotes/snjs@^2.115.4":
version "2.115.3" version "2.115.4"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.115.3.tgz#d82d51c88106c2801a00e9de1edd78f434e1e21a" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.115.4.tgz#eaf206cd8ddcfd502fc01d445fcf08b8e9caaf14"
integrity sha512-XXp5Z3ThU0aUvVIIbtMFomoudXFQiE1Cf/EipKz2cFuQKcVswUcegYk8qIFwUBXYN/cwBzfkRyUA2dWR6kllCg== integrity sha512-9Y1Uql0d1T9USgK/TalJSXauHW6orZCDsCBBN+AytmdH12Eph6Kv0+XOcxOzc2/D7B1Syor7a3wMalQH8v1RlQ==
dependencies: dependencies:
"@standardnotes/api" "^1.1.3" "@standardnotes/api" "^1.1.3"
"@standardnotes/auth" "^3.19.2" "@standardnotes/auth" "^3.19.2"