ordering-ui-react-native 0.18.59 → 0.18.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.18.59",
+  "version": "0.18.60",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",
@@ -49,6 +49,8 @@
     "@react-navigation/material-bottom-tabs": "^5.3.14",
     "@react-navigation/native": "^5.7.6",
     "@react-navigation/stack": "^5.9.3",
+    "@segment/analytics-react-native": "2.1.11",
+    "@segment/sovran-react-native": "0.2.6",
     "@sentry/react-native": "^2.6.0",
     "@stripe/stripe-react-native": "^0.2.0",
     "@types/react-native-loading-spinner-overlay": "^0.5.2",
@@ -81,6 +83,7 @@
     "react-native-fbsdk-next": "^7.0.1",
     "react-native-geocoding": "^0.5.0",
     "react-native-gesture-handler": "^1.8.0",
+    "react-native-get-random-values": "1.8.0",
     "react-native-gifted-chat": "^0.16.3",
     "react-native-google-places-autocomplete": "^2.1.3",
     "react-native-html-to-pdf": "^0.10.0",

package/themes/original/index.tsx

@@ -1,6 +1,6 @@
 import { AddressForm } from './src/components/AddressForm';
 import { AddressDetails } from './src/components/AddressDetails';
-// import { AnalyticsSegment } from './src/components/AnalyticsSegment';
+import { AnalyticsSegment } from './src/components/AnalyticsSegment';
 import { Home } from './src/components/Home';
 import { LoginForm } from './src/components/LoginForm';
 import { SignupForm } from './src/components/SignupForm';
@@ -167,7 +167,7 @@ import {
 export {
 	AddressForm,
 	AddressDetails,
-	// AnalyticsSegment,
+	AnalyticsSegment,
 	Home as HomeView,
 	SignupForm,
 	LoginForm,

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

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import {
   createClient,
-  // AnalyticsProvider
+  AnalyticsProvider
 } from '@segment/analytics-react-native';
 import { useEvent, useConfig, useLanguage } from 'ordering-components/native';
 
@@ -302,9 +302,9 @@ export const AnalyticsSegment = (props: any) => {
 
   return (
     <>
-      {/* <AnalyticsProvider client={segmentClient}>
+      <AnalyticsProvider client={segmentClient}>
         {children}
-      </AnalyticsProvider> */}
+      </AnalyticsProvider>
     </>
   )
 }

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

@@ -345,7 +345,7 @@ const CartUI = (props: any) => {
                     <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })}>
                       <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
                     </TouchableOpacity>
-                    {!offer?.type && !!offer?.id && (
+                    {!!offer?.id && (
                       <OfferAlert offerId={offer?.id} />
                     )}
                   </OSRow>

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

@@ -23,6 +23,7 @@ const DriverTipsUI = (props: any) => {
 		driverTip,
 		driverTipsOptions,
 		isMulti,
+		isLoading,
 		cart,
 		carts,
 		isDriverTipUseCustom,
@@ -79,8 +80,10 @@ const DriverTipsUI = (props: any) => {
 					<TouchableOpacity
 						key={i}
 						onPress={() => {
-							handlerChangeOption(option)
-							setCustomTip(false)
+							if (!isLoading) {
+								handlerChangeOption(option)
+								setCustomTip(false)
+							}
 						}}
 					>
 						<DTCard
@@ -95,7 +98,7 @@ const DriverTipsUI = (props: any) => {
 				))}
 				{isDriverTipUseCustom && (
 					<TouchableOpacity
-						onPress={() => setCustomTip(true)}
+						onPress={() => { !isLoading && setCustomTip(true) }}
 					>
 						<DTCard
 							style={style.semicircle}

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

@@ -325,6 +325,7 @@ const MultiCheckoutUI = (props: any) => {
                   </OText>
                   <DriverTips
                     isMulti
+                    isLoading={loading}
                     carts={openCarts}
                     businessIds={openCarts.map((cart: any) => cart.business_id)}
                     driverTipsOptions={driverTipsOptions}