From 92639535ed8f860d9cc84c79608565fe08ed4760 Mon Sep 17 00:00:00 2001
From: Max Antonucci <maxx1128@gmail.com>
Date: Wed, 28 Feb 2024 09:36:07 -0500
Subject: [PATCH] VA-16652: Check extension for other va-telephone instances

---
 src/site/includes/vba_facilities/service_location.liquid | 9 +++++++--
 src/site/layouts/vba_facility.drupal.liquid              | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/site/includes/vba_facilities/service_location.liquid b/src/site/includes/vba_facilities/service_location.liquid
index d925720c55..977d7f3fa1 100644
--- a/src/site/includes/vba_facilities/service_location.liquid
+++ b/src/site/includes/vba_facilities/service_location.liquid
@@ -25,7 +25,12 @@
         Main Phone
       </h5>
 
-      <va-telephone contact="{{ facilityPhone }}" message-aria-describedby="Main Phone" />
+      {% assign separatedFacilityPhone = facilityPhone | separatePhoneNumberExtension %}
+      <va-telephone
+        contact="{{ separatedFacilityPhone.phoneNumber }}"
+        extension="{{ separatedFacilityPhone.extension }}"
+        message-aria-describedby="Main Phone"
+      />
     </div>
   {% elsif location.entity.fieldPhone %}
     {% for phoneObj in location.entity.fieldPhone %}
@@ -136,4 +141,4 @@
       </p>
     </div>
   {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/src/site/layouts/vba_facility.drupal.liquid b/src/site/layouts/vba_facility.drupal.liquid
index 3739641a2c..5dea66dc9a 100644
--- a/src/site/layouts/vba_facility.drupal.liquid
+++ b/src/site/layouts/vba_facility.drupal.liquid
@@ -114,7 +114,11 @@
                         <div class="vads-u-margin-bottom--1">
                           <p class="vads-u-margin-top--0">
                             <strong>Main phone:</strong>
-                            <va-telephone contact="{{fieldPhoneNumber}}" />
+                            {% assign separatedFieldPhoneNumber = fieldPhoneNumber | separatePhoneNumberExtension %}
+                            <va-telephone
+                              contact="{{ separatedFieldPhoneNumber.phoneNumber }}"
+                              extension="{{ separatedFieldPhoneNumber.extension }}"
+                            />
                           </p>
                         </div>
                       {% endif %}