Merge pull request #1787 from thebiggive/develop

Develop -> main

package.json

@@ -44,8 +44,8 @@
     "@angular/platform-server": "^18.2.8",
     "@angular/router": "^18.2.8",
     "@angular/ssr": "^18.2.8",
-    "@biggive/components": "^202411271427.0.0",
-    "@biggive/components-angular": "^202411271427.0.0",
+    "@biggive/components": "^202411281608.0.0",
+    "@biggive/components-angular": "^202411281608.0.0",
     "@fortawesome/angular-fontawesome": "~0.15.0",
     "@fortawesome/free-brands-svg-icons": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",

src/app/donation-thanks/donation-thanks.component.html

@@ -205,7 +205,7 @@ <h2>Thank you!</h2>
                 <biggive-social-icon
                   service="Twitter"
                   label-prefix="Share"
-                  url="https://twitter.com/share?url={{ encodedShareUrl }}&text={{ encodedPrefilledText }}"
+                  url="https://x.com/intent/post?url={{ encodedShareUrl }}&text={{ encodedPrefilledText }}"
                   background-colour="tertiary"
                   icon-colour="black"
                   wide="true"

src/app/highlight-cards/HighlightCard.spec.ts

@@ -113,6 +113,10 @@ describe('highlightCard', () => {
   });
 
   it('should replace CC24 link with metacampaign page', () => {
+    if (new Date() > new Date('2025-02-01')) {
+      pending('Implementation was only made for 2024');
+    }
+
     const cardFromApi = cardLinkingTo("https://example-blog.com/christmas-challenge/");
 
     const highlightCardForHomepage = SFAPIHighlightCardToHighlightCard(

src/app/highlight-cards/HighlightCard.ts

@@ -62,7 +62,7 @@ export const SFAPIHighlightCardToHighlightCard = (experienceUriPrefix: string, b
   let href = replaceURLOrigin(experienceUriPrefix, blogUriPrefix, donateUriPrefix, sfApiHighlightCard.button.href);
 
   // temp fix for 2024. Will need to think of something better and probably move this logic to SF for next year.
-  if (href.pathname.includes('christmas-challenge')) {
+  if (href.pathname.includes('christmas-challenge') && (new Date() < new Date('2025-02-01')))  {
     href = new URL(donateUriPrefix + '/christmas-challenge-2024');
   }