@riosst100/pwa-marketplace 1.0.4 → 1.0.6

package/package.json

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

package/src/components/BecomeSeller/becomeSeller.js

@@ -22,6 +22,8 @@ import GoogleRecaptcha from '@magento/venia-ui/lib/components/GoogleReCaptcha';
 import Country from '@magento/venia-ui/lib/components/Country';
 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';
 
 const BecomeSeller = props => {
     const talonProps = useBecomeSeller({
@@ -285,10 +287,24 @@ const BecomeSeller = props => {
                 <Checkbox
                     field="become_seller_agreement"
                     id="becomeSellerAgreement"
-                    label={formatMessage({
-                        id: 'becomeSeller.becomeSellerAgreementText',
-                        defaultMessage: 'I agree the Terms and Condition (Terms and Conditions)'
-                    })}
+                    validate={isRequired}
+                    label={(
+                        <>
+                            {formatMessage({
+                                id: 'becomeSeller.becomeSellerAgreementText',
+                                defaultMessage: 'I agree the Terms and Condition'
+                            })} <span>
+                                (<a href={'/seller-term-conditions'}>
+                                    <u>
+                                        {formatMessage({
+                                            id: 'becomeSellerPage.termConditions',
+                                            defaultMessage: 'Terms and Conditions'
+                                        })}
+                                    </u>
+                                </a>)
+                            </span>
+                        </>
+                    )}
                 />
             </div>
             <GoogleRecaptcha {...recaptchaWidgetProps} />

package/src/components/SellerAccountPage/sellerAccountPage.js

@@ -40,30 +40,6 @@ const SellerAccountPage = props => {
         const customerName = `${customer.firstname} ${customer.lastname}`;
         const passwordValue = 'Same as current';
 
-        sellerAccountDetails = (
-            <Fragment>
-                <div className={classes.accountDetails}>
-                    <span className={classes.nameLabel}>
-                        <FormattedMessage
-                            id={'global.sellerAccountDetailsText'}
-                            defaultMessage={'Seller Account Details'}
-                        />
-                    </span>
-                    <div className={classes.lineItemsContainer}>
-                        <span className={classes.nameLabel}>
-                            <FormattedMessage
-                                id={'global.status'}
-                                defaultMessage={'Status'}
-                            />
-                        </span>
-                        <span className={classes.nameValue}>
-                            Not Verified
-                        </span>
-                    </div>
-                </div>
-            </Fragment>
-        );
-
         sellerLoginAccount = (
             <Fragment>
                 <div className={classes.accountDetails}>
@@ -116,8 +92,6 @@ const SellerAccountPage = props => {
                     defaultMessage: 'Seller Account'
                 })}
             </StoreTitle>
-            {sellerAccountDetails}
-            <br />
             {sellerLoginAccount}
         </div>
     )

package/src/overwrites/peregrine/lib/talons/AccountMenu/useAccountMenuItems.js

@@ -1,4 +1,7 @@
-import { useCallback } from 'react';
+import { useCallback, useEffect } from 'react';
+import { BrowserPersistence } from '@magento/peregrine/lib/util';
+
+const storage = new BrowserPersistence();
 
 /**
  * @param {Object}      props
@@ -14,12 +17,7 @@ export const useAccountMenuItems = props => {
         onSignOut();
     }, [onSignOut]);
 
-    const MENU_ITEMS = [
-        {
-            name: 'Seller Account Information',
-            id: 'accountMenu.sellerAccountInfoLink',
-            url: '/seller-account'
-        },
+    let MENU_ITEMS = [
         {
             name: 'Order History',
             id: 'accountMenu.orderHistoryLink',
@@ -57,6 +55,17 @@ export const useAccountMenuItems = props => {
             url: '/account-information'
         }
     ];
+    
+    if (storage && storage.getItem('is_seller')) {
+        MENU_ITEMS = [
+            ...MENU_ITEMS,
+            {
+                name: 'Seller Account Information',
+                id: 'accountMenu.sellerAccountInfoLink',
+                url: '/seller-account'
+            }
+        ];
+    }
 
     return {
         handleSignOut,

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

@@ -90,6 +90,8 @@ export const useSignIn = props => {
                 const token = signInResponse.data.generateCustomerToken.token;
                 await setToken(token);
 
+                await getUserDetails({ fetchUserDetails });
+
                 // Clear all cart/customer data from cache and redux.
                 await apolloClient.clearCacheData(apolloClient, 'cart');
                 await apolloClient.clearCacheData(apolloClient, 'customer');
@@ -111,7 +113,7 @@ export const useSignIn = props => {
 
                 // Ensure old stores are updated with any new data.
 
-                await getUserDetails({ fetchUserDetails });
+                
 
                 const { data } = await fetchUserDetails({
                     fetchPolicy: 'cache-only'