refactor: native feature management (#2350)

2023-07-12 12:56:08 -05:00
parent 49f7581cd8
commit 078ef3772c
223 changed files with 3996 additions and 3438 deletions
--- a/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/NoteConflictResolutionModal/NoteConflictResolutionModal.tsx
@@ -105,7 +105,7 @@ const NoteConflictResolutionModal = ({
        mutator.conflictOf = undefined
      })
      setIsPerformingAction(false)
-      void application.getViewControllerManager().selectionController.selectItem(selectedNotes[0].uuid, true)
+      void application.controllers.selectionController.selectItem(selectedNotes[0].uuid, true)
      void application.sync.sync()
      close()
    }