@riosst100/pwa-marketplace 1.2.0 → 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.2.0",
+  "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 PhoneTextInput from '@riosst100/pwa-marketplace/src/components/PhoneTextInput';
 
 const BecomeSeller = props => {
     const talonProps = useBecomeSeller({
@@ -274,10 +273,9 @@ const BecomeSeller = props => {
                     defaultMessage: 'Contact Number'
                 })}
             >
-                <PhoneTextInput
+                <TextInput
                     id="contactNumber"
                     field="seller.contact_number"
-                    countryCodeField="seller.country_id"
                     validate={isRequired}
                 />
             </Field>
@@ -313,17 +311,6 @@ const BecomeSeller = props => {
     ) : '';
 };
 
-BecomeSeller.defaultProps = {
-    seller: {
-        country: {
-            code: DEFAULT_COUNTRY_CODE
-        },
-        region: {
-            id: null
-        }
-    }
-};
-
 BecomeSeller.propTypes = {
     classes: shape({
         actions: string,

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/phoneTextInput.js

@@ -16,15 +16,18 @@ const PhoneTextInput = props => {
         regionError,
         field,
         message,
-        countryCodeField,
+        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 [value, setValue] = useState('');
+    
+    const handleChange = (value) => {
+        fieldState.value = value;
+    }
 
     const countryFieldState = useFieldState(countryCodeField);
     const { value: country } = countryFieldState;
@@ -36,8 +39,10 @@ const PhoneTextInput = props => {
                 international
                 countryCallingCodeEditable={false}
                 defaultCountry={country}
-                value={value}
-                onChange={setValue}/>
+                name={field}
+                value={phoneValue}
+                onChange={handleChange}
+                />
             </FieldIcons>
             <Message fieldState={fieldState}>{message}</Message>
         </Fragment>