npm - ordering-ui-react-native - Versions diffs - 0.11.54 → 0.11.58 - Mend

ordering-ui-react-native 0.11.54 → 0.11.58

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (47) hide show

package/themes/original/src/components/LoginForm/index.tsx CHANGED Viewed

@@ -58,6 +58,7 @@ const LoginFormUI = (props: LoginParams) => {
 		handleSendVerifyCode,
 		handleCheckPhoneCode,
 		onNavigationRedirect,
+		notificationState
 	} = props;
 	const [, { showToast }] = useToast();
@@ -461,6 +462,7 @@ const LoginFormUI = (props: LoginParams) => {
 								{(configs?.facebook_login?.value === 'true' || configs?.facebook_login?.value === '1') &&
                   configs?.facebook_id?.value && (
 									<FacebookLogin
+										notificationState={notificationState}
 										handleErrors={(err: any) => showToast(ToastType.Error, err)}
 										handleLoading={(val: boolean) => setIsFBLoading(val)}
 										handleSuccessFacebookLogin={handleSuccessFacebook}
@@ -468,16 +470,19 @@ const LoginFormUI = (props: LoginParams) => {
 								)}
                 {(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && (
 									<GoogleLogin
+										notificationState={notificationState}
+										webClientId={configs?.google_login_client_id?.value}
 										handleErrors={(err: any) => showToast(ToastType.Error, err)}
 										handleLoading={(val: boolean) => setIsFBLoading(val)}
-										handleSuccessFacebookLogin={handleSuccessFacebook}
+										handleSuccessGoogleLogin={handleSuccessFacebook}
 									/>
 								)}
                 {(configs?.apple_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && (
 									<AppleLogin
+										notificationState={notificationState}
 										handleErrors={(err: any) => showToast(ToastType.Error, err)}
 										handleLoading={(val: boolean) => setIsFBLoading(val)}
-										handleSuccessFacebookLogin={handleSuccessFacebook}
+										handleSuccessAppleLogin={handleSuccessFacebook}
 									/>
 								)}
 							</SocialButtons>

package/themes/original/src/components/ProductForm/index.tsx CHANGED Viewed

@@ -569,7 +569,11 @@ export const ProductOptionsUI = (props: any) => {
 				)}
 			</ScrollView>
 			{!loading && !error && product && (
-				<ProductActions style={{ paddingBottom: bottom + 12 }}>
+				<ProductActions
+					style={{
+						paddingBottom: Platform.OS === 'ios' ? bottom + 30 : bottom + 80
+					}}
+				>
 					<OText size={16} lineHeight={24} weight={'600'}>
 						{productCart.total ? parsePrice(productCart?.total) : ''}
 					</OText>

package/themes/original/src/components/ProductForm/styles.tsx CHANGED Viewed

@@ -57,13 +57,15 @@ export const WrapperSubOption = styled.View`
 `
 export const ProductComment = styled.View`
+  padding-bottom: 50px;
 `
 export const ProductActions = styled.View`
   position: absolute;
   bottom: 0px;
 	min-height: 70px;
-  padding: 12px 40px;
+  padding-top: 12px;
+  padding-horizontal: 40px;
   width: 100%;
   flex-direction: row;
   background-color: #FFF;

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

@@ -62,6 +62,7 @@ const SignupFormUI = (props: SignupParams) => {
 		setCheckPhoneCodeState,
 		handleSendVerifyCode,
 		handleCheckPhoneCode,
+		notificationState
 	} = props;
 	const theme = useTheme();
@@ -637,6 +638,7 @@ const SignupFormUI = (props: SignupParams) => {
 								{(configs?.facebook_login?.value === 'true' || configs?.facebook_login?.value === '1') &&
 								configs?.facebook_id?.value && (
 									<FacebookLogin
+										notificationState={notificationState}
 										handleErrors={(err: any) => showToast(ToastType.Error, err)}
 										handleLoading={(val: boolean) => setIsFBLoading(val)}
 										handleSuccessFacebookLogin={handleSuccessFacebook}
@@ -644,16 +646,19 @@ const SignupFormUI = (props: SignupParams) => {
 								)}
 								{(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && (
 									<GoogleLogin
+										notificationState={notificationState}
+                    					webClientId={configs?.google_login_client_id?.value}
 										handleErrors={(err: any) => showToast(ToastType.Error, err)}
 										handleLoading={(val: boolean) => setIsFBLoading(val)}
-										handleSuccessFacebookLogin={handleSuccessFacebook}
+										handleSuccessGoogleLogin={handleSuccessFacebook}
 									/>
 								)}
 								{(configs?.apple_login_client_id?.value !== '' && configs?.apple_login_client_id?.value !== null) && (
 									<AppleLogin
+										notificationState={notificationState}
 										handleErrors={(err: any) => showToast(ToastType.Error, err)}
 										handleLoading={(val: boolean) => setIsFBLoading(val)}
-										handleSuccessFacebookLogin={handleSuccessFacebook}
+										handleSuccessAppleLogin={handleSuccessFacebook}
 									/>
 								)}
 							</SocialButtons>

package/themes/original/src/components/UserDetails/index.tsx CHANGED Viewed

@@ -25,7 +25,8 @@ const UserDetailsUI = (props: any) => {
 		validationFields,
 		isUserDetailsEdit,
 		phoneUpdate,
-		togglePhoneUpdate
+		togglePhoneUpdate,
+		isCheckout
 	} = props
 	const theme = useTheme();
@@ -116,7 +117,7 @@ const UserDetailsUI = (props: any) => {
 							)}
 						</UDInfo>
 					) : (
-						<UserFormDetailsUI {...props} phoneUpdate={phoneUpdate} togglePhoneUpdate={togglePhoneUpdate} />
+						<UserFormDetailsUI {...props} phoneUpdate={phoneUpdate} togglePhoneUpdate={togglePhoneUpdate} isCheckout={isCheckout} />
 					)}
 				</UDContainer>
 			)}

package/themes/original/src/components/UserFormDetails/styles.tsx CHANGED Viewed

@@ -14,7 +14,6 @@ export const UDWrapper = styled.View`
   flex-direction: column;
   width: 100%;
   margin-top: 20px;
-  padding-bottom: 50px;
 `
 export const UDLoader = styled.View`

package/themes/original/src/components/shared/OInput.tsx CHANGED Viewed

@@ -48,6 +48,7 @@ const Wrapper = styled.View`
 	flex-direction: row;
 	align-items: center;
 	justify-content: center;
+	width: 100%;
 `;
 const OInput = (props: Props): React.ReactElement => {

package/themes/original/src/layouts/Container.tsx CHANGED Viewed

@@ -1,9 +1,12 @@
 import React from 'react';
 import styled, { css } from 'styled-components/native';
+import { Platform } from 'react-native';
 const ContainerStyled = styled.ScrollView`
   flex: 1;
-  padding: ${(props: any) => props.noPadding ? '0' : '0 40px'};
+  ${(props: any) => !props.noPadding && css`
+    padding: ${Platform.OS === 'ios' ? '0px 40px' : '20px 40px'};
+  `}
   background-color: ${(props: any) => props.theme.colors.backgroundPage};
 `;

package/themes/single-business/src/components/Checkout/index.tsx CHANGED Viewed

@@ -96,7 +96,7 @@ const CheckoutUI = (props: any) => {
 		}
 	})
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const [, t] = useLanguage();
 	const [{ user }] = useSession();
 	const [{ configs }] = useConfig();
@@ -513,7 +513,7 @@ export const Checkout = (props: any) => {
 		onNavigationRedirect,
 	} = props
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const [, t] = useLanguage();
 	const [{ token }] = useSession();
 	const [ordering] = useApi();

package/themes/single-business/src/components/ForgotPasswordForm/index.tsx CHANGED Viewed

@@ -22,7 +22,7 @@ const ForgotPasswordUI = (props: any) => {
 		handleButtonForgotPasswordClick,
 	} = props;
 	const [, t] = useLanguage();
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const { control, handleSubmit, errors } = useForm();
 	const theme = useTheme();
@@ -31,7 +31,7 @@ const ForgotPasswordUI = (props: any) => {
 		inputStyle: {
 			marginBottom: 25,
 			borderWidth: 1,
-			borderColor: theme.theme.colors.border,
+			borderColor: theme.colors.border,
 			minHeight: 40,
 			borderRadius: 7.6,
 		}

package/themes/single-business/src/components/LastOrder/index.tsx CHANGED Viewed

@@ -32,7 +32,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 	const [, t] = useLanguage()
 	const [, { reorder }] = useOrder()
-	const { showToast } = useToast()
+	const [, { showToast }] = useToast()
 	const { loading, error, orders: values } = orderList
 	const theme = useTheme();

package/themes/single-business/src/components/LoginForm/index.tsx CHANGED Viewed

@@ -58,7 +58,7 @@ const LoginFormUI = (props: LoginParams) => {
 		onNavigationRedirect,
 	} = props;
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const [, t] = useLanguage();
 	const [{ configs }] = useConfig();
 	const [, { login }] = useSession();

package/themes/single-business/src/components/ReviewOrder/index.tsx CHANGED Viewed

@@ -60,7 +60,7 @@ export const ReviewOrderUI = (props: ReviewOrderParams) => {
 	})
 	const [, t] = useLanguage()
-	const { showToast } = useToast()
+	const [, { showToast }] = useToast()
 	const { handleSubmit, control, errors } = useForm()
 	const [alertState, setAlertState] = useState<{ open: boolean, content: Array<any>, success?: boolean }>({ open: false, content: [], success: false })

package/themes/single-business/src/components/SignupForm/index.tsx CHANGED Viewed

@@ -95,7 +95,7 @@ const SignupFormUI = (props: SignupParams) => {
 	const showInputPhoneNumber =
 		validationFields?.fields?.checkout?.cellphone?.enabled ?? false;
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const [, t] = useLanguage();
 	const [, { login }] = useSession();
 	const [{ configs }] = useConfig();

package/themes/single-business/src/components/StripeRedirectForm/index.tsx CHANGED Viewed

@@ -26,7 +26,7 @@ const StripeRedirectFormUI = (props: any) => {
 	//   // androidPayMode: 'test', // Android only
 	// })
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const { control, handleSubmit, errors } = useForm();
 	const [{ user }] = useSession();

package/themes/single-business/src/components/UserFormDetails/index.tsx CHANGED Viewed

@@ -62,7 +62,7 @@ export const UserFormDetailsUI = (props: any) => {
 	});
 	const [, t] = useLanguage();
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const { handleSubmit, control, errors, setValue } = useForm();
 	const [{ user }] = useSession();

package/themes/single-business/src/components/UserProfile/index.tsx CHANGED Viewed

@@ -84,7 +84,7 @@ const ProfileListUI = (props: ProfileParams) => {
 	const [{ user }] = useSession();
 	const [, t] = useLanguage();
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const { errors } = useForm();
 	const { height } = useWindowDimensions();

package/themes/single-business/src/components/UserProfileForm/index.tsx CHANGED Viewed

@@ -52,7 +52,7 @@ const ProfileUI = (props: ProfileParams) => {
 	const [{ user }] = useSession();
 	const [, t] = useLanguage();
-	const { showToast } = useToast();
+	const [, { showToast }] = useToast();
 	const { handleSubmit, errors, setValue, control } = useForm();
 	const [phoneInputData, setPhoneInputData] = useState({

package/themes/single-business/src/components/shared/OToast.tsx CHANGED Viewed

@@ -9,7 +9,7 @@ const bottomPosition = 20;
 export const Toast: React.FC = () => {
 	const theme = useTheme();
 	// const insets = useSafeAreaInsets();
-	const { toastConfig, hideToast } = useToast();
+	const [, { toastConfig, hideToast }] = useToast();
 	const opacity = React.useRef(new Animated.Value(0)).current;
 	const fadeIn = React.useCallback(() => {