Merge branch 'stage' into MWPW-159906-safari-url-hash

adobecom · Oct 11, 2024 · 9c1b8b8 · 9c1b8b8
2 parents b221bae + 0629150
commit 9c1b8b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/edsdme/components/PartnerCards.js b/edsdme/components/PartnerCards.js
@@ -521,12 +521,13 @@ export default class PartnerCards extends LitElement {
         }
         // eslint-disable-next-line consistent-return
         return selectedFiltersKeys.every((key) => cardArbitraryArr.some((arbitraryTag) => {
-          if (!arbitraryTag.value || !arbitraryTag.key) return false;
-          const arbitraryTagKeyStr = arbitraryTag.key.trim().toLowerCase().replaceAll(' ', '-');
-          const arbitraryTagValueStr = arbitraryTag.value.trim().toLowerCase().replaceAll(' ', '-');
-          if (key === arbitraryTagKeyStr) {
+          const arbitraryTagKey = Object.keys(arbitraryTag)[0]?.replaceAll(' ', '-');
+          if (arbitraryTagKey !== key) return false;
+
+          const arbitraryTagValue = arbitraryTag[key].replaceAll(' ', '-');
+          if (arbitraryTagValue) {
             // eslint-disable-next-line max-len
-            return this.selectedFilters[key].some((selectedTag) => selectedTag.key === arbitraryTagValueStr);
+            return this.selectedFilters[key].some((selectedTag) => selectedTag.key === arbitraryTagValue);
           }
           return false;
         }));

diff --git a/nala/blocks/banners/banners.spec.js b/nala/blocks/banners/banners.spec.js
@@ -207,7 +207,7 @@ export default {
           permissionRegion: 'United Kingdom,Europe West',
         },
         paragraphIndex: 1,
-        bannerText: 'Your membership will expire in 9 days. Make sure to renew so that you don’t loose your benefits with Adobe.',
+        bannerText: 'Your membership will expire in 9 days. Make sure to renew so that you don’t lose your benefits with Adobe.',
         renewButtonText: 'Renew now',
         renewLinkPath: 'https://channelpartners.adobe.com/s/renewal/',
       },
@@ -225,7 +225,7 @@ export default {
           permissionRegion: 'Pacific',
         },
         paragraphIndex: 1,
-        bannerText: 'Your membership will expire in 9 days. Make sure to renew so that you don’t loose your benefits with Adobe.',
+        bannerText: 'Your membership will expire in 9 days. Make sure to renew so that you don’t lose your benefits with Adobe.',
         renewButtonText: 'Renew now',
         renewLinkPath: 'https://channelpartners.adobe.com/s/renewal/',
       },
@@ -243,7 +243,7 @@ export default {
           permissionRegion: 'China',
         },
         paragraphIndex: 1,
-        bannerText: 'Your membership will expire in 9 days. Make sure to renew so that you don’t loose your benefits with Adobe.',
+        bannerText: 'Your membership will expire in 9 days. Make sure to renew so that you don’t lose your benefits with Adobe.',
         renewButtonText: 'Renew now',
         renewLinkPath: 'https://channelpartners.adobe.com/s/renewal/',
       },