diff --git a/package.json b/package.json index 52b3f3ba..b1e1d8be 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@react-navigation/native": "^5.9.3", "@react-navigation/stack": "^5.14.3", "@standardnotes/sncrypto-common": "1.6.0", - "@standardnotes/snjs": "2.49.4", + "@standardnotes/snjs": "2.53.0", "js-base64": "^3.5.2", "moment": "^2.29.1", "react": "17.0.2", @@ -68,8 +68,8 @@ "@babel/core": "^7.11.6", "@babel/runtime": "^7.11.2", "@react-native-community/eslint-config": "^2.0.0", - "@standardnotes/components": "^1.5.0", - "@standardnotes/features": "^1.27.0", + "@standardnotes/components": "^1.7.0", + "@standardnotes/features": "^1.29.0", "@types/detox": "^16.4.1", "@types/faker": "^5.1.3", "@types/jest": "^26.0.14", diff --git a/src/lib/application.ts b/src/lib/application.ts index 12405718..cba32305 100644 --- a/src/lib/application.ts +++ b/src/lib/application.ts @@ -64,7 +64,6 @@ export class MobileApplication extends SNApplication { ? 'https://api-dev.standardnotes.com' : 'https://api.standardnotes.com', version, - true, IsDev ? 'wss://sockets-dev.standardnotes.com' : 'wss://sockets.standardnotes.com' diff --git a/src/lib/component_manager.ts b/src/lib/component_manager.ts index a058b276..87b498a7 100644 --- a/src/lib/component_manager.ts +++ b/src/lib/component_manager.ts @@ -1,7 +1,7 @@ import { FeatureDescription, FeatureIdentifier, - Features, + GetFeatures, } from '@standardnotes/features'; import { ComponentMutator, @@ -156,7 +156,7 @@ export class ComponentManager extends SNComponentManager { } public nativeFeatureForIdentifier(identifier: FeatureIdentifier) { - return Features.find( + return GetFeatures().find( (feature: FeatureDescription) => feature.identifier === identifier ); } diff --git a/src/lib/snjs_helper_hooks.ts b/src/lib/snjs_helper_hooks.ts index 5119af00..a4954a30 100644 --- a/src/lib/snjs_helper_hooks.ts +++ b/src/lib/snjs_helper_hooks.ts @@ -304,7 +304,7 @@ export const useDeleteNoteWithPrivileges = ( }, [application?.alertService, onTrashCallback]); const deleteNotePermanently = useCallback(async () => { - const title = `Delete ${note!.safeTitle()}`; + const title = `Delete ${note!.title}`; const message = 'Are you sure you want to permanently delete this note?'; if (editor?.isTemplateNote) { application?.alertService!.alert( diff --git a/src/screens/Compose/Compose.tsx b/src/screens/Compose/Compose.tsx index 5041916d..6ebbbee2 100644 --- a/src/screens/Compose/Compose.tsx +++ b/src/screens/Compose/Compose.tsx @@ -561,13 +561,13 @@ export class Compose extends React.Component<{}, State> { {(this.state.downloadingEditor || (this.state.loadingWebview && themeService?.isLikelyUsingDarkColorTheme())) && ( - - - {'Loading '} - {this.state.componentViewer?.component.name}... - - - )} + + + {'Loading '} + {this.state.componentViewer?.component.name}... + + + )} {/* setting webViewError to false on onLoadEnd will cause an infinite loop on Android upon webview error, so, don't do that. */} {shouldDisplayEditor && ( - {note.safeTitle().length > 0 ? ( + {note.title.length > 0 ? ( {note.title} ) : ( @@ -247,7 +247,7 @@ export const NoteCell = ({ )} - {!hasPlainPreview && showPreview && note.safeText().length > 0 && ( + {!hasPlainPreview && showPreview && note.text.length > 0 && ( {note.text} diff --git a/yarn.lock b/yarn.lock index e91a83dc..80f71395 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1757,39 +1757,39 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@standardnotes/auth@^3.15.3": - version "3.15.3" - resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.15.3.tgz#bf77332e0ac3d846acc45f25083459e42f4a4374" - integrity sha512-16wgMl0qmq8w+HUktfQ7ODoprkngSs0vsSF5G9aHM1L+lFMwlGeVOztHH2zwG91pFkl7BaK6LcEimoYiml6VAw== +"@standardnotes/auth@^3.15.4": + version "3.15.4" + resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.15.4.tgz#acb2e9497724e1ba290664f199f3cc165c0fce3e" + integrity sha512-QhOnM8yPL63RrS+0qQjT4PIlHT3a+Ht17BmTEoNeNw3hc0QSXb3wqkwHoqyMfxWZKcAVjOSPhl+aOO9O2JUC3w== dependencies: - "@standardnotes/common" "^1.8.0" + "@standardnotes/common" "^1.9.0" jsonwebtoken "^8.5.1" -"@standardnotes/common@^1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.8.0.tgz#af72ad85f0d410ae31c0c110137911e2595634de" - integrity sha512-R3nfAvhaXp5ufMB0M0fmV9yizE/Of2PGNJKnxtdxwowAq/ZakHu8Rh/v485PXrCaCFREVOZQO8kg0RQM8YngSw== +"@standardnotes/common@^1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.9.0.tgz#45c0a8da16cb6e3c56ee53e8abde73934c5cf91e" + integrity sha512-4c/7f/sFBykmiu/SqYn3OfmMSdJ6dNVsl6yDm4aPB37EAyNPhOfhOeY8kQ12606EZArtUJ8FYo5sKPbLV0PCug== -"@standardnotes/components@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@standardnotes/components/-/components-1.5.0.tgz#29f46734ac8837b74cd15c8ba78358205a56d4bc" - integrity sha512-Xz8JsGxDuBClIu+US0UM1tqCbuSFJ5xHCmRWXBPEXQpkCFCENQ6avheIXp3oJKR2iYxwwgZuHAfnZClyIEMxSg== +"@standardnotes/components@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@standardnotes/components/-/components-1.7.0.tgz#192f358ddffe275a9ab3709ef31b7b8bf3b58ec1" + integrity sha512-4J9iuos5WZvl+/Z7dNvhgEY9SRTdSm6JiUHbo6rRtryjvlJB4EkvnARxexJvw17MBmTWjvHY8c3aLm/w1dzv0A== -"@standardnotes/domain-events@^2.21.2": - version "2.21.2" - resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.21.2.tgz#e28a0c1a65b09cf9712ce1efab279af33f68cae6" - integrity sha512-wZuTpgFFhV6CxwWHxU1Y0rtlR7SLZAccnT+GIbWk77WlkbdyJydpMIgcr5I94+9wFZuzMGA3SU+HyYbAE08ozg== +"@standardnotes/domain-events@^2.21.4": + version "2.21.4" + resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.21.4.tgz#d6a78e5e9ff700208e7ed407edf492bd289137a4" + integrity sha512-1odojLlirCNB8h8O3PKPgaSmbjRtkg1MYTovg4uvcDPRbPecw+2F70dA9gMS33224JlorBhjBi4qcn+ehraP8w== dependencies: - "@standardnotes/auth" "^3.15.3" - "@standardnotes/features" "^1.27.0" + "@standardnotes/auth" "^3.15.4" + "@standardnotes/features" "^1.29.0" -"@standardnotes/features@^1.27.0": - version "1.27.0" - resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.27.0.tgz#eac735cafaa90f2d174fea65757034bfd841b056" - integrity sha512-RJXtBw5PCGNXuvUZDn1UJHQuF9+V0kZcGI4leWZJNRFDCQeuESOopVXvVIPCske/vUTHy8BGJttc2m9OatTlPw== +"@standardnotes/features@^1.29.0": + version "1.29.0" + resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.29.0.tgz#f7c4c2cb9fdf5c7cc08bae177a40ec09eb73be95" + integrity sha512-OTxAtj1nA5yj6yEh3m2AsMnpd+JU6xQ8MBd6Vn3nxx3WKux5d+hTJkkskkbERc+0MZhIFLCiBUrkSolJc8Yo+g== dependencies: - "@standardnotes/auth" "^3.15.3" - "@standardnotes/common" "^1.8.0" + "@standardnotes/auth" "^3.15.4" + "@standardnotes/common" "^1.9.0" "@standardnotes/settings@^1.11.3": version "1.11.3" @@ -1801,15 +1801,15 @@ resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.6.0.tgz#c6174adf65c778c8d53e45ea4c68087786f86b67" integrity sha512-3gTTokb+DWxtBH72auVtoB76V9pCZWyQ7hmClgBuQF3i5j6HvuuBZGiicHmwAv1zJxMi/op3haE8lwzQc8NJ9g== -"@standardnotes/snjs@2.49.4": - version "2.49.4" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.49.4.tgz#ae443f0f3d8f72a4f7e65fe47e2030bcc6df9fab" - integrity sha512-RXyUNVvcT2TtGSYC32fDXgGUZdSiUvOFosLDWWGeY5kwOTnj1ZHrqmKaUlKCGPi1xiYANay42+EwLCLyyqOkzQ== +"@standardnotes/snjs@2.53.0": + version "2.53.0" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.53.0.tgz#151ff71dbc05d1d650fb8d6907d92af9122f5c91" + integrity sha512-xJLB1W4OP2ApbLZTuO/kVnuq4IS0LHR3aM5WsSmk3g84PiAjvOTYAf/hsUp2/YWq5msxx9wOUi3fB8YFieDqxg== dependencies: - "@standardnotes/auth" "^3.15.3" - "@standardnotes/common" "^1.8.0" - "@standardnotes/domain-events" "^2.21.2" - "@standardnotes/features" "^1.27.0" + "@standardnotes/auth" "^3.15.4" + "@standardnotes/common" "^1.9.0" + "@standardnotes/domain-events" "^2.21.4" + "@standardnotes/features" "^1.29.0" "@standardnotes/settings" "^1.11.3" "@standardnotes/sncrypto-common" "^1.6.0"