ordering-ui-react-native 0.15.61 → 0.15.62

package/package.json

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

package/src/components/PaymentOptions/index.tsx

@@ -67,7 +67,7 @@ const PaymentOptionsUI = (props: any) => {
 
   const theme = useTheme();
   const [, t] = useLanguage();
-  const methodsPay = ['google_pay', 'apple_pay']
+  const methodsPay = ['google_pay']
   const stripeDirectMethods = ['stripe_direct', ...methodsPay]
 
   const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
@@ -156,7 +156,7 @@ const PaymentOptionsUI = (props: any) => {
     )
   }
 
-  const excludeGateway: any = ['stripe_connect', 'stripe_redirect']; //exclude connect & redirect
+  const excludeGateway: any = ['stripe_connect', 'stripe_redirect', 'apple_pay']; //exclude connect & redirect & apple pay
 
   return (
     <PMContainer>

package/src/components/StripeMethodForm/index.tsx

@@ -131,7 +131,7 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
 
   return (
     <>
-      {paymethod === 'google_pay' ? (
+      {paymethod === 'google_pay' && (
         <View>
           <OButton
             textStyle={{
@@ -145,26 +145,27 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
             style={{ marginTop: 20 }}
           />
         </View>
-      ) : (
-        <View>
-          {isApplePaySupported ? (
-            <>
-              <OText>{t('APPLE_PAY_PAYMENT', 'Apple pay payment')}</OText>
-              <ApplePayButton
-                onPress={pay}
-                type="plain"
-                buttonStyle="black"
-                borderRadius={4}
-                style={{
-                  width: '100%',
-                  height: 50,
-                }}
-              />
-            </>
-          ) : (
-            <OText>{t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported')}</OText>
-          )}
-        </View>
+        // ) : (
+        //   <View>
+        //     {isApplePaySupported ? (
+        //       <>
+        //         <OText>{t('APPLE_PAY_PAYMENT', 'Apple pay payment')}</OText>
+        //         <ApplePayButton
+        //           onPress={pay}
+        //           type="plain"
+        //           buttonStyle="black"
+        //           borderRadius={4}
+        //           style={{
+        //             width: '100%',
+        //             height: 50,
+        //           }}
+        //         />
+        //       </>
+        //     ) : (
+        //       <OText>{t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported')}</OText>
+        //     )}
+        //   </View>
+        // )}
       )}
       <Spinner
         visible={loadingGooglePayment}

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

@@ -165,7 +165,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
           : _products
 
         const shortCategoryDescription = category?.description?.length > 80 ? `${category?.description?.substring(0, 80)}...` : category?.description
-
+        
         return (
           <React.Fragment key={'cat_' + category.id}>
             {products.length > 0 && (
@@ -224,11 +224,11 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                         />
                       )}
                     </OText>
-                    {category?.subcategories?.length > 0 && (
-                      <SubcategoriesComponent category={category} />
-                    )}
                   </View>
                 )}
+                {category?.subcategories?.length > 0 && (
+                  <SubcategoriesComponent category={category} />
+                )}
                 <>
                   {products.sort((a: any, b: any) => a.rank - b.rank).map((product: any, i: any) => (
                     <SingleProductCard

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

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
 	UserFormDetails as UserProfileController,
 	useSession,
@@ -18,6 +18,7 @@ import MessageCircle from 'react-native-vector-icons/AntDesign'
 import Ionicons from 'react-native-vector-icons/Ionicons'
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons'
 import FastImage from 'react-native-fast-image'
+import { OAlert } from '../../../../../src/components/shared'
 
 import {
 	OIcon,
@@ -35,7 +36,9 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 const ProfileListUI = (props: ProfileParams) => {
 	const {
 		navigation,
-		formState
+		formState,
+		handleRemoveAccount,
+		removeAccountState
 	} = props;
 
 	const theme = useTheme();
@@ -92,15 +95,19 @@ const ProfileListUI = (props: ProfileParams) => {
 	});
 
 
-	const [{ user }] = useSession();
+	const [{ user }, { logout }] = useSession();
 	const [, t] = useLanguage();
 	const [{ configs }] = useConfig();
 	const [, { showToast }] = useToast();
 	const { errors } = useForm();
 
+	const isAdmin = user?.level === 0
+
 	const { height } = useWindowDimensions();
 	const { top, bottom } = useSafeAreaInsets();
 
+	const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
+
 	const isWalletEnabled = configs?.wallet_enabled?.value === '1' && (configs?.wallet_cash_enabled?.value === '1' || configs?.wallet_credit_point_enabled?.value === '1')
 	const IsPromotionsEnabled = configs?.advanced_offers_module === '1' || configs?.advanced_offers_module === 'true'
 	const onRedirect = (route: string, params?: any) => {
@@ -136,6 +143,24 @@ const ProfileListUI = (props: ProfileParams) => {
 		onNavigationRedirect: (route: string, params: any) => props.navigation.navigate(route, params)
 	}
 
+	const onRemoveAccount = () => {
+		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)
+      }
+    })
+	}
+
+	useEffect(() => {
+		if (removeAccountState?.result === 'OK') {
+			logout()
+		}
+	}, [removeAccountState])
+
 	return (
 		<View style={{ flex: 1, height: height - top - bottom - 62, paddingTop: 20 }}>
 			{/* <OText size={24} style={{ marginTop: 15, paddingHorizontal: 40 }}>
@@ -195,8 +220,21 @@ const ProfileListUI = (props: ProfileParams) => {
 					<LanguageSelector iconColor={theme.colors.textNormal} pickerStyle={langPickerStyle} />
 					<View style={{ height: 17 }} />
 					<LogoutButton color={theme.colors.textNormal} text={t('LOGOUT', 'Logout')} />
+					<View style={{ height: 17 }} />
+					<ListItem disabled={isAdmin} onPress={() => onRemoveAccount()} activeOpacity={0.7}>
+						<OIcon src={theme.images.general.user} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
+						<OText size={14} lineHeight={24} weight={'400'} style={{ opacity: isAdmin ? 0.5 : 1 }} color={theme.colors.danger5}>{t('REMOVE_ACCOUNT', 'Remove account')}</OText>
+					</ListItem>
 				</Actions>
 			</ListWrap>
+			<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 })}
+      />
 		</View>
 	);
 };

package/themes/original/src/types/index.tsx

@@ -39,6 +39,8 @@ export interface ProfileParams {
 	verifyPhoneState?: any;
 	setCheckPhoneCodeState?: any;
 	isVerifiedPhone?: any;
+	handleRemoveAccount?: any;
+	removeAccountState?: any;
 }
 
 export interface AddressListParams {