@riosst100/pwa-marketplace 1.1.2 → 1.1.4

package/i18n/en_US.json

@@ -26,7 +26,7 @@
     "addressBookPage.addDialogTitle": "New Address",
     "addressBookPage.addressBookText": "Address Book",
     "addressBookPage.editDialogTitle": "Edit Address",
-    "addressBookPage.makeDefaultAddress": "Make this my default address",
+    "addressBookPage.makeDefaultAddress": "Make this my default address222",
     "addressBookPage.addAddressMessage": "You have added {count} address in your address book.",
     "addressBookPage.telephone": "Contact Number {telephone}",
     "addressCard.defaultText": "Default",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/components/WebsiteSwitcher/websiteSwitcher.js

@@ -34,7 +34,7 @@ const WebsiteSwitcher = props => {
 
     storeGroups.forEach((group, key) => {
         const stores = [];
-        group.forEach(({ storeGroupName, websiteCode, websiteName, isCurrent, storeCode }) => {
+        group.forEach(({ websiteCode, websiteName, isCurrent, storeCode }) => {
             let label = `${websiteName}`;
             stores.push(
                 <li
@@ -70,8 +70,6 @@ const WebsiteSwitcher = props => {
 
     let triggerLabel = currentWebsiteName ? `${currentWebsiteName}` : '';
 
-    console.log('triggerLabel: '+triggerLabel)
-
     return (
         <div className={classes.root} data-cy="WebsiteSwitcher-root">
             <button

package/src/intercept.js

@@ -12,8 +12,8 @@ module.exports = targets => {
     availableWebsites = await getAvailableWebsitesConfigData();
   })();
 
-  targets.of('@magento/pwa-buildpack').specialFeatures.tap(flags => {
-    flags[targets.name] = { i18n: true, esModules: true, cssModules: true, graphqlQueries: true };
+  targets.of('@magento/pwa-buildpack').specialFeatures.tap(features => {
+    features[targets.name] = { i18n: true, esModules: true, cssModules: true, graphqlQueries: true };
   });
 
   targets.of('@magento/pwa-buildpack').webpackCompiler.tap(compiler => {
@@ -61,10 +61,6 @@ module.exports = targets => {
     }).apply(compiler);
   });
 
-  targets.of('@magento/pwa-buildpack').specialFeatures.tap(flags => {
-    flags[targets.name] = { esModules: true, cssModules: true, graphqlQueries: true };
-  });
-
   // Handle the routes directly within the routes tap
   targets.of("@magento/venia-ui").routes.tap(routesArray => {
     routesArray.push(...routes);

package/src/overwrites/venia-ui/lib/components/Header/header.js

@@ -2,7 +2,6 @@ import React, { Fragment, Suspense } from 'react';
 import { shape, string } from 'prop-types';
 import { Link, Route } from 'react-router-dom';
 
-import Logo from '@magento/venia-ui/lib/components/Logo';
 import AccountTrigger from '@magento/venia-ui/lib/components/Header/accountTrigger';
 import CartTrigger from '@magento/venia-ui/lib/components/Header/cartTrigger';
 import NavTrigger from '@magento/venia-ui/lib/components/Header/navTrigger';

package/src/overwrites/venia-ui/lib/components/Header/storeSwitcher.js

@@ -28,18 +28,12 @@ const StoreSwitcher = props => {
     if (!availableStores) return <Shimmer />;
 
     const groups = [];
-    const hasOnlyOneGroup = storeGroups.size === 1;
 
     storeGroups.forEach((group, key) => {
         const stores = [];
-        group.forEach(({ storeGroupName, storeName, isCurrent, storeCode, websiteCode }) => {
-            let label;
-            if (hasOnlyOneGroup) {
-                label = `${storeName}`;
-            } else {
-                label = `${storeGroupName} - ${storeName}`;
-            }
-
+        group.forEach(({ storeName, isCurrent, storeCode, websiteCode }) => {
+            let label = `${storeName}`;
+            
             stores.push(
                 <li
                     aria-selected={currentStoreName}
@@ -72,20 +66,18 @@ const StoreSwitcher = props => {
         );
     });
 
-    let triggerLabel = currentStoreName ? `${currentStoreName}` : '';
-
     return (
         <div className={classes.root} data-cy="StoreSwitcher-root">
             <button
                 data-cy="StoreSwitcher-triggerButton"
                 className={classes.trigger}
-                aria-label={triggerLabel || ''}
+                aria-label={currentStoreName || ''}
                 onClick={handleTriggerClick}
                 ref={storeMenuTriggerRef}
                 data-cy="StoreSwitcher-trigger"
                 aria-expanded={storeMenuIsOpen}
             >
-                {triggerLabel || ''}
+                {currentStoreName || ''}
             </button>
             <div
                 ref={storeMenuRef}