From 599e2b886e22a283529b17fc081e819390c3fd1d Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Mon, 23 May 2022 21:28:38 +0530 Subject: [PATCH] fix: selected smart view and note list issue (#1042) --- app/assets/javascripts/UIModels/AppState/AppState.ts | 7 +++---- app/assets/stylesheets/utils/_color.scss | 4 ++++ package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/UIModels/AppState/AppState.ts b/app/assets/javascripts/UIModels/AppState/AppState.ts index 92a630be2..b2ca22606 100644 --- a/app/assets/javascripts/UIModels/AppState/AppState.ts +++ b/app/assets/javascripts/UIModels/AppState/AppState.ts @@ -90,16 +90,15 @@ export class AppState extends AbstractState { }, this.appEventObserverRemovers, ) - - this.noteTags = new NoteTagsState(application, this, this.appEventObserverRemovers) this.features = new FeaturesState(application, this.appEventObserverRemovers) this.tags = new TagsState(application, this.appEventObserverRemovers, this.features) + this.searchOptions = new SearchOptionsState(application, this.appEventObserverRemovers) + this.contentListView = new ContentListViewState(application, this, this.appEventObserverRemovers) + this.noteTags = new NoteTagsState(application, this, this.appEventObserverRemovers) this.noAccountWarning = new NoAccountWarningState(application, this.appEventObserverRemovers) this.accountMenu = new AccountMenuState(application, this.appEventObserverRemovers) - this.searchOptions = new SearchOptionsState(application, this.appEventObserverRemovers) this.subscription = new SubscriptionState(application, this.appEventObserverRemovers) this.purchaseFlow = new PurchaseFlowState(application) - this.contentListView = new ContentListViewState(application, this, this.appEventObserverRemovers) this.files = new FilesState(application, this, this.appEventObserverRemovers) this.addAppEventObserver() this.onVisibilityChange = () => { diff --git a/app/assets/stylesheets/utils/_color.scss b/app/assets/stylesheets/utils/_color.scss index 14be39daa..221b83a8a 100644 --- a/app/assets/stylesheets/utils/_color.scss +++ b/app/assets/stylesheets/utils/_color.scss @@ -73,3 +73,7 @@ .color-warning-contrast { color: var(--warning-text-color); } + +.color-danger-contrast { + color: var(--sn-stylekit-danger-contrast-color); +} diff --git a/package.json b/package.json index f8951ac28..3f53530da 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@standardnotes/icons": "^1.1.7", "@standardnotes/services": "^1.13.1", "@standardnotes/sncrypto-web": "1.10.1", - "@standardnotes/snjs": "2.113.0", + "@standardnotes/snjs": "2.113.1", "@standardnotes/stylekit": "5.27.1", "@zip.js/zip.js": "^2.4.10", "mobx": "^6.5.0", diff --git a/yarn.lock b/yarn.lock index 60d4bc5ff..974a9af55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2401,10 +2401,10 @@ buffer "^6.0.3" libsodium-wrappers "^0.7.9" -"@standardnotes/snjs@2.113.0": - version "2.113.0" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.113.0.tgz#4dd65cafc633da1c0a7e04a23ee7f0fed9ba80cf" - integrity sha512-fZHZbFDfZWHkpQsz8qOBy4Q0kbdmHNtW28cbbzwGKglVbmWeCEb07DG3/vkCMSJj+4UiHUw6lWv8D7qm08k7rw== +"@standardnotes/snjs@2.113.1": + version "2.113.1" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.113.1.tgz#d01f617f9eecac2540e338666fc19b38c0a6e414" + integrity sha512-tsTEBi6mwXxWcfjFnobftMNwbWJQqsysW3P53FJrt2z50hC3wLvtHVcE+ys4a0ObeWdbxIuS9BpmF8zpwQY6Ug== dependencies: "@standardnotes/auth" "^3.18.17" "@standardnotes/common" "^1.22.0"