From 2a7567e7b835527cb8bd4a3d431a6552b98f529c Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Tue, 16 May 2023 20:16:55 +0530
Subject: [PATCH] chore: fix template super note editor icon

---
 .../ChangeEditor/ChangeEditorButton.tsx       | 25 +++++++++++++++----
 .../Components/NoteView/NoteView.tsx          |  1 +
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx
index 8af41a848..297489a17 100644
--- a/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx
+++ b/packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorButton.tsx
@@ -7,13 +7,20 @@ import RoundIconButton from '../Button/RoundIconButton'
 import { getIconAndTintForNoteType } from '@/Utils/Items/Icons/getIconAndTintForNoteType'
 import { CHANGE_EDITOR_COMMAND, keyboardStringForShortcut } from '@standardnotes/ui-services'
 import { useApplication } from '../ApplicationProvider'
+import { NoteViewController } from '../NoteView/Controller/NoteViewController'
+import { noteTypeForEditorIdentifier } from '@standardnotes/snjs'
 
 type Props = {
   viewControllerManager: ViewControllerManager
+  noteViewController?: NoteViewController
   onClickPreprocessing?: () => Promise<void>
 }
 
-const ChangeEditorButton: FunctionComponent<Props> = ({ viewControllerManager, onClickPreprocessing }: Props) => {
+const ChangeEditorButton: FunctionComponent<Props> = ({
+  viewControllerManager,
+  noteViewController,
+  onClickPreprocessing,
+}: Props) => {
   const application = useApplication()
 
   const note = viewControllerManager.notesController.firstSelectedNote
@@ -23,10 +30,18 @@ const ChangeEditorButton: FunctionComponent<Props> = ({ viewControllerManager, o
   const [selectedEditor, setSelectedEditor] = useState(() => {
     return note ? application.componentManager.editorForNote(note) : undefined
   })
-  const [selectedEditorIcon, selectedEditorIconTint] = getIconAndTintForNoteType(
-    note?.noteType || selectedEditor?.package_info.note_type,
-    true,
-  )
+  const noteType = noteViewController?.isTemplateNote
+    ? noteTypeForEditorIdentifier(
+        application.geDefaultEditorIdentifier(
+          noteViewController.templateNoteOptions?.tag
+            ? application.items.findItem(noteViewController.templateNoteOptions.tag)
+            : undefined,
+        ),
+      )
+    : note
+    ? note.noteType
+    : selectedEditor?.package_info.note_type
+  const [selectedEditorIcon, selectedEditorIconTint] = getIconAndTintForNoteType(noteType, true)
   const [isClickOutsideDisabled, setIsClickOutsideDisabled] = useState(false)
 
   const toggleMenu = useCallback(async () => {
diff --git a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx
index 56a7cbc9b..938c19440 100644
--- a/packages/web/src/javascripts/Components/NoteView/NoteView.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/NoteView.tsx
@@ -860,6 +860,7 @@ class NoteView extends AbstractComponent<NoteViewProps, State> {
                   />
                   <ChangeEditorButton
                     viewControllerManager={this.viewControllerManager}
+                    noteViewController={this.controller}
                     onClickPreprocessing={this.ensureNoteIsInsertedBeforeUIAction}
                   />
                   <PinNoteButton