ordering-ui-external 1.5.4 → 1.6.0

package/src/themes/five/src/components/ServiceForm/index.js

@@ -1,6 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { Swiper, SwiperSlide } from 'swiper/react'
 import { useUtils, useLanguage, useSession, ProductForm as ProductFormController } from 'ordering-components-external'
+import Skeleton from 'react-loading-skeleton'
 import { Alert } from '../Confirm'
 import { Modal } from '../Modal'
 import { LoginForm } from '../LoginForm'
@@ -34,22 +35,25 @@ import {
   StatusInfo,
   DropDownWrapper,
   DropDownTitle,
-  EmptyProfessional
+  EmptyProfessional,
+  SkeletonBlock
 } from './styles'
 import moment from 'moment'
 SwiperCore.use([Navigation])
 
 const ServiceFormUI = (props) => {
   const {
-    product,
+    productObject,
     professionalSelected,
     handleSave,
     isSoldOut,
     maxProductQuantity,
     productCart,
-    professionalList
+    isCartProduct,
+    professionalListState
   } = props
 
+  const { product, loading, error } = productObject
   const theme = useTheme()
   const [, t] = useLanguage()
   const [{ parsePrice, parseDate }] = useUtils()
@@ -151,102 +155,84 @@ const ServiceFormUI = (props) => {
   }, [isDropDown])
 
   useEffect(() => {
-    if (!professionalSelected) return
+    if (!professionalSelected?.schedule) return
     setCurrentProfessional(professionalSelected)
   }, [professionalSelected])
 
+  useEffect(() => {
+    if (isCartProduct && professionalListState?.professionals?.length > 0) {
+      const professional = professionalListState?.professionals?.find(item => item.id === professionalSelected?.id)
+      setCurrentProfessional(professional)
+    }
+  }, [isCartProduct, professionalListState?.professionals])
+
   return (
     <>
       <Container>
-        <ImageWrapper>
-          <SwiperWrapper>
-            <ArrowButtonWrapper className='button-prev'>
-              <ChevronLeft />
-            </ArrowButtonWrapper>
-            <Swiper
-              spaceBetween={0}
-              slidesPerView={1}
-              watchSlidesProgress
-              className='mySwiper2'
-              preventClicksPropagation={false}
-              navigation={{
-                nextEl: '.button-next',
-                prevEl: '.button-prev'
-              }}
-            >
-              {gallery?.map((photo, i) => (
-                <SwiperSlide key={i}>
-                  <img src={photo} alt='' />
-                </SwiperSlide>
-              ))}
-            </Swiper>
-            <ArrowButtonWrapper className='button-next'>
-              <ChevronRight />
-            </ArrowButtonWrapper>
-          </SwiperWrapper>
-        </ImageWrapper>
-        <HeaderInfoWrapper>
-          <h2>{product?.name}</h2>
-          <PriceAndDuration>
-            <span>{parsePrice(product?.price)}</span>
-            <span className='dot'>•</span>
-            <span>{product?.duration}min</span>
-          </PriceAndDuration>
-          <p>{product?.description}</p>
-        </HeaderInfoWrapper>
-        <Divider />
-        <ProfessionalInfoWrapper>
-          <SectionHeader>
-            <h2>{t('PROFESSIONALS', 'Professionals')}</h2>
-            <span>{t('REQUIRED', 'Required')}</span>
-          </SectionHeader>
-          <ProfessionalSelectWrapper ref={dropDownRef}>
-            <SelectedItem onClick={() => setIsDropDown(prev => !prev)}>
-              {currentProfessional ? (
-                <InfoWrapper>
-                  {currentProfessional?.photo ? (
-                    <ProfessionalPhoto
-                      bgimage={currentProfessional?.photo}
-                    />
-                  ) : <FaUserAlt />}
-                  <NameWrapper>
-                    <p>{currentProfessional?.name} {currentProfessional?.lastname}</p>
-                    <StatusInfo available={!isBusyTime()}>
-                      {isBusyTime(currentProfessional) ? (
-                        <>
-                          <span className='status'>{t('BUSY_ON_SELECTED_TIME', 'Busy on selected time')}</span>
-                        </>
-                      ) : (
-                        <span className='status'>{t('AVAILABLE', 'Available')}</span>
-                      )}
-                    </StatusInfo>
-                  </NameWrapper>
-                </InfoWrapper>
-              ) : (
-                <p>{t('SELECT_PROFESSIONAL', 'Select professional')}</p>
-              )}
-              <ChevronDown />
-            </SelectedItem>
-            {isDropDown && (
-              <DropDownWrapper>
-                <DropDownTitle>{t('ANY_PROFESSIONAL_MEMBER', 'Any professional member')}</DropDownTitle>
-                {professionalList?.map((professional) => (
-                  <SelectedItem
-                    key={professional?.id}
-                    isDropDown
-                    active={professional?.id === currentProfessional?.id}
-                    onClick={() => handleChangeProfessional(professional)}
-                  >
+        {loading && !error && (
+          <SkeletonBlock width={90}>
+            <Skeleton variant='rect' height={50} />
+            <Skeleton variant='rect' height={50} />
+            <Skeleton variant='rect' height={200} />
+          </SkeletonBlock>
+        )}
+        {product && !loading && (
+          <>
+            <ImageWrapper>
+              <SwiperWrapper>
+                <ArrowButtonWrapper className='button-prev'>
+                  <ChevronLeft />
+                </ArrowButtonWrapper>
+                <Swiper
+                  spaceBetween={0}
+                  slidesPerView={1}
+                  watchSlidesProgress
+                  className='mySwiper2'
+                  preventClicksPropagation={false}
+                  navigation={{
+                    nextEl: '.button-next',
+                    prevEl: '.button-prev'
+                  }}
+                >
+                  {gallery?.map((photo, i) => (
+                    <SwiperSlide key={i}>
+                      <img src={photo} alt='' />
+                    </SwiperSlide>
+                  ))}
+                </Swiper>
+                <ArrowButtonWrapper className='button-next'>
+                  <ChevronRight />
+                </ArrowButtonWrapper>
+              </SwiperWrapper>
+            </ImageWrapper>
+            <HeaderInfoWrapper>
+              <h2>{product?.name}</h2>
+              <PriceAndDuration>
+                <span>{parsePrice(product?.price)}</span>
+                <span className='dot'>•</span>
+                <span>{product?.duration}min</span>
+              </PriceAndDuration>
+              <p>{product?.description}</p>
+            </HeaderInfoWrapper>
+            <Divider />
+            <ProfessionalInfoWrapper>
+              <SectionHeader>
+                <h2>{t('PROFESSIONALS', 'Professionals')}</h2>
+                <span>{t('REQUIRED', 'Required')}</span>
+              </SectionHeader>
+              <ProfessionalSelectWrapper ref={dropDownRef}>
+                <SelectedItem onClick={() => setIsDropDown(prev => !prev)}>
+                  {currentProfessional ? (
                     <InfoWrapper>
-                      {professional?.photo ? (
+                      {currentProfessional?.photo ? (
                         <ProfessionalPhoto
-                          bgimage={professional?.photo}
+                          bgimage={currentProfessional?.photo}
                         />
                       ) : <FaUserAlt />}
                       <NameWrapper>
-                        <p>{professional?.name} {professional?.lastname}</p>
-                        <StatusInfo available={!isBusyTime(professional)}>
-                          {isBusyTime(professional) ? (
+                        <p>{currentProfessional?.name} {currentProfessional?.lastname}</p>
+                        <StatusInfo available={!isBusyTime()}>
+                          {isBusyTime(currentProfessional) ? (
                             <>
                               <span className='status'>{t('BUSY_ON_SELECTED_TIME', 'Busy on selected time')}</span>
                             </>
@@ -256,58 +242,95 @@ const ServiceFormUI = (props) => {
                         </StatusInfo>
                       </NameWrapper>
                     </InfoWrapper>
-                  </SelectedItem>
-                ))}
-              </DropDownWrapper>
-            )}
+                  ) : (
+                    <p>{t('SELECT_PROFESSIONAL', 'Select professional')}</p>
+                  )}
+                  <ChevronDown />
+                </SelectedItem>
+                {isDropDown && (
+                  <DropDownWrapper>
+                    <DropDownTitle>{t('ANY_PROFESSIONAL_MEMBER', 'Any professional member')}</DropDownTitle>
+                    {professionalListState?.professionals?.map((professional) => (
+                      <SelectedItem
+                        key={professional?.id}
+                        isDropDown
+                        active={professional?.id === currentProfessional?.id}
+                        onClick={() => handleChangeProfessional(professional)}
+                      >
+                        <InfoWrapper>
+                          {professional?.photo ? (
+                            <ProfessionalPhoto
+                              bgimage={professional?.photo}
+                            />
+                          ) : <FaUserAlt />}
+                          <NameWrapper>
+                            <p>{professional?.name} {professional?.lastname}</p>
+                            <StatusInfo available={!isBusyTime(professional)}>
+                              {isBusyTime(professional) ? (
+                                <>
+                                  <span className='status'>{t('BUSY_ON_SELECTED_TIME', 'Busy on selected time')}</span>
+                                </>
+                              ) : (
+                                <span className='status'>{t('AVAILABLE', 'Available')}</span>
+                              )}
+                            </StatusInfo>
+                          </NameWrapper>
+                        </InfoWrapper>
+                      </SelectedItem>
+                    ))}
+                  </DropDownWrapper>
+                )}
+
+              </ProfessionalSelectWrapper>
+            </ProfessionalInfoWrapper>
+            <ScheduleWrapper>
+              <SectionHeader>
+                <h2>{t('SCHEDULE', 'Schedule')}</h2>
+                <span>{t('REQUIRED', 'Required')}</span>
+              </SectionHeader>
+              {currentProfessional ? (
+                <BusinessPreorder
+                  business={currentProfessional}
+                  isProfessional
+                  maxDays={50}
+                  onChangeMoment={setDateSelected}
+                  useOrderContext={false}
+                />
+              ) : (
+                <EmptyProfessional>
+                  {t('NO_SCHEDULE', 'No schedule')}
+                </EmptyProfessional>
+              )}
+            </ScheduleWrapper>
+            <ButtonWrapper>
+              <span>{dateSelected
+                ? parseDate(dateSelected, { outputFormat: 'hh:mm a' })
+                : t('ASAP_ABBREVIATION', 'ASAP')}
+              </span>
+              {!isSoldOut && maxProductQuantity > 0 && auth && (
+                <Button
+                  onClick={() => handleAddProduct()}
+                  color='primary'
+                  disabled={isBusyTime(currentProfessional)}
+                >
+                  {t('BOOK', 'Book')}
+                </Button>
+              )}
+              {(!auth || isSoldOut || maxProductQuantity <= 0) && (
+                <Button
+                  className={`add ${!(productCart && !isSoldOut && maxProductQuantity > 0) ? 'soldout' : ''}`}
+                  color='primary'
+                  outline
+                  disabled={isSoldOut || maxProductQuantity <= 0}
+                  onClick={() => setModalIsOpen(true)}
+                >
+                  {isSoldOut || maxProductQuantity <= 0 ? t('SOLD_OUT', theme?.defaultLanguages?.SOLD_OUT || 'Sold out') : t('LOGIN_SIGNUP', theme?.defaultLanguages?.LOGIN_SIGNUP || 'Login / Sign Up')}
+                </Button>
+              )}
+            </ButtonWrapper>
+          </>
+        )}
 
-          </ProfessionalSelectWrapper>
-        </ProfessionalInfoWrapper>
-        <ScheduleWrapper>
-          <SectionHeader>
-            <h2>{t('SCHEDULE', 'Schedule')}</h2>
-            <span>{t('REQUIRED', 'Required')}</span>
-          </SectionHeader>
-          {currentProfessional ? (
-            <BusinessPreorder
-              business={currentProfessional}
-              isProfessional
-              maxDays={50}
-              onChangeMoment={setDateSelected}
-              useOrderContext={false}
-            />
-          ) : (
-            <EmptyProfessional>
-              {t('NO_SCHEDULE', 'No schedule')}
-            </EmptyProfessional>
-          )}
-        </ScheduleWrapper>
-        <ButtonWrapper>
-          <span>{dateSelected
-            ? parseDate(dateSelected, { outputFormat: 'hh:mm a' })
-            : t('ASAP_ABBREVIATION', 'ASAP')}
-          </span>
-          {!isSoldOut && maxProductQuantity > 0 && auth && (
-            <Button
-              onClick={() => handleAddProduct()}
-              color='primary'
-              disabled={isBusyTime(currentProfessional)}
-            >
-              {t('BOOK', 'Book')}
-            </Button>
-          )}
-          {(!auth || isSoldOut || maxProductQuantity <= 0) && (
-            <Button
-              className={`add ${!(productCart && !isSoldOut && maxProductQuantity > 0) ? 'soldout' : ''}`}
-              color='primary'
-              outline
-              disabled={isSoldOut || maxProductQuantity <= 0}
-              onClick={() => setModalIsOpen(true)}
-            >
-              {isSoldOut || maxProductQuantity <= 0 ? t('SOLD_OUT', theme?.defaultLanguages?.SOLD_OUT || 'Sold out') : t('LOGIN_SIGNUP', theme?.defaultLanguages?.LOGIN_SIGNUP || 'Login / Sign Up')}
-            </Button>
-          )}
-        </ButtonWrapper>
         {modalIsOpen && !auth && (
           <Modal
             open={modalIsOpen}

package/src/themes/five/src/components/ServiceForm/styles.js

@@ -311,3 +311,13 @@ export const EmptyProfessional = styled.div`
   align-items: center;
   justify-content: center;
 `
+
+export const SkeletonBlock = styled.div`
+  width: ${({ width }) => width && `${width}%`};
+  border-radius: 16px;
+  margin: 50px auto 20px auto;
+
+  span {
+    margin-bottom: 10px;
+  }
+`

package/src/themes/five/src/components/SignUpApproval/index.js

@@ -21,8 +21,7 @@ import {
 export const SignUpApproval = (props) => {
   const theme = useTheme()
   const [, t] = useLanguage()
-  const { content: { project, dashboardUrl, dashboardLoginUrl, approvalType, businessType }, onAccept, onCancel } = props
-  const contactEmail = 'support@ordering.co'
+  const { content: { project, dashboardUrl, dashboardLoginUrl, approvalType, businessType, contactEmail }, onAccept, onCancel } = props
   const showDomain = false
 
   const logoImgUrl = businessType === 2
@@ -60,9 +59,9 @@ export const SignUpApproval = (props) => {
               </tr>
               <tr>
                 <td className='bigger td-text-right'>{t('DASHBOARD_WEBPAGE', 'Dashboard webpage')}: </td>
-                <td className='td-text-left'><a className='green-text' href={dashboardLoginUrl} target='_blank' rel='noopener noreferrer'>{dashboardUrl}</a></td>
+                <td className='td-text-left'><a className='green-text' href={t('SIGNUP_DASHBOARD_LOGIN_URL', dashboardLoginUrl)} target='_blank' rel='noopener noreferrer'>{t('SIGNUP_DASHBOARD_URL', dashboardUrl)}</a></td>
               </tr>
-            </tbody> 
+            </tbody>
           </ProjectInfoContainer>
         </BodySection>
       ) : (
@@ -71,13 +70,13 @@ export const SignUpApproval = (props) => {
             <DescriptionContainer>
               <Description><span className='bigger'>{t('YOUR_STORE_UNDER_APPROVAL', 'Your store is under approval')}</span></Description>
               <Description>{t('BUSINESS_SIGNUP_MESSAGE', 'We will contact you as soon as possible')}</Description>
-              <Description>{t('FEEL_FREE_CONTACT_US', 'feel free to contact us at ')} <a className='green-text' href={`mailto:${t('SIGNUP_DRIVER_EMAIL', contactEmail)}`}>{contactEmail}</a></Description>
+              <Description>{t('FEEL_FREE_CONTACT_US', 'feel free to contact us at ')} <a className='green-text' href={`mailto:${t('SIGNUP_DRIVER_EMAIL', contactEmail)}`}>{t('SIGNUP_DRIVER_EMAIL', contactEmail)}</a></Description>
             </DescriptionContainer>
           ) : (
             <DescriptionContainer>
               <Description><span className='bigger'>{t('REQUEST_TO_START_UNDER_APPROVAL', 'Your request to start as a driver is under approval.')}</span></Description>
               <Description>{t('BUSINESS_SIGNUP_MESSAGE', 'We will contact you as soon as possible')}</Description>
-              <Description>{t('FEEL_FREE_CONTACT_US', 'feel free to contact us at ')} <a className='green-text' href={`mailto:${t('SIGNUP_DRIVER_EMAIL', contactEmail)}`}>{contactEmail}</a></Description>
+              <Description>{t('FEEL_FREE_CONTACT_US', 'feel free to contact us at ')} <a className='green-text' href={`mailto:${t('SIGNUP_DRIVER_EMAIL', contactEmail)}`}>{t('SIGNUP_DRIVER_EMAIL', contactEmail)}</a></Description>
             </DescriptionContainer>
           )}
         </BodySection>
@@ -101,7 +100,7 @@ export const SignUpApproval = (props) => {
           </Button>
         </ActionGroup>
         {(approvalType === 'automatic' && userType === 'business') && (
-          <ContactSection>{t('CONTACT_US_QUESTIONS', 'If you have some questions do no hestitate to contact us at ')} <a className='green-text' href={`mailto:${t('SIGNUP_DRIVER_EMAIL', contactEmail)}`}>{contactEmail}</a></ContactSection>
+          <ContactSection>{t('CONTACT_US_QUESTIONS', 'If you have some questions do no hestitate to contact us at ')} <a className='green-text' href={`mailto:${t('SIGNUP_DRIVER_EMAIL', contactEmail)}`}>{t('SIGNUP_DRIVER_EMAIL', contactEmail)}</a></ContactSection>
         )}
       </FooterSection>
     </Container>

package/src/themes/five/src/components/SingleProductCard/index.js

@@ -157,7 +157,7 @@ const SingleProductCardUI = (props) => {
                     <span>{productAddedToCartLength}</span>
                   </QuantityContainer>
                 )}
-                <CardInfo soldOut={isSoldOut || maxProductQuantity <= 0} isBgimage={optimizeImage(product?.images, 'h_86,c_limit')} oneLine={isPreviously}>
+                <CardInfo soldOut={isSoldOut || maxProductQuantity <= 0} isBgimage={optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_86,c_limit')} oneLine={isPreviously}>
                   <TitleWrapper>
                     {!isSkeleton ? (<h1>{product?.name}</h1>) : (<Skeleton width={100} />)}
                     {!useKioskApp && !isPreviously && (
@@ -182,7 +182,7 @@ const SingleProductCardUI = (props) => {
                   {isPreviously && (!isSkeleton ? (<LastOrder>{t('LAST_ORDERED_ON', 'Last ordered on')} {parseDate(product?.last_ordered_date, { outputFormat: 'MMM DD, YYYY' })}</LastOrder>) : (<Skeleton width={80} />))}
                 </CardInfo>
                 {!isSkeleton ? (
-                  <WrapLogo isBgimage={optimizeImage(product?.images, 'h_86,c_limit')}>
+                  <WrapLogo isBgimage={optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_86,c_limit')}>
                     {product?.ribbon?.enabled && (
                       <RibbonBox
                         bgColor={product?.ribbon?.color}
@@ -195,7 +195,7 @@ const SingleProductCardUI = (props) => {
                     <CardLogo
                       className='image'
                       soldOut={isSoldOut || maxProductQuantity <= 0}
-                      bgimage={optimizeImage(product?.images, 'h_86,c_limit')}
+                      bgimage={optimizeImage(product?.images || theme?.images?.dummies?.product, 'h_86,c_limit')}
                     />
                   </WrapLogo>
                 ) : (

package/src/themes/five/src/components/UserFormDetails/index.js

@@ -13,9 +13,12 @@ import {
   Divider,
   InputPhoneNumberWrapper,
   LanguageSelectorWrapper,
-  PromotionsWrapper
+  SwitchWrapper,
+  NotificationsGroupSwitchWrapper
 } from './styles'
 
+import { Switch } from '../../../../../styles/Switch'
+
 import { Input } from '../../styles/Inputs'
 import { Button } from '../../styles/Buttons'
 import { InputPhoneNumber } from '../../../../../components/InputPhoneNumber'
@@ -42,7 +45,8 @@ export const UserFormDetailsUI = (props) => {
     setWillVerifyOtpState,
     handleChangePromotions,
     isOldLayout,
-    requiredFields
+    requiredFields,
+    handleChangeNotifications
   } = props
 
   const formMethods = useForm()
@@ -57,13 +61,26 @@ export const UserFormDetailsUI = (props) => {
   const [, { setUserCustomer }] = useCustomer()
   const [isChanged, setIsChanged] = useState(false)
   const emailInput = useRef(null)
-
+  
   const user = userData || userSession
-
+  
+  const [notificationList, setNotificationList] = useState({
+    email: formState?.result?.result
+      ? !!formState?.result?.result?.settings?.email?.newsletter
+      : !!(formState?.changes?.settings?.email?.newsletter ?? (user && user?.settings?.email?.newsletter)),
+    sms: formState?.result?.result
+      ? !!formState?.result?.result?.settings?.sms?.newsletter
+      : !!(formState?.changes?.settings?.sms?.newsletter ?? (user && user?.settings?.sms?.newsletter)),
+    notification: formState?.result?.result
+      ? !!formState?.result?.result?.settings?.notification?.newsletter
+      : !!(formState?.changes?.settings?.notification?.newsletter ?? (user && user?.settings?.notification?.newsletter))
+  })
+  
   const showCustomerCellphone = !orderingTheme?.theme?.profile?.components?.cellphone?.hidden
   const showCustomerPassword = !orderingTheme?.theme?.profile?.components?.password?.hidden
   const showCustomerPromotions = !orderingTheme?.theme?.profile?.components?.promotions?.hidden
   const showLangauges = !orderingTheme?.theme?.profile?.components?.languages?.hidden
+  const showNotifications = !orderingTheme?.theme?.profile?.components?.notification_settings?.hidden
 
   const closeAlert = () => {
     setAlertState({
@@ -251,6 +268,17 @@ export const UserFormDetailsUI = (props) => {
     if (requiredFields && !requiredFields.includes('cellphone')) setIsValidPhoneNumber(true)
   }, [requiredFields])
 
+  const handleEditNotifications = (key, value) => {
+    setNotificationList({
+      ...notificationList,
+      [key]: value
+    })
+  }
+
+  useEffect(()=> {
+    isEdit && handleChangeNotifications(notificationList)
+  },[notificationList])
+
   return (
     <>
       {props.beforeElements?.map((BeforeElement, i) => (
@@ -359,28 +387,36 @@ export const UserFormDetailsUI = (props) => {
                 />
               </InputGroup>
             )}
-            {!isCheckout && showCustomerPromotions && (
-              <PromotionsWrapper>
-                <Checkbox
-                  name='promotions'
-                  id='promotions'
-                  onChange={() => handleChangePromotions(!(formState?.result?.result
-                    ? !!formState?.result?.result?.settings?.notification?.newsletter
-                    : formState?.changes?.settings?.notification?.newsletter ?? (user && user?.settings?.notification?.newsletter)))}
-                  defaultChecked={formState?.result?.result
-                    ? !!formState?.result?.result?.settings?.notification?.newsletter
-                    : !!(formState?.changes?.settings?.notification?.newsletter ?? (user && user?.settings?.notification?.newsletter))}
-                />
-                <label
-                  htmlFor='promotions'
-                >
-                  <span>{t('RECEIVE_NEWS_EXCLUSIVE_PROMOTIONS', 'Receive newsletters and exclusive promotions')}</span>
-                </label>
-              </PromotionsWrapper>
+            {showNotifications && showCustomerPromotions && !requiredFields && (
+              <>
+                <NotificationsGroupSwitchWrapper>
+                  <p>{t('MARKETING_NOTIFICATIONS', 'Marketing Notifications')}</p>
+                  <SwitchWrapper>
+                    <p>{t('EMAILS', 'Emails')}</p>
+                    <Switch
+                      onChange={value => handleEditNotifications('email', value)}
+                      defaultChecked={notificationList?.email}
+                    />
+                  </SwitchWrapper>
+                  <SwitchWrapper>
+                    <p>{t('SMS', 'Sms')}</p>
+                    <Switch
+                      onChange={value => handleEditNotifications('sms', value)}
+                      defaultChecked={notificationList?.sms}
+                    />
+                  </SwitchWrapper>
+                  <SwitchWrapper>
+                    <p>{t('PUSH_NOTIFICATIONS', 'Push Notifications')}</p>
+                    <Switch
+                      onChange={value => handleEditNotifications('notification', value)}
+                      defaultChecked={notificationList?.notification}
+                    />
+                  </SwitchWrapper>
+                </NotificationsGroupSwitchWrapper>
+              </>
             )}
             {showLangauges && !requiredFields && (
               <>
-                <Divider />
                 <LanguageSelectorWrapper>
                   <p>{t('LANGUAGE', 'Language')}</p>
                   <LanguageSelector />

package/src/themes/five/src/components/UserFormDetails/styles.js

@@ -182,3 +182,29 @@ export const PromotionsWrapper = styled.div`
     }
   }
 `
+
+export const NotificationsGroupSwitchWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  width: 100%;
+  padding: 15px 0;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #E9ECEF;
+  
+  > p {
+    margin: 0;
+    font-weight: 500;
+    font-size: 20px;
+    color: ${props => props.theme.colors.darkTextColor};
+    width: 100%;
+    text-align: left;
+  }
+`
+
+export const SwitchWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+`