@riosst100/pwa-marketplace 1.0.9 → 1.1.1

package/package.json

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

package/src/components/BecomeSeller/becomeSeller.js

@@ -228,15 +228,10 @@ const BecomeSeller = props => {
                 <TextInput
                     id="addressLine2"
                     field="seller.address_line_2"
-                    validate={isRequired}
                     validateOnBlur
                     mask={value => value && value.trim()}
                     maskOnBlur={true}
                     data-cy="seller-addressline2"
-                    aria-label={formatMessage({
-                        id: 'global.addressLine2Required',
-                        defaultMessage: 'Address Line 2 is required'
-                    })}
                 />
             </Field>
             <Field
@@ -257,7 +252,7 @@ const BecomeSeller = props => {
                 fieldSelect="seller.region_id"
                 label={formatMessage({
                     id: 'global.region',
-                    defaultMessage: 'Region'
+                    defaultMessage: 'State / Province'
                 })}
                 translationId="global.region"
                 countryCodeField="seller.country_id"

package/src/components/WebsiteSwitcher/websiteSwitcher.js

@@ -70,6 +70,8 @@ const WebsiteSwitcher = props => {
 
     let triggerLabel = currentWebsiteName ? `${currentWebsiteName}` : '';
 
+    console.log('triggerLabel: '+triggerLabel)
+
     return (
         <div className={classes.root} data-cy="WebsiteSwitcher-root">
             <button

package/src/overwrites/venia-ui/lib/components/Adapter/adapter.js

@@ -65,26 +65,28 @@ const Adapter = props => {
 
             const websiteCode = getWebsiteByUserIp.countryCode && !isAccessBaseWebsite ? getWebsiteByUserIp.countryCode.toLowerCase() : process.env.WEBSITE_CODE;
 
-            routerProps.basename = websiteCode != process.env.WEBSITE_CODE && !isAccessBaseWebsite ? '/'+websiteCode : '/';
-
-            setNewRouterProps(routerProps);
-
-            if (isAccessBaseWebsite) {
-                storage.setItem('access_base_website', 1);
+            if (websiteCodes.find((str) => str === websiteCode)) {
+                routerProps.basename = websiteCode != process.env.WEBSITE_CODE && !isAccessBaseWebsite ? '/'+websiteCode : '/';
+
+                setNewRouterProps(routerProps);
+
+                if (isAccessBaseWebsite) {
+                    storage.setItem('access_base_website', 1);
+                }
+
+                let storeCodeInUrl = websiteStores[websiteCode];
+
+                storage.setItem('store_view_code', storeCodeInUrl);
+                storage.setItem('website_code', websiteCode);
+                storage.setItem(
+                    'store_view_currency',
+                    storeCurrencies[storeCodeInUrl]
+                );
+                storage.setItem(
+                    'store_view_secure_base_media_url',
+                    storeSecureBaseMediaUrl[storeCodeInUrl]
+                );
             }
-
-            let storeCodeInUrl = websiteStores[websiteCode];
-
-            storage.setItem('store_view_code', storeCodeInUrl);
-            storage.setItem('website_code', websiteCode);
-            storage.setItem(
-                'store_view_currency',
-                storeCurrencies[storeCodeInUrl]
-            );
-            storage.setItem(
-                'store_view_secure_base_media_url',
-                storeSecureBaseMediaUrl[storeCodeInUrl]
-            );
         }
     }, [websiteCodeInUrl, getWebsiteByUserIp])
 

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

@@ -72,19 +72,14 @@ const StoreSwitcher = props => {
         );
     });
 
-    let triggerLabel;
-    if (hasOnlyOneGroup) {
-        triggerLabel = currentStoreName ? `${currentStoreName}` : '';
-    } else {
-        triggerLabel = `${currentGroupName} - ${currentStoreName}`;
-    }
+    let triggerLabel = currentStoreName ? `${currentStoreName}` : '';
 
     return (
         <div className={classes.root} data-cy="StoreSwitcher-root">
             <button
                 data-cy="StoreSwitcher-triggerButton"
                 className={classes.trigger}
-                aria-label={currentStoreName || ''}
+                aria-label={triggerLabel || ''}
                 onClick={handleTriggerClick}
                 ref={storeMenuTriggerRef}
                 data-cy="StoreSwitcher-trigger"