From 546d6caf9b69f95e1a2b64639fb27eacecbfcf9e Mon Sep 17 00:00:00 2001
From: salgsstyrke <155984652+salgsstyrke@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:06:43 +0200
Subject: [PATCH 01/25] changed quick flow to autolayout

changed Unsubscribe Link quick to autolayout format
---
 .../Unsubscribe_Link_Quick.flow-meta.xml      | 77 ++++++++++---------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml b/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
index 534e6d7..a5c160c 100644
--- a/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
+++ b/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
@@ -4,8 +4,8 @@
         <description>Alert the person that they unsubscribed. Turn this off in the custom metadata type Unsubscribe Link.</description>
         <name>ConfirmationEmail</name>
         <label>ConfirmationEmail</label>
-        <locationX>950</locationX>
-        <locationY>1627</locationY>
+        <locationX>50</locationX>
+        <locationY>1430</locationY>
         <actionName>emailSimple</actionName>
         <actionType>emailSimple</actionType>
         <connector>
@@ -52,16 +52,16 @@
             </value>
         </inputParameters>
         <nameSegment>emailSimple</nameSegment>
-        <versionSegment>1</versionSegment>
     </actionCalls>
     <apiVersion>61.0</apiVersion>
     <decisions>
         <description>Was the original email with an unsubscribe link sent to a contact or a lead record? The Unsubscribe Link contains the public id., starting with C or L if it is a lead or contact. We need to find whether it is a contact or lead so that the Unsubscribe Record can be properly linked to the record.</description>
         <name>Contact_or_Lead</name>
         <label>Contact or Lead</label>
-        <locationX>1287</locationX>
-        <locationY>362</locationY>
+        <locationX>842</locationX>
+        <locationY>242</locationY>
         <defaultConnector>
+            <isGoTo>true</isGoTo>
             <targetReference>Blank_Values_Flow</targetReference>
         </defaultConnector>
         <defaultConnectorLabel>No Record Found</defaultConnectorLabel>
@@ -99,8 +99,8 @@
     <decisions>
         <name>Quick_UnsubscribeDecision</name>
         <label>Quick Unsubscribe</label>
-        <locationX>1028</locationX>
-        <locationY>1081</locationY>
+        <locationX>314</locationX>
+        <locationY>698</locationY>
         <defaultConnector>
             <targetReference>Are_you_sure</targetReference>
         </defaultConnector>
@@ -125,8 +125,8 @@
         <description>The custom metadata type stores the yes/no answer to whether or not you want an email sent to confirm that the person unsubscribed.</description>
         <name>Send_Confirmation_Email</name>
         <label>Send Confirmation Email</label>
-        <locationX>1620</locationX>
-        <locationY>1610</locationY>
+        <locationX>314</locationX>
+        <locationY>1322</locationY>
         <defaultConnector>
             <targetReference>screenConfirmationNoEmail</targetReference>
         </defaultConnector>
@@ -152,8 +152,8 @@
 If not, check if the custom metadata type allows the user to type in their email address.</description>
         <name>Was_a_Record_Found</name>
         <label>Was a Record Found</label>
-        <locationX>946</locationX>
-        <locationY>775</locationY>
+        <locationX>842</locationX>
+        <locationY>590</locationY>
         <defaultConnectorLabel>No record found, no type in</defaultConnectorLabel>
         <rules>
             <name>Yes_Record_Found1st</name>
@@ -225,7 +225,7 @@ If not, check if the custom metadata type allows the user to type in their email
     <processMetadataValues>
         <name>CanvasMode</name>
         <value>
-            <stringValue>FREE_FORM_CANVAS</stringValue>
+            <stringValue>AUTO_LAYOUT_CANVAS</stringValue>
         </value>
     </processMetadataValues>
     <processType>Flow</processType>
@@ -233,13 +233,14 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Create Unsubscribe record which stores details of this transaction.</description>
         <name>Create_Unsubscribe_Record</name>
         <label>Create Unsubscribe Record</label>
-        <locationX>1447</locationX>
-        <locationY>1093</locationY>
+        <locationX>314</locationX>
+        <locationY>998</locationY>
         <assignRecordIdToReference>UnsubscribeId.Id</assignRecordIdToReference>
         <connector>
             <targetReference>Unsubscribe_Contacts</targetReference>
         </connector>
         <faultConnector>
+            <isGoTo>true</isGoTo>
             <targetReference>Error_Alert_Email</targetReference>
         </faultConnector>
         <inputAssignments>
@@ -272,13 +273,14 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Look for a contact record with ID passed into the flow. Assign the email address to an email variable and the ID to a text variable called FoundId that is passed to other flows.</description>
         <name>Get_Contact</name>
         <label>Get Contact</label>
-        <locationX>1001</locationX>
-        <locationY>583</locationY>
+        <locationX>314</locationX>
+        <locationY>350</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Was_a_Record_Found</targetReference>
         </connector>
         <faultConnector>
+            <isGoTo>true</isGoTo>
             <targetReference>Error_Alert_Email</targetReference>
         </faultConnector>
         <filterLogic>and</filterLogic>
@@ -310,13 +312,14 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Look for a lead record with ID passed into the flow. Assign the email address to an email variable and the ID to a text variable called FoundId that is passed to other flows.</description>
         <name>Get_Lead</name>
         <label>Get Lead</label>
-        <locationX>1377</locationX>
-        <locationY>554</locationY>
+        <locationX>842</locationX>
+        <locationY>350</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Was_a_Record_Found</targetReference>
         </connector>
         <faultConnector>
+            <isGoTo>true</isGoTo>
             <targetReference>Error_Alert_Email</targetReference>
         </faultConnector>
         <filterLogic>or</filterLogic>
@@ -340,13 +343,14 @@ If not, check if the custom metadata type allows the user to type in their email
     <recordLookups>
         <name>Get_Unsubscribe_Link_Setup</name>
         <label>Get Unsubscribe Link Setup</label>
-        <locationX>888</locationX>
-        <locationY>185</locationY>
+        <locationX>842</locationX>
+        <locationY>134</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Contact_or_Lead</targetReference>
         </connector>
         <faultConnector>
+            <isGoTo>true</isGoTo>
             <targetReference>Error_Alert_Email</targetReference>
         </faultConnector>
         <getFirstRecordOnly>true</getFirstRecordOnly>
@@ -358,8 +362,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>confirmation screen for person to confirm they want to unsubscribe. Update &quot;our organization&quot; in the custom metadata type &quot;Unsubscribe Link.&quot;</description>
         <name>Are_you_sure</name>
         <label>Are you sure</label>
-        <locationX>854</locationX>
-        <locationY>1373</locationY>
+        <locationX>402</locationX>
+        <locationY>806</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -378,8 +382,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>We will be alerted about an error at this point.</description>
         <name>Error_Alert_Email</name>
         <label>Error Alert Screen</label>
-        <locationX>1715</locationX>
-        <locationY>186</locationY>
+        <locationX>314</locationX>
+        <locationY>1538</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -394,8 +398,8 @@ If not, check if the custom metadata type allows the user to type in their email
     <screens>
         <name>screenConfirmationEmail</name>
         <label>screenConfirmationEmail</label>
-        <locationX>950</locationX>
-        <locationY>1800</locationY>
+        <locationX>50</locationX>
+        <locationY>1538</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -410,8 +414,8 @@ If not, check if the custom metadata type allows the user to type in their email
     <screens>
         <name>screenConfirmationNoEmail</name>
         <label>screenConfirmationNoEmail</label>
-        <locationX>1444</locationX>
-        <locationY>1703</locationY>
+        <locationX>578</locationX>
+        <locationY>1430</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -424,8 +428,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <showHeader>false</showHeader>
     </screens>
     <start>
-        <locationX>762</locationX>
-        <locationY>48</locationY>
+        <locationX>716</locationX>
+        <locationY>0</locationY>
         <connector>
             <targetReference>Get_Unsubscribe_Link_Setup</targetReference>
         </connector>
@@ -434,9 +438,10 @@ If not, check if the custom metadata type allows the user to type in their email
     <subflows>
         <name>Blank_Values_Flow</name>
         <label>Blank Values Flow</label>
-        <locationX>1218</locationX>
-        <locationY>854</locationY>
+        <locationX>1106</locationX>
+        <locationY>698</locationY>
         <connector>
+            <isGoTo>true</isGoTo>
             <targetReference>Quick_UnsubscribeDecision</targetReference>
         </connector>
         <flowName>recordIdBlankFlow</flowName>
@@ -465,8 +470,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Launch this additional flow to find all contacts who have this email address and mark them as email opt out.</description>
         <name>Unsubscribe_Contacts</name>
         <label>Unsubscribe Contacts</label>
-        <locationX>1469</locationX>
-        <locationY>1363</locationY>
+        <locationX>314</locationX>
+        <locationY>1106</locationY>
         <connector>
             <targetReference>Unsubscribe_Leads</targetReference>
         </connector>
@@ -498,8 +503,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Part of the unmanaged packed Unsubscribe Link from Salesforce Labs and loops through all leads with a particular email address to mark them as email opt out. This flow is launched by the flow Unsubscribe Link.</description>
         <name>Unsubscribe_Leads</name>
         <label>Unsubscribe Leads</label>
-        <locationX>1473</locationX>
-        <locationY>1482</locationY>
+        <locationX>314</locationX>
+        <locationY>1214</locationY>
         <connector>
             <targetReference>Send_Confirmation_Email</targetReference>
         </connector>

From 61e7e7823353412d06e56141e8cfe79ee82cb96b Mon Sep 17 00:00:00 2001
From: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
Date: Thu, 24 Jul 2025 16:58:00 +0200
Subject: [PATCH 02/25] new version

cumulus ci and sfdx versions
---
 .github/workflows/beta.yml    | 3 ++-
 .github/workflows/feature.yml | 3 ++-
 .github/workflows/prod.yml    | 3 ++-
 cumulusci.yml                 | 2 +-
 package-lock.json             | 8 ++++----
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index d4aba19..ac81baf 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -10,4 +10,5 @@ jobs:
    secrets:
     dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
    with:
-    cumulusci-version: '3.86.1'
+    cumulusci-version: '3.93.0'
+    sfdx-version: '7.209.6'
diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index fb33093..b3edfc6 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -12,4 +12,5 @@ jobs:
    secrets:
     dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
    with:
-    cumulusci-version: '3.86.1'
+    cumulusci-version: '3.93.0'
+    sfdx-version: '7.209.6'
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index f367ae5..1696028 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -5,6 +5,7 @@ jobs:
     name: "Upload Production Release (2GP)"
     uses: SFDO-Community/standard-workflows/.github/workflows/production-2gp.yml@main
     with:
-      cumulusci-version: '3.86.1'
+      cumulusci-version: '3.93.0'
+      sfdx-version: '7.209.6'
     secrets:
       dev-hub-auth-url: '${{ secrets.PACKAGING_ORG_AUTH_URL }}'
diff --git a/cumulusci.yml b/cumulusci.yml
index 11eb9c8..b4dee9c 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -1,4 +1,4 @@
-minimum_cumulusci_version: '3.86.1'
+minimum_cumulusci_version: '3.93.0'
 project:
     name: Unsubscribe-Link
     package:
diff --git a/package-lock.json b/package-lock.json
index b2ba4ee..93dd391 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -908,8 +908,8 @@
       "license": "MIT"
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "version": "3.93.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-3.93.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "license": "MIT",
@@ -2973,7 +2973,7 @@
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
+        "@eslint-community/eslint-utils": "^3.93.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
         "@typescript-eslint/scope-manager": "6.21.0",
@@ -9299,7 +9299,7 @@
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^3.93.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"

From 9a52c7b67e03d38708c0f881c0bdfc3352f3d08c Mon Sep 17 00:00:00 2001
From: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:04:24 +0200
Subject: [PATCH 03/25] packagelock undo

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 93dd391..b2ba4ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -908,8 +908,8 @@
       "license": "MIT"
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "3.93.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-3.93.0.tgz",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
       "license": "MIT",
@@ -2973,7 +2973,7 @@
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^3.93.0",
+        "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
         "@typescript-eslint/scope-manager": "6.21.0",
@@ -9299,7 +9299,7 @@
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^3.93.0"
+        "entities": "^4.4.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"

From b6efe81fdaa8c5de97bf956e6b7c8fea729596e9 Mon Sep 17 00:00:00 2001
From: Greg <46513157+Necroni@users.noreply.github.com>
Date: Wed, 30 Jul 2025 14:49:35 -0400
Subject: [PATCH 04/25] Update object permissions to allow edit for Lead and
 Contact

---
 .../permissionsets/Unsubscribe_Link.permissionset-meta.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml b/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml
index 5348194..f4e84cc 100644
--- a/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml
+++ b/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml
@@ -148,7 +148,7 @@
     <objectPermissions>
         <allowCreate>false</allowCreate>
         <allowDelete>false</allowDelete>
-        <allowEdit>false</allowEdit>
+        <allowEdit>true</allowEdit>
         <allowRead>true</allowRead>
         <modifyAllRecords>false</modifyAllRecords>
         <object>Contact</object>
@@ -157,7 +157,7 @@
     <objectPermissions>
         <allowCreate>false</allowCreate>
         <allowDelete>false</allowDelete>
-        <allowEdit>false</allowEdit>
+        <allowEdit>true</allowEdit>
         <allowRead>true</allowRead>
         <modifyAllRecords>false</modifyAllRecords>
         <object>Lead</object>

From 250cb10618fb3b446faef56289505a82b4a9d3ef Mon Sep 17 00:00:00 2001
From: Greg <46513157+Necroni@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:42:16 -0400
Subject: [PATCH 05/25] Update Unsubscribe object description to remove Labs
 reference.

---
 .../objects/Unsubscribe__c/Unsubscribe__c.object-meta.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/objects/Unsubscribe__c/Unsubscribe__c.object-meta.xml b/force-app/main/default/objects/Unsubscribe__c/Unsubscribe__c.object-meta.xml
index 4641999..215453e 100644
--- a/force-app/main/default/objects/Unsubscribe__c/Unsubscribe__c.object-meta.xml
+++ b/force-app/main/default/objects/Unsubscribe__c/Unsubscribe__c.object-meta.xml
@@ -143,7 +143,7 @@
     <allowInChatterGroups>false</allowInChatterGroups>
     <compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
     <deploymentStatus>Deployed</deploymentStatus>
-    <description>Manage unsubscribes from email lists. Part of unmanaged package Unsubscribe Link from Salesforce Labs. Each record represents a time a user attempted to Unsubscribe from commercial email.</description>
+    <description>Manage unsubscribes from email lists. Each record represents a time a user attempted to Unsubscribe from commercial email.</description>
     <enableActivities>true</enableActivities>
     <enableBulkApi>true</enableBulkApi>
     <enableFeeds>false</enableFeeds>

From 095be88e2a4d37f5ff816716d7e1ed53c953c268 Mon Sep 17 00:00:00 2001
From: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Date: Thu, 31 Jul 2025 13:22:16 -0400
Subject: [PATCH 06/25] Templates for Unsubscribe Link

---
 .../Sample_Contact_Template_HTML.email        | 17 ++++++++++++++
 ...ample_Contact_Template_HTML.email-meta.xml | 12 ++++++++++
 .../Sample_Lead_Template_HTML.email           | 17 ++++++++++++++
 .../Sample_Lead_Template_HTML.email-meta.xml  | 12 ++++++++++
 .../Sample_Lead_Template_Plain_Text.email     | 17 ++++++++++++++
 ...le_Lead_Template_Plain_Text.email-meta.xml | 12 ++++++++++
 ...subscribe_Url_Plain_Text__c.field-meta.xml | 12 ++++++++++
 ...subscribe_Url_Plain_Text__c.field-meta.xml | 12 ++++++++++
 .../Unsubscribe_Link.permissionset-meta.xml   | 22 ++++++++++++++-----
 9 files changed, 127 insertions(+), 6 deletions(-)
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
 create mode 100644 force-app/main/default/objects/Contact/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml
 create mode 100644 force-app/main/default/objects/Lead/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml

diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
new file mode 100644
index 0000000..3956710
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Contact" >
+  <messaging:htmlEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+<P>Dear Friend,</P>
+
+<P>It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!</P>
+
+<P>Your friend,</P>
+
+<P>Bob</P>
+
+
+     <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
+     which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
+   </messaging:htmlEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
new file mode 100644
index 0000000..d66ee3a
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Sample Contact Template</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
new file mode 100644
index 0000000..fe5b9ac
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
+  <messaging:htmlEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+<P>Dear Friend,</P>
+
+<P>It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!</P>
+
+<P>Your friend,</P>
+
+<P>Bob</P>
+
+
+     <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
+     which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
+   </messaging:htmlEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
new file mode 100644
index 0000000..aed24c3
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Sample Lead Template</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
new file mode 100644
index 0000000..edb2140
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
+  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+Dear Friend,
+
+It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!
+
+Your friend,
+
+Bob
+
+Copy and paste this in your browser to unsubscribe: 
+{!Recipient.Unsubscribe_Url_Plain_Text__c}  <!-- This field can be 
+added to any plain text contact or lead email to display the url-->
+   </messaging:plainTextEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
new file mode 100644
index 0000000..baf382d
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Sample Lead Template-Plain Text</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/objects/Contact/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml b/force-app/main/default/objects/Contact/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml
new file mode 100644
index 0000000..eed9499
--- /dev/null
+++ b/force-app/main/default/objects/Contact/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Unsubscribe_Url_Plain_Text__c</fullName>
+    <description>Returns a plain text version of the url that can be used in emails.</description>
+    <externalId>false</externalId>
+    <formula>LEFT(Part1_Unsubscribe_Link__c , FIND(&quot;+&quot;,Part1_Unsubscribe_Link__c ) - 1)</formula>
+    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+    <label>Unsubscribe Url Plain Text</label>
+    <required>false</required>
+    <type>Text</type>
+    <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/objects/Lead/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml b/force-app/main/default/objects/Lead/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml
new file mode 100644
index 0000000..9506eca
--- /dev/null
+++ b/force-app/main/default/objects/Lead/fields/Unsubscribe_Url_Plain_Text__c.field-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Unsubscribe_Url_Plain_Text__c</fullName>
+    <description>Holds the plain text value of the url.  This is used to add the url to plain text emails.</description>
+    <externalId>false</externalId>
+    <formula>LEFT(Part1_Unsubscribe_Link__c , FIND(&quot;+&quot;,Part1_Unsubscribe_Link__c ) - 1)</formula>
+    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+    <label>Unsubscribe Url Plain Text</label>
+    <required>false</required>
+    <type>Text</type>
+    <unique>false</unique>
+</CustomField>
diff --git a/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml b/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml
index 5348194..8d2196b 100644
--- a/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml
+++ b/force-app/main/default/permissionsets/Unsubscribe_Link.permissionset-meta.xml
@@ -6,19 +6,24 @@
         <field>Contact.HasOptedOutOfEmail</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>true</editable>
+        <field>Contact.Part1_Unsubscribe_Link__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
     <fieldPermissions>
         <editable>false</editable>
         <field>Contact.Public_Id__c</field>
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>
-        <editable>true</editable>
-        <field>Contact.Part1_Unsubscribe_Link__c</field>
+        <editable>false</editable>
+        <field>Contact.Unsubscribe_Link_Contact__c</field>
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>
         <editable>false</editable>
-        <field>Contact.Unsubscribe_Link_Contact__c</field>
+        <field>Contact.Unsubscribe_Url_Plain_Text__c</field>
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>
@@ -26,19 +31,24 @@
         <field>Lead.HasOptedOutOfEmail</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>true</editable>
+        <field>Lead.Part1_Unsubscribe_Link__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
     <fieldPermissions>
         <editable>false</editable>
         <field>Lead.Public_Id__c</field>
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>
-        <editable>true</editable>
-        <field>Lead.Part1_Unsubscribe_Link__c</field>
+        <editable>false</editable>
+        <field>Lead.Unsubscribe_Link_Lead__c</field>
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>
         <editable>false</editable>
-        <field>Lead.Unsubscribe_Link_Lead__c</field>
+        <field>Lead.Unsubscribe_Url_Plain_Text__c</field>
         <readable>true</readable>
     </fieldPermissions>
     <fieldPermissions>

From edb8c7d6e2201e34a2f17ceb5b335f804f0f25e5 Mon Sep 17 00:00:00 2001
From: ivanrichiee <120200932+ivanrichiee@users.noreply.github.com>
Date: Thu, 31 Jul 2025 18:54:11 +0100
Subject: [PATCH 07/25] Gracefully handle Org-Wide Email issues

---
 .../Unsubscribe_Link_Quick.flow-meta.xml      | 174 +++++++++++++-----
 1 file changed, 131 insertions(+), 43 deletions(-)

diff --git a/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml b/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
index a5c160c..6f319b4 100644
--- a/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
+++ b/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
@@ -5,7 +5,7 @@
         <name>ConfirmationEmail</name>
         <label>ConfirmationEmail</label>
         <locationX>50</locationX>
-        <locationY>1430</locationY>
+        <locationY>1598</locationY>
         <actionName>emailSimple</actionName>
         <actionType>emailSimple</actionType>
         <connector>
@@ -53,12 +53,60 @@
         </inputParameters>
         <nameSegment>emailSimple</nameSegment>
     </actionCalls>
+    <actionCalls>
+        <description>Send error email to the email address held in the ErrorRecipient variable. In case this Error Email send fails, the end user is still returned the success screen.</description>
+        <name>Send_Error_Email</name>
+        <label>Send Error Email</label>
+        <locationX>578</locationX>
+        <locationY>1598</locationY>
+        <actionName>emailSimple</actionName>
+        <actionType>emailSimple</actionType>
+        <connector>
+            <targetReference>screenConfirmationNoEmail</targetReference>
+        </connector>
+        <faultConnector>
+            <isGoTo>true</isGoTo>
+            <targetReference>screenConfirmationNoEmail</targetReference>
+        </faultConnector>
+        <flowTransactionModel>CurrentTransaction</flowTransactionModel>
+        <inputParameters>
+            <name>emailAddresses</name>
+            <value>
+                <elementReference>ErrorRecipient</elementReference>
+            </value>
+        </inputParameters>
+        <inputParameters>
+            <name>composeEmailContent</name>
+            <value>
+                <stringValue>True</stringValue>
+            </value>
+        </inputParameters>
+        <inputParameters>
+            <name>emailSubject</name>
+            <value>
+                <stringValue>Org-wide Email error</stringValue>
+            </value>
+        </inputParameters>
+        <inputParameters>
+            <name>emailBody</name>
+            <value>
+                <elementReference>errorEmailRichText</elementReference>
+            </value>
+        </inputParameters>
+        <inputParameters>
+            <name>sendRichBody</name>
+            <value>
+                <booleanValue>true</booleanValue>
+            </value>
+        </inputParameters>
+        <nameSegment>emailSimple</nameSegment>
+    </actionCalls>
     <apiVersion>61.0</apiVersion>
     <decisions>
         <description>Was the original email with an unsubscribe link sent to a contact or a lead record? The Unsubscribe Link contains the public id., starting with C or L if it is a lead or contact. We need to find whether it is a contact or lead so that the Unsubscribe Record can be properly linked to the record.</description>
         <name>Contact_or_Lead</name>
         <label>Contact or Lead</label>
-        <locationX>842</locationX>
+        <locationX>1128</locationX>
         <locationY>242</locationY>
         <defaultConnector>
             <isGoTo>true</isGoTo>
@@ -96,11 +144,33 @@
             <label>Lead</label>
         </rules>
     </decisions>
+    <decisions>
+        <name>Is_Org_Wide_Email_Address_Valid</name>
+        <label>Is Org-Wide Email Address Valid</label>
+        <locationX>314</locationX>
+        <locationY>1490</locationY>
+        <defaultConnector>
+            <targetReference>Send_Error_Email</targetReference>
+        </defaultConnector>
+        <defaultConnectorLabel>No, Invalid</defaultConnectorLabel>
+        <rules>
+            <name>Is_OrgWideEmailAddressValid_true</name>
+            <conditionLogic>and</conditionLogic>
+            <conditions>
+                <leftValueReference>Get_Org_Wide_Email_Address.Id</leftValueReference>
+                <operator>NotEqualTo</operator>
+            </conditions>
+            <connector>
+                <targetReference>ConfirmationEmail</targetReference>
+            </connector>
+            <label>Yes, Valid</label>
+        </rules>
+    </decisions>
     <decisions>
         <name>Quick_UnsubscribeDecision</name>
         <label>Quick Unsubscribe</label>
-        <locationX>314</locationX>
-        <locationY>698</locationY>
+        <locationX>710</locationX>
+        <locationY>650</locationY>
         <defaultConnector>
             <targetReference>Are_you_sure</targetReference>
         </defaultConnector>
@@ -125,8 +195,8 @@
         <description>The custom metadata type stores the yes/no answer to whether or not you want an email sent to confirm that the person unsubscribed.</description>
         <name>Send_Confirmation_Email</name>
         <label>Send Confirmation Email</label>
-        <locationX>314</locationX>
-        <locationY>1322</locationY>
+        <locationX>710</locationX>
+        <locationY>1274</locationY>
         <defaultConnector>
             <targetReference>screenConfirmationNoEmail</targetReference>
         </defaultConnector>
@@ -142,7 +212,7 @@
                 </rightValue>
             </conditions>
             <connector>
-                <targetReference>ConfirmationEmail</targetReference>
+                <targetReference>Get_Org_Wide_Email_Address</targetReference>
             </connector>
             <label>Yes, send email</label>
         </rules>
@@ -152,8 +222,8 @@
 If not, check if the custom metadata type allows the user to type in their email address.</description>
         <name>Was_a_Record_Found</name>
         <label>Was a Record Found</label>
-        <locationX>842</locationX>
-        <locationY>590</locationY>
+        <locationX>1128</locationX>
+        <locationY>542</locationY>
         <defaultConnectorLabel>No record found, no type in</defaultConnectorLabel>
         <rules>
             <name>Yes_Record_Found1st</name>
@@ -233,16 +303,12 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Create Unsubscribe record which stores details of this transaction.</description>
         <name>Create_Unsubscribe_Record</name>
         <label>Create Unsubscribe Record</label>
-        <locationX>314</locationX>
-        <locationY>998</locationY>
+        <locationX>710</locationX>
+        <locationY>950</locationY>
         <assignRecordIdToReference>UnsubscribeId.Id</assignRecordIdToReference>
         <connector>
             <targetReference>Unsubscribe_Contacts</targetReference>
         </connector>
-        <faultConnector>
-            <isGoTo>true</isGoTo>
-            <targetReference>Error_Alert_Email</targetReference>
-        </faultConnector>
         <inputAssignments>
             <field>Contact__c</field>
             <value>
@@ -273,16 +339,12 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Look for a contact record with ID passed into the flow. Assign the email address to an email variable and the ID to a text variable called FoundId that is passed to other flows.</description>
         <name>Get_Contact</name>
         <label>Get Contact</label>
-        <locationX>314</locationX>
+        <locationX>864</locationX>
         <locationY>350</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Was_a_Record_Found</targetReference>
         </connector>
-        <faultConnector>
-            <isGoTo>true</isGoTo>
-            <targetReference>Error_Alert_Email</targetReference>
-        </faultConnector>
         <filterLogic>and</filterLogic>
         <filters>
             <field>Public_Id__c</field>
@@ -312,16 +374,12 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Look for a lead record with ID passed into the flow. Assign the email address to an email variable and the ID to a text variable called FoundId that is passed to other flows.</description>
         <name>Get_Lead</name>
         <label>Get Lead</label>
-        <locationX>842</locationX>
+        <locationX>1128</locationX>
         <locationY>350</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Was_a_Record_Found</targetReference>
         </connector>
-        <faultConnector>
-            <isGoTo>true</isGoTo>
-            <targetReference>Error_Alert_Email</targetReference>
-        </faultConnector>
         <filterLogic>or</filterLogic>
         <filters>
             <field>Public_Id__c</field>
@@ -340,19 +398,44 @@ If not, check if the custom metadata type allows the user to type in their email
             <field>Id</field>
         </outputAssignments>
     </recordLookups>
+    <recordLookups>
+        <description>Get Organization-Wide Email Address that is stored in the Unsubscribe Link Setup Record to check if it still exists and/or it has been verified</description>
+        <name>Get_Org_Wide_Email_Address</name>
+        <label>Get Org-Wide Email Address</label>
+        <locationX>314</locationX>
+        <locationY>1382</locationY>
+        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
+        <connector>
+            <targetReference>Is_Org_Wide_Email_Address_Valid</targetReference>
+        </connector>
+        <filterLogic>and</filterLogic>
+        <filters>
+            <field>Address</field>
+            <operator>EqualTo</operator>
+            <value>
+                <elementReference>Get_Unsubscribe_Link_Setup.Org_Wide_Email_Address__c</elementReference>
+            </value>
+        </filters>
+        <filters>
+            <field>IsVerified</field>
+            <operator>EqualTo</operator>
+            <value>
+                <booleanValue>true</booleanValue>
+            </value>
+        </filters>
+        <getFirstRecordOnly>true</getFirstRecordOnly>
+        <object>OrgWideEmailAddress</object>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordLookups>
     <recordLookups>
         <name>Get_Unsubscribe_Link_Setup</name>
         <label>Get Unsubscribe Link Setup</label>
-        <locationX>842</locationX>
+        <locationX>1128</locationX>
         <locationY>134</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Contact_or_Lead</targetReference>
         </connector>
-        <faultConnector>
-            <isGoTo>true</isGoTo>
-            <targetReference>Error_Alert_Email</targetReference>
-        </faultConnector>
         <getFirstRecordOnly>true</getFirstRecordOnly>
         <object>Unsubscribe_Link_Setup__c</object>
         <storeOutputAutomatically>true</storeOutputAutomatically>
@@ -362,8 +445,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>confirmation screen for person to confirm they want to unsubscribe. Update &quot;our organization&quot; in the custom metadata type &quot;Unsubscribe Link.&quot;</description>
         <name>Are_you_sure</name>
         <label>Are you sure</label>
-        <locationX>402</locationX>
-        <locationY>806</locationY>
+        <locationX>798</locationX>
+        <locationY>758</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -383,7 +466,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Error_Alert_Email</name>
         <label>Error Alert Screen</label>
         <locationX>314</locationX>
-        <locationY>1538</locationY>
+        <locationY>1706</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -399,7 +482,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>screenConfirmationEmail</name>
         <label>screenConfirmationEmail</label>
         <locationX>50</locationX>
-        <locationY>1538</locationY>
+        <locationY>1706</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -414,8 +497,8 @@ If not, check if the custom metadata type allows the user to type in their email
     <screens>
         <name>screenConfirmationNoEmail</name>
         <label>screenConfirmationNoEmail</label>
-        <locationX>578</locationX>
-        <locationY>1430</locationY>
+        <locationX>710</locationX>
+        <locationY>2114</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -428,7 +511,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <showHeader>false</showHeader>
     </screens>
     <start>
-        <locationX>716</locationX>
+        <locationX>1002</locationX>
         <locationY>0</locationY>
         <connector>
             <targetReference>Get_Unsubscribe_Link_Setup</targetReference>
@@ -438,8 +521,8 @@ If not, check if the custom metadata type allows the user to type in their email
     <subflows>
         <name>Blank_Values_Flow</name>
         <label>Blank Values Flow</label>
-        <locationX>1106</locationX>
-        <locationY>698</locationY>
+        <locationX>1282</locationX>
+        <locationY>650</locationY>
         <connector>
             <isGoTo>true</isGoTo>
             <targetReference>Quick_UnsubscribeDecision</targetReference>
@@ -470,8 +553,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Launch this additional flow to find all contacts who have this email address and mark them as email opt out.</description>
         <name>Unsubscribe_Contacts</name>
         <label>Unsubscribe Contacts</label>
-        <locationX>314</locationX>
-        <locationY>1106</locationY>
+        <locationX>710</locationX>
+        <locationY>1058</locationY>
         <connector>
             <targetReference>Unsubscribe_Leads</targetReference>
         </connector>
@@ -503,8 +586,8 @@ If not, check if the custom metadata type allows the user to type in their email
         <description>Part of the unmanaged packed Unsubscribe Link from Salesforce Labs and loops through all leads with a particular email address to mark them as email opt out. This flow is launched by the flow Unsubscribe Link.</description>
         <name>Unsubscribe_Leads</name>
         <label>Unsubscribe Leads</label>
-        <locationX>314</locationX>
-        <locationY>1214</locationY>
+        <locationX>710</locationX>
+        <locationY>1166</locationY>
         <connector>
             <targetReference>Send_Confirmation_Email</targetReference>
         </connector>
@@ -543,6 +626,11 @@ If not, check if the custom metadata type allows the user to type in their email
         <isViewedAsPlainText>false</isViewedAsPlainText>
         <text>&lt;p&gt;&lt;span style=&quot;color: rgb(62, 62, 60); background-color: rgb(255, 255, 255);&quot;&gt;Alert: there was an error in running the Flow Unsubscribe Link Quick.  This is part of the Unsubscribe Link managed package from appExchange. &lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;color: rgb(62, 62, 60); background-color: rgb(255, 255, 255);&quot;&gt;The error is most likely that the flow could not find the required Unsubscribe Link Setup record.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;color: rgb(62, 62, 60); background-color: rgb(255, 255, 255);&quot;&gt;Here are the variables that were input from the link in the email. &lt;/span&gt;&lt;/p&gt;&lt;ul&gt;&lt;li&gt;&lt;span style=&quot;color: rgb(62, 62, 60); background-color: rgb(255, 255, 255);&quot;&gt;publicId (the id passed in the URL)= {!varPublicID}&lt;/span&gt;&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;To modify who receives this email, run the Unsubscribe Link Setup Flow.&lt;/p&gt;</text>
     </textTemplates>
+    <textTemplates>
+        <name>errorEmailRichText</name>
+        <isViewedAsPlainText>false</isViewedAsPlainText>
+        <text>&lt;p&gt;There&apos;s an error in the &lt;strong&gt;Unsubscribe Link Quick &lt;/strong&gt;flow.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Please check whether the Organization-Wide Email Address: &lt;strong&gt;{!Get_Unsubscribe_Link_Setup.Org_Wide_Email_Address__c}&lt;/strong&gt;,&lt;strong&gt; &lt;/strong&gt;specified on the Unsubscribe Link Setup record exist in Setup and it&apos;s Status is &lt;strong&gt;Verified&lt;/strong&gt;.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;background-color: rgb(255, 255, 255);&quot;&gt;The Flow is part of an unmanaged package called Unsubscribe Link from the App Exchange.&lt;/span&gt;&lt;/p&gt;</text>
+    </textTemplates>
     <variables>
         <name>contactCollection</name>
         <dataType>SObject</dataType>

From c146fe064d43ab5ee86dfd4fc244b9f87ab03851 Mon Sep 17 00:00:00 2001
From: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Date: Fri, 1 Aug 2025 11:27:27 -0400
Subject: [PATCH 08/25] Partially addresses issue discovered error emails.

---
 .../Unsubscribe_Link_Quick.flowDefinition-meta.xml            | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml

diff --git a/force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml b/force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml
new file mode 100644
index 0000000..62c41b3
--- /dev/null
+++ b/force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FlowDefinition xmlns="http://soap.sforce.com/2006/04/metadata">
+    <activeVersionNumber>3</activeVersionNumber>
+</FlowDefinition>

From 177eda03229c13ed754048e998cf1f87f581a181 Mon Sep 17 00:00:00 2001
From: DKeatonDC <165526945+DKeatonDC@users.noreply.github.com>
Date: Fri, 1 Aug 2025 11:30:12 -0400
Subject: [PATCH 09/25] assigns value to text variable

---
 .../Unsubscribe_Link_Quick.flow-meta.xml      | 57 ++++++++++++-------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml b/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
index 6f319b4..2ff0be1 100644
--- a/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
+++ b/force-app/main/default/flows/Unsubscribe_Link_Quick.flow-meta.xml
@@ -5,7 +5,7 @@
         <name>ConfirmationEmail</name>
         <label>ConfirmationEmail</label>
         <locationX>50</locationX>
-        <locationY>1598</locationY>
+        <locationY>1706</locationY>
         <actionName>emailSimple</actionName>
         <actionType>emailSimple</actionType>
         <connector>
@@ -58,7 +58,7 @@
         <name>Send_Error_Email</name>
         <label>Send Error Email</label>
         <locationX>578</locationX>
-        <locationY>1598</locationY>
+        <locationY>1706</locationY>
         <actionName>emailSimple</actionName>
         <actionType>emailSimple</actionType>
         <connector>
@@ -102,12 +102,29 @@
         <nameSegment>emailSimple</nameSegment>
     </actionCalls>
     <apiVersion>61.0</apiVersion>
+    <assignments>
+        <description>Passes the error email recipient email from the unsubscribe link setup to a text variable used by subflows.</description>
+        <name>Set_ErrorRecipient</name>
+        <label>Set ErrorRecipient</label>
+        <locationX>1128</locationX>
+        <locationY>242</locationY>
+        <assignmentItems>
+            <assignToReference>ErrorRecipient</assignToReference>
+            <operator>Assign</operator>
+            <value>
+                <elementReference>Get_Unsubscribe_Link_Setup.Error_Email_Recipient__c</elementReference>
+            </value>
+        </assignmentItems>
+        <connector>
+            <targetReference>Contact_or_Lead</targetReference>
+        </connector>
+    </assignments>
     <decisions>
         <description>Was the original email with an unsubscribe link sent to a contact or a lead record? The Unsubscribe Link contains the public id., starting with C or L if it is a lead or contact. We need to find whether it is a contact or lead so that the Unsubscribe Record can be properly linked to the record.</description>
         <name>Contact_or_Lead</name>
         <label>Contact or Lead</label>
         <locationX>1128</locationX>
-        <locationY>242</locationY>
+        <locationY>350</locationY>
         <defaultConnector>
             <isGoTo>true</isGoTo>
             <targetReference>Blank_Values_Flow</targetReference>
@@ -148,7 +165,7 @@
         <name>Is_Org_Wide_Email_Address_Valid</name>
         <label>Is Org-Wide Email Address Valid</label>
         <locationX>314</locationX>
-        <locationY>1490</locationY>
+        <locationY>1598</locationY>
         <defaultConnector>
             <targetReference>Send_Error_Email</targetReference>
         </defaultConnector>
@@ -170,7 +187,7 @@
         <name>Quick_UnsubscribeDecision</name>
         <label>Quick Unsubscribe</label>
         <locationX>710</locationX>
-        <locationY>650</locationY>
+        <locationY>758</locationY>
         <defaultConnector>
             <targetReference>Are_you_sure</targetReference>
         </defaultConnector>
@@ -196,7 +213,7 @@
         <name>Send_Confirmation_Email</name>
         <label>Send Confirmation Email</label>
         <locationX>710</locationX>
-        <locationY>1274</locationY>
+        <locationY>1382</locationY>
         <defaultConnector>
             <targetReference>screenConfirmationNoEmail</targetReference>
         </defaultConnector>
@@ -223,7 +240,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Was_a_Record_Found</name>
         <label>Was a Record Found</label>
         <locationX>1128</locationX>
-        <locationY>542</locationY>
+        <locationY>650</locationY>
         <defaultConnectorLabel>No record found, no type in</defaultConnectorLabel>
         <rules>
             <name>Yes_Record_Found1st</name>
@@ -256,7 +273,7 @@ If not, check if the custom metadata type allows the user to type in their email
             <label>No record found. Allow Type-In</label>
         </rules>
     </decisions>
-    <description>Customer facing flow of the Unsubscribe Link managed package from AppExchange.</description>
+    <description>Customer facing flow of the Unsubscribe Link managed package from AppExchange. Updated to set the value of the error email recipient flow.  Previously, the value was blank.</description>
     <environments>Default</environments>
     <formulas>
         <description>get the total number of records that had this email address and unsubscribed.</description>
@@ -304,7 +321,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Create_Unsubscribe_Record</name>
         <label>Create Unsubscribe Record</label>
         <locationX>710</locationX>
-        <locationY>950</locationY>
+        <locationY>1058</locationY>
         <assignRecordIdToReference>UnsubscribeId.Id</assignRecordIdToReference>
         <connector>
             <targetReference>Unsubscribe_Contacts</targetReference>
@@ -340,7 +357,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Get_Contact</name>
         <label>Get Contact</label>
         <locationX>864</locationX>
-        <locationY>350</locationY>
+        <locationY>458</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Was_a_Record_Found</targetReference>
@@ -375,7 +392,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Get_Lead</name>
         <label>Get Lead</label>
         <locationX>1128</locationX>
-        <locationY>350</locationY>
+        <locationY>458</locationY>
         <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Was_a_Record_Found</targetReference>
@@ -403,7 +420,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Get_Org_Wide_Email_Address</name>
         <label>Get Org-Wide Email Address</label>
         <locationX>314</locationX>
-        <locationY>1382</locationY>
+        <locationY>1490</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Is_Org_Wide_Email_Address_Valid</targetReference>
@@ -434,7 +451,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <locationY>134</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
-            <targetReference>Contact_or_Lead</targetReference>
+            <targetReference>Set_ErrorRecipient</targetReference>
         </connector>
         <getFirstRecordOnly>true</getFirstRecordOnly>
         <object>Unsubscribe_Link_Setup__c</object>
@@ -446,7 +463,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Are_you_sure</name>
         <label>Are you sure</label>
         <locationX>798</locationX>
-        <locationY>758</locationY>
+        <locationY>866</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -466,7 +483,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Error_Alert_Email</name>
         <label>Error Alert Screen</label>
         <locationX>314</locationX>
-        <locationY>1706</locationY>
+        <locationY>1814</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -482,7 +499,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>screenConfirmationEmail</name>
         <label>screenConfirmationEmail</label>
         <locationX>50</locationX>
-        <locationY>1706</locationY>
+        <locationY>1814</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -498,7 +515,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>screenConfirmationNoEmail</name>
         <label>screenConfirmationNoEmail</label>
         <locationX>710</locationX>
-        <locationY>2114</locationY>
+        <locationY>2222</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>true</allowPause>
@@ -522,7 +539,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Blank_Values_Flow</name>
         <label>Blank Values Flow</label>
         <locationX>1282</locationX>
-        <locationY>650</locationY>
+        <locationY>758</locationY>
         <connector>
             <isGoTo>true</isGoTo>
             <targetReference>Quick_UnsubscribeDecision</targetReference>
@@ -554,7 +571,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Unsubscribe_Contacts</name>
         <label>Unsubscribe Contacts</label>
         <locationX>710</locationX>
-        <locationY>1058</locationY>
+        <locationY>1166</locationY>
         <connector>
             <targetReference>Unsubscribe_Leads</targetReference>
         </connector>
@@ -587,7 +604,7 @@ If not, check if the custom metadata type allows the user to type in their email
         <name>Unsubscribe_Leads</name>
         <label>Unsubscribe Leads</label>
         <locationX>710</locationX>
-        <locationY>1166</locationY>
+        <locationY>1274</locationY>
         <connector>
             <targetReference>Send_Confirmation_Email</targetReference>
         </connector>

From abc5880511a14e133e6acc48ba2fadaaeeafc6c7 Mon Sep 17 00:00:00 2001
From: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
Date: Wed, 27 Aug 2025 14:37:45 +0200
Subject: [PATCH 10/25] Delete
 force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml

flow definition does not need to be included.

Signed-off-by: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
---
 .../Unsubscribe_Link_Quick.flowDefinition-meta.xml            | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml

diff --git a/force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml b/force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml
deleted file mode 100644
index 62c41b3..0000000
--- a/force-app/main/default/flowDefinitions/Unsubscribe_Link_Quick.flowDefinition-meta.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FlowDefinition xmlns="http://soap.sforce.com/2006/04/metadata">
-    <activeVersionNumber>3</activeVersionNumber>
-</FlowDefinition>

From a51e4ba587a59afd41c6ae81b0cc29443a98d889 Mon Sep 17 00:00:00 2001
From: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
Date: Wed, 27 Aug 2025 19:49:21 +0200
Subject: [PATCH 11/25] feature/versionNumber

update version numbers in sfdx-project.json
---
 sfdx-project.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sfdx-project.json b/sfdx-project.json
index 3896fe3..478c634 100644
--- a/sfdx-project.json
+++ b/sfdx-project.json
@@ -4,13 +4,13 @@
       "path": "force-app",
       "package": "Unsubscribe Link",
       "versionName": "ver 0.1.NEXT",
-      "versionNumber": "0.1.0.NEXT",
+      "versionNumber": "0.1.1.NEXT",
       "default": true,
       "versionDescription": ""
     },
     {
       "versionName": "ver 0.1",
-      "versionNumber": "0.1.0.NEXT",
+      "versionNumber": "0.1.1.NEXT",
       "definitionFile": "config/scratch-org-def.json",
       "path": "unsubscribe",
       "default": false,

From 23e8fbaae2445f8a5232770602dc51edf5b34312 Mon Sep 17 00:00:00 2001
From: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
Date: Thu, 28 Aug 2025 10:23:17 +0200
Subject: [PATCH 12/25] Update Sample_Contact_Template_HTML.email-meta.xml

Change the name of the email template.

Signed-off-by: Jessie Rymph <155984652+salgsstyrke@users.noreply.github.com>
---
 .../unfiled$public/Sample_Contact_Template_HTML.email-meta.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
index d66ee3a..ce7a4a0 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Sample Contact Template</name>
+    <name>Unsubscribe Sample Contact Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>

From a2505441382da074bdfaff5700f5b56b346a8927 Mon Sep 17 00:00:00 2001
From: salgsstyrke <jessierymph+git@gmail.com>
Date: Thu, 28 Aug 2025 10:39:08 +0200
Subject: [PATCH 13/25] feature/emailtemplatenames

---
 .../unfiled$public/Sample_Contact_Template_HTML.email-meta.xml  | 2 +-
 .../unfiled$public/Sample_Lead_Template_HTML.email-meta.xml     | 2 +-
 .../Sample_Lead_Template_Plain_Text.email-meta.xml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
index ce7a4a0..e1707b0 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Contact Template</name>
+    <name>Unsubscribe Sample Contact Template </name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
index aed24c3..e063018 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Sample Lead Template</name>
+    <name>Unsubscribe Sample Lead Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
index baf382d..1a92eb7 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Sample Lead Template-Plain Text</name>
+    <name>Unsubscribe Sample Lead Template-Plain Text</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>

From 9b03f6fb5da409f418c7e20664e874d38e315ada Mon Sep 17 00:00:00 2001
From: salgsstyrke <jessierymph+git@gmail.com>
Date: Fri, 29 Aug 2025 12:48:17 +0200
Subject: [PATCH 14/25] feature/emailFolder

Move 3 vf template emails to their own folder because of a conflict in unfiled public.
---
 .../Sample_Contact_Template_HTML.email                      | 0
 .../Sample_Contact_Template_HTML.email-meta.xml             | 0
 .../Sample_Lead_Template_HTML.email                         | 0
 .../Sample_Lead_Template_HTML.email-meta.xml                | 0
 .../Sample_Lead_Template_Plain_Text.email                   | 0
 .../Sample_Lead_Template_Plain_Text.email-meta.xml          | 0
 .../Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml  | 6 ++++++
 7 files changed, 6 insertions(+)
 rename force-app/main/default/email/{unfiled$public => Unsubscribe_Link}/Sample_Contact_Template_HTML.email (100%)
 rename force-app/main/default/email/{unfiled$public => Unsubscribe_Link}/Sample_Contact_Template_HTML.email-meta.xml (100%)
 rename force-app/main/default/email/{unfiled$public => Unsubscribe_Link}/Sample_Lead_Template_HTML.email (100%)
 rename force-app/main/default/email/{unfiled$public => Unsubscribe_Link}/Sample_Lead_Template_HTML.email-meta.xml (100%)
 rename force-app/main/default/email/{unfiled$public => Unsubscribe_Link}/Sample_Lead_Template_Plain_Text.email (100%)
 rename force-app/main/default/email/{unfiled$public => Unsubscribe_Link}/Sample_Lead_Template_Plain_Text.email-meta.xml (100%)
 create mode 100644 force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml

diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email b/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email
similarity index 100%
rename from force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
rename to force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email
diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml
similarity index 100%
rename from force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
rename to force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email b/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email
similarity index 100%
rename from force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
rename to force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email-meta.xml
similarity index 100%
rename from force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
rename to force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email-meta.xml
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email b/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email
similarity index 100%
rename from force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
rename to force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email-meta.xml
similarity index 100%
rename from force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
rename to force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email-meta.xml
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml
new file mode 100644
index 0000000..33b4625
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
+    <accessType>Public</accessType>
+    <name>Unsubscribe Link</name>
+    <publicFolderAccess>ReadOnly</publicFolderAccess>
+</EmailFolder>

From fbf7d551815259f22b81dbc0b7ff9be6c2b2a8d0 Mon Sep 17 00:00:00 2001
From: salgsstyrke <jessierymph+git@gmail.com>
Date: Fri, 29 Aug 2025 13:02:59 +0200
Subject: [PATCH 15/25] feature/Email Folder xml

---
 .../default/email/Unsubscribe_Link.emailFolder-meta.xml     | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml

diff --git a/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml b/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
new file mode 100644
index 0000000..33b4625
--- /dev/null
+++ b/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
+    <accessType>Public</accessType>
+    <name>Unsubscribe Link</name>
+    <publicFolderAccess>ReadOnly</publicFolderAccess>
+</EmailFolder>

From 45bb14e27a4dad7a44ec5c0b39ca37b44334f750 Mon Sep 17 00:00:00 2001
From: salgsstyrke <jessierymph+git@gmail.com>
Date: Fri, 29 Aug 2025 13:27:24 +0200
Subject: [PATCH 16/25] feature/ReNameEmailsandFolder

---
 .../default/email/Unsubscribe_Link.emailFolder-meta.xml     | 2 +-
 ...e_HTML.email => Unsubscribe_Contact_Template_HTML.email} | 0
 ...xml => Unsubscribe_Contact_Template_HTML.email-meta.xml} | 2 +-
 ...late_HTML.email => Unsubscribe_Lead_Template_HTML.email} | 0
 ...ta.xml => Unsubscribe_Lead_Template_HTML.email-meta.xml} | 0
 ...ext.email => Unsubscribe_Lead_Template_Plain_Text.email} | 0
 ... => Unsubscribe_Lead_Template_Plain_Text.email-meta.xml} | 0
 .../Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml  | 6 ------
 8 files changed, 2 insertions(+), 8 deletions(-)
 rename force-app/main/default/email/Unsubscribe_Link/{Sample_Contact_Template_HTML.email => Unsubscribe_Contact_Template_HTML.email} (100%)
 rename force-app/main/default/email/Unsubscribe_Link/{Sample_Contact_Template_HTML.email-meta.xml => Unsubscribe_Contact_Template_HTML.email-meta.xml} (89%)
 rename force-app/main/default/email/Unsubscribe_Link/{Sample_Lead_Template_HTML.email => Unsubscribe_Lead_Template_HTML.email} (100%)
 rename force-app/main/default/email/Unsubscribe_Link/{Sample_Lead_Template_HTML.email-meta.xml => Unsubscribe_Lead_Template_HTML.email-meta.xml} (100%)
 rename force-app/main/default/email/Unsubscribe_Link/{Sample_Lead_Template_Plain_Text.email => Unsubscribe_Lead_Template_Plain_Text.email} (100%)
 rename force-app/main/default/email/Unsubscribe_Link/{Sample_Lead_Template_Plain_Text.email-meta.xml => Unsubscribe_Lead_Template_Plain_Text.email-meta.xml} (100%)
 delete mode 100644 force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml

diff --git a/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml b/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
index 33b4625..307b43b 100644
--- a/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
+++ b/force-app/main/default/email/Unsubscribe_Link.emailFolder-meta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
     <accessType>Public</accessType>
-    <name>Unsubscribe Link</name>
+    <name>UnsubscribeLink</name>
     <publicFolderAccess>ReadOnly</publicFolderAccess>
 </EmailFolder>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email
rename to force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml
similarity index 89%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml
rename to force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml
index e1707b0..ce7a4a0 100644
--- a/force-app/main/default/email/Unsubscribe_Link/Sample_Contact_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Contact_Template_HTML.email-meta.xml
@@ -4,7 +4,7 @@
     <available>true</available>
     <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
     <encodingKey>UTF-8</encodingKey>
-    <name>Unsubscribe Sample Contact Template </name>
+    <name>Unsubscribe Sample Contact Template</name>
     <style>none</style>
     <subject>Edit this subject</subject>
     <type>visualforce</type>
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email
rename to force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_HTML.email-meta.xml
rename to force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_HTML.email-meta.xml
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email
rename to force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email
diff --git a/force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml
similarity index 100%
rename from force-app/main/default/email/Unsubscribe_Link/Sample_Lead_Template_Plain_Text.email-meta.xml
rename to force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Lead_Template_Plain_Text.email-meta.xml
diff --git a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml b/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml
deleted file mode 100644
index 33b4625..0000000
--- a/force-app/main/default/email/Unsubscribe_Link/Unsubscribe_Link.emailFolder-meta.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EmailFolder xmlns="http://soap.sforce.com/2006/04/metadata">
-    <accessType>Public</accessType>
-    <name>Unsubscribe Link</name>
-    <publicFolderAccess>ReadOnly</publicFolderAccess>
-</EmailFolder>

From 6ca94d4b31c586d00806ca5321df34d6e1ff976a Mon Sep 17 00:00:00 2001
From: salgsstyrke <jessierymph+git@gmail.com>
Date: Mon, 1 Sep 2025 13:50:56 +0200
Subject: [PATCH 17/25] feature/undoEmailRelatedChanges

All of my changes related to the emails were breaking it so now attempting to undo those changes.
---
 .../email/unfiled$public/Sample_Contact_Template_HTML.email     | 2 +-
 .../unfiled$public/Sample_Contact_Template_HTML.email-meta.xml  | 2 +-
 .../unfiled$public/Sample_Lead_Template_HTML.email-meta.xml     | 2 +-
 .../email/unfiled$public/Sample_Lead_Template_Plain_Text.email  | 2 +-
 .../Sample_Lead_Template_Plain_Text.email-meta.xml              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
index 3956710..f86d2ca 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
@@ -1,5 +1,5 @@
 <messaging:emailTemplate subject="Edit this subject" recipientType="Contact" >
-  <messaging:htmlEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  <messaging:htmlEmailBody > <!--  When creating a new visualforce template, the default option is plainTextEmailBody.
   the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
   adding the visualforce component -->
 <P>Dear Friend,</P>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
index e1707b0..b610f52 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
@@ -2,7 +2,7 @@
 <EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>64.0</apiVersion>
     <available>true</available>
-    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object. </description>
     <encodingKey>UTF-8</encodingKey>
     <name>Unsubscribe Sample Contact Template </name>
     <style>none</style>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
index e063018..3f23bc9 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
@@ -2,7 +2,7 @@
 <EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>64.0</apiVersion>
     <available>true</available>
-    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object. </description>
     <encodingKey>UTF-8</encodingKey>
     <name>Unsubscribe Sample Lead Template</name>
     <style>none</style>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
index edb2140..4b47148 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
@@ -1,5 +1,5 @@
 <messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
-  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody. 
   the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
   adding the visualforce component -->
 Dear Friend,
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
index 1a92eb7..9b44272 100644
--- a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
@@ -2,7 +2,7 @@
 <EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>64.0</apiVersion>
     <available>true</available>
-    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email.</description>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email </description>
     <encodingKey>UTF-8</encodingKey>
     <name>Unsubscribe Sample Lead Template-Plain Text</name>
     <style>none</style>

From 5b1d08ad65301ae3d9b67886fa7bb43ae9fa3bb1 Mon Sep 17 00:00:00 2001
From: Aaron Crosman <acrosman@avaenergy.org>
Date: Fri, 14 Nov 2025 09:57:52 -0700
Subject: [PATCH 18/25] Move try statement to before single email message
 creation.

---
 force-app/main/default/classes/UUIDBatchJob.cls | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/classes/UUIDBatchJob.cls b/force-app/main/default/classes/UUIDBatchJob.cls
index f208d4e..ee56f15 100644
--- a/force-app/main/default/classes/UUIDBatchJob.cls
+++ b/force-app/main/default/classes/UUIDBatchJob.cls
@@ -109,12 +109,12 @@ public with sharing class UUIDBatchJob implements Database.Batchable<SObject> {
       }
     );
 
-    Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
-    mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
-    mail.setSubject('UUID Batch Job Complete');
-    mail.setPlainTextBody(emailBody);
-
     try {
+      Messaging.SingleEmailMessage mail = new Messaging.SingleEmailMessage();
+      mail.setToAddresses(new List<String>{ job.CreatedBy.Email });
+      mail.setSubject('UUID Batch Job Complete');
+      mail.setPlainTextBody(emailBody);
+
       Messaging.sendEmail(new List<Messaging.SingleEmailMessage>{ mail });
     } catch (Exception e) {
       System.debug(

From c46568a56106dbb548c7fb494ce1a2298c313814 Mon Sep 17 00:00:00 2001
From: Aaron Crosman <acrosman@gmail.com>
Date: Fri, 14 Nov 2025 15:31:28 -0700
Subject: [PATCH 19/25] Remove CCI and SFDX version hardcoding.

---
 .github/workflows/feature.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index b3edfc6..ffda1b7 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -11,6 +11,6 @@ jobs:
    uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
    secrets:
     dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  #  with:
+  #   cumulusci-version: '3.93.0'
+  #   sfdx-version: '7.209.6'

From 8ea88ff27c862a059b3c02a78bb7c68bd1e5b864 Mon Sep 17 00:00:00 2001
From: Aaron Crosman <acrosman@gmail.com>
Date: Fri, 14 Nov 2025 15:35:16 -0700
Subject: [PATCH 20/25] Updates to Beta and Prod workflows to review version
 numbers

---
 .github/workflows/beta.yml | 6 +++---
 .github/workflows/prod.yml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index ac81baf..5122806 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -9,6 +9,6 @@ jobs:
    uses: "SFDO-Community/standard-workflows/.github/workflows/beta-2gp.yml@main"
    secrets:
     dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-   with:
-    cumulusci-version: '3.93.0'
-    sfdx-version: '7.209.6'
+  #  with:
+  #   cumulusci-version: '3.93.0'
+  #   sfdx-version: '7.209.6'
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index 1696028..e704693 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -1,11 +1,11 @@
 on:
-  workflow_dispatch: 
+  workflow_dispatch:
 jobs:
   upload-production-release-2gp:
     name: "Upload Production Release (2GP)"
     uses: SFDO-Community/standard-workflows/.github/workflows/production-2gp.yml@main
-    with:
-      cumulusci-version: '3.93.0'
-      sfdx-version: '7.209.6'
+    # with:
+    #   cumulusci-version: '3.93.0'
+    #   sfdx-version: '7.209.6'
     secrets:
       dev-hub-auth-url: '${{ secrets.PACKAGING_ORG_AUTH_URL }}'

From f9c2758b43a5af39f16ec5cccbfde848359afa66 Mon Sep 17 00:00:00 2001
From: James Estevez <j@jstvz.dev>
Date: Tue, 2 Dec 2025 17:25:59 -0800
Subject: [PATCH 21/25] Enable CI workflow on all pull requests (#182)

Updates feature test workflow to trigger on pull requests instead of
only feature/** branch pushes. This enables CI to run on PRs from any
branch and from forks after maintainer approval.
---
 .github/workflows/feature.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index ffda1b7..ec51375 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -1,8 +1,6 @@
 name: "Feature Test"
 on:
-  push:
-    branches:
-      - feature/**
+  pull_request:
 
 
 jobs:

From a8836adde248133cc945c19892832e482d47a42c Mon Sep 17 00:00:00 2001
From: Cori O'Brien <37851761+coriobriensfdo@users.noreply.github.com>
Date: Thu, 4 Dec 2025 10:12:11 -0800
Subject: [PATCH 22/25] Update CODEOWNERS (#181)

Description to use: Adding ECCN information per Salesforce OSPO request

Signed-off-by: Cori O'Brien <37851761+coriobriensfdo@users.noreply.github.com>
Co-authored-by: James Estevez <j@jstvz.dev>
---
 CODEOWNERS | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index ce7a494..f1550f4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,14 @@
-# Comment line immediately above ownership line is reserved for related other information. Please be careful while editing.
+# Python
+*.py                  @SFDO-Community/sfdo-release-engineers
+
+# CumulusCI
+/cumulusci.yml        @SFDO-Community/sfdo-release-engineers
+/tasks/               @SFDO-Community/sfdo-release-engineers
+
+# Actions
+/.github                @SFDO-Community/sfdo-release-engineers
+/scripts                @SFDO-Community/sfdo-release-engineers
+
+
 #ECCN:Open Source
+#GUSINFO:Open Source,Open Source Workflow

From edbbed1602164953a7f38a605b32ace2ab6e1900 Mon Sep 17 00:00:00 2001
From: James Estevez <j@jstvz.dev>
Date: Thu, 4 Dec 2025 20:25:14 -0800
Subject: [PATCH 23/25] chore: enable manual workflow dispatch for security
 testing (#183)

---
 .github/workflows/feature.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index ec51375..3be451d 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -1,6 +1,7 @@
 name: "Feature Test"
 on:
   pull_request:
+  workflow_dispatch:
 
 
 jobs:

From d2115c5d766dd98b41b44b2d9a855cdcbad55c11 Mon Sep 17 00:00:00 2001
From: James Estevez <j@jstvz.dev>
Date: Tue, 3 Feb 2026 14:41:40 -0800
Subject: [PATCH 24/25] fix: correct YAML indentation in feature workflow
 (#191)

## Summary
- Fix YAML indentation in feature workflow that caused SFDX auth URL parsing errors

## Details
Corrected indentation for the `feature-test` job and `secrets` section. The malformed YAML was causing the dev-hub-auth-url secret to be incorrectly parsed, resulting in "Invalid SFDX authorization URL" errors during workflow execution.

## Test Plan
- [ ] Verify workflow runs successfully with proper SFDX auth URL format
---
 .github/workflows/feature.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/feature.yml b/.github/workflows/feature.yml
index 3be451d..5bf1d9c 100644
--- a/.github/workflows/feature.yml
+++ b/.github/workflows/feature.yml
@@ -3,13 +3,9 @@ on:
   pull_request:
   workflow_dispatch:
 
-
 jobs:
- feature-test:
-   name: "Feature Test"
-   uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
-   secrets:
-    dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
-  #  with:
-  #   cumulusci-version: '3.93.0'
-  #   sfdx-version: '7.209.6'
+  feature-test:
+    name: "Feature Test"
+    uses: "SFDO-Community/standard-workflows/.github/workflows/feature.yml@main"
+    secrets:
+      dev-hub-auth-url: "${{ secrets.DEV_HUB_AUTH_URL }}"
\ No newline at end of file

From 75d776c50b278e881c59c7aabdde9e6021c7158d Mon Sep 17 00:00:00 2001
From: Aaron Crosman <acrosman@gmail.com>
Date: Thu, 8 Jan 2026 18:46:39 -0500
Subject: [PATCH 25/25] Restore sample email templates to public folder.

---
 .../Sample_Contact_Template_HTML.email          | 17 +++++++++++++++++
 .../Sample_Contact_Template_HTML.email-meta.xml | 12 ++++++++++++
 .../Sample_Lead_Template_HTML.email             | 17 +++++++++++++++++
 .../Sample_Lead_Template_HTML.email-meta.xml    | 12 ++++++++++++
 .../Sample_Lead_Template_Plain_Text.email       | 17 +++++++++++++++++
 ...mple_Lead_Template_Plain_Text.email-meta.xml | 12 ++++++++++++
 6 files changed, 87 insertions(+)
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
 create mode 100644 force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml

diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
new file mode 100644
index 0000000..3956710
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Contact" >
+  <messaging:htmlEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+<P>Dear Friend,</P>
+
+<P>It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!</P>
+
+<P>Your friend,</P>
+
+<P>Bob</P>
+
+
+     <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
+     which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
+   </messaging:htmlEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
new file mode 100644
index 0000000..d66ee3a
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Contact_Template_HTML.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for contact that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Sample Contact Template</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
new file mode 100644
index 0000000..fe5b9ac
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
+  <messaging:htmlEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+<P>Dear Friend,</P>
+
+<P>It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!</P>
+
+<P>Your friend,</P>
+
+<P>Bob</P>
+
+
+     <c:UnsubscribeLink recipientId="{!recipient.Id}"></c:UnsubscribeLink> <!-- This is the custom component
+     which can be added to any visualforce email template.  It is compatible with both leads and contacts. -->
+   </messaging:htmlEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
new file mode 100644
index 0000000..aed24c3
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_HTML.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link visualforce object.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Sample Lead Template</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
new file mode 100644
index 0000000..edb2140
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email
@@ -0,0 +1,17 @@
+<messaging:emailTemplate subject="Edit this subject" recipientType="Lead" >
+  <messaging:plainTextEmailBody > <!-- When creating a new visualforce template, the default option is plainTextEmailBody.
+  the unsubscribe link will note appear in that case.  Convert any visualforce templates to htmlEmailBody before
+  adding the visualforce component -->
+Dear Friend,
+
+It's Thursday! You love to order a pizza on Thursdays! If you order before 5, I'll also throw in some free drinks!
+
+Your friend,
+
+Bob
+
+Copy and paste this in your browser to unsubscribe: 
+{!Recipient.Unsubscribe_Url_Plain_Text__c}  <!-- This field can be 
+added to any plain text contact or lead email to display the url-->
+   </messaging:plainTextEmailBody>
+</messaging:emailTemplate>
\ No newline at end of file
diff --git a/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
new file mode 100644
index 0000000..baf382d
--- /dev/null
+++ b/force-app/main/default/email/unfiled$public/Sample_Lead_Template_Plain_Text.email-meta.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>64.0</apiVersion>
+    <available>true</available>
+    <description>Sample template for lead that demonstrates how to use the unsubscribe link field in a plain text Visualforce email.</description>
+    <encodingKey>UTF-8</encodingKey>
+    <name>Sample Lead Template-Plain Text</name>
+    <style>none</style>
+    <subject>Edit this subject</subject>
+    <type>visualforce</type>
+    <uiType>Aloha</uiType>
+</EmailTemplate>