fix merge conflict

defaultState.ts

@@ -1,64 +1,2 @@
-export const defaultState = `
+export const defaultState = `<notification_widget></notification_widget><callout>This page is a sample of what you can include in your Home app. Edit the content and add a banner image to give your clients a personalized experience when they open up the client portal. <br><br>The Tasks widget will show clients notifications for actions they have to take (in real-time), if they have any.</callout><h1>Welcome, <span data-type="mention" class="autofill-pill" data-id="{{client.givenName}}">{{client.givenName}}</span></h1><p>Welcome to Copilot, a full-service marketing agency that helps businesses increase their brand awareness, attract new customers, and grow their bottom line. We specialize in crafting unique and effective marketing strategies that align with your business goals and help you stand out in a crowded marketplace.</p><p></p><p>Here are our Working Hours:</p><table><tbody><tr><th class="font-bold" colspan="1" rowspan="1"><p>Days</p></th><th class="font-bold" colspan="1" rowspan="1"><p>Hours (EST)</p></th></tr><tr><td colspan="1" rowspan="1"><p>M-F</p></td><td colspan="1" rowspan="1"><p>9AM - 6PM</p></td></tr><tr><td colspan="1" rowspan="1"><p>Sat</p></td><td colspan="1" rowspan="1"><p>10AM - 5PM</p></td></tr><tr><td colspan="1" rowspan="1"><p>Sun</p></td><td colspan="1" rowspan="1"><p>Closed</p></td></tr></tbody></table><h1>How to use the Copilot portal</h1><h3>💬&nbsp;Messages</h3><p>Chat with the Copilot team or ask questions — make sure to check the Helpdesk first for some FAQs!</p><h3>📂&nbsp;Files</h3><p>Use this tab to share files with the Copilot team — you can upload any required documents and assets here. This is where we will store files for reference in the future.</p><h3>📜&nbsp;Contracts</h3><p>View and sign contracts shared by our team.</p><h3>📤&nbsp;Forms</h3><p>We’ve already shared our onboarding form with you. Please fill out the form and include all relevant information, including your brand guidelines and company details.</p><h3>💵&nbsp;Billing</h3><p>Here you will see active subscription and invoices once they’ve been assigned to you.</p><h3>🆘&nbsp;Helpdesk</h3><p>Access a collection of helpful articles we have put together.</p><h3>📊&nbsp;Analytics</h3><p>View custom analytics reports for your business.</p><h3>🌇&nbsp;Media Gallery</h3><p>See any visual and design work that the Copilot team has completed.</p><h3>📈&nbsp;Project status</h3><p>Track the projects we’re working on for you.</p>`;
 
-<callout>This page is a sample of what you can include in your Home app. Edit the content and add a banner image to give your clients a personalized experience when they open up the client portal. <br><br>The Tasks widget will show clients notifications for actions they have to take (in real-time), if they have any.</callout>
-<h1>Welcome, <span data-type="mention" class="autofill-pill" data-id="{{client.givenName}}" contenteditable="false">{{client.givenName}}</span></h1>
-<p>Welcome to Copilot, a full-service marketing agency that helps businesses increase their brand awareness, attract new customers, and grow their bottom line. We specialize in crafting unique and effective marketing strategies that align with your business goals and help you stand out in a crowded marketplace.</p>
-<p></p>
-<p>Here are our Working Hours:</p>
-<table>
-   <tbody>
-      <tr>
-         <th class="font-bold" colspan="1" rowspan="1">
-            <p>Days</p>
-         </th>
-         <th class="font-bold" colspan="1" rowspan="1">
-            <p>Hours (EST)</p>
-         </th>
-      </tr>
-      <tr>
-         <td colspan="1" rowspan="1">
-            <p>M-F</p>
-         </td>
-         <td colspan="1" rowspan="1">
-            <p>9AM - 6PM</p>
-         </td>
-      </tr>
-      <tr>
-         <td colspan="1" rowspan="1">
-            <p>Sat</p>
-         </td>
-         <td colspan="1" rowspan="1">
-            <p>10AM - 5PM</p>
-         </td>
-      </tr>
-      <tr>
-         <td colspan="1" rowspan="1">
-            <p>Sun</p>
-         </td>
-         <td colspan="1" rowspan="1">
-            <p>Closed</p>
-         </td>
-      </tr>
-   </tbody>
-</table>
-<h1>How to use the Copilot portal</h1>
-<h3>💬&nbsp;Messages</h3>
-<p>Chat with the Copilot team or ask questions — make sure to check the Helpdesk first for some FAQs!</p>
-<h3>📂&nbsp;Files</h3>
-<p>Use this tab to share files with the Copilot team — you can upload any required documents and assets here. This is where we will store files for reference in the future.</p>
-<h3>📜&nbsp;Contracts</h3>
-<p>View and sign contracts shared by our team.</p>
-<h3>📤&nbsp;Forms</h3>
-<p>We’ve already shared our onboarding form with you. Please fill out the form and include all relevant information, including your brand guidelines and company details.</p>
-<h3>💵&nbsp;Billing</h3>
-<p>Here you will see active subscription and invoices once they’ve been assigned to you.</p>
-<h3>🆘&nbsp;Helpdesk</h3>
-<p>Access a collection of helpful articles we have put together.</p>
-<h3>📊&nbsp;Analytics</h3>
-<p>View custom analytics reports for your business.</p>
-<h3>🌇&nbsp;Media Gallery</h3>
-<p>See any visual and design work that the Copilot team has completed.</p>
-<h3>📈&nbsp;Project status</h3>
-<p>Track the projects we’re working on for you.</p>
-
-`

src/app/components/EditorInterface.tsx

@@ -191,7 +191,8 @@ const EditorInterface = ({ settings, token }: IEditorInterface) => {
   useEffect(() => {
     if (
       editor &&
-      appState?.appState.settings?.content?.includes(defaultState)
+      appState?.appState.settings?.content?.includes(defaultState) &&
+      appState?.appState.originalTemplate
     ) {
       if (
         appState?.appState.originalTemplate?.replace(/\s/g, '') !==

src/components/NotificationsModal/index.tsx

@@ -117,6 +117,7 @@ const NotificationsModal = ({ settings }: NotificationsModalProps) => {
           timeout: 250,
         },
       }}
+      sx={{ zIndex: 999999999 }} //highest in the app
     >
       <div className='absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-[80vw] max-w-[720px] bg-white rounded-md shadow-lg outline-none font-medium'>
         <Fade in={showError}>

src/components/display/DisplayTasksToggle.tsx

@@ -46,6 +46,7 @@ const DisplayTasksToggle = () => {
   useEffect(() => {
     if (appState?.appState.editor) {
       handleNotificationWidget()
+      appState?.appState.editor?.chain().focus().setTextSelection(0).run()
     }
   }, [appState?.appState.displayTasks])