From 1934ae0758fb6ebb163c84bc3dd6732164e6b337 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@imexsystems.ca>
Date: Tue, 22 Jul 2025 09:03:41 -0700
Subject: [PATCH] IO-3292 Add note pinning functionality.

---
 bodyshop_translations.babel                   | 1150 ++++++++++++++++-
 .../job-notes-pin-toggle.component.jsx        |   52 +
 .../jobs-detail-header.component.jsx          |  482 +++----
 .../jobs-notes/jobs.notes.component.jsx       |    6 +
 .../note-upsert-modal.component.jsx           |   11 +-
 .../note-upsert-modal.container.jsx           |   59 +-
 .../pinned-job-notes.component.jsx            |   30 +
 client/src/graphql/jobs.queries.js            |   33 +-
 client/src/graphql/notes.queries.js           |    3 +
 client/src/translations/en_us/common.json     |  107 +-
 client/src/translations/es/common.json        |  109 +-
 client/src/translations/fr/common.json        |  109 +-
 hasura/metadata/tables.yaml                   |    3 +
 .../down.sql                                  |    4 +
 .../up.sql                                    |    2 +
 15 files changed, 1757 insertions(+), 403 deletions(-)
 create mode 100644 client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx
 create mode 100644 client/src/components/pinned-job-notes/pinned-job-notes.component.jsx
 create mode 100644 hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/down.sql
 create mode 100644 hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 399953905..83e01d686 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -7226,6 +7226,74 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <folder_node>
+                                        <name>notifications</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>description</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>invalid_followers</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>placeholder</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
                                     <concept_node>
                                         <name>partslocation</name>
                                         <definition_loaded>false</definition_loaded>
@@ -9979,6 +10047,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>nobusinessdays</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                         </children>
                                     </folder_node>
                                     <folder_node>
@@ -11067,6 +11156,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>consent_settings</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>csiq</name>
                                         <definition_loaded>false</definition_loaded>
@@ -11770,6 +11880,32 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <folder_node>
+                                        <name>notifications</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>followers</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
                                     <concept_node>
                                         <name>orderstatuses</name>
                                         <definition_loaded>false</definition_loaded>
@@ -12884,6 +13020,158 @@
                             </folder_node>
                         </children>
                     </folder_node>
+                    <folder_node>
+                        <name>consent</name>
+                        <children>
+                            <concept_node>
+                                <name>associated_owners</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>created_at</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>no_owners</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>phone_1</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>phone_2</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>phone_number</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                            <concept_node>
+                                <name>text_body</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                        </children>
+                    </folder_node>
                     <folder_node>
                         <name>contracts</name>
                         <children>
@@ -15992,6 +16280,48 @@
                             <folder_node>
                                 <name>errors</name>
                                 <children>
+                                    <concept_node>
+                                        <name>atp</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>insco</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>refreshrequired</name>
                                         <definition_loaded>false</definition_loaded>
@@ -16013,6 +16343,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>status</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>updatinglayout</name>
                                         <definition_loaded>false</definition_loaded>
@@ -16401,6 +16752,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>scheduleddeliverydate</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>scheduleddeliverytoday</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>scheduledindate</name>
                                         <definition_loaded>false</definition_loaded>
@@ -19867,6 +20260,53 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <folder_node>
+                                        <name>sub_status</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>expired</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>trial-expired</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                        </children>
+                                    </folder_node>
                                     <concept_node>
                                         <name>submit-for-testing</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27049,6 +27489,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>acv_amount</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>adjustment_bottom_line</name>
                                         <definition_loaded>false</definition_loaded>
@@ -29452,6 +29913,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>estimate_approved</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>estimate_sent_approval</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>federal_tax_payable</name>
                                         <definition_loaded>false</definition_loaded>
@@ -29515,6 +30018,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>hit_and_run</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>ins_addr1</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33309,6 +33833,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>approved</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>associationwarning</name>
                                         <definition_loaded>false</definition_loaded>
@@ -34442,6 +34987,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>deletewatchers</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>deliverchecklist</name>
                                         <definition_loaded>false</definition_loaded>
@@ -36945,6 +37511,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>sent</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>specialcoveragepolicy</name>
                                         <definition_loaded>false</definition_loaded>
@@ -39272,6 +39859,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>remoteassist</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>reportcenter</name>
                                         <definition_loaded>false</definition_loaded>
@@ -39314,6 +39922,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>rescuemezoho</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>schedule</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40551,6 +41180,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>no_consent</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>noattachedjobs</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40682,6 +41332,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>no_consent</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>noallowtxt</name>
                                         <definition_loaded>false</definition_loaded>
@@ -41106,6 +41777,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>pinned</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>private</name>
                                         <definition_loaded>false</definition_loaded>
@@ -41410,6 +42102,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>pinned_note</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>systemnotes</name>
                                         <definition_loaded>false</definition_loaded>
@@ -41692,6 +42405,153 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>auto-add</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>auto-add-description</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>auto-add-failure</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>auto-add-off</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>auto-add-on</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>auto-add-success</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>employee-notification</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>employee-search</name>
                                         <definition_loaded>false</definition_loaded>
@@ -42395,6 +43255,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>not-employee</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>not-employee-notifications</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                         </children>
@@ -52257,6 +53159,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>customer_list_excel</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>cycle_time_analysis</name>
                                         <definition_loaded>false</definition_loaded>
@@ -55829,6 +56752,32 @@
                             </folder_node>
                         </children>
                     </folder_node>
+                    <folder_node>
+                        <name>settings</name>
+                        <children>
+                            <concept_node>
+                                <name>title</name>
+                                <definition_loaded>false</definition_loaded>
+                                <description></description>
+                                <comment></comment>
+                                <default_text></default_text>
+                                <translations>
+                                    <translation>
+                                        <language>en-US</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>es-MX</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                    <translation>
+                                        <language>fr-CA</language>
+                                        <approved>false</approved>
+                                    </translation>
+                                </translations>
+                            </concept_node>
+                        </children>
+                    </folder_node>
                     <folder_node>
                         <name>tasks</name>
                         <children>
@@ -56288,6 +57237,32 @@
                                     </concept_node>
                                 </children>
                             </folder_node>
+                            <folder_node>
+                                <name>errors</name>
+                                <children>
+                                    <concept_node>
+                                        <name>load_failure</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                </children>
+                            </folder_node>
                             <folder_node>
                                 <name>failures</name>
                                 <children>
@@ -56854,6 +57829,179 @@
                                     </concept_node>
                                 </children>
                             </folder_node>
+                            <folder_node>
+                                <name>labels</name>
+                                <children>
+                                    <concept_node>
+                                        <name>due_today</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>go_to_job</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>my_tasks_center</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>no_due_date</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>no_tasks</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>overdue</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>ro-number</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>upcoming</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                </children>
+                            </folder_node>
                             <folder_node>
                                 <name>placeholders</name>
                                 <children>
diff --git a/client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx b/client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx
new file mode 100644
index 000000000..a54bac4a4
--- /dev/null
+++ b/client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx
@@ -0,0 +1,52 @@
+import { PushpinFilled, PushpinOutlined } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
+import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
+import { UPDATE_NOTE } from "../../graphql/notes.queries";
+
+function JobNotesPinToggle({ note }) {
+  const [updateNote] = useMutation(UPDATE_NOTE, {
+    update(cache, { data: { updateNote: updatedNote } }) {
+      try {
+        const existingJob = cache.readQuery({
+          query: GET_JOB_BY_PK,
+          variables: { id: note.jobid }
+        });
+
+        if (existingJob) {
+          cache.writeQuery({
+            query: GET_JOB_BY_PK,
+            variables: { id: note.jobid },
+            data: {
+              ...existingJob,
+              job: {
+                ...existingJob.job,
+                notes: updatedNote.pinned
+                  ? [updatedNote, ...existingJob.job.notes]
+                  : existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
+              }
+            }
+          });
+        }
+      } catch (error) {
+        // Query not yet executed is most likely. No logging as this isn't a fatal error.
+      }
+    }
+  });
+
+  const handlePinToggle = () => {
+    updateNote({
+      variables: {
+        noteId: note.id,
+        note: { pinned: !note.pinned }
+      }
+    });
+  };
+
+  return note.pinned ? (
+    <PushpinFilled size="large" onClick={handlePinToggle} style={{ color: "gold" }} />
+  ) : (
+    <PushpinOutlined size="large" onClick={handlePinToggle} />
+  );
+}
+
+export default JobNotesPinToggle;
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 9496b1d95..c445e9dfe 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -23,6 +23,7 @@ import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
 import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
+import PinnedJobNotes from "../pinned-job-notes/pinned-job-notes.component.jsx";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
@@ -102,254 +103,257 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail })
   };
 
   return (
-    <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
-      <Col {...colSpan}>
-        <Card title={"Job Status"} style={{ height: "100%" }}>
-          <div>
-            <DataLabel label={t("jobs.fields.status")}>
+    <>
+      <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
+        <Col {...colSpan}>
+          <Card title={"Job Status"} style={{ height: "100%" }}>
+            <div>
+              <DataLabel label={t("jobs.fields.status")}>
+                <Space wrap>
+                  {job.status}
+                  {job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>}
+                  {job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
+                  {job.iouparent && (
+                    <Link to={`/manage/jobs/${job.iouparent}`}>
+                      <Tooltip title={t("jobs.labels.iou")}>
+                        <BranchesOutlined style={{ color: "orangered" }} />
+                      </Tooltip>
+                    </Link>
+                  )}
+                  {job.production_vars && job.production_vars.alert ? (
+                    <ExclamationCircleFilled className="production-alert" />
+                  ) : null}
+                  {job.status === bodyshop.md_ro_statuses.default_scheduled && job.scheduled_in ? (
+                    <Tag>
+                      <Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format("YYYY-MM-DD")}`}>
+                        <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                      </Link>
+                    </Tag>
+                  ) : null}
+                </Space>
+              </DataLabel>
+              <DataLabel label={t("jobs.fields.comment")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
+                <ProductionListColumnComment record={job} />
+              </DataLabel>
+              <DataLabel label={t("jobs.fields.ins_co_nm_short")}>{job.ins_co_nm}</DataLabel>
+              <DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
+              <DataLabel label={t("jobs.fields.ponumber")} hideIfNull>
+                {job.po_number}
+              </DataLabel>
+              <DataLabel label={t("jobs.fields.repairtotal")}>
+                <CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
+                <span style={{ margin: "0rem .5rem" }}>/</span>
+                <CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
+              </DataLabel>
+              <DataLabel label={t("jobs.fields.alt_transport")}>
+                {job.alt_transport}
+                <JobAltTransportChange job={job} />
+              </DataLabel>
+              {job?.cccontracts?.length > 0 && (
+                <DataLabel label={t("jobs.labels.contracts")}>
+                  {job.cccontracts.map((c, index) => (
+                    <Space key={c.id} wrap>
+                      <Link to={`/manage/courtesycars/contracts/${c.id}`}>
+                        {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
+                        {index !== job.cccontracts.length - 1 ? "," : null}
+                      </Link>
+                    </Space>
+                  ))}
+                </DataLabel>
+              )}
+              <DataLabel label={t("jobs.fields.production_vars.note")}>
+                <ProductionListColumnProductionNote record={job} />
+              </DataLabel>
+              <DataLabel label={t("jobs.fields.estimate_sent_approval")}>
+                <Space>
+                  <Checkbox
+                    checked={!!job.estimate_sent_approval}
+                    onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
+                    disabled={disabled}
+                  >
+                    {job.estimate_sent_approval && (
+                      <span style={{ color: "#888" }}>
+                        <DateTimeFormatter>{job.estimate_sent_approval}</DateTimeFormatter>
+                      </span>
+                    )}
+                  </Checkbox>
+                </Space>
+              </DataLabel>
+              <DataLabel label={t("jobs.fields.estimate_approved")}>
+                <Space>
+                  <Checkbox
+                    checked={!!job.estimate_approved}
+                    onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
+                    disabled={disabled}
+                  >
+                    {job.estimate_approved && (
+                      <span style={{ color: "#888" }}>
+                        <DateTimeFormatter>{job.estimate_approved}</DateTimeFormatter>
+                      </span>
+                    )}
+                  </Checkbox>
+                </Space>
+              </DataLabel>
               <Space wrap>
-                {job.status}
-                {job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>}
-                {job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
-                {job.iouparent && (
-                  <Link to={`/manage/jobs/${job.iouparent}`}>
-                    <Tooltip title={t("jobs.labels.iou")}>
-                      <BranchesOutlined style={{ color: "orangered" }} />
-                    </Tooltip>
-                  </Link>
-                )}
-                {job.production_vars && job.production_vars.alert ? (
-                  <ExclamationCircleFilled className="production-alert" />
-                ) : null}
-                {job.status === bodyshop.md_ro_statuses.default_scheduled && job.scheduled_in ? (
-                  <Tag>
-                    <Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format("YYYY-MM-DD")}`}>
-                      <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
-                    </Link>
+                {job.special_coverage_policy && (
+                  <Tag color="tomato">
+                    <Space>
+                      <WarningFilled />
+                      <span>{t("jobs.labels.specialcoveragepolicy")}</span>
+                    </Space>
                   </Tag>
-                ) : null}
+                )}
+                {job.ca_gst_registrant && (
+                  <Tag color="geekblue">
+                    <Space>
+                      <WarningFilled />
+                      <span>{t("jobs.fields.ca_gst_registrant")}</span>
+                    </Space>
+                  </Tag>
+                )}
+                {job.hit_and_run && (
+                  <Tag color="green">
+                    <Space>
+                      <WarningFilled />
+                      <span>{t("jobs.fields.hit_and_run")}</span>
+                    </Space>
+                  </Tag>
+                )}
               </Space>
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.comment")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
-              <ProductionListColumnComment record={job} />
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.ins_co_nm_short")}>{job.ins_co_nm}</DataLabel>
-            <DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
-            <DataLabel label={t("jobs.fields.ponumber")} hideIfNull>
-              {job.po_number}
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.repairtotal")}>
-              <CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
-              <span style={{ margin: "0rem .5rem" }}>/</span>
-              <CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.alt_transport")}>
-              {job.alt_transport}
-              <JobAltTransportChange job={job} />
-            </DataLabel>
-            {job?.cccontracts?.length > 0 && (
-              <DataLabel label={t("jobs.labels.contracts")}>
-                {job.cccontracts.map((c, index) => (
-                  <Space key={c.id} wrap>
-                    <Link to={`/manage/courtesycars/contracts/${c.id}`}>
-                      {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
-                      {index !== job.cccontracts.length - 1 ? "," : null}
-                    </Link>
-                  </Space>
-                ))}
-              </DataLabel>
-            )}
-            <DataLabel label={t("jobs.fields.production_vars.note")}>
-              <ProductionListColumnProductionNote record={job} />
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.estimate_sent_approval")}>
-              <Space>
-                <Checkbox
-                  checked={!!job.estimate_sent_approval}
-                  onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
-                  disabled={disabled}
-                >
-                  {job.estimate_sent_approval && (
-                    <span style={{ color: "#888" }}>
-                      <DateTimeFormatter>{job.estimate_sent_approval}</DateTimeFormatter>
-                    </span>
-                  )}
-                </Checkbox>
-              </Space>
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.estimate_approved")}>
-              <Space>
-                <Checkbox
-                  checked={!!job.estimate_approved}
-                  onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
-                  disabled={disabled}
-                >
-                  {job.estimate_approved && (
-                    <span style={{ color: "#888" }}>
-                      <DateTimeFormatter>{job.estimate_approved}</DateTimeFormatter>
-                    </span>
-                  )}
-                </Checkbox>
-              </Space>
-            </DataLabel>
-            <Space wrap>
-              {job.special_coverage_policy && (
-                <Tag color="tomato">
-                  <Space>
-                    <WarningFilled />
-                    <span>{t("jobs.labels.specialcoveragepolicy")}</span>
-                  </Space>
-                </Tag>
-              )}
-              {job.ca_gst_registrant && (
-                <Tag color="geekblue">
-                  <Space>
-                    <WarningFilled />
-                    <span>{t("jobs.fields.ca_gst_registrant")}</span>
-                  </Space>
-                </Tag>
-              )}
-              {job.hit_and_run && (
-                <Tag color="green">
-                  <Space>
-                    <WarningFilled />
-                    <span>{t("jobs.fields.hit_and_run")}</span>
-                  </Space>
-                </Tag>
-              )}
-            </Space>
-          </div>
-        </Card>
-      </Col>
-      <Col {...colSpan}>
-        <Card
-          style={{ height: "100%" }}
-          title={
-            disabled ? (
-              <>{ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}</>
-            ) : (
-              <Link to={`/manage/owners/${job.owner.id}`}>
-                {ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}
-              </Link>
-            )
-          }
-        >
-          <div>
-            <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
-              {disabled ? (
-                <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
-              ) : (
-                <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
-              )}
-            </DataLabel>
-            <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
-              {disabled ? (
-                <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
-              ) : (
-                <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
-              )}
-            </DataLabel>
-            <DataLabel key="3" label={t("owners.fields.address")}>
-              {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
-                job.ownr_city || ""
-              } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
-            </DataLabel>
-            <DataLabel key="4" label={t("owners.fields.ownr_ea")}>
-              {disabled ? (
-                <>{job.ownr_ea || ""}</>
-              ) : job.ownr_ea ? (
-                <a href={`mailto:${job.ownr_ea}`}>{job.ownr_ea}</a>
-              ) : null}
-            </DataLabel>
-            {job.owner?.tax_number && (
-              <DataLabel key="5" label={t("owners.fields.tax_number")}>
-                {job.owner?.tax_number || ""}
-              </DataLabel>
-            )}
-            <DataLabel label={t("owners.fields.note")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
-              {job.owner?.note || ""}
-            </DataLabel>
-          </div>
-        </Card>
-      </Col>
-      <Col {...colSpan}>
-        <Card
-          style={{ height: "100%" }}
-          title={
-            job.vehicle ? (
+            </div>
+          </Card>
+        </Col>
+        <Col {...colSpan}>
+          <Card
+            style={{ height: "100%" }}
+            title={
               disabled ? (
-                <>{vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")} </>
+                <>{ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}</>
               ) : (
-                <Link to={job.vehicle && `/manage/vehicles/${job.vehicle.id}`}>
-                  {vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")}
+                <Link to={`/manage/owners/${job.owner.id}`}>
+                  {ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}
                 </Link>
               )
-            ) : (
-              <span></span>
-            )
-          }
-        >
-          <div>
-            <DataLabel key="2" label={t("vehicles.fields.plate_no")}>
-              {`${job.plate_no || t("general.labels.na")} (${`${job.plate_st || t("general.labels.na")}`})`}
-            </DataLabel>
-            <DataLabel key="4" label={t("vehicles.fields.v_vin")}>
-              <VehicleVinDisplay>{`${job.v_vin || t("general.labels.na")}`}</VehicleVinDisplay>
-              {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
-                job.v_vin?.length !== 17 ? (
-                  <WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
-                ) : null
-              ) : null}
-            </DataLabel>
-            <DataLabel label={t("jobs.fields.regie_number")}>{job.regie_number || t("general.labels.na")}</DataLabel>
-            <DataLabel label={t("jobs.labels.relatedros")}>
-              <JobsRelatedRos jobid={job.id} job={job} disabled={disabled} />
-            </DataLabel>
-            {job.vehicle && job.vehicle.notes && (
-              <DataLabel
-                label={t("vehicles.fields.notes")}
-                valueStyle={{ whiteSpace: "pre-wrap" }}
-                valueClassName={notesClamped ? "clamp" : ""}
-                onValueClick={() => setNotesClamped(!notesClamped)}
-              >
-                {job.vehicle.notes}
+            }
+          >
+            <div>
+              <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
+                {disabled ? (
+                  <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
+                ) : (
+                  <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
+                )}
               </DataLabel>
-            )}
-            {job.vehicle && job.vehicle.v_paint_codes && (
-              <DataLabel label={t("vehicles.fields.v_paint_codes", { number: "" })}>
-                <span style={{ whiteSpace: "pre" }}>
-                  {Object.keys(job.vehicle.v_paint_codes)
-                    .filter(
-                      (key) =>
-                        job.vehicle.v_paint_codes[key] !== "" &&
-                        job.vehicle.v_paint_codes[key] !== null &&
-                        job.vehicle.v_paint_codes[key] !== undefined
-                    )
-                    .map((key, idx) => (
-                      <Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
-                    ))}
-                </span>
+              <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
+                {disabled ? (
+                  <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
+                ) : (
+                  <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+                )}
               </DataLabel>
-            )}
-          </div>
-        </Card>
-      </Col>
-      <Col {...colSpan}>
-        <Card
-          style={{ height: "100%" }}
-          title={<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>}
-          id={"job-employee-assignments"}
-        >
-          <div>
-            <JobEmployeeAssignments job={job} />
-            <Divider style={{ margin: ".5rem" }} />
-            <DataLabel label={t("jobs.labels.labor_hrs")}>
-              {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} / {(bodyHrs + refinishHrs).toFixed(1)}
-            </DataLabel>
-          </div>
-        </Card>
-      </Col>
-    </Row>
+              <DataLabel key="3" label={t("owners.fields.address")}>
+                {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
+                  job.ownr_city || ""
+                } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
+              </DataLabel>
+              <DataLabel key="4" label={t("owners.fields.ownr_ea")}>
+                {disabled ? (
+                  <>{job.ownr_ea || ""}</>
+                ) : job.ownr_ea ? (
+                  <a href={`mailto:${job.ownr_ea}`}>{job.ownr_ea}</a>
+                ) : null}
+              </DataLabel>
+              {job.owner?.tax_number && (
+                <DataLabel key="5" label={t("owners.fields.tax_number")}>
+                  {job.owner?.tax_number || ""}
+                </DataLabel>
+              )}
+              <DataLabel label={t("owners.fields.note")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
+                {job.owner?.note || ""}
+              </DataLabel>
+            </div>
+          </Card>
+        </Col>
+        <Col {...colSpan}>
+          <Card
+            style={{ height: "100%" }}
+            title={
+              job.vehicle ? (
+                disabled ? (
+                  <>{vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")} </>
+                ) : (
+                  <Link to={job.vehicle && `/manage/vehicles/${job.vehicle.id}`}>
+                    {vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")}
+                  </Link>
+                )
+              ) : (
+                <span></span>
+              )
+            }
+          >
+            <div>
+              <DataLabel key="2" label={t("vehicles.fields.plate_no")}>
+                {`${job.plate_no || t("general.labels.na")} (${`${job.plate_st || t("general.labels.na")}`})`}
+              </DataLabel>
+              <DataLabel key="4" label={t("vehicles.fields.v_vin")}>
+                <VehicleVinDisplay>{`${job.v_vin || t("general.labels.na")}`}</VehicleVinDisplay>
+                {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+                  job.v_vin?.length !== 17 ? (
+                    <WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
+                  ) : null
+                ) : null}
+              </DataLabel>
+              <DataLabel label={t("jobs.fields.regie_number")}>{job.regie_number || t("general.labels.na")}</DataLabel>
+              <DataLabel label={t("jobs.labels.relatedros")}>
+                <JobsRelatedRos jobid={job.id} job={job} disabled={disabled} />
+              </DataLabel>
+              {job.vehicle && job.vehicle.notes && (
+                <DataLabel
+                  label={t("vehicles.fields.notes")}
+                  valueStyle={{ whiteSpace: "pre-wrap" }}
+                  valueClassName={notesClamped ? "clamp" : ""}
+                  onValueClick={() => setNotesClamped(!notesClamped)}
+                >
+                  {job.vehicle.notes}
+                </DataLabel>
+              )}
+              {job.vehicle && job.vehicle.v_paint_codes && (
+                <DataLabel label={t("vehicles.fields.v_paint_codes", { number: "" })}>
+                  <span style={{ whiteSpace: "pre" }}>
+                    {Object.keys(job.vehicle.v_paint_codes)
+                      .filter(
+                        (key) =>
+                          job.vehicle.v_paint_codes[key] !== "" &&
+                          job.vehicle.v_paint_codes[key] !== null &&
+                          job.vehicle.v_paint_codes[key] !== undefined
+                      )
+                      .map((key, idx) => (
+                        <Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
+                      ))}
+                  </span>
+                </DataLabel>
+              )}
+            </div>
+          </Card>
+        </Col>
+        <Col {...colSpan}>
+          <Card
+            style={{ height: "100%" }}
+            title={<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>}
+            id={"job-employee-assignments"}
+          >
+            <div>
+              <JobEmployeeAssignments job={job} />
+              <Divider style={{ margin: ".5rem" }} />
+              <DataLabel label={t("jobs.labels.labor_hrs")}>
+                {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} / {(bodyHrs + refinishHrs).toFixed(1)}
+              </DataLabel>
+            </div>
+          </Card>
+        </Col>
+      </Row>
+      <PinnedJobNotes job={job} />
+    </>
   );
 }
 
diff --git a/client/src/components/jobs-notes/jobs.notes.component.jsx b/client/src/components/jobs-notes/jobs.notes.component.jsx
index b1458f372..ec6e890fe 100644
--- a/client/src/components/jobs-notes/jobs.notes.component.jsx
+++ b/client/src/components/jobs-notes/jobs.notes.component.jsx
@@ -12,6 +12,7 @@ import useLocalStorage from "../../utils/useLocalStorage";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import NoteUpsertModal from "../note-upsert-modal/note-upsert-modal.container";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
+import JobNotesPinToggle from "../job-notes-pin-toggle/job-notes-pin-toggle.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly
@@ -47,6 +48,9 @@ export function JobNotesComponent({
       key: "icons",
       width: 80,
       filteredValue: filter?.icons || null,
+      defaultSortOrder: "desc",
+      multiple: 1,
+      sorter: (a, b) => a.pinned - b.pinned,
       filters: [
         {
           text: t("notes.labels.usernotes"),
@@ -63,6 +67,7 @@ export function JobNotesComponent({
           {record.critical ? <WarningFilled style={{ margin: 4, color: "red" }} /> : null}
           {record.private ? <EyeInvisibleFilled style={{ margin: 4 }} /> : null}
           {record.audit ? <AuditOutlined style={{ margin: 4 }} /> : null}
+          <JobNotesPinToggle note={record} />
         </span>
       )
     },
@@ -100,6 +105,7 @@ export function JobNotesComponent({
       dataIndex: "updated_at",
       key: "updated_at",
       defaultSortOrder: "descend",
+      multiple: 2,
       width: 200,
       sorter: (a, b) => new Date(a.updated_at) - new Date(b.updated_at),
       render: (text, record) => <DateTimeFormatter>{record.updated_at}</DateTimeFormatter>
diff --git a/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx b/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
index 6b4e4562c..bdd6c713c 100644
--- a/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
@@ -23,17 +23,22 @@ export function NoteUpsertModalComponent({ form, noteUpsertModal }) {
   return (
     <>
       <Row gutter={[16, 16]}>
-        <Col span={8}>
+        <Col span={6}>
           <Form.Item label={t("notes.fields.critical")} name="critical" valuePropName="checked">
             <Switch />
           </Form.Item>
         </Col>
-        <Col span={8}>
+        <Col span={6}>
           <Form.Item label={t("notes.fields.private")} name="private" valuePropName="checked">
             <Switch />
           </Form.Item>
         </Col>
-        <Col span={8}>
+        <Col span={6}>
+          <Form.Item label={t("notes.fields.pinned")} name="pinned" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+        </Col>
+        <Col span={6}>
           <Form.Item label={t("notes.fields.type")} name="type" initialValue="general">
             <Select
               options={[
diff --git a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
index 18c3b9f1a..b5b8cb54e 100644
--- a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
@@ -1,10 +1,12 @@
 import { useMutation } from "@apollo/client";
 import { Form, Modal } from "antd";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { GET_JOB_BY_PK } from "../../graphql/jobs.queries.js";
 import { INSERT_NEW_NOTE, UPDATE_NOTE } from "../../graphql/notes.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
@@ -12,7 +14,6 @@ import { selectNoteUpsert } from "../../redux/modals/modals.selectors";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import NoteUpsertModalComponent from "./note-upsert-modal.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -65,6 +66,33 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
         variables: {
           noteId: existingNote.id,
           note: values
+        },
+        update(cache, { data: { updateNote: updatedNote } }) {
+          try {
+            const existingJob = cache.readQuery({
+              query: GET_JOB_BY_PK,
+              variables: { id: jobId }
+            });
+
+            if (existingJob) {
+              cache.writeQuery({
+                query: GET_JOB_BY_PK,
+                variables: { id: jobId },
+                data: {
+                  ...existingJob,
+                  job: {
+                    ...existingJob.job,
+                    notes: updatedNote.pinned
+                      ? [updatedNote, ...existingJob.job.notes]
+                      : existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
+                  }
+                }
+              });
+            }
+          } catch (error) {
+            // Cache miss is okay, query hasn't been executed yet
+            console.log("Cache miss for GET_JOB_BY_PK");
+          }
         }
       }).then((r) => {
         notification["success"]({
@@ -86,6 +114,33 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
         variables: {
           noteInput: [{ ...values, jobid: jobId, created_by: currentUser.email }]
         },
+        update(cache, { data: { updateNote: updatedNote } }) {
+          try {
+            const existingJob = cache.readQuery({
+              query: GET_JOB_BY_PK,
+              variables: { id: jobId }
+            });
+
+            if (existingJob) {
+              cache.writeQuery({
+                query: GET_JOB_BY_PK,
+                variables: { id: jobId },
+                data: {
+                  ...existingJob,
+                  job: {
+                    ...existingJob.job,
+                    notes: updatedNote.pinned
+                      ? [updatedNote, ...existingJob.job.notes]
+                      : existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
+                  }
+                }
+              });
+            }
+          } catch (error) {
+            // Cache miss is okay, query hasn't been executed yet
+            console.log("Cache miss for GET_JOB_BY_PK");
+          }
+        },
         refetchQueries: ["QUERY_NOTES_BY_JOB_PK"]
       });
 
diff --git a/client/src/components/pinned-job-notes/pinned-job-notes.component.jsx b/client/src/components/pinned-job-notes/pinned-job-notes.component.jsx
new file mode 100644
index 000000000..90eb4b3bd
--- /dev/null
+++ b/client/src/components/pinned-job-notes/pinned-job-notes.component.jsx
@@ -0,0 +1,30 @@
+import { Card, Divider, Space } from "antd";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import JobNotesPinToggle from "../job-notes-pin-toggle/job-notes-pin-toggle.component";
+
+function PinnedJobNotes({ job }) {
+  const { t } = useTranslation();
+
+  const pinnedNotes = useMemo(() => {
+    return job?.notes?.filter((note) => note.pinned); //This will be typically filtered, but adding this to maximize flexibility of the component.
+  }, [job.notes]);
+
+  return pinnedNotes?.length ? (
+    <>
+      <Divider />
+      <Space direction="vertical" style={{ width: "100%" }}>
+        {pinnedNotes?.map((note) => (
+          <Card
+            key={note.id}
+            title={`${t("notes.labels.pinned_note")} - ${t(`notes.fields.types.${note.type}`)}`}
+            extra={<JobNotesPinToggle note={note} />}
+          >
+            {note.text}
+          </Card>
+        ))}
+      </Space>
+    </>
+  ) : null;
+}
+export default PinnedJobNotes;
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 68c8adfbe..a5c9e2708 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -713,6 +713,19 @@ export const GET_JOB_BY_PK = gql`
       v_model_yr
       v_model_desc
       v_vin
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+        created_at
+        created_by
+        critical
+        id
+        jobid
+        private
+        text
+        updated_at
+        audit
+        type
+        pinned
+      }
       vehicle {
         id
         jobs {
@@ -959,6 +972,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         critical
         private
         created_at
+        pinned
+        type
       }
       updated_at
       clm_total
@@ -984,6 +999,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         key
         type
       }
+
     }
   }
 `;
@@ -1048,6 +1064,8 @@ export const QUERY_TECH_JOB_DETAILS = gql`
         critical
         private
         created_at
+        pinned
+        type
       }
       updated_at
       documents(order_by: { created_at: desc }) {
@@ -2323,7 +2341,7 @@ export const QUERY_JOBS_TECH_ASIGNED_TO_BY_TEAM = gql`
 `;
 
 export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
-  query QUERY_JOB_CARD_DETAILS($id: uuid!) {
+  query QUERY_PARTS_QUEUE_CARD_DETAILS($id: uuid!) {
     jobs_by_pk(id: $id) {
       actual_completion
       actual_delivery
@@ -2349,6 +2367,19 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
         start
         status
       }
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+        created_at
+        created_by
+        critical
+        id
+        jobid
+        private
+        text
+        updated_at
+        audit
+        type
+        pinned
+      }
       clm_no
       clm_total
       comment
diff --git a/client/src/graphql/notes.queries.js b/client/src/graphql/notes.queries.js
index 791d48b08..77858ae44 100644
--- a/client/src/graphql/notes.queries.js
+++ b/client/src/graphql/notes.queries.js
@@ -14,6 +14,7 @@ export const INSERT_NEW_NOTE = gql`
         updated_at
         audit
         type
+        pinned
       }
     }
   }
@@ -43,6 +44,7 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
         updated_at
         audit
         type
+        pinned
       }
     }
   }
@@ -63,6 +65,7 @@ export const UPDATE_NOTE = gql`
         updated_at
         audit
         type
+        pinned
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index cbfbdcef5..3cc3880fd 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -426,6 +426,11 @@
         "messagingtext": "Messaging Preset Text",
         "noteslabel": "Note Label",
         "notestext": "Note Text",
+        "notifications": {
+          "description": "Select employees to automatically follow new jobs and receive notifications for job updates.",
+          "invalid_followers": "Invalid selection. Please select valid employees.",
+          "placeholder": "Search for employees"
+        },
         "partslocation": "Parts Location",
         "phone": "Phone",
         "prodtargethrs": "Production Target Hours",
@@ -648,15 +653,9 @@
         "use_paint_scale_data": "Use Paint Scale Data for Job Costing?",
         "uselocalmediaserver": "Use Local Media Server?",
         "website": "Website",
-        "zip_post": "Zip/Postal Code",
-        "notifications": {
-          "description": "Select employees to automatically follow new jobs and receive notifications for job updates.",
-          "placeholder": "Search for employees",
-          "invalid_followers": "Invalid selection. Please select valid employees."
-        }
+        "zip_post": "Zip/Postal Code"
       },
       "labels": {
-        "consent_settings": "Phone Number Opt-Out List",
         "2tiername": "Name => RO",
         "2tiersetup": "2 Tier Setup",
         "2tiersource": "Source => RO",
@@ -667,6 +666,7 @@
         "apptcolors": "Appointment Colors",
         "businessinformation": "Business Information",
         "checklists": "Checklists",
+        "consent_settings": "Phone Number Opt-Out List",
         "csiq": "CSI Questions",
         "customtemplates": "Custom Templates",
         "defaultcostsmapping": "Default Costs Mapping",
@@ -704,6 +704,9 @@
         "messagingpresets": "Messaging Presets",
         "notemplatesavailable": "No templates available to add.",
         "notespresets": "Notes Presets",
+        "notifications": {
+          "followers": "Notifications"
+        },
         "orderstatuses": "Order Statuses",
         "partslocations": "Parts Locations",
         "partsscan": "Parts Scanning",
@@ -734,10 +737,7 @@
         "ssbuckets": "Job Size Definitions",
         "systemsettings": "System Settings",
         "task-presets": "Task Presets",
-        "workingdays": "Working Days",
-        "notifications": {
-          "followers": "Notifications"
-        }
+        "workingdays": "Working Days"
       },
       "operations": {
         "contains": "Contains",
@@ -783,6 +783,15 @@
         "completed": "Job checklist completed."
       }
     },
+    "consent": {
+      "associated_owners": "Associated Owners",
+      "created_at": "Opt-Out Date",
+      "no_owners": "No Associated Owners",
+      "phone_1": "Phone 1",
+      "phone_2": "Phone 2",
+      "phone_number": "Phone Number",
+      "text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
+    },
     "contracts": {
       "actions": {
         "changerate": "Change Contract Rates",
@@ -1235,11 +1244,11 @@
         "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
         "notfound": "No record was found.",
         "sizelimit": "The selected items exceed the size limit.",
-        "submit-for-testing": "Error submitting Job for testing.",
         "sub_status": {
           "expired": "The subscription for this shop has expired. Please contact Sales to reactivate.",
           "trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate."
-        }
+        },
+        "submit-for-testing": "Error submitting Job for testing."
       },
       "itemtypes": {
         "contract": "CC Contract",
@@ -1659,8 +1668,6 @@
         "adjustment_bottom_line": "Adjustments",
         "adjustmenthours": "Adjustment Hours",
         "alt_transport": "Alt. Trans.",
-        "estimate_sent_approval": "Estimate Sent for Approval",
-        "estimate_approved": "Estimate Approved",
         "area_of_damage_impact": {
           "10": "Left Front Side",
           "11": "Left Front Corner",
@@ -1783,6 +1790,8 @@
         "est_ct_ln": "Estimator Last Name",
         "est_ea": "Estimator Email",
         "est_ph1": "Estimator Phone #",
+        "estimate_approved": "Estimate Approved",
+        "estimate_sent_approval": "Estimate Sent for Approval",
         "federal_tax_payable": "Federal Tax Payable",
         "federal_tax_rate": "Federal Tax Rate",
         "flat_rate_ats": "Flat Rate ATS?",
@@ -1966,8 +1975,6 @@
         "scheddates": "Schedule Dates"
       },
       "labels": {
-        "sent": "",
-        "approved": "",
         "accountsreceivable": "Accounts Receivable",
         "act_price_ppc": "New Part Price",
         "actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
@@ -1982,6 +1989,7 @@
         "alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.",
         "alreadyclosed": "This Job has already been closed.",
         "appointmentconfirmation": "Send confirmation to customer?",
+        "approved": "",
         "associationwarning": "Any changes to associations will require updating the data from the new parent record to the Job.",
         "audit": "Audit Trail",
         "available": "Available",
@@ -2172,6 +2180,7 @@
         "sales": "Sales",
         "savebeforeconversion": "You have unsaved changes on the Job.  Please save them before converting it. ",
         "scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the Job. ",
+        "sent": "",
         "specialcoveragepolicy": "Special Coverage Policy Applies",
         "state_tax_amt": "Provincial/State Taxes",
         "subletsnotcompleted": "Outstanding Sublets",
@@ -2388,15 +2397,16 @@
       },
       "errors": {
         "invalidphone": "The phone number is invalid.  Unable to open conversation. ",
+        "no_consent": "This phone number has opted-out of Messaging.",
         "noattachedjobs": "No Jobs have been associated to this conversation. ",
-        "updatinglabel": "Error updating label. {{error}}",
-        "no_consent": "This phone number has opted-out of Messaging."
+        "updatinglabel": "Error updating label. {{error}}"
       },
       "labels": {
         "addlabel": "Add a label to this conversation.",
         "archive": "Archive",
         "maxtenimages": "You can only select up to a maximum of 10 images at a time.",
         "messaging": "Messaging",
+        "no_consent": "Opted-out",
         "noallowtxt": "This customer has not indicated their permission to be messaged.",
         "nojobs": "Not associated to any Job.",
         "nopush": "Polling Mode Enabled",
@@ -2406,8 +2416,7 @@
         "selectmedia": "Select Media",
         "sentby": "Sent by {{by}} at {{time}}",
         "typeamessage": "Send a message...",
-        "unarchive": "Unarchive",
-        "no_consent": "Opted-out"
+        "unarchive": "Unarchive"
       },
       "render": {
         "conversation_list": "Conversation List"
@@ -2427,6 +2436,7 @@
       "fields": {
         "createdby": "Created By",
         "critical": "Critical",
+        "pinned": "Pinned",
         "private": "Private",
         "text": "Contents",
         "type": "Type",
@@ -2445,6 +2455,7 @@
         "addtorelatedro": "Add to Related ROs",
         "newnoteplaceholder": "Add a note...",
         "notetoadd": "Note to Add",
+        "pinned_note": "Pinned Note",
         "systemnotes": "System Notes",
         "usernotes": "User Notes"
       },
@@ -2467,11 +2478,15 @@
         "fcm": "Push"
       },
       "labels": {
-        "auto-add": "Automatically watch Jobs I import",
-        "auto-add-success": "Auto watcher status successfully changed.",
-        "auto-add-failure": "Something went wrong updating your auto watcher status.",
         "add-watchers": "Add Watchers",
         "add-watchers-team": "Add Team Members",
+        "auto-add": "Automatically watch Jobs I import",
+        "auto-add-description": "",
+        "auto-add-failure": "Something went wrong updating your auto watcher status.",
+        "auto-add-off": "",
+        "auto-add-on": "",
+        "auto-add-success": "Auto watcher status successfully changed.",
+        "employee-notification": "Notifications are disabled because you do not have an associated Employee record.",
         "employee-search": "Search for an Employee",
         "mark-all-read": "Mark All Read",
         "new-notification-title": "New Notification:",
@@ -2488,8 +2503,7 @@
         "teams-search": "Search for a Team",
         "unwatch": "Unwatch",
         "watch": "Watch",
-        "watching-issue": "Watching",
-        "employee-notification": "Notifications are disabled because you do not have an associated Employee record."
+        "watching-issue": "Watching"
       },
       "scenarios": {
         "alternate-transport-changed": "Alternate Transport Changed",
@@ -3299,17 +3313,10 @@
         "updated": "Scoreboard updated."
       }
     },
+    "settings": {
+      "title": "Phone Number Opt-Out List"
+    },
     "tasks": {
-      "labels": {
-        "my_tasks_center": "Task Center",
-        "go_to_job": "Go to Job",
-        "overdue": "Overdue",
-        "due_today": "Today",
-        "upcoming": "Upcoming",
-        "no_due_date": "Incomplete",
-        "ro-number": "RO #{{ro_number}}",
-        "no_tasks": "No Tasks Found"
-      },
       "actions": {
         "edit": "Edit Task",
         "new": "New Task",
@@ -3324,9 +3331,6 @@
         "myTasks": "Mine",
         "refresh": "Refresh"
       },
-      "errors": {
-        "load_failure": "Failed to load Tasks."
-      },
       "date_presets": {
         "completion": "Completion",
         "day": "Day",
@@ -3340,6 +3344,9 @@
         "tomorrow": "Tomorrow",
         "two_weeks": "Two Weeks"
       },
+      "errors": {
+        "load_failure": "Failed to load Tasks."
+      },
       "failures": {
         "completed": "Failed to toggle Task completion.",
         "created": "Failed to create Task.",
@@ -3374,6 +3381,16 @@
         "remind_at": "Remind At",
         "title": "Title"
       },
+      "labels": {
+        "due_today": "Today",
+        "go_to_job": "Go to Job",
+        "my_tasks_center": "Task Center",
+        "no_due_date": "Incomplete",
+        "no_tasks": "No Tasks Found",
+        "overdue": "Overdue",
+        "ro-number": "RO #{{ro_number}}",
+        "upcoming": "Upcoming"
+      },
       "placeholders": {
         "assigned_to": "Select an Employee",
         "billid": "Select a Bill",
@@ -3889,18 +3906,6 @@
       "validation": {
         "unique_vendor_name": "You must enter a unique vendor name."
       }
-    },
-    "consent": {
-      "phone_number": "Phone Number",
-      "associated_owners": "Associated Owners",
-      "created_at": "Opt-Out Date",
-      "no_owners": "No Associated Owners",
-      "phone_1": "Phone 1",
-      "phone_2": "Phone 2",
-      "text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
-    },
-    "settings": {
-      "title": "Phone Number Opt-Out List"
     }
   }
 }
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index ac4188eac..1346b0454 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -426,6 +426,11 @@
         "messagingtext": "",
         "noteslabel": "",
         "notestext": "",
+        "notifications": {
+          "description": "",
+          "invalid_followers": "",
+          "placeholder": ""
+        },
         "partslocation": "",
         "phone": "",
         "prodtargethrs": "",
@@ -648,15 +653,9 @@
         "use_paint_scale_data": "",
         "uselocalmediaserver": "",
         "website": "",
-        "zip_post": "",
-        "notifications": {
-          "description": "",
-          "placeholder": "",
-          "invalid_followers": ""
-        }
+        "zip_post": ""
       },
       "labels": {
-        "consent_settings": "",
         "2tiername": "",
         "2tiersetup": "",
         "2tiersource": "",
@@ -667,6 +666,7 @@
         "apptcolors": "",
         "businessinformation": "",
         "checklists": "",
+        "consent_settings": "",
         "csiq": "",
         "customtemplates": "",
         "defaultcostsmapping": "",
@@ -704,6 +704,9 @@
         "messagingpresets": "",
         "notemplatesavailable": "",
         "notespresets": "",
+        "notifications": {
+          "followers": ""
+        },
         "orderstatuses": "",
         "partslocations": "",
         "partsscan": "",
@@ -734,10 +737,7 @@
         "ssbuckets": "",
         "systemsettings": "",
         "task-presets": "",
-        "workingdays": "",
-        "notifications": {
-          "followers": ""
-        }
+        "workingdays": ""
       },
       "operations": {
         "contains": "",
@@ -783,6 +783,15 @@
         "completed": ""
       }
     },
+    "consent": {
+      "associated_owners": "",
+      "created_at": "",
+      "no_owners": "",
+      "phone_1": "",
+      "phone_2": "",
+      "phone_number": "",
+      "text_body": ""
+    },
     "contracts": {
       "actions": {
         "changerate": "",
@@ -1235,11 +1244,11 @@
         "fcm": "",
         "notfound": "",
         "sizelimit": "",
-        "submit-for-testing": "",
         "sub_status": {
           "expired": "",
           "trial-expired": ""
-        }
+        },
+        "submit-for-testing": ""
       },
       "itemtypes": {
         "contract": "",
@@ -1651,8 +1660,6 @@
         "voiding": ""
       },
       "fields": {
-        "estimate_sent_approval": "",
-        "estimate_approved": "",
         "active_tasks": "",
         "actual_completion": "Realización real",
         "actual_delivery": "Entrega real",
@@ -1783,6 +1790,8 @@
         "est_ct_ln": "Apellido del tasador",
         "est_ea": "Correo electrónico del tasador",
         "est_ph1": "Número de teléfono del tasador",
+        "estimate_approved": "",
+        "estimate_sent_approval": "",
         "federal_tax_payable": "Impuesto federal por pagar",
         "federal_tax_rate": "",
         "flat_rate_ats": "",
@@ -1966,8 +1975,6 @@
         "scheddates": ""
       },
       "labels": {
-        "sent": "",
-        "approved": "",
         "accountsreceivable": "",
         "act_price_ppc": "",
         "actual_completion_inferred": "",
@@ -1982,6 +1989,7 @@
         "alreadyaddedtoscoreboard": "",
         "alreadyclosed": "",
         "appointmentconfirmation": "¿Enviar confirmación al cliente?",
+        "approved": "",
         "associationwarning": "",
         "audit": "",
         "available": "",
@@ -2172,6 +2180,7 @@
         "sales": "",
         "savebeforeconversion": "",
         "scheduledinchange": "",
+        "sent": "",
         "specialcoveragepolicy": "",
         "state_tax_amt": "",
         "subletsnotcompleted": "",
@@ -2388,15 +2397,16 @@
       },
       "errors": {
         "invalidphone": "",
+        "no_consent": "",
         "noattachedjobs": "",
-        "updatinglabel": "",
-        "no_consent": ""
+        "updatinglabel": ""
       },
       "labels": {
         "addlabel": "",
         "archive": "",
         "maxtenimages": "",
         "messaging": "Mensajería",
+        "no_consent": "",
         "noallowtxt": "",
         "nojobs": "",
         "nopush": "",
@@ -2406,8 +2416,7 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Enviar un mensaje...",
-        "unarchive": "",
-        "no_consent": ""
+        "unarchive": ""
       },
       "render": {
         "conversation_list": ""
@@ -2427,6 +2436,7 @@
       "fields": {
         "createdby": "Creado por",
         "critical": "Crítico",
+        "pinned": "",
         "private": "Privado",
         "text": "Contenido",
         "type": "",
@@ -2445,6 +2455,7 @@
         "addtorelatedro": "",
         "newnoteplaceholder": "Agrega una nota...",
         "notetoadd": "",
+        "pinned_note": "",
         "systemnotes": "",
         "usernotes": ""
       },
@@ -2467,13 +2478,15 @@
         "fcm": ""
       },
       "labels": {
-        "auto-add-on": "",
-        "auto-add-off": "",
-        "auto-add-success": "",
-        "auto-add-failure": "",
-        "auto-add-description": "",
         "add-watchers": "",
         "add-watchers-team": "",
+        "auto-add": "",
+        "auto-add-description": "",
+        "auto-add-failure": "",
+        "auto-add-off": "",
+        "auto-add-on": "",
+        "auto-add-success": "",
+        "employee-notification": "",
         "employee-search": "",
         "mark-all-read": "",
         "new-notification-title": "",
@@ -2490,8 +2503,7 @@
         "teams-search": "",
         "unwatch": "",
         "watch": "",
-        "watching-issue": "",
-        "employee-notification": ""
+        "watching-issue": ""
       },
       "scenarios": {
         "alternate-transport-changed": "",
@@ -3301,17 +3313,10 @@
         "updated": ""
       }
     },
+    "settings": {
+      "title": ""
+    },
     "tasks": {
-      "labels": {
-        "my_tasks_center": "",
-        "go_to_job": "",
-        "overdue": "",
-        "due_today": "",
-        "upcoming": "",
-        "no_due_date": "",
-        "ro-number": "",
-        "no_tasks": ""
-      },
       "actions": {
         "edit": "",
         "new": "",
@@ -3326,9 +3331,6 @@
         "myTasks": "",
         "refresh": ""
       },
-      "errors": {
-        "load_failure": ""
-      },
       "date_presets": {
         "completion": "",
         "day": "",
@@ -3342,6 +3344,9 @@
         "tomorrow": "",
         "two_weeks": ""
       },
+      "errors": {
+        "load_failure": ""
+      },
       "failures": {
         "completed": "",
         "created": "",
@@ -3376,6 +3381,16 @@
         "remind_at": "",
         "title": ""
       },
+      "labels": {
+        "due_today": "",
+        "go_to_job": "",
+        "my_tasks_center": "",
+        "no_due_date": "",
+        "no_tasks": "",
+        "overdue": "",
+        "ro-number": "",
+        "upcoming": ""
+      },
       "placeholders": {
         "assigned_to": "",
         "billid": "",
@@ -3891,18 +3906,6 @@
       "validation": {
         "unique_vendor_name": ""
       }
-    },
-    "consent": {
-      "phone_number": "",
-      "associated_owners": "",
-      "created_at": "",
-      "no_owners": "",
-      "phone_1": "",
-      "phone_2": "",
-      "text_body": ""
-    },
-    "settings": {
-      "title": ""
     }
   }
 }
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 604267929..36dba4dfd 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -426,6 +426,11 @@
         "messagingtext": "",
         "noteslabel": "",
         "notestext": "",
+        "notifications": {
+          "description": "",
+          "invalid_followers": "",
+          "placeholder": ""
+        },
         "partslocation": "",
         "phone": "",
         "prodtargethrs": "",
@@ -648,15 +653,9 @@
         "use_paint_scale_data": "",
         "uselocalmediaserver": "",
         "website": "",
-        "zip_post": "",
-        "notifications": {
-          "description": "",
-          "placeholder": "",
-          "invalid_followers": ""
-        }
+        "zip_post": ""
       },
       "labels": {
-        "consent_settings": "",
         "2tiername": "",
         "2tiersetup": "",
         "2tiersource": "",
@@ -667,6 +666,7 @@
         "apptcolors": "",
         "businessinformation": "",
         "checklists": "",
+        "consent_settings": "",
         "csiq": "",
         "customtemplates": "",
         "defaultcostsmapping": "",
@@ -704,6 +704,9 @@
         "messagingpresets": "",
         "notemplatesavailable": "",
         "notespresets": "",
+        "notifications": {
+          "followers": ""
+        },
         "orderstatuses": "",
         "partslocations": "",
         "partsscan": "",
@@ -734,10 +737,7 @@
         "ssbuckets": "",
         "systemsettings": "",
         "task-presets": "",
-        "workingdays": "",
-        "notifications": {
-          "followers": ""
-        }
+        "workingdays": ""
       },
       "operations": {
         "contains": "",
@@ -783,6 +783,15 @@
         "completed": ""
       }
     },
+    "consent": {
+      "associated_owners": "Associated Owners",
+      "created_at": "Opt-Out Date",
+      "no_owners": "No Associated Owners",
+      "phone_1": "Phone 1",
+      "phone_2": "Phone 2",
+      "phone_number": "Phone Number",
+      "text_body": ""
+    },
     "contracts": {
       "actions": {
         "changerate": "",
@@ -1235,11 +1244,11 @@
         "fcm": "",
         "notfound": "",
         "sizelimit": "",
-        "submit-for-testing": "",
         "sub_status": {
           "expired": "",
           "trial-expired": ""
-        }
+        },
+        "submit-for-testing": ""
       },
       "itemtypes": {
         "contract": "",
@@ -1651,8 +1660,6 @@
         "voiding": ""
       },
       "fields": {
-        "estimate_sent_approval": "",
-        "estimate_approved": "",
         "active_tasks": "",
         "actual_completion": "Achèvement réel",
         "actual_delivery": "Livraison réelle",
@@ -1783,6 +1790,8 @@
         "est_ct_ln": "Nom de l'évaluateur",
         "est_ea": "Courriel de l'évaluateur",
         "est_ph1": "Numéro de téléphone de l'évaluateur",
+        "estimate_approved": "",
+        "estimate_sent_approval": "",
         "federal_tax_payable": "Impôt fédéral à payer",
         "federal_tax_rate": "",
         "flat_rate_ats": "",
@@ -1966,8 +1975,6 @@
         "scheddates": ""
       },
       "labels": {
-        "sent": "",
-        "approved": "",
         "accountsreceivable": "",
         "act_price_ppc": "",
         "actual_completion_inferred": "",
@@ -1982,6 +1989,7 @@
         "alreadyaddedtoscoreboard": "",
         "alreadyclosed": "",
         "appointmentconfirmation": "Envoyer une confirmation au client?",
+        "approved": "",
         "associationwarning": "",
         "audit": "",
         "available": "",
@@ -2172,6 +2180,7 @@
         "sales": "",
         "savebeforeconversion": "",
         "scheduledinchange": "",
+        "sent": "",
         "specialcoveragepolicy": "",
         "state_tax_amt": "",
         "subletsnotcompleted": "",
@@ -2388,15 +2397,16 @@
       },
       "errors": {
         "invalidphone": "",
+        "no_consent": "",
         "noattachedjobs": "",
-        "updatinglabel": "",
-        "no_consent": ""
+        "updatinglabel": ""
       },
       "labels": {
         "addlabel": "",
         "archive": "",
         "maxtenimages": "",
         "messaging": "Messagerie",
+        "no_consent": "",
         "noallowtxt": "",
         "nojobs": "",
         "nopush": "",
@@ -2406,8 +2416,7 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Envoyer un message...",
-        "unarchive": "",
-        "no_consent": ""
+        "unarchive": ""
       },
       "render": {
         "conversation_list": ""
@@ -2427,6 +2436,7 @@
       "fields": {
         "createdby": "Créé par",
         "critical": "Critique",
+        "pinned": "",
         "private": "privé",
         "text": "Contenu",
         "type": "",
@@ -2445,6 +2455,7 @@
         "addtorelatedro": "",
         "newnoteplaceholder": "Ajouter une note...",
         "notetoadd": "",
+        "pinned_note": "",
         "systemnotes": "",
         "usernotes": ""
       },
@@ -2467,13 +2478,15 @@
         "fcm": ""
       },
       "labels": {
-        "auto-add-on": "",
-        "auto-add-off": "",
-        "auto-add-success": "",
-        "auto-add-failure": "",
-        "auto-add-description": "",
         "add-watchers": "",
         "add-watchers-team": "",
+        "auto-add": "",
+        "auto-add-description": "",
+        "auto-add-failure": "",
+        "auto-add-off": "",
+        "auto-add-on": "",
+        "auto-add-success": "",
+        "employee-notification": "",
         "employee-search": "",
         "mark-all-read": "",
         "new-notification-title": "",
@@ -2490,8 +2503,7 @@
         "teams-search": "",
         "unwatch": "",
         "watch": "",
-        "watching-issue": "",
-        "employee-notification": ""
+        "watching-issue": ""
       },
       "scenarios": {
         "alternate-transport-changed": "",
@@ -3301,17 +3313,10 @@
         "updated": ""
       }
     },
+    "settings": {
+      "title": ""
+    },
     "tasks": {
-      "labels": {
-        "my_tasks_center": "",
-        "go_to_job": "",
-        "overdue": "",
-        "due_today": "",
-        "upcoming": "",
-        "no_due_date": "",
-        "ro-number": "",
-        "no_tasks": ""
-      },
       "actions": {
         "edit": "",
         "new": "",
@@ -3326,9 +3331,6 @@
         "myTasks": "",
         "refresh": ""
       },
-      "errors": {
-        "load_failure": ""
-      },
       "date_presets": {
         "completion": "",
         "day": "",
@@ -3342,6 +3344,9 @@
         "tomorrow": "",
         "two_weeks": ""
       },
+      "errors": {
+        "load_failure": ""
+      },
       "failures": {
         "completed": "",
         "created": "",
@@ -3376,6 +3381,16 @@
         "remind_at": "",
         "title": ""
       },
+      "labels": {
+        "due_today": "",
+        "go_to_job": "",
+        "my_tasks_center": "",
+        "no_due_date": "",
+        "no_tasks": "",
+        "overdue": "",
+        "ro-number": "",
+        "upcoming": ""
+      },
       "placeholders": {
         "assigned_to": "",
         "billid": "",
@@ -3891,18 +3906,6 @@
       "validation": {
         "unique_vendor_name": ""
       }
-    },
-    "consent": {
-      "phone_number": "Phone Number",
-      "associated_owners": "Associated Owners",
-      "created_at": "Opt-Out Date",
-      "no_owners": "No Associated Owners",
-      "phone_1": "Phone 1",
-      "phone_2": "Phone 2",
-      "text_body": ""
-    },
-    "settings": {
-      "title": ""
     }
   }
 }
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index dc9343e9d..190163203 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -4909,6 +4909,7 @@
           - critical
           - id
           - jobid
+          - pinned
           - private
           - text
           - type
@@ -4923,6 +4924,7 @@
           - critical
           - id
           - jobid
+          - pinned
           - private
           - text
           - type
@@ -4947,6 +4949,7 @@
           - critical
           - id
           - jobid
+          - pinned
           - private
           - text
           - type
diff --git a/hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/down.sql b/hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/down.sql
new file mode 100644
index 000000000..981961658
--- /dev/null
+++ b/hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."notes" add column "pinned" boolean
+--  not null default 'false';
diff --git a/hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/up.sql b/hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/up.sql
new file mode 100644
index 000000000..19db5bdf4
--- /dev/null
+++ b/hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."notes" add column "pinned" boolean
+ not null default 'false';