ordering-ui-react-native 0.21.96 → 0.21.98

package/package.json

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

package/src/components/StripeMethodForm/index.tsx

@@ -3,7 +3,6 @@ import { useLanguage, useConfig, useOrder } from 'ordering-components/native'
 import { useGooglePay, useApplePay } from '@stripe/stripe-react-native'
 import { Platform } from 'react-native';
 import { StripeMethodFormParams } from '../../types';
-import { android_app_id } from '../../config.json'
 
 export const StripeMethodForm = (props: StripeMethodFormParams) => {
   const {
@@ -17,7 +16,8 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
     placeByMethodPay,
     methodPaySupported,
     setPlaceByMethodPay,
-    cartTotal
+    cartTotal,
+    androidAppId
   } = props
   const { initGooglePay, createGooglePayPaymentMethod, loading } = useGooglePay();
   const { presentApplePay, isApplePaySupported } = useApplePay();
@@ -61,7 +61,7 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
       })
       const { error } = await initGooglePay({
         testEnv: devMode,
-        merchantName: android_app_id,
+        merchantName: androidAppId,
         countryCode: 'US',
         billingAddressConfig: {
           format: 'FULL',

package/src/types/index.tsx

@@ -494,5 +494,6 @@ export interface StripeMethodFormParams {
   placeByMethodPay?: any
   methodPaySupported?: any,
   setPlaceByMethodPay?: any,
-  cartTotal?: number
+  cartTotal?: number,
+  androidAppId?: string
 }

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

@@ -200,7 +200,11 @@ const CartUI = (props: any) => {
     if (cart?.business_id) {
       setOpenUpselling(true)
     } else {
-      handleUpsellingPage(cart)
+      onNavigationRedirect('CheckoutNavigator', {
+        screen: 'CheckoutPage',
+        cartUuid: cart?.uuid,
+        cartTotal: cart?.total
+      }, true)
     }
   }
 

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

@@ -101,7 +101,9 @@ const CheckoutUI = (props: any) => {
 		currency,
 		merchantId,
 		setPlaceSpotNumber,
-		maxDate
+		maxDate,
+		androidAppId,
+		urlscheme
 	} = props
 
 	const theme = useTheme();
@@ -817,6 +819,8 @@ const CheckoutUI = (props: any) => {
 									handlePaymentMethodClickCustom={handlePaymentMethodClick}
 									handlePlaceOrder={handlePlaceOrder}
 									merchantId={merchantId}
+									urlscheme={urlscheme}
+									androidAppId={androidAppId}
 									setMethodPaySupported={setMethodPaySupported}
 									methodPaySupported={methodPaySupported}
 									placeByMethodPay={placeByMethodPay}

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

@@ -58,8 +58,8 @@ const OrderProgressUI = (props: any) => {
       shadowOpacity: 0.2,
       shadowRadius: 2,
       elevation: 3,
-      borderWidth: Platform.OS === 'android' && Number(DeviceInfo?.getSystemVersion?.()) < 5 ? 1 : 0,
-      borderColor: 'rgba(0,0,0,0.2)'
+      borderWidth: 1,
+      borderColor: 'rgba(0,0,0,0.1)'
     },
     logoWrapper: {
       overflow: 'hidden',

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

@@ -65,6 +65,7 @@ const PaymentOptionsUI = (props: any) => {
 		handlePaymentMethodClickCustom,
 		handlePlaceOrder,
 		merchantId,
+		urlscheme,
 		setMethodPaySupported,
 		placeByMethodPay,
 		methodPaySupported,
@@ -74,7 +75,8 @@ const PaymentOptionsUI = (props: any) => {
 		requiredFields,
 		openUserModal,
 		paymethodClicked,
-		setPaymethodClicked
+		setPaymethodClicked,
+		androidAppId
 	} = props
 
 	const theme = useTheme();
@@ -360,6 +362,8 @@ const PaymentOptionsUI = (props: any) => {
 					handleSource={handlePaymethodDataChange}
 					onCancel={() => handlePaymethodClick(null)}
 					merchantId={merchantId}
+					urlscheme={urlscheme}
+					androidAppId={androidAppId}
 					setMethodPaySupported={setMethodPaySupported}
 					methodPaySupported={methodPaySupported}
 					placeByMethodPay={placeByMethodPay}
@@ -407,6 +411,8 @@ const PaymentOptionsUI = (props: any) => {
 						handleSource={handlePaymethodDataChange}
 						onCancel={() => handlePaymethodClick(null)}
 						merchantId={merchantId}
+						urlscheme={urlscheme}
+						androidAppId={androidAppId}
 						publicKeyAddCard={isOpenMethod?.paymethod?.credentials?.stripe?.publishable}
 					/>
 				</KeyboardAvoidingView>

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

@@ -34,7 +34,9 @@ const StripeElementsFormUI = (props: any) => {
 		methodPaySupported,
 		setPlaceByMethodPay,
 		cartTotal,
-		publicKeyAddCard
+		publicKeyAddCard,
+		urlScheme,
+		androidAppId
 	} = props;
 
 	const theme = useTheme();
@@ -204,7 +206,7 @@ const StripeElementsFormUI = (props: any) => {
 					<StripeProvider
 						publishableKey={isToSave}
 						merchantIdentifier={merchantId}
-						urlScheme={merchantId}
+						urlScheme={`${urlScheme}://checkout/${cart?.uuid}`}
 					>
 						{methodsPay?.includes(paymethod) ? (
 							<StripeMethodForm
@@ -219,6 +221,7 @@ const StripeElementsFormUI = (props: any) => {
 								placeByMethodPay={placeByMethodPay}
 								methodPaySupported={methodPaySupported}
 								setPlaceByMethodPay={setPlaceByMethodPay}
+								androidAppId={androidAppId}
 							/>
 						) : (
 							<CardField