ordering-ui-react-native 0.16.12 → 0.16.15

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

@@ -1,56 +1,144 @@
 import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
-import { View, StyleSheet, Platform, I18nManager } from 'react-native';
+import { View, StyleSheet, RefreshControl } from 'react-native';
 
 import { OrdersOption } from '../OrdersOption'
-import { OText } from '../shared'
+import { HeaderTitle, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
-
-const PIXELS_TO_SCROLL = 1000;
+import { Tab } from './styles'
+import { useTheme } from 'styled-components/native';
+import { Container } from '../../layouts/Container';
 
 export const MyOrders = (props: any) => {
-  const [, t] = useLanguage();
-  const [loadMore, setLoadMore] = useState(false)
-
+  const {
+    hideOrders,
+    businessesSearchList
+  } = props
+  const [, t] = useLanguage()
+  const theme = useTheme()
+  const [refreshing] = useState(false);
+  const [refreshOrders, setRefreshOrders] = useState(false)
+  const [isEmptyBusinesses, setIsEmptyBusinesses] = useState(false)
+  const [businessOrderIds, setBusinessOrderIds] = useState([])
   const [ordersLength, setOrdersLength] = useState({
     activeOrdersLength: 0,
     previousOrdersLength: 0,
   });
+  const [selectedOption, setSelectedOption] = useState(!hideOrders ? 'orders' : 'business')
+
+  const notOrderOptions = ['business', 'products']
+  const allEmpty = (ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) || ((isEmptyBusinesses || businessOrderIds?.length === 0) && hideOrders)
+  const MyOrdersMenu = [
+    { key: 'orders', value: t('ORDERS', 'Orders') },
+    { key: 'business', value: t('BUSINESS', 'Business') },
+    { key: 'products', value: t('PRODUCTS', 'Products') }
+  ]
 
-  const handleScroll = ({ nativeEvent }: any) => {
-		const y = nativeEvent.contentOffset.y
-		const height = nativeEvent.contentSize.height
+  const handleOnRefresh = () => {
+    setRefreshOrders(true);
+  }
 
-    if (y + PIXELS_TO_SCROLL > height ) {
-      setLoadMore(true)
+  const styles = StyleSheet.create({
+    container: {
+      paddingVertical: 5,
+      borderColor: theme.colors.clear,
+      backgroundColor: '#FFF'
+    },
+    featuredStyle: {
+      display: 'none',
+    },
+    tabStyle: {
+      marginTop: 10,
+      height: 4,
+      borderTopStartRadius: 4,
+      borderTopEndRadius: 4,
+      backgroundColor: theme.colors.textPrimary,
+    },
+    tabDeactived: {
+      marginTop: 10,
+      height: 4
     }
-	}
+  });
 
   return (
-    <ScrollView onScroll={(e: any) => handleScroll(e)}>
-      <OText
-        size={20}
-        mBottom={15}
-        style={{ marginTop: 25, paddingHorizontal: 40 }}>
-        {t('MY_ORDERS', 'My Orders')}
-      </OText>
-      <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+    <Container noPadding refreshControl={
+      <RefreshControl
+        refreshing={refreshing}
+        onRefresh={() => handleOnRefresh()}
+      />
+    }>
+      {!hideOrders && (
+        <HeaderTitle text={t('MY_ORDERS', 'My Orders')} />
+      )}
+      {!allEmpty && (
+        <ScrollView
+          horizontal
+          style={{ ...styles.container, borderBottomWidth: 1 }}
+          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : 40 }}
+          showsHorizontalScrollIndicator={false}
+          scrollEventThrottle={16}
+        >
+          {MyOrdersMenu.filter(option => !hideOrders || option.key !== 'orders').map(option => (
+            <Tab
+              key={option.key}
+              onPress={() => setSelectedOption(option.key)}
+              style={
+                {
+                  borderBottomColor:
+                    selectedOption === option.key
+                      ? theme.colors.textNormal
+                      : theme.colors.border,
+                }
+              }
+            >
+              <OText>{option?.value}</OText>
+            </Tab>
+          ))}
+        </ScrollView>
+      )}
+      {selectedOption === 'orders' && (
+        <>
+          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+            <OrdersOption
+              {...props}
+              activeOrders
+              ordersLength={ordersLength}
+              setOrdersLength={setOrdersLength}
+              setRefreshOrders={setRefreshOrders}
+              refreshOrders={refreshOrders}
+            />
+          </View>
+          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+            <OrdersOption
+              {...props}
+              ordersLength={ordersLength}
+              setOrdersLength={setOrdersLength}
+              setRefreshOrders={setRefreshOrders}
+              refreshOrders={refreshOrders}
+            />
+          </View>
+        </>
+      )}
+      {notOrderOptions.includes(selectedOption) && (
         <OrdersOption
           {...props}
+          titleContent={t('PREVIOUSLY_ORDERED', 'Previously ordered')}
+          hideOrders
+          horizontal
+          isBusiness={selectedOption === 'business'}
+          isProducts={selectedOption === 'products'}
           activeOrders
-          ordersLength={ordersLength}
-          setOrdersLength={setOrdersLength}
-          loadMoreStatus={loadMore}
-          setLoadMoreStatus={setLoadMore}
-        />
-      </View>
-      <View style={{ paddingLeft: 40, paddingRight: 40 }}>
-        <OrdersOption
-          {...props}
+          pastOrders
+          preOrders
+          businessesSearchList={businessesSearchList}
+          setIsEmptyBusinesses={setIsEmptyBusinesses}
+          businessOrderIds={businessOrderIds}
+          setBusinessOrderIds={setBusinessOrderIds}
           ordersLength={ordersLength}
           setOrdersLength={setOrdersLength}
         />
-      </View>
-    </ScrollView>
+      )}
+    </Container>
+
   )
 }

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

@@ -3,4 +3,11 @@ import styled, { css } from 'styled-components/native'
 export const Wrapper = styled.View`
   flex: 1;
   background-color: ${(props: any) => props.theme.colors.white};
-`
+`
+
+export const Tab = styled.TouchableOpacity`
+  padding-horizontal: 10px;
+  padding-vertical: 10px;
+  justify-content: center;
+	border-bottom-width: 1px;
+`

package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/index.tsx

@@ -0,0 +1,150 @@
+import React, { useEffect } from 'react'
+import { BusinessList as BusinessListController, useOrder } from 'ordering-components/native'
+import { BusinessController } from '../../BusinessController'
+import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
+
+import { ListWrapper } from './styles'
+import {
+  View,
+  StyleSheet,
+  ScrollView
+} from 'react-native';
+import { PreviousBusinessOrderedParams } from '../../../types';
+
+export const PreviousBusinessOrderedUI = (props : PreviousBusinessOrderedParams) => {
+  const {
+    navigation,
+    businessesList,
+    setBusinessLoading,
+    businessId,
+    onNavigationRedirect,
+    isBusinessesSearchList,
+    businessLoading
+  } = props
+
+  const [orderState] = useOrder()
+  const onBusinessClick = (business: any) => {
+    onNavigationRedirect('Business', { store: business.slug })
+  }
+  useEffect(() => {
+    if (businessesList?.loading && businessesList?.businesses?.length === 0) {
+      setBusinessLoading(true)
+    } else {
+      setBusinessLoading(false)
+    }
+  }, [businessesList?.loading])
+
+  const styles = StyleSheet.create({
+    container: {
+      marginBottom: 0,
+    },
+  });
+
+  const BusinessControllerList = ({ style }: any) => {
+    return (
+      <>
+        {businessesList.businesses?.filter((business: any) => businessId?.includes(business?.id))?.map((business: any, i: number) => (
+          <BusinessController
+            key={`${business.id}_` + i}
+            business={business}
+            isBusinessOpen={business.open}
+            handleCustomClick={() => onBusinessClick(business)}
+            orderType={orderState?.options?.type}
+            navigation={navigation}
+            businessHeader={business?.header}
+            businessFeatured={business?.featured}
+            businessLogo={business?.logo}
+            businessReviews={business?.reviews}
+            businessDeliveryPrice={business?.delivery_price}
+            businessDeliveryTime={business?.delivery_time}
+            businessPickupTime={business?.pickup_time}
+            businessDistance={business?.distance}
+            style={style}
+          />
+        ))}
+      </>
+    )
+  }
+
+  const BusinessSkeletons = () => {
+    return (
+      <>
+        {[...Array(4).keys()].map((item, i) => (
+          <Placeholder
+            Animation={Fade}
+            key={i}
+            style={{ marginBottom: 20 }}>
+            <View style={{ width: '100%' }}>
+              <PlaceholderLine
+                height={200}
+                style={{ marginBottom: 20, borderRadius: 25 }}
+              />
+              <View style={{ paddingHorizontal: 10 }}>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                  }}>
+                  <PlaceholderLine
+                    height={25}
+                    width={40}
+                    style={{ marginBottom: 10 }}
+                  />
+                  <PlaceholderLine
+                    height={25}
+                    width={20}
+                    style={{ marginBottom: 10 }}
+                  />
+                </View>
+                <PlaceholderLine
+                  height={20}
+                  width={30}
+                  style={{ marginBottom: 10 }}
+                />
+                <PlaceholderLine
+                  height={20}
+                  width={80}
+                  style={{ marginBottom: 10 }}
+                />
+              </View>
+            </View>
+          </Placeholder>
+        ))}
+      </>
+    )
+  }
+
+  return (
+    <ScrollView horizontal={isBusinessesSearchList} style={styles.container} showsVerticalScrollIndicator={false}>
+      {isBusinessesSearchList ? (
+        <>
+          {!businessLoading && (
+            <BusinessControllerList
+              style={{ width: 320, marginRight: 20 }}
+            />
+          )}
+        </>
+      ) : (
+        <ListWrapper>
+          <BusinessControllerList />
+          {businessesList.loading && (
+            <BusinessSkeletons />
+          )}
+        </ListWrapper>
+      )}
+
+    </ScrollView>
+  )
+}
+
+export const PreviousBusinessOrdered = (props) => {
+  const previousBusinessOrderedController = {
+    ...props,
+    UIComponent: PreviousBusinessOrderedUI,
+    paginationSettings: { initialPage: 1, pageSize: 50, controlType: 'infinity' }
+  }
+
+  return (
+    <BusinessListController {...previousBusinessOrderedController} />
+  )
+}

package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/styles.tsx

@@ -0,0 +1,6 @@
+import styled, { css } from 'styled-components/native'
+
+export const ListWrapper = styled.View`
+	background-color: ${(props: any) => props.theme.colors.backgroundLight};
+	padding-horizontal: ${(props : any) => props.isBusinessesSearchList ? '0' : '40px'};
+`;

package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/index.tsx

@@ -0,0 +1,51 @@
+import React from 'react'
+import { ScrollView, StyleSheet } from 'react-native'
+import {
+  ListWrapper
+} from './styles'
+
+import { SingleProductCard } from '../../SingleProductCard'
+import { PreviousProductsOrderedParams } from '../../../types'
+
+export const PreviousProductsOrdered = (props : PreviousProductsOrderedParams) => {
+  const {
+    products,
+    onProductClick,
+    isBusinessesSearchList
+  } = props
+
+  const styles = StyleSheet.create({
+    container: {
+      marginBottom: 0,
+    },
+  });
+
+  const ProductList = ({ style }: any) => {
+    return (
+      <>
+        {products?.map((product: any) => (
+          <SingleProductCard
+            key={product?.id}
+            isSoldOut={(product.inventoried && !product.quantity)}
+            product={product}
+            businessId={product?.business?.id}
+            onProductClick={onProductClick}
+            style={style}
+            productAddedToCartLength={0}
+          />
+        ))}
+      </>
+    )
+  }
+  return (
+    <ScrollView horizontal={isBusinessesSearchList} style={styles.container} showsVerticalScrollIndicator={false}>
+      {isBusinessesSearchList ? (
+        <ProductList style={{ width: 320, marginRight: 20 }} />
+      ) : (
+        <ListWrapper isBusinessesSearchList={isBusinessesSearchList}>
+          <ProductList />
+        </ListWrapper>
+      )}
+    </ScrollView>
+  )
+}

package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/styles.tsx

@@ -0,0 +1,6 @@
+import styled from 'styled-components/native'
+
+export const ListWrapper = styled.View`
+	background-color: ${(props: any) => props.theme.colors.backgroundLight};
+	padding-horizontal: ${(props : any) => props.isBusinessesSearchList ? '0' : '40px'};
+`;

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

@@ -6,7 +6,8 @@ import { OText, OButton } from '../shared'
 import { NotFoundSource } from '../NotFoundSource'
 import { ActiveOrders } from '../ActiveOrders'
 import { PreviousOrders } from '../PreviousOrders'
-
+import { PreviousBusinessOrdered } from './PreviousBusinessOrdered'
+import { PreviousProductsOrdered } from './PreviousProductsOrdered'
 import { OptionTitle, NoOrdersWrapper } from './styles'
 import { OrdersOptionParams } from '../../types'
 import { _setStoreData } from '../../providers/StoreUtil';
@@ -38,15 +39,23 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		setRefreshOrders,
 		reorderState,
 		handleReorder,
-		handleUpdateOrderList
+		handleUpdateOrderList,
+		isBusiness,
+		isProducts,
+		businessOrderIds,
+		products,
+		businessesSearchList,
+		hideOrders,
+		BusinessControllerSkeletons,
 	} = props
 
 	const theme = useTheme();
 
 	const [, t] = useLanguage()
 	const [{ carts }] = useOrder()
-	const { showToast } = useToast()
+	const [, { showToast }] = useToast()
 	const { loading, error, orders: values } = orderList
+	const [businessLoading, setBusinessLoading] = useState(true)
 
 	const imageFails = activeOrders
 		? theme.images.general.emptyActiveOrders
@@ -88,28 +97,40 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		return objectStatus && objectStatus
 	}
 
+	const onProductClick = (product: any) => {
+		if (product?.product_id && product?.category_id && product?.businessId) {
+			onNavigationRedirect('ProductDetails', {
+				productId: product?.product_id,
+				categoryId: product?.category_id,
+				businessId: product?.businessId,
+			})
+		} else {
+			showToast(ToastType.Error, t('ERROR_FAILED_REDIRECT_IDS', 'Failed to redirect product for ids'))
+		}
+	}
+
 	useEffect(() => {
 		const _businessId = 'businessId:' + reorderState?.result?.business_id
 		if (reorderState?.error) {
-		  if (reorderState?.result?.business_id) {
-			_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
-			navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
-		  }
+			if (reorderState?.result?.business_id) {
+				_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+				navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
+			}
 		}
 		if (!reorderState?.error && reorderState.loading === false && reorderState?.result?.business_id) {
-		  const cartProducts = carts?.[_businessId]?.products
-		  const available = cartProducts.every((product: any) => product.valid === true)
-		  const orderProducts = orders.find((order: any) => order?.id === reorderState?.result?.orderId)?.products
+			const cartProducts = carts?.[_businessId]?.products
+			const available = cartProducts.every((product: any) => product.valid === true)
+			const orderProducts = orders.find((order: any) => order?.id === reorderState?.result?.orderId)?.products
 
-		  if (available && reorderState?.result?.uuid && (cartProducts?.length === orderProducts?.length)) {
-			onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
-		  } else {
-			_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
-			cartProducts?.length !== orderProducts?.length && _setStoreData('already-removed', JSON.stringify('removed'))
-			navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
-		  }
+			if (available && reorderState?.result?.uuid && (cartProducts?.length === orderProducts?.length)) {
+				onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+			} else {
+				_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+				cartProducts?.length !== orderProducts?.length && _setStoreData('already-removed', JSON.stringify('removed'))
+				navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
+			}
 		}
-	  }, [reorderState])
+	}, [reorderState])
 
 	useFocusEffect(
 		React.useCallback(() => {
@@ -134,10 +155,10 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		} else if (!preOrders) {
 			setOrdersLength && setOrdersLength({ ...ordersLength, previousOrdersLength: updateOrders?.length })
 		}
-	}, [orders, activeOrders])
+	}, [orders, activeOrders, preOrders])
 
 	useEffect(() => {
-		if(refreshOrders){
+		if (refreshOrders) {
 			loadOrders(false, false, false, true)
 			setRefreshOrders && setRefreshOrders(false)
 		}
@@ -159,9 +180,9 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
 				</NoOrdersWrapper>
 			)}
-			{(ordersLength.activeOrdersLength > 0 || ordersLength.previousOrdersLength > 0) && (
+			{(ordersLength?.activeOrdersLength > 0 || ordersLength?.previousOrdersLength > 0) && (
 				<>
-					<OptionTitle>
+					<OptionTitle titleContent={!!titleContent} isBusinessesSearchList={!!businessesSearchList}>
 						<OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={10} >
 							{titleContent || (activeOrders
 								? t('ACTIVE', 'Active')
@@ -170,7 +191,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 									: t('PAST', 'Past'))}
 						</OText>
 					</OptionTitle>
-					{!(ordersLength.activeOrdersLength === 0 && ordersLength.previousOrdersLength === 0) &&
+					{!(ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) &&
 						!loading &&
 						orders.filter((order: any) => orderStatus.includes(order.status)).length === 0 &&
 						(
@@ -182,7 +203,51 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 						)}
 				</>
 			)}
-			{loading && (
+			{isBusiness && !!businessesSearchList && businessLoading && (
+				<ScrollView horizontal>
+					<BusinessControllerSkeletons />
+				</ScrollView>
+			)}
+			{isBusiness && businessOrderIds?.length > 0 && (
+				<PreviousBusinessOrdered
+					businessId={businessOrderIds}
+					businessLoading={businessLoading}
+					setBusinessLoading={setBusinessLoading}
+					onNavigationRedirect={onNavigationRedirect}
+					isLoadingOrders={loading}
+					isBusinessesSearchList={!!businessesSearchList}
+				/>
+			)}
+
+			{isProducts && (
+				<PreviousProductsOrdered
+					products={products}
+					onProductClick={onProductClick}
+					isBusinessesSearchList={!!businessesSearchList}
+				/>
+			)}
+			{(loading && isProducts) && (
+				<>
+					{[...Array(4).keys()].map(
+						(item, i) => (
+							<Placeholder key={i} style={{ padding: 5, paddingLeft: 40 }} Animation={Fade}>
+								<View style={{ flexDirection: 'row' }}>
+									<PlaceholderLine
+										width={24}
+										height={70}
+										style={{ marginRight: 10, marginBottom: 10 }}
+									/>
+									<Placeholder style={{ paddingVertical: 10 }}>
+										<PlaceholderLine width={60} style={{ marginBottom: 25 }} />
+										<PlaceholderLine width={20} />
+									</Placeholder>
+								</View>
+							</Placeholder>
+						),
+					)}
+				</>
+			)}
+			{loading && !hideOrders && (
 				<>
 					{!activeOrders ? (
 						<Placeholder style={{ marginTop: 30 }} Animation={Fade}>
@@ -213,7 +278,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 					)}
 				</>
 			)}
-			{!loading && !error && orders.length > 0 && (
+			{!loading && !error && orders.length > 0 && !hideOrders && (
 				preOrders ? (
 					<ActiveOrders
 						orders={orders.filter((order: any) => orderStatus.includes(order.status))}
@@ -253,13 +318,22 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 }
 
 export const OrdersOption = (props: OrdersOptionParams) => {
+	const getAllOrders = props.activeOrders && props.pastOrders && props.preOrders
+
 	const MyOrdersProps = {
 		...props,
 		UIComponent: OrdersOptionUI,
-		orderStatus: props.preOrders ? [13] : props.activeOrders
-			? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
-			: [1, 2, 5, 6, 10, 11, 12, 15, 16, 17],
+		orderStatus: getAllOrders
+			? [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
+			: props.preOrders ? [13] : props.activeOrders
+				? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
+				: [1, 2, 5, 6, 10, 11, 12, 15, 16, 17],
 		useDefualtSessionManager: true,
+		paginationSettings: {
+			initialPage: 1,
+			pageSize: getAllOrders ? 30 : 10,
+			controlType: 'infinity'
+		}
 	}
 
 	return <OrderList {...MyOrdersProps} />

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

@@ -1,7 +1,10 @@
-import styled from 'styled-components/native'
+import styled, { css } from 'styled-components/native'
 
 export const OptionTitle = styled.View`
 	margin-top: 24px;
+	${(props : any) => props.titleContent && css`
+		margin-left: ${() => props.isBusinessesSearchList ? '0' : '40px'};
+	`}
 `
 
 export const NoOrdersWrapper = styled.View`

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

@@ -27,7 +27,8 @@ const StripeElementsFormUI = (props: any) => {
 		paymethod,
 		onCancel,
 		cart,
-		merchantId
+		merchantId,
+		businessIds
 	} = props;
 
 	const theme = useTheme();
@@ -108,7 +109,14 @@ const StripeElementsFormUI = (props: any) => {
 			const { setupIntent, error } = await confirmSetupIntent(requirements, params);
 
 			if (setupIntent?.status === 'Succeeded') {
-				stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);
+				if (businessIds) {
+					businessIds.forEach((_businessId: any, index: any) => {
+					  const _isNewCard = index === 0
+					  stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId, _isNewCard);
+					})
+				} else {
+					stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);
+				}
 			}
 
 			if (error) {

package/themes/original/src/components/StripeElementsForm/naked.tsx

@@ -40,7 +40,7 @@ export const StripeElementsForm = (props: any) => {
     }
   }
 
-  const stripeTokenHandler = async (tokenId: string, user: any, businessId: string) => {
+  const stripeTokenHandler = async (tokenId: string, user: any, businessId: string, isNewCard: any = true) => {
     try {
       setState({
         ...state,
@@ -60,7 +60,7 @@ export const StripeElementsForm = (props: any) => {
         })
       })
       const response = await result.json();
-      props.onSelectCard && props.onSelectCard(response.result);
+      isNewCard && props.onSelectCard && props.onSelectCard(response.result);
       setState({
         ...state,
         loadingAdd: false