[email protected] - Update supported country list & change redirection f…

…rom twitter to X platform (#2530) * Fix failed f-footer tests * remove unused flags * address comment * address comment * Update CHANGELOG.md * WCP-944: update test snapshot * WCP-944: remove nz tenant files
justeattakeaway · May 22, 2024 · dd2837a · dd2837a
1 parent 50ec7e3
commit dd2837a
Show file tree

Hide file tree

Showing 21 changed files with 68 additions and 418 deletions.
diff --git a/packages/components/organisms/f-footer/CHANGELOG.md b/packages/components/organisms/f-footer/CHANGELOG.md
@@ -3,6 +3,16 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v8.8.0
+
+_May 21, 2024_
+
+### Changed
+
+- Stop Portugal, Romania, and New Zealand support.
+- Support new country Slovakia.
+- Redirect user from Twitter to X Just Eat page.
+
 ## v8.7.0
 
 _March 13, 2024_

diff --git a/packages/components/organisms/f-footer/data/en-NZ.json b/packages/components/organisms/f-footer/data/en-NZ.json
diff --git a/packages/components/organisms/f-footer/package.json b/packages/components/organisms/f-footer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@justeat/f-footer",
-  "version": "8.7.0",
+  "version": "8.8.0",
   "main": "dist/f-footer.umd.min.js",
   "maxBundleSize": "80kB",
   "files": [

diff --git a/packages/components/organisms/f-footer/src/components/AppStoreIcon.vue b/packages/components/organisms/f-footer/src/components/AppStoreIcon.vue
@@ -24,15 +24,13 @@ export default {
         AndroidIconEnGb,
         AndroidIconEnIe: AndroidIconEnGb,
         AndroidIconEnAu: AndroidIconEnGb,
-        AndroidIconEnNz: AndroidIconEnGb,
         AndroidIconEsEs,
         AndroidIconItIt,
         AndroidIconNbNo,
         IosIconDaDk,
         IosIconEnGb,
         IosIconEnIe: IosIconEnGb,
         IosIconEnAu: IosIconEnGb,
-        IosIconEnNz: IosIconEnGb,
         IosIconEsEs,
         IosIconItIt,
         IosIconNbNo,

diff --git a/packages/components/organisms/f-footer/src/components/BaseProviderIcon.vue b/packages/components/organisms/f-footer/src/components/BaseProviderIcon.vue
@@ -20,7 +20,8 @@ import {
 // Social icons
 import {
     SocialFacebookIcon as FacebookIcon,
-    SocialTwitterIcon as TwitterIcon,
+    // TODO: Update to latest icon package with the correct logos
+    SocialTwitterIcon as XIcon,
     SocialYoutubeIcon as YoutubeIcon,
     SocialPinterestIcon as PinterestIcon,
     SocialInstagramIcon as InstagramIcon,
@@ -32,7 +33,7 @@ import iconPropsMixin from '../mixins/iconProps.mixin';
 export default {
     components: {
         FacebookIcon,
-        TwitterIcon,
+        XIcon,
         YoutubeIcon,
         PinterestIcon,
         InstagramIcon,

diff --git a/packages/components/organisms/f-footer/src/components/FlagIcon.vue b/packages/components/organisms/f-footer/src/components/FlagIcon.vue
@@ -4,28 +4,26 @@
 
 <script>
 import {
-    FlagAtRoundIcon as FlagIconAt,
-    FlagBeRoundIcon as FlagIconBe,
-    FlagBgRoundIcon as FlagIconBg,
-    FlagCaRoundIcon as FlagIconCa,
-    FlagChRoundIcon as FlagIconCh,
-    FlagDkRoundIcon as FlagIconDk,
-    FlagAuRoundIcon as FlagIconAu,
-    FlagFrRoundIcon as FlagIconFr,
-    FlagDeRoundIcon as FlagIconDe,
-    FlagIeRoundIcon as FlagIconIe,
-    FlagIlRoundIcon as FlagIconIl,
-    FlagItRoundIcon as FlagIconIt,
-    FlagLuRoundIcon as FlagIconLu,
-    FlagNlRoundIcon as FlagIconNl,
-    FlagNzRoundIcon as FlagIconNz,
-    FlagNoRoundIcon as FlagIconNo,
-    FlagPlRoundIcon as FlagIconPl,
-    FlagPtRoundIcon as FlagIconPt,
-    FlagRoRoundIcon as FlagIconRo,
-    FlagEsRoundIcon as FlagIconEs,
-    FlagGbRoundIcon as FlagIconGb
-} from '@justeat/f-vue-icons';
+    FlagAustriaIcon as FlagIconAt,
+    FlagAustraliaIcon as FlagIconAu,
+    FlagBelgiumIcon as FlagIconBe,
+    FlagBulgariaIcon as FlagIconBg,
+    FlagCanadaIcon as FlagIconCa,
+    FlagSwitzerlandIcon as FlagIconCh,
+    FlagDenmarkIcon as FlagIconDk,
+    FlagGermanyIcon as FlagIconDe,
+    FlagFranceIcon as FlagIconFr,
+    FlagUnitedKingdomIcon as FlagIconGb,
+    FlagIrelandIcon as FlagIconIe,
+    FlagIsraelIcon as FlagIconIl,
+    FlagItalyIcon as FlagIconIt,
+    FlagLuxemburgIcon as FlagIconLu,
+    FlagNetherlandsIcon as FlagIconNl,
+    FlagNorwayIcon as FlagIconNo,
+    FlagPolandIcon as FlagIconPl,
+    FlagSpainIcon as FlagIconEs,
+    FlagSlovakiaIcon as FlagIconSk
+} from '@justeattakeaway/pie-icons-vue';
 
 export default {
     components: {
@@ -43,13 +41,11 @@ export default {
         FlagIconIt,
         FlagIconLu,
         FlagIconNl,
-        FlagIconNz,
         FlagIconNo,
         FlagIconPl,
-        FlagIconPt,
-        FlagIconRo,
         FlagIconEs,
-        FlagIconGb
+        FlagIconGb,
+        FlagIconSk
     },
 
     props: {

diff --git a/packages/components/organisms/f-footer/src/components/_tests/Footer.test.js b/packages/components/organisms/f-footer/src/components/_tests/Footer.test.js
@@ -38,19 +38,6 @@ describe('Footer', () => {
         expect(wrapper.attributes('data-theme')).toBe('ml');
     });
 
-    it('should render ml themed component if NZ locale passed', () => {
-        // Arrange & Act
-        propsData = {
-            ...propsData,
-            locale: 'en-NZ'
-        };
-
-        const wrapper = shallowMount(Footer, { propsData });
-
-        // Assert
-        expect(wrapper.attributes('data-theme')).toBe('ml');
-    });
-
     it('should render je themed component if IE locale passed', () => {
         // Arrange & Act
         propsData = {
@@ -96,7 +83,6 @@ describe('Footer', () => {
         'en-GB',
         'en-AU',
         'en-IE',
-        'en-NZ',
         'it-IT'
     ])('should not render the Confianza URL and icon when locale is %s', locale => {
         // Arrange & Act

diff --git a/...ges/components/organisms/f-footer/src/components/_tests/__snapshots__/Footer.test.js.snap b/...ges/components/organisms/f-footer/src/components/_tests/__snapshots__/Footer.test.js.snap
@@ -20,7 +20,7 @@ exports[`Footer should render default component markup 1`] = `
     </div>
   </div>
   <div class="">
-    <country-selector-stub currentcountryname="United Kingdom" currentcountrykey="gb" countries="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]" changecountrytext="You are on the UK website, click here to change." data-test-id="country-selector"></country-selector-stub>
+    <country-selector-stub currentcountryname="United Kingdom" currentcountrykey="gb" countries="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]" changecountrytext="You are on the UK website, click here to change." data-test-id="country-selector"></country-selector-stub>
     <!---->
     <icon-list-stub icons="[object Object],[object Object],[object Object]" title="" listtype="payments" locale="en-GB"></icon-list-stub>
   </div>