ordering-ui-react-native 0.22.53 → 0.22.54-release

package/themes/business/src/components/PrinterEdition/index.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
-import { Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
+import { StarPRNT } from 'react-native-star-prnt';
+import { ActivityIndicator, Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
 import SelectDropdown from 'react-native-select-dropdown'
 import { useLanguage } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native'
@@ -20,47 +21,36 @@ import {
 import { Container } from '../../layouts/Container'
 import { OText, OInput, OIcon, OButton } from '../shared'
 
-const printerList = [
-  { nickname: 'mPOP', model: 'mPOP', emulation: 'StarPRNT', portName1: 'BT:mPOP', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'FVP10', model: 'FVP10', emulation: 'StarLine', portName1: 'BT:FVP10', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP100', model: 'TSP100', emulation: 'StarGraphic', portName1: 'BT:TSP100', type: 1, ip: '', printMode: 'appendBitmapText' },
-  { nickname: 'TSP100IV', model: 'TSP100IV', emulation: 'StarLine', portName1: 'BT:TSP100iv', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP65011', model: 'TSP65011', emulation: 'StarLine', portName1: 'BT:TSP65011', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP7001', model: 'TSP7001', emulation: 'StarLine', portName1: 'BT:TSP7001', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP80011', model: 'TSP80011', emulation: 'StarLine', portName1: 'BT:TSP80011', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SP700', model: 'SP700', emulation: 'StarDotImpact', portName1: 'BT:SP700', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S210i', model: 'SM-S210i', emulation: 'EscPosMobile', portName1: 'BT:SMS210i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S220i', model: 'SM-S220i', emulation: 'EscPosMobile', portName1: 'BT:SMS220i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S230i', model: 'SM-S230i', emulation: 'EscosMobile', portName1: 'BT:SMS230i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T300i/T300', model: 'SM-T300i/T300', emulation: 'EscPosMobile', portName1: 'BT:SMT300i/T300', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T400i', model: 'SM-T400i', emulation: 'EscosMobile', portName1: 'BT:SMT400i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-L200', model: 'SM-L200', emulation: 'StarPRNT', portName1: 'BT:SML200', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-L300', model: 'SM-L300', emulation: 'StarPRNT', portName1: 'BT:SML300', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'BSC10', model: 'BSC10', emulation: 'EscPos', portName1: 'BT:BSC10', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S210i StarPRNT', model: 'SM-S210i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMS210i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S220i StarPRNT', model: 'SM-S220i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMS220i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S230i StarPRNT', model: 'SM-S230i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMS230i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T300i/T300 StarPRNT', model: 'SM-T300i/T300 StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMT300i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T400i StarPRNT', model: 'SM-T400i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMT400i', type: 1, ip: '', printMode: 'append' },
-]
+import { PRINTERS } from './printerList'
+import { MessageAlert } from './MessageAlert'
+
+const printerList = PRINTERS.map(printer => ({
+  ...printer,
+  ip: '',
+  type: 1,
+  nickname: printer.model,
+  portName1: `BT:${printer.model.split(' ')[0]}`,
+  bt: `BT:${printer.model.split(' ')[0]}`
+}))
 
 export const PrinterEdition = (props: any) => {
-  const {
-    printer,
-    onClose
-  } = props
+  const { printer, onClose } = props
 
   const HEIGHT_SCREEN = Dimensions.get('window').height
   const [, t] = useLanguage()
   const theme = useTheme()
-  const { handleSubmit, control, setValue, watch } = useForm();
+  const { control, setValue, watch } = useForm()
+
+  const [currentPrinter, setCurrentPrinter] = useState(printer)
+  const [discoverPort, setDiscoverPort] = useState({ loading: false, msg: null })
 
   const watchIp = watch('ip')
+  const watchBt = watch('bt')
   const watchNickname = watch('nickname')
-  const isErrorIp = !/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(watchIp)
-  const isErrorNickname = watchNickname && !/^[a-zA-Z0-9\s]+$/i.test(watchNickname)
-
-  const [currentPrinter, setCurrentPrinter] = useState(printer)
+  const errorIP = !/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(watchIp)
+  const errorBT = !/^[^\n]*$/i.test(watchBt) || !watchBt
+  const isErrorInput = currentPrinter?.type === 2 ? errorIP : errorBT
+  const isErrorNickname = watchNickname && !/^[^\n]*$/i.test(watchNickname)
 
   const styles = StyleSheet.create({
     icons: {
@@ -73,9 +63,13 @@ export const PrinterEdition = (props: any) => {
       paddingRight: 10
     },
     inputStyle: {
-      height: 40,
       borderWidth: 1,
       borderRadius: 8,
+      color: theme.colors.arrowColor,
+      borderColor: theme.colors.inputSignup,
+      backgroundColor: theme.colors.transparent,
+      minHeight: 50,
+      maxHeight: 50
     },
     savePrinterBtnText: {
       color: theme.colors.white,
@@ -98,6 +92,36 @@ export const PrinterEdition = (props: any) => {
     })
   }
 
+  const portDiscovery = async () => {
+    try {
+      setDiscoverPort({ ...discoverPort, loading: true })
+      let printers = await StarPRNT.portDiscovery('Bluetooth');
+
+      if (printers?.length) {
+        setValue('bt', printers[0]?.portName)
+        setCurrentPrinter({
+          ...currentPrinter,
+          ['bt']: printers[0]?.portName
+        })
+      }
+      setTimeout(() => {
+        setDiscoverPort({
+          ...discoverPort,
+          loading: false,
+          msg: !printers?.length
+            ? t('NO_PRINTERS_FOUND', 'No printers found')
+            : null
+        })
+      }, 1000);
+    } catch (e) {
+      setValue('bt', currentPrinter?.portName)
+      setCurrentPrinter({
+        ...currentPrinter,
+        ['bt']: currentPrinter?.portName
+      })
+    }
+  }
+
   const onSubmit = () => {
     handleChangePrinter({ edit: !!printer, isAdd: !printer })
     onClose && onClose()
@@ -105,6 +129,7 @@ export const PrinterEdition = (props: any) => {
 
   useEffect(() => {
     currentPrinter?.ip && setValue('ip', currentPrinter?.ip)
+    currentPrinter?.bt && setValue('bt', currentPrinter?.bt)
     currentPrinter?.nickname && setValue('nickname', currentPrinter?.nickname)
   }, [currentPrinter?.type])
 
@@ -281,51 +306,93 @@ export const PrinterEdition = (props: any) => {
                 {t('CONNECTION_VIA_LAN', 'Via LAN')}
               </OText>
             </WrapperIcon>
-            {currentPrinter?.type === 2 && (
-              <>
-                <View style={{ flexDirection: 'row' }}>
-                  <Controller
-                    control={control}
-                    name={'ip'}
-                    rules={{
-                      required: t('VALIDATION_ERROR_IP_ADDRESS_REQUIRED', 'Ip address is required'),
-                      pattern: {
-                        value: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i,
-                        message: t('INVALID_ERROR_IP_ADDRESS', 'Invalid ip address')
-                      }
-                    }}
-                    defaultValue={currentPrinter?.ip ?? ''}
-                    render={() => (
-                      <OInput
-                        placeholder={t('IP_ADDRESS', 'Ip address')}
-                        placeholderTextColor={theme.colors.arrowColor}
-                        style={{
-                          ...styles.inputStyle,
-                          borderColor: isErrorIp ? theme.colors.danger500 : theme.colors.tabBar
-                        }}
-                        value={currentPrinter?.ip ?? ''}
-                        selectionColor={theme.colors.primary}
-                        color={theme.colors.textGray}
-                        onChange={(value: any) => {
-                          setValue('ip', value)
-                          setCurrentPrinter({
-                            ...currentPrinter,
-                            ip: value
-                          })
-                        }}
-                      />
-                    )}
-                  />
-                </View>
+            <View style={{ flexDirection: 'column', marginTop: 30 }}>
+              {currentPrinter?.type === 1 && (
                 <OText
                   size={14}
-                  color={theme.colors.tabBar}
-                  style={{ paddingTop: 5, paddingLeft: 10 }}
+                  color={theme.colors.toastInfo}
+                  style={{ marginBottom: 10 }}
                 >
-                  {`${t('EXAMPLE_SHORT', 'Ex:')} 8.8.8.8`}
+                  {t('SEARCH_AVAILABLE_PRINTER_MESSAGE', 'Use the search icon to find an available printer')}
                 </OText>
-              </>
-            )}
+              )}
+              <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+                <Controller
+                  control={control}
+                  name={currentPrinter?.type === 2 ? 'ip' : 'bt'}
+                  rules={{
+                    required: currentPrinter?.type === 2
+                      ? t('VALIDATION_ERROR_IP_ADDRESS_REQUIRED', 'Ip address is required')
+                      : t('VALIDATION_ERROR_BLUETOOTH_PORN_REQUIRED', 'Bluetooth port name is required'),
+                    pattern: {
+                      value: currentPrinter?.type === 2
+                        ? /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i
+                        : /^[a-zA-Z0-9]+$/i,
+                      message: currentPrinter?.type === 2
+                        ? t('INVALID_ERROR_IP_ADDRESS', 'Invalid ip address')
+                        : t('INVALID_ERROR_BLUETOOTH_PORT_NAME', 'Invalid bluetooth port name')
+                    }
+                  }}
+                  defaultValue={currentPrinter?.type === 2 ? currentPrinter?.ip ?? '' : currentPrinter?.bt ?? ''}
+                  render={() => (
+                    <OInput
+                      placeholder={currentPrinter?.type === 2
+                        ? t('IP_ADDRESS', 'Ip address')
+                        : t('BLUETOOTH_PORT', 'Bluetooth port')
+                      }
+                      placeholderTextColor={theme.colors.arrowColor}
+                      style={{
+                        ...styles.inputStyle,
+                        borderColor: isErrorInput ? theme.colors.danger500 : theme.colors.tabBar
+                      }}
+                      value={currentPrinter?.type === 2 ? currentPrinter?.ip ?? '' : currentPrinter?.bt ?? ''}
+                      selectionColor={theme.colors.primary}
+                      color={theme.colors.textGray}
+                      onChange={(value: any) => {
+                        setValue(currentPrinter?.type === 2 ? 'ip' : 'bt', value)
+                        setCurrentPrinter({
+                          ...currentPrinter,
+                          [currentPrinter?.type === 2 ? 'ip' : 'bt']: value
+                        })
+                      }}
+                    />
+                  )}
+                />
+                {currentPrinter?.type === 1 && (
+                  <>
+                    {!discoverPort.loading ? (
+                      <FAIcons
+                        name='search'
+                        size={22}
+                        color={theme.colors.primary}
+                        style={{ marginLeft: 10 }}
+                        onPress={() => portDiscovery()}
+                      />
+                    ) : (
+                      <ActivityIndicator
+                        size="small"
+                        style={{ marginLeft: 10 }}
+                        color={theme.colors.primary}
+                      />
+                    )}
+                  </>
+                )}
+              </View>
+            </View>
+            <OText
+              size={14}
+              color={theme.colors.tabBar}
+              style={{ paddingTop: 5, paddingLeft: 10 }}
+            >
+              {discoverPort.msg ? (
+                <MessageAlert
+                  message={discoverPort.msg}
+                  resetMsg={() => setDiscoverPort({ ...discoverPort, msg: null })}
+                />
+              ) : (
+                `${t('EXAMPLE_SHORT', 'Ex:')} ${currentPrinter?.type === 2 ? '8.8.8.8' : currentPrinter?.portName1}`
+              )}
+            </OText>
           </WrapperIcons>
         )}
       </ContainerEdition>
@@ -341,6 +408,7 @@ export const PrinterEdition = (props: any) => {
         isDisabled={
           isErrorNickname ||
           !currentPrinter?.model ||
+          currentPrinter?.type === 1 && !currentPrinter?.bt ||
           currentPrinter?.type === 2 && !currentPrinter?.ip
         }
         onClick={() => onSubmit()}

package/themes/business/src/components/PrinterEdition/printerList.tsx

@@ -0,0 +1,23 @@
+export const PRINTERS = [
+  { model: 'mPOP', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'FVP10', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP100', emulation: 'StarGraphic', printMode: 'appendBitmapText' },
+  { model: 'TSP100IV', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP65011', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP7001', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP80011', emulation: 'StarLine', printMode: 'append' },
+  { model: 'SP700', emulation: 'StarDotImpact', printMode: 'append' },
+  { model: 'SM-S210i', emulation: 'EscPosMobile', printMode: 'append' },
+  { model: 'SM-S220i', emulation: 'EscPosMobile', printMode: 'append' },
+  { model: 'SM-S230i', emulation: 'EscosMobile', printMode: 'append' },
+  { model: 'SM-T300i/T300', emulation: 'EscPosMobile', printMode: 'append' },
+  { model: 'SM-T400i', emulation: 'EscosMobile', printMode: 'append' },
+  { model: 'SM-L200', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-L300', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'BSC10', emulation: 'EscPos', bt: 'BT:BSC10', printMode: 'append' },
+  { model: 'SM-S210i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-S220i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-S230i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-T300i/T300 StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-T400i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+]

package/themes/business/src/components/PrinterSettings/index.tsx

@@ -102,7 +102,7 @@ export const PrinterSettings = (props: any) => {
         type: type ?? _currentPrinter?.type ?? 1,
         ip: ip ?? _currentPrinter?.ip ?? '',
         portName: (type ?? _currentPrinter?.type) === 1 || !ip
-          ? item.portName1 ?? _currentPrinter?.portName1
+          ? item?.bt ?? item.portName1 ?? _currentPrinter?.portName1
           : `TCP:${ip}`
       }
       edit ? (_printers[idx] = _item) : _printers.push(_item)

package/themes/business/src/components/ProductItemAccordion/index.tsx

@@ -22,6 +22,7 @@ import {
 } from './styles';
 import { OText, OAlert } from '../shared';
 import { ProductItemAccordionParams } from '../../types';
+import { getCurrenySymbol } from '../../utils';
 
 export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
   const {
@@ -160,7 +161,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
               }}>
               <View style={{ flexDirection: 'row' }}>
                 <OText size={12} color={theme.colors.textGray}>
-                  {parsePrice(getProductPrice(product), { currency })}
+                  {parsePrice(getProductPrice(product), { currency: getCurrenySymbol(currency) })}
                 </OText>
 
                 {(
@@ -281,7 +282,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
                                   suboption.position,
                                 )
                                 : '',
-                            price: parsePrice(suboption.price, { currency }),
+                            price: parsePrice(suboption.price, { currency: getCurrenySymbol(currency) }),
                           })}
                         </OText>
                       </ProductSubOption>

package/themes/business/src/components/ReviewCustomer/index.tsx

@@ -1,3 +1,5 @@
+
+
 import React, { useState, useEffect, useRef } from 'react'
 import {
   useLanguage,

package/themes/business/src/components/StoresList/index.tsx

@@ -149,10 +149,10 @@ const StoresListUI = (props: BusinessesListingParams) => {
             width={12}
             height={12}
             color={theme.colors.skyBlue}
-            style={{ marginRight: 5, marginTop: 3 }}
+            style={{ marginRight: 5 }}
           />
           <OText size={12}>
-            {t('MORE_SETTINGS_GO_TO', 'For more settings go to')}{' '}
+            {t('MORE_SETTINGS_GO_TO', 'For more settings go to ')}
           </OText>
           <TouchableOpacity onPress={() => { Linking.openURL(t('LINK_MORE_SETTINGS_GO_TO', 'https://app.ordering.co')) }}>
             <OText size={12} color={theme.colors.skyBlue}>

package/themes/business/src/components/UserProfileForm/index.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { View, StyleSheet, ScrollView, ActivityIndicator, Pressable } from 'react-native';
+import { _retrieveStoreData, _clearStoreData } from '../../providers/StoreUtil';
 import { useForm } from 'react-hook-form';
 import { launchImageLibrary } from 'react-native-image-picker';
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
@@ -20,6 +21,7 @@ import {
   UserData,
   EditButton,
   EnabledStatusDriver,
+  RemoveAccount
 } from './styles';
 import { LogoutButton } from '../LogoutButton';
 import { LanguageSelector } from '../LanguageSelector';
@@ -36,6 +38,8 @@ import {
   OInput,
   OModal,
 } from '../../components/shared';
+import { OAlert } from '../../../../../src/components/shared'
+
 import { sortInputFields, getTraduction } from '../../utils';
 import { ProfileParams } from '../../types';
 import { NotFoundSource } from '../NotFoundSource';
@@ -49,6 +53,7 @@ const ProfileUI = (props: ProfileParams) => {
     toggleIsEdit,
     cleanFormState,
     handleToggleAvalaibleStatusDriver,
+    handleRemoveAccount,
     isAlsea,
     isShowDriverStatus,
     navigation
@@ -62,6 +67,7 @@ const ProfileUI = (props: ProfileParams) => {
   const [{ loading }, { loadOriginalValidationFields }] = useValidationFields()
   const { errors } = useForm();
   const theme = useTheme();
+  const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
 
   const [phoneInputData, setPhoneInputData] = useState<any>({
     error: '',
@@ -76,13 +82,8 @@ const ProfileUI = (props: ProfileParams) => {
   const [phoneToShow, setPhoneToShow] = useState('');
   const [openModal, setOpenModal] = useState(false)
   const allowDriverUpdateData = user?.level !== 4 || configs?.allow_driver_update_data?.value === "1"
-  useEffect(() => {
-    if (phoneInputData.phone.cellphone) {
-      const codeNumberPhone = phoneInputData.phone.country_phone_code
-      const numberPhone = phoneInputData.phone.cellphone
-      setPhoneToShow(`(${codeNumberPhone}) ${numberPhone}`);
-    }
-  }, [phoneInputData.phone.cellphone]);
+  const allowDeleteDriverAccount = user?.level !== 4 || configs?.allow_delete_driver_account?.value === "1"
+  const isAdmin = user?.level === 0
 
   const setUserCellPhone = (isEdit = false) => {
     if (userPhoneNumber && !userPhoneNumber.includes('null') && !isEdit) {
@@ -148,6 +149,28 @@ const ProfileUI = (props: ProfileParams) => {
     });
   };
 
+  const onRemoveAccount = async () => {
+    setConfirm({
+      open: true,
+      content: [t('QUESTION_REMOVE_ACCOUNT', 'Are you sure that you want to remove your account?')],
+      title: t('ACCOUNT_ALERT', 'Account alert'),
+      handleOnAccept: () => {
+        setConfirm({ ...confirm, open: false })
+        handleRemoveAccount && handleRemoveAccount(user?.id)
+        _clearStoreData({ excludedKeys: ['isTutorial', 'language'] });
+        props?.setRootState && props?.setRootState({ isAuth: false, token: null })
+      }
+    })
+  }
+
+  useEffect(() => {
+    if (phoneInputData.phone.cellphone) {
+      const codeNumberPhone = phoneInputData.phone.country_phone_code
+      const numberPhone = phoneInputData.phone.cellphone
+      setPhoneToShow(`(${codeNumberPhone}) ${numberPhone}`);
+    }
+  }, [phoneInputData.phone.cellphone]);
+
   useEffect(() => {
     const isLoadingDriver = userState?.loadingDriver ?? true;
 
@@ -155,8 +178,8 @@ const ProfileUI = (props: ProfileParams) => {
       if (userState?.result?.error) {
         const messageError =
           userState.result.error || userState.result.error[0];
-        showToast(ToastType.Error, getTraduction(messageError, t));
-      } else {
+          showToast(ToastType.Error, typeof messageError === 'string' ? getTraduction(messageError, t) : t('CANNOT_UPDATE_AVAILABLE_STATE', 'Cannot update available state'));
+        } else {
         showToast(
           ToastType.Success,
           t('AVAILABLE_STATE_IS_UPDATED', 'Available state is updated'),
@@ -486,10 +509,11 @@ const ProfileUI = (props: ProfileParams) => {
                 handleCancelEdit={handleCancelEdit}
                 toggleIsEdit={toggleIsEdit}
                 isAlsea={isAlsea}
+                allowDriverUpdateData={allowDriverUpdateData}
               />
             </View>
           )}
-          {!validationFields.loading && !isEdit && allowDriverUpdateData && (
+          {!validationFields.loading && !isEdit && (
             <EditButton>
               <OButton
                 text={t('EDIT', 'Edit')}
@@ -544,6 +568,12 @@ const ProfileUI = (props: ProfileParams) => {
 
             <LogoutButton />
           </Actions>
+          {allowDeleteDriverAccount && (
+            <RemoveAccount disabled={isAdmin} onPress={() => onRemoveAccount()} activeOpacity={0.7}>
+              <AntDesignIcon size={16} name='close' color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
+              <OText size={14} lineHeight={24} weight={'400'} style={{ opacity: isAdmin ? 0.5 : 1 }} color={theme.colors.danger500}>{t('REMOVE_ACCOUNT', 'Remove account')}</OText>
+            </RemoveAccount>
+          )}
           <OModal
             open={openModal}
             onClose={() => setOpenModal(false)}
@@ -554,6 +584,14 @@ const ProfileUI = (props: ProfileParams) => {
               <DriverSchedule schedule={user?.schedule} />
             )}
           </OModal>
+          <OAlert
+            open={confirm.open}
+            title={confirm.title}
+            content={confirm.content}
+            onAccept={confirm.handleOnAccept}
+            onCancel={() => setConfirm({ ...confirm, open: false, title: null })}
+            onClose={() => setConfirm({ ...confirm, open: false, title: null })}
+          />
         </ScrollView>
       )}
     </>

package/themes/business/src/components/UserProfileForm/styles.tsx

@@ -34,3 +34,10 @@ export const Actions = styled.View`
   justify-content: space-between;
   align-items: flex-start;
 `;
+
+export const RemoveAccount = styled.TouchableOpacity`
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	margin-bottom: 24px;
+`

package/themes/business/src/components/WebsocketStatus/index.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import { useLanguage, useUtils, WebsocketStatus as WebsocketStatusController } from 'ordering-components/native'
-import { TouchableOpacity, View, StyleSheet } from 'react-native'
+import { TouchableOpacity, View, StyleSheet, Platform } from 'react-native'
 import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 import { useTheme } from 'styled-components/native'
 import RNRestart from 'react-native-restart'
@@ -37,7 +37,7 @@ const SocketStatusUI = (props: any) => {
       paddingLeft: 0,
       paddingRight: 0,
       marginBottom: 30,
-      marginTop: 30
+      marginTop: Platform.OS === 'ios' ? 60 : 30
     },
   })