@riosst100/pwa-marketplace 1.1.9 → 1.2.1

package/i18n/id_ID.json

@@ -451,7 +451,7 @@
     "validation.invalidRegions": "Country \"{value}\" does not contain any available regions.",
     "validation.isEqualToField": "{value} must match.",
     "validation.isNotEqualToField": "{value} must be different",
-    "validation.isRequired": "Is required.",
+    "validation.isRequired": "This is required field.",
     "validation.mustBeChecked": "Must be checked.",
     "validation.validatePassword": "A password must contain at least 3 of the following: lowercase, uppercase, digits, special characters.",
     "wishlist.name": "Wish List",

package/package.json

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

package/src/components/BecomeSeller/becomeSeller.js

@@ -24,7 +24,6 @@ import Region from '@magento/venia-ui/lib/components/Region';
 import Postcode from '@magento/venia-ui/lib/components/Postcode';
 import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
 import { Link } from 'react-router-dom';
-import PhoneInput from '@riosst100/pwa-marketplace/src/components/PhoneInput';
 
 const BecomeSeller = props => {
     const talonProps = useBecomeSeller({
@@ -274,7 +273,7 @@ const BecomeSeller = props => {
                     defaultMessage: 'Contact Number'
                 })}
             >
-                <PhoneInput
+                <TextInput
                     id="contactNumber"
                     field="seller.contact_number"
                     validate={isRequired}

package/src/components/BecomeSellerLink/becomeSellerLink.js

@@ -7,6 +7,10 @@ import { shape, string } from 'prop-types';
 import { useIntl } from 'react-intl';
 import { useBecomeSellerLink } from '@riosst100/pwa-marketplace/src/talons/BecomeSellerLink/useBecomeSellerLink';
 
+import { BrowserPersistence } from '@magento/peregrine/lib/util';
+
+const storage = new BrowserPersistence();
+
 const BecomeSellerLink = props => {
     const classes = useStyle(defaultClasses, props.classes);
     const { formatMessage } = useIntl();
@@ -15,9 +19,12 @@ const BecomeSellerLink = props => {
         isSeller
     } = useBecomeSellerLink(props);
 
+    const websiteCountry = storage.getItem('website_code') && storage.getItem('website_code') != "base" ? '/' + storage.getItem('website_code') : '';
+    const sellerDashboardUrl = process.env.MAGENTO_BACKEND_URL ? process.env.MAGENTO_BACKEND_URL + websiteCountry : '';
+
     return isSeller ? (
         <div className={classes.root} data-cy="BecomeSellerLink-root">
-            <a href={process.env.MAGENTO_BACKEND_URL + "/lofmarketplace/seller/login"}>
+            <a href={sellerDashboardUrl + "/lofmarketplace/seller/login"}>
                 {formatMessage({
                     id: 'sellerDashboard.title',
                     defaultMessage: 'Seller Dashboard'

package/src/components/PhoneTextInput/index.js

@@ -0,0 +1 @@
+export { default } from './phoneTextInput';

package/src/components/{PhoneInput/phoneInput.js → PhoneTextInput/phoneTextInput.js}

@@ -4,10 +4,11 @@ import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInforme
 
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import { FieldIcons, Message } from '@magento/venia-ui/lib/components/Field';
-import defaultClasses from './phoneInput.module.css';
-import {PhoneInput as ReactPhoneInput} from 'react-phone-number-input'
+import defaultClasses from './phoneTextInput.module.css';
+import PhoneInput from 'react-phone-number-input'
+import 'react-phone-number-input/style.css'
 
-const PhoneInput = props => {
+const PhoneTextInput = props => {
     const {
         after,
         before,
@@ -15,33 +16,42 @@ const PhoneInput = props => {
         regionError,
         field,
         message,
+        countryCodeField = "country",
         ...rest
     } = props;
     const fieldState = useFieldState(field);
+    const { value: phoneValue } = fieldState;
     const classes = useStyle(defaultClasses, propClasses);
     var inputClass =
         fieldState.error || regionError ? classes.input_error : classes.input;
+    
+    const handleChange = (value) => {
+        fieldState.value = value;
+    }
 
-    const [value, setValue] = useState('');
+    const countryFieldState = useFieldState(countryCodeField);
+    const { value: country } = countryFieldState;
 
     return (
         <Fragment>
             <FieldIcons after={after} before={before}>
-                <ReactPhoneInput
+                <PhoneInput
                 international
                 countryCallingCodeEditable={false}
-                defaultCountry="ID"
-                value={value}
-                onChange={setValue}/>
+                defaultCountry={country}
+                name={field}
+                value={phoneValue}
+                onChange={handleChange}
+                />
             </FieldIcons>
             <Message fieldState={fieldState}>{message}</Message>
         </Fragment>
     );
 };
 
-export default PhoneInput;
+export default PhoneTextInput;
 
-PhoneInput.propTypes = {
+PhoneTextInput.propTypes = {
     after: node,
     before: node,
     classes: shape({

package/src/components/SellerCountry/sellerCountry.js

@@ -8,6 +8,9 @@ import Field from '@magento/venia-ui/lib/components/Field';
 import Select from '@magento/venia-ui/lib/components/Select';
 import defaultClasses from './sellerCountry.module.css';
 import { GET_SELLER_COUNTRIES_QUERY } from './sellerCountry.gql';
+import { BrowserPersistence } from '@magento/peregrine/lib/util';
+
+const storage = new BrowserPersistence();
 
 const SellerCountry = props => {
     const talonProps = useSellerCountry({
@@ -26,11 +29,14 @@ const SellerCountry = props => {
     const { formatMessage } = useIntl();
 
     const classes = useStyle(defaultClasses, propClasses);
+    const websiteCode = storage.getItem('website_code') || null;
+    const currentWebsiteCountry = websiteCode && websiteCode != "base" ? websiteCode.toUpperCase() : DEFAULT_COUNTRY_CODE;
     const selectProps = {
         classes,
         disabled: loading,
         field,
         items: countries,
+        initialValue: currentWebsiteCountry,
         ...inputProps
     };
 

package/src/overwrites/peregrine/lib/talons/SignIn/useSignIn.js

@@ -119,8 +119,6 @@ export const useSignIn = props => {
                     fetchPolicy: 'cache-only'
                 });
 
-                console.log(data.customer)
-
                 if (data.customer.is_seller) {
                     storage.setItem('is_seller', true);
                 }

package/src/talons/Header/useWebsiteSwitcher.js

@@ -108,7 +108,6 @@ export const useWebsiteSwitcher = (props = {}) => {
 
     // availableStores => mapped options or empty map if undefined.
     const availableStores = useMemo(() => {
-        console.log(availableStoresData)
         return (
             (storeConfigData &&
                 availableStoresData &&

package/src/talons/WebsiteByIp/useWebsiteByIp.js

@@ -13,7 +13,6 @@ export const useWebsiteByIp = websiteCodeInUrl => {
                         setWebsiteByUserIpData(data)
                     }
                 }).catch((error) => {
-                    console.log(error);
                 });
             };
         

package/src/components/PhoneInput/index.js

@@ -1 +0,0 @@
-export { default } from './phoneInput';