From 1e65f26af113f453cd0108ce479ce5bbc33054ae Mon Sep 17 00:00:00 2001
From: Jason Rosa <jrosa@hubspot.com>
Date: Wed, 25 Oct 2023 16:49:33 -0400
Subject: [PATCH 1/4] Updating icon set for the social follow module and update
 the twitter icon to use twitter X

---
 src/modules/social-follow.module/fields.json | 4 ++--
 src/modules/social-follow.module/module.html | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/social-follow.module/fields.json b/src/modules/social-follow.module/fields.json
index 70bab8cbe..e3d5249a6 100644
--- a/src/modules/social-follow.module/fields.json
+++ b/src/modules/social-follow.module/fields.json
@@ -15,7 +15,7 @@
         "type": "choice",
         "choices": [
           ["facebook-f", "Facebook"],
-          ["twitter", "Twitter"],
+          ["x-twitter", "Twitter"],
           ["instagram", "Instagram"],
           ["linkedin-in", "LinkedIn"],
           ["youtube", "YouTube"],
@@ -108,7 +108,7 @@
         }
       },
       {
-        "social_account": "twitter",
+        "social_account": "x-twitter",
         "social_link": {
           "no_follow": false,
           "open_in_new_tab": true,
diff --git a/src/modules/social-follow.module/module.html b/src/modules/social-follow.module/module.html
index 5fc3cdc75..ba4a3c341 100644
--- a/src/modules/social-follow.module/module.html
+++ b/src/modules/social-follow.module/module.html
@@ -105,7 +105,7 @@
     {# Sets a custom icon if the custom option is selected #}
 
     {% if item.social_account != "custom_icon" %}
-      {% set social_icon = item.social_account %}
+      {% set social_icon = item.social_account|replace("-", " ") %}
     {% else %}
       {% set social_icon = item.custom_icon.name %}
     {% endif %}
@@ -118,11 +118,13 @@
       {% icon
         extra_classes="social-links__icon",
         name="{{ social_icon }}",
+        icon_set="fontawesome-6.4.2"
         purpose="semantic",
         style="SOLID",
         title="{{ item.accessibility.title }}",
         unique_in_loop=True
       %}
+      {{ social_icon }}
     </a>
 
   {% endfor %}

From ff23f584e190e870680256a9d7da282806fc7215 Mon Sep 17 00:00:00 2001
From: Jason Rosa <jrosa@hubspot.com>
Date: Wed, 25 Oct 2023 16:50:40 -0400
Subject: [PATCH 2/4] Removing test code

---
 src/modules/social-follow.module/module.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/social-follow.module/module.html b/src/modules/social-follow.module/module.html
index ba4a3c341..afdd2bbb5 100644
--- a/src/modules/social-follow.module/module.html
+++ b/src/modules/social-follow.module/module.html
@@ -124,7 +124,6 @@
         title="{{ item.accessibility.title }}",
         unique_in_loop=True
       %}
-      {{ social_icon }}
     </a>
 
   {% endfor %}

From 4530db3b97a4432d5b3c95fe9cfcc488f584c46a Mon Sep 17 00:00:00 2001
From: Jason Rosa <jrosa@hubspot.com>
Date: Wed, 25 Oct 2023 17:00:53 -0400
Subject: [PATCH 3/4] Making a tweak to fix whatsapp

---
 src/modules/social-follow.module/fields.json | 1 +
 src/modules/social-follow.module/module.html | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/social-follow.module/fields.json b/src/modules/social-follow.module/fields.json
index e3d5249a6..d99d1a941 100644
--- a/src/modules/social-follow.module/fields.json
+++ b/src/modules/social-follow.module/fields.json
@@ -33,6 +33,7 @@
         "label": "Custom icon",
         "name": "custom_icon",
         "type": "icon",
+        "icon_set" : "fontawesome-6.4.2",
         "visibility": {
           "controlling_field": "social_account",
           "controlling_value_regex": "custom_icon",
diff --git a/src/modules/social-follow.module/module.html b/src/modules/social-follow.module/module.html
index afdd2bbb5..7e5c3f291 100644
--- a/src/modules/social-follow.module/module.html
+++ b/src/modules/social-follow.module/module.html
@@ -104,7 +104,9 @@
 
     {# Sets a custom icon if the custom option is selected #}
 
-    {% if item.social_account != "custom_icon" %}
+    {% if item.social_account == "whatsapp" %}
+      {% set social_icon = "What's App" %}
+    {% elif item.social_account != "custom_icon" %}
       {% set social_icon = item.social_account|replace("-", " ") %}
     {% else %}
       {% set social_icon = item.custom_icon.name %}

From 419f40ed983b615bf289b11f24038a425df6795c Mon Sep 17 00:00:00 2001
From: Jason Rosa <jrosa@hubspot.com>
Date: Wed, 25 Oct 2023 17:02:04 -0400
Subject: [PATCH 4/4] Updating pricing card icon to use the latest set

---
 src/modules/pricing-card.module/fields.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/pricing-card.module/fields.json b/src/modules/pricing-card.module/fields.json
index fa756fcb0..69aa6e0a7 100644
--- a/src/modules/pricing-card.module/fields.json
+++ b/src/modules/pricing-card.module/fields.json
@@ -30,6 +30,7 @@
     "label": "Features list icon",
     "name": "feature_icon",
     "type": "icon",
+    "icon_set" : "fontawesome-6.4.2",
     "default": {
       "name": "check",
       "type": "SOLID",