ordering-ui-react-native 0.16.89 → 0.16.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.16.89",
+  "version": "0.16.90",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/original/src/components/BusinessProductsListing/index.tsx

@@ -21,6 +21,8 @@ import { BusinessProductsCategories } from '../BusinessProductsCategories'
 import { BusinessProductsList } from '../BusinessProductsList'
 import { BusinessProductsListingParams } from '../../types'
 import { _retrieveStoreData, _removeStoreData } from '../../providers/StoreUtil';
+import IconAntDesign from 'react-native-vector-icons/AntDesign';
+
 import {
 	TopHeader,
 	WrapSearchBar,
@@ -29,7 +31,8 @@ import {
 	ContainerSafeAreaView,
 	BackgroundGray,
 	ProfessionalFilterWrapper,
-	NearBusiness
+	NearBusiness,
+	TopActions
 } from './styles'
 import { FloatingButton } from '../FloatingButton'
 import { UpsellingRedirect } from './UpsellingRedirect'
@@ -248,16 +251,9 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 					<TopHeader isIos={Platform.OS === 'ios'}>
 						{!isOpenSearchBar && (
 							<>
-								<View style={{ ...styles.headerItem, width: 175 }}>
-									<OButton
-										imgLeftSrc={theme.images.general.arrow_left}
-										imgRightSrc={null}
-										style={styles.btnBackArrow}
-										onClick={() => handleBackNavigation()}
-										imgLeftStyle={{ tintColor: theme.colors.textNormal, width: 30 }}
-									/>
-
-								</View>
+								<TopActions onPress={() => handleBackNavigation()}>
+									<IconAntDesign name='arrowleft' size={26} />
+								</TopActions>
 								{!errorQuantityProducts && (
 									<View style={{ ...styles.headerItem }}>
 										<TouchableOpacity

package/themes/original/src/components/BusinessProductsListing/styles.tsx

@@ -66,3 +66,10 @@ export const NearBusiness = styled.View`
   padding-left: 20px;
   max-height: 80px;
 `
+
+export const TopActions = styled.TouchableOpacity`
+	height: 60px;
+	justify-content: center;
+  padding-horizontal: 30px;
+  width: 100px;
+`;

package/themes/original/src/components/BusinessesListing/Layout/Appointment/index.tsx

@@ -22,6 +22,7 @@ import {
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import Ionicons from 'react-native-vector-icons/Ionicons'
+import IconAntDesign from 'react-native-vector-icons/AntDesign';
 
 import {
 	Search,
@@ -283,7 +284,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 				style={{ paddingTop: top + 20 }}>
 				{!auth && (
 					<TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
-						<OIcon src={theme.images.general.arrow_left} width={20} style={{ tintColor: theme.colors.white }} />
+						<IconAntDesign name='arrowleft' size={26} />
 					</TouchableOpacity>
 				)}
 				<Search>

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -53,6 +53,7 @@ import { getTypesText, convertToRadian } from '../../../../utils';
 import { OrderProgress } from '../../../OrderProgress';
 import { useFocusEffect, useIsFocused } from '@react-navigation/native';
 import FastImage from 'react-native-fast-image';
+import IconAntDesign from 'react-native-vector-icons/AntDesign';
 
 const PIXELS_TO_SCROLL = 2000;
 
@@ -450,8 +451,9 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 					resizeMode='cover'
 				>
 					{!auth && (
+
 						<TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
-							<OIcon src={theme.images.general.arrow_left} width={20} style={{ tintColor: theme.colors.white }} />
+							<IconAntDesign name='arrowleft' size={26} />
 						</TouchableOpacity>
 					)}
 				</HeaderWrapper>

package/themes/original/src/components/SignupForm/index.tsx

@@ -635,7 +635,6 @@ const SignupFormUI = (props: SignupParams) => {
 											}
 										})}
 										forwardRef={phoneRef}
-										defaultCode={formState?.country_code ?? formState?.country_phone_code ?? null}
 										changeCountry={(val: any) => setPhoneInputData({
 											...phoneInputData,
 											phone: {

package/themes/original/src/components/Wallets/index.tsx

@@ -9,6 +9,7 @@ import {
   useUtils,
   useConfig
 } from 'ordering-components/native'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 import {
   Container,
@@ -64,7 +65,7 @@ const WalletsUI = (props: any) => {
 
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
   const [openHistory, setOpenHistory] = useState(false)
-	const isChewLayout = theme?.wallets_view?.components?.layout?.type === 'original'
+  const isChewLayout = theme?.wallets_view?.components?.layout?.type === 'original'
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)
 
@@ -103,7 +104,7 @@ const WalletsUI = (props: any) => {
   }, [configs])
 
   useEffect(() => {
-    if(refreshWallets){
+    if (refreshWallets) {
       getWallets()
       setRefreshWallets && setRefreshWallets(false)
     }
@@ -139,83 +140,83 @@ const WalletsUI = (props: any) => {
           !userLoyaltyLevel.loading &&
           !walletList.error &&
           walletList.wallets?.length > 0 &&
-        (
-          <>
-            <OTabs
-              horizontal
-              showsHorizontalScrollIndicator={false}
-            >
-              {walletList.wallets?.map((wallet: any) => walletName[wallet.type]?.isActive && (
-                <Pressable
-                  key={wallet.id}
-                  onPress={() => handleChangeTab(wallet)}
-                >
-                  <OTab isSelected={tabSelected === wallet.type}>
-                    <OText size={18}>
-                      {walletName[wallet.type]?.name}
-                    </OText>
-                  </OTab>
-                </Pressable>
-              ))}
-            </OTabs>
+          (
+            <>
+              <OTabs
+                horizontal
+                showsHorizontalScrollIndicator={false}
+              >
+                {walletList.wallets?.map((wallet: any) => walletName[wallet.type]?.isActive && (
+                  <Pressable
+                    key={wallet.id}
+                    onPress={() => handleChangeTab(wallet)}
+                  >
+                    <OTab isSelected={tabSelected === wallet.type}>
+                      <OText size={18}>
+                        {walletName[wallet.type]?.name}
+                      </OText>
+                    </OTab>
+                  </Pressable>
+                ))}
+              </OTabs>
 
-            <SectionContent>
-              {!!loyaltyLevel && tabSelected === 'credit_point' && (
-                <LoyaltyContent>
-                  <LoyaltyWrapp>
-                    <OText size={20}>
-                      {`${t('LOYALTY_LEVEL_TITLE', 'Your level is')}:`}
-                    </OText>
-                    {loyaltyLevel.image ? (
-                      <FastImage
-                        style={styles.logoStyle}
-                        source={{
-                          uri: loyaltyLevel.image,
-                          priority: FastImage.priority.high,
-                          cache:FastImage.cacheControl.web
-                        }}
-                        resizeMode={FastImage.resizeMode.contain}
-                      />
-                    ) : (
-                      <LoyaltyImg
-                        source={theme.images.dummies.loyaltyLevel}
-                        resizeMode='contain'
-                      />
-                    )}
-                    <OText
-                      size={22}
-                      weight='bold'
-                      style={{ textTransform: 'uppercase' }}
-                      color={theme.colors.primary}
-                    >
-                      {loyaltyLevel.name}
-                    </OText>
-                  </LoyaltyWrapp>
-                </LoyaltyContent>
-              )}
-              <BalanceElement>
-                <OText size={20} style={{fontWeight: '600'}}>
-                  {currentWalletSelected?.type === 'cash'
-                    ? parsePrice(currentWalletSelected?.balance)
-                    : currentWalletSelected?.balance
-                  }
-                </OText>
-                <OText style={{ paddingLeft: 5 }}>
-                  {currentWalletSelected?.type === 'cash'
-                    ? configs?.stripe_currency?.value
-                    : t('POINTS', 'Points')}
-                </OText>
-              </BalanceElement>
+              <SectionContent>
+                {!!loyaltyLevel && tabSelected === 'credit_point' && (
+                  <LoyaltyContent>
+                    <LoyaltyWrapp>
+                      <OText size={20}>
+                        {`${t('LOYALTY_LEVEL_TITLE', 'Your level is')}:`}
+                      </OText>
+                      {loyaltyLevel.image ? (
+                        <FastImage
+                          style={styles.logoStyle}
+                          source={{
+                            uri: loyaltyLevel.image,
+                            priority: FastImage.priority.high,
+                            cache: FastImage.cacheControl.web
+                          }}
+                          resizeMode={FastImage.resizeMode.contain}
+                        />
+                      ) : (
+                        <LoyaltyImg
+                          source={theme.images.dummies.loyaltyLevel}
+                          resizeMode='contain'
+                        />
+                      )}
+                      <OText
+                        size={22}
+                        weight='bold'
+                        style={{ textTransform: 'uppercase' }}
+                        color={theme.colors.primary}
+                      >
+                        {loyaltyLevel.name}
+                      </OText>
+                    </LoyaltyWrapp>
+                  </LoyaltyContent>
+                )}
+                <BalanceElement>
+                  <OText size={20} style={{ fontWeight: '600' }}>
+                    {currentWalletSelected?.type === 'cash'
+                      ? parsePrice(currentWalletSelected?.balance)
+                      : currentWalletSelected?.balance
+                    }
+                  </OText>
+                  <OText style={{ paddingLeft: 5 }}>
+                    {currentWalletSelected?.type === 'cash'
+                      ? configs?.stripe_currency?.value
+                      : t('POINTS', 'Points')}
+                  </OText>
+                </BalanceElement>
 
-              {!isChewLayout && (
-                <WalletTransactions
-                  transactionsList={transactionsList}
-                  currentWalletSelected={currentWalletSelected}
-                />
-              )}
-            </SectionContent>
-          </>
-        )}
+                {!isChewLayout && (
+                  <WalletTransactions
+                    transactionsList={transactionsList}
+                    currentWalletSelected={currentWalletSelected}
+                  />
+                )}
+              </SectionContent>
+            </>
+          )}
 
         {(walletList?.loading || userLoyaltyLevel.loading) && (
           <>
@@ -260,8 +261,6 @@ const WalletsUI = (props: any) => {
         <ScrollView>
           <WalletTransactionsWrapper>
             <OButton
-              imgLeftSrc={theme.images.general.arrow_left}
-              imgLeftStyle={{ width: 18 }}
               imgRightSrc={null}
               style={{
                 borderWidth: 0,
@@ -273,6 +272,11 @@ const WalletsUI = (props: any) => {
                 paddingRight: 0
               }}
               onClick={() => setOpenHistory(false)}
+              icon={AntDesignIcon}
+              iconProps={{
+                name: 'arrowleft',
+                size: 26
+              }}
             />
             <WalletTransactions
               transactionsList={transactionsList}