chore: merge develop

app/assets/javascripts/components/NotesOptions/NotesOptions.tsx

@@ -560,7 +560,7 @@ export const NotesOptions = observer(
               }}
             >
               <Icon type="trash" className={iconClass} />
-              Move to Trash
+              Move to trash
             </button>
           ))}
         {trashed && (

app/assets/javascripts/components/NotesOptions/changeEditor/ChangeEditorMenu.tsx

@@ -163,6 +163,12 @@ export const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
   };
 
   const selectEditor = async (itemToBeSelected: EditorMenuItem) => {
+    const areBothEditorsPlain = !currentEditor && !itemToBeSelected.component;
+
+    if (areBothEditorsPlain) {
+      return;
+    }
+
     let shouldSelectEditor = true;
 
     if (itemToBeSelected.component) {

app/assets/javascripts/components/RevisionHistoryModal/SelectedRevisionContent.tsx

@@ -66,7 +66,7 @@ export const SelectedRevisionContent: FunctionComponent<SelectedRevisionContentP
           {!componentViewer && (
             <div className="relative flex-grow min-h-0 overflow-x-hidden overflow-y-auto">
               {selectedRevision.payload.content.text.length ? (
-                <p className="p-4 pt-0">
+                <p className="p-4 pt-0 color-text text-editor font-editor">
                   {selectedRevision.payload.content.text}
                 </p>
               ) : (

app/assets/javascripts/components/RevisionHistoryModal/utils.ts

@@ -84,13 +84,17 @@ export const sortRevisionListIntoGroups = <EntryType extends RevisionEntry>(
     },
   ];
 
+  const addBeforeLastGroup = (group: ListGroup<EntryType>) => {
+    sortedGroups.splice(sortedGroups.length - 1, 0, group);
+  };
+
   revisionList?.forEach((entry) => {
     const groupIndex = getGroupIndexForEntry(entry, sortedGroups);
 
     if (groupIndex > -1) {
       sortedGroups[groupIndex]?.entries?.push(entry);
     } else {
-      sortedGroups.push({
+      addBeforeLastGroup({
         title: formatDateAsMonthYearString(
           new Date(
             (entry as RevisionListEntry).created_at ??

app/assets/stylesheets/_sn.scss

@@ -946,3 +946,7 @@
 .sn-component .border-t-0 {
   border-top-width: 0;
 }
+
+.text-editor {
+  font-size: var(--sn-stylekit-font-size-editor);
+}