@kiosinc/commons-rn 0.1.85 → 0.1.87

package/src/{auth/screens → screens/Auth}/ResetPassword.tsx

@@ -5,14 +5,22 @@ import {
   Button,
   KeyboardAvoidingView,
   Header,
+  Alert,
+  View,
 } from '../../components';
-import { type NavigationProp, useNavigation } from '@react-navigation/native';
+import {
+  type NavigationProp,
+  useNavigation,
+  useTheme,
+} from '@react-navigation/native';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Controller, useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
+import { useAuth } from '../../hooks/useAuth';
+import Config from 'react-native-config';
 import { resetPasswordValidationSchema } from './validators';
-import { useAuthentication } from '../hooks/useAuthentication';
+import AlertSVG from '../../assets/icons/alert.svg';
 
 type FormData = {
   email: string;
@@ -21,8 +29,9 @@ type FormData = {
 export const ResetPassword = () => {
   const { t } = useTranslation();
   const navigation = useNavigation<NavigationProp<RootStackType>>();
-  const { useResetPassword } = useAuthentication();
+  const { useResetPassword } = useAuth();
   const { mutate: resetPassword, isLoading } = useResetPassword();
+  const theme = useTheme();
 
   const {
     handleSubmit,
@@ -36,7 +45,36 @@ export const ResetPassword = () => {
   });
 
   const onSubmit = async (data: FormData) => {
-    resetPassword({ email: data.email });
+    if (!['gusteau'].includes(Config.APP_NAME ?? '')) {
+      Alert.show({
+        renderDescription: () => {
+          return (
+            <View pt={'24'}>
+              <View alignSelf={'center'}>
+                <AlertSVG fill={theme.colors.text} />
+              </View>
+              <Text variant="titleMedium" textAlign={'center'} py={'16'}>
+                {t('commons.resetPasswordWarningAlert.title')}
+              </Text>
+              <Text variant="bodyMedium" pb={'16'}>
+                {t('commons.resetPasswordWarningAlert.description')}
+              </Text>
+            </View>
+          );
+        },
+        buttons: [
+          {
+            label: t('commons.continue'),
+            onPress: () => resetPassword({ email: data.email }),
+          },
+          {
+            label: t('commons.cancel'),
+          },
+        ],
+      });
+    } else {
+      resetPassword({ email: data.email });
+    }
   };
 
   return (
@@ -48,7 +86,7 @@ export const ResetPassword = () => {
         width={{ phone: '100%', tablet: 372 }}
       >
         <Text py="48" textAlign="center" variant="titleLarge">
-          {t('authentication.enterYour')}
+          {t('commons.enterYour')}
         </Text>
         <Controller
           control={control}
@@ -65,7 +103,7 @@ export const ResetPassword = () => {
                 onBlur={onBlur}
                 onChangeText={onChange}
                 value={value}
-                label={t('authentication.email')}
+                label={t('commons.email')}
               />
             );
           }}
@@ -77,10 +115,10 @@ export const ResetPassword = () => {
           mode="contained"
           onPress={handleSubmit(onSubmit)}
         >
-          {t('authentication.resetPassword')}
+          {t('commons.resetPassword')}
         </Button>
         <Button mt="48" mode="outlined" onPress={navigation.goBack}>
-          {t('cancel')}
+          {t('commons.cancel')}
         </Button>
       </KeyboardAvoidingView>
     </ParentView>

package/src/{auth/screens → screens/Auth}/ResetPasswordInstructionsSent.tsx

@@ -25,12 +25,12 @@ export const ResetPasswordInstructionSent: React.FC<
       width={{ phone: '100%', tablet: 372 }}
     >
       <Text py="48" textAlign="center" variant="titleLarge">
-        {t('authentication.resetPasswordInstructionSent', {
+        {t('commons.resetPasswordInstructionSent', {
           email: route.params?.email,
         })}
       </Text>
       <Button mode="outlined" onPress={() => navigation.navigate('Login')}>
-        {t('authentication.backToLogin')}
+        {t('commons.backToLogin')}
       </Button>
     </ParentView>
   );

package/src/{auth/screens → screens/Auth}/SignUp.tsx

@@ -18,12 +18,11 @@ import {
   signUpValidationSchemaWithBusinessName,
   signUpValidationSchemaWithoutBusinessName,
 } from './validators';
-import { useAuthentication } from '../hooks/useAuthentication';
 import { Linking } from 'react-native';
 import { PRIVACY_POLICY, TERMS_OF_SERVICE } from '../../constants';
 import Config from 'react-native-config';
 import { ICountry } from 'react-native-international-phone-number';
-import { useTermsOfService } from '../hooks/useTermsOfService';
+import { useAuth, useTermsOfService } from '../../hooks';
 
 export type TUserForm = {
   displayName: string;
@@ -35,7 +34,7 @@ export type TUserForm = {
 export const SignUp = () => {
   const [selectedCountry, setSelectedCountry] = useState<ICountry>();
   const { t } = useTranslation();
-  const { useIsCheckRegistered } = useAuthentication();
+  const { useIsCheckRegistered } = useAuth();
   const { mutate: checkRegistration, isLoading: isCheckingIsRegistered } =
     useIsCheckRegistered();
   const { useTermsOfServiceURL } = useTermsOfService();
@@ -71,7 +70,7 @@ export const SignUp = () => {
 
   return (
     <ParentView px="16">
-      <Header title={t('authentication.createAccountTitle')} />
+      <Header title={t('commons.createAccountTitle')} />
       <KeyboardAvoidingView
         flex={1}
         behavior="padding"
@@ -90,7 +89,7 @@ export const SignUp = () => {
                 onBlur={onBlur}
                 onChangeText={onChange}
                 value={value}
-                label={t('authentication.displayName')}
+                label={t('commons.displayName')}
               />
             );
           }}
@@ -109,7 +108,7 @@ export const SignUp = () => {
                   onBlur={onBlur}
                   onChangeText={onChange}
                   value={value}
-                  label={t('authentication.businessName')}
+                  label={t('commons.businessName')}
                 />
               );
             }}
@@ -131,7 +130,7 @@ export const SignUp = () => {
                 onBlur={onBlur}
                 onChangeText={onChange}
                 value={value}
-                label={t('authentication.email')}
+                label={t('commons.email')}
               />
             );
           }}
@@ -161,24 +160,24 @@ export const SignUp = () => {
           onPress={handleSubmit(onSubmit)}
           mode="contained"
         >
-          {t('authentication.createAccount')}
+          {t('commons.createAccount')}
         </Button>
         <View flexDirection="row" flexWrap="wrap" pt="10">
-          <Text variant="bodyMedium">{t('authentication.byContinue')} </Text>
+          <Text variant="bodyMedium">{t('commons.byContinue')} </Text>
           <LinkButton
             labelStyle={style.linkButton}
             mode="text"
             onPress={() => Linking.openURL(url || TERMS_OF_SERVICE)}
           >
-            {t('authentication.termsAndConditions')}
+            {t('commons.termsAndConditions')}
           </LinkButton>
-          <Text variant="bodyMedium"> {t('authentication.and')} </Text>
+          <Text variant="bodyMedium"> {t('commons.and')} </Text>
           <LinkButton
             labelStyle={style.linkButton}
             mode="text"
             onPress={() => Linking.openURL(PRIVACY_POLICY)}
           >
-            {t('authentication.privacyPolicy')}
+            {t('commons.privacyPolicy')}
           </LinkButton>
         </View>
       </KeyboardAvoidingView>

package/src/{auth/screens → screens/Auth}/SignUpPassword.tsx

@@ -13,7 +13,7 @@ import { useTranslation } from 'react-i18next';
 import { Controller, useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { passwordVerificationSchema } from './validators';
-import { useAuthentication } from '../hooks/useAuthentication';
+import { useAuth } from '../../hooks';
 
 type FormData = {
   password: string;
@@ -26,15 +26,15 @@ type SignUpPasswordProps = {
 export const SignUpPassword: React.FC<SignUpPasswordProps> = ({ route }) => {
   const params = route.params;
   const { t } = useTranslation();
-  const { useVerifyPhoneNumber } = useAuthentication();
+  const { useVerifyPhoneNumber } = useAuth();
   const { mutate: verifyPhoneNumber, isLoading: isVerifyingPhoneNumber } =
     useVerifyPhoneNumber();
   const passwordExpectations = [
-    t('authentication.minLength'),
-    t('authentication.1lowerChar'),
-    t('authentication.1upperChar'),
-    t('authentication.1number'),
-    t('authentication.1special'),
+    t('commons.minLength'),
+    t('commons.1lowerChar'),
+    t('commons.1upperChar'),
+    t('commons.1number'),
+    t('commons.1special'),
   ];
 
   const {
@@ -59,7 +59,7 @@ export const SignUpPassword: React.FC<SignUpPasswordProps> = ({ route }) => {
 
   return (
     <ParentView px="16">
-      <Header title={t('authentication.createPassword')} />
+      <Header title={t('commons.createPassword')} />
       <View flex={1}>
         <KeyboardAvoidingView
           alignSelf="center"
@@ -87,9 +87,9 @@ export const SignUpPassword: React.FC<SignUpPasswordProps> = ({ route }) => {
                       trigger();
                     }}
                     value={value}
-                    label={t('authentication.password')}
+                    label={t('commons.password')}
                   />
-                  <Text pt="4">{t('authentication.passwordMustContain')}</Text>
+                  <Text pt="4">{t('commons.passwordMustContain')}</Text>
                   {passwordExpectations.map((expectation, index) => {
                     const didExpectationFoundInErrors =
                       passwordErrors?.includes(expectation) ?? false;
@@ -122,7 +122,7 @@ export const SignUpPassword: React.FC<SignUpPasswordProps> = ({ route }) => {
             mode="contained"
             onPress={handleSubmit(onSubmit)}
           >
-            {t('continue')}
+            {t('commons.continue')}
           </Button>
         </KeyboardAvoidingView>
       </View>

package/src/{auth/screens → screens/Auth}/VerifyPhoneNumber.tsx

@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { Controller, useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { verificationValidationSchema } from './validators';
-import { useAuthentication } from '../hooks/useAuthentication';
+import { useAuth } from '../../hooks';
 
 type FormData = {
   code: string;
@@ -29,7 +29,7 @@ export const VerifyPhoneNumber: React.FC<VerifyPhoneNumberProps> = ({
 }) => {
   const params = route.params as any;
   const { t } = useTranslation();
-  const { useSignUp, useVerifyPhoneNumber } = useAuthentication();
+  const { useSignUp, useVerifyPhoneNumber } = useAuth();
 
   const { mutate: signUp, isLoading: isSigningUp } = useSignUp();
   const { mutate: resendCode, isLoading: isResendingCode } =
@@ -57,7 +57,7 @@ export const VerifyPhoneNumber: React.FC<VerifyPhoneNumberProps> = ({
         >
           <View alignItems="center">
             <Text pt="48" pb="8" textAlign="center" variant="titleLarge">
-              {t('authentication.verifyYourNumber')}
+              {t('commons.verifyYourNumber')}
             </Text>
             <Text
               color="onSurfaceVariant"
@@ -65,7 +65,7 @@ export const VerifyPhoneNumber: React.FC<VerifyPhoneNumberProps> = ({
               textAlign="center"
               variant="bodyLarge"
             >
-              {t('authentication.codeSent', {
+              {t('commons.codeSent', {
                 phoneNumber: params.phoneNumber,
               })}
             </Text>
@@ -90,7 +90,7 @@ export const VerifyPhoneNumber: React.FC<VerifyPhoneNumberProps> = ({
             mode="contained"
             onPress={handleSubmit(onSubmit)}
           >
-            {t('continue')}
+            {t('commons.continue')}
           </Button>
           <LinkButton
             disabled={isResendingCode || isSigningUp}
@@ -101,7 +101,7 @@ export const VerifyPhoneNumber: React.FC<VerifyPhoneNumberProps> = ({
               resendCode(params as any);
             }}
           >
-            {t('authentication.resendCode')}
+            {t('commons.resendCode')}
           </LinkButton>
         </KeyboardAvoidingView>
       </View>

package/src/{auth/screens → screens/Auth}/VerifyPhoneNumberForLogin.tsx

@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { Controller, useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { verificationValidationSchema } from './validators';
-import { useAuthentication } from '../hooks/useAuthentication';
+import { useAuth } from '../../hooks';
 
 type FormData = {
   code: string;
@@ -29,8 +29,7 @@ export const VerifyPhoneNumberForLogin: React.FC<
 > = ({ route }) => {
   const params = route.params as any;
   const { t } = useTranslation();
-  const { useVerifyPhoneNumberForLogin, useConfirmPhoneNumber } =
-    useAuthentication();
+  const { useVerifyPhoneNumberForLogin, useConfirmPhoneNumber } = useAuth();
 
   const { mutate: confirmCode, isLoading: isConfirmingCode } =
     useConfirmPhoneNumber();
@@ -59,7 +58,7 @@ export const VerifyPhoneNumberForLogin: React.FC<
         >
           <View alignItems="center">
             <Text pt="48" pb="8" textAlign="center" variant="titleLarge">
-              {t('authentication.loginWithNumber')}
+              {t('commons.loginWithNumber')}
             </Text>
             <Text
               color="onSurfaceVariant"
@@ -67,7 +66,7 @@ export const VerifyPhoneNumberForLogin: React.FC<
               textAlign="center"
               variant="bodyLarge"
             >
-              {t('authentication.codeSent', {
+              {t('commons.codeSent', {
                 phoneNumber: params.phoneNumber,
               })}
             </Text>
@@ -92,7 +91,7 @@ export const VerifyPhoneNumberForLogin: React.FC<
             mode="contained"
             onPress={handleSubmit(onSubmit)}
           >
-            {t('continue')}
+            {t('commons.continue')}
           </Button>
           <LinkButton
             disabled={isResendingCode || isConfirmingCode}
@@ -103,7 +102,7 @@ export const VerifyPhoneNumberForLogin: React.FC<
               resendCode(params as any);
             }}
           >
-            {t('authentication.resendCode')}
+            {t('commons.resendCode')}
           </LinkButton>
         </KeyboardAvoidingView>
       </View>

package/src/{auth/screens → screens/Auth}/validators.ts

@@ -5,51 +5,51 @@ import type { TFunction } from 'i18next';
 const displayName = (t: TFunction) =>
   yup
     .string()
-    .required(t('authentication.displayNameRequired'))
-    .label(t('authentication.displayNameRequired'));
+    .required(t('commons.displayNameRequired'))
+    .label(t('commons.displayNameRequired'));
 
 const businessName = (t: TFunction) =>
   yup
     .string()
-    .required(t('authentication.businessNameRequired'))
-    .label(t('authentication.businessName'));
+    .required(t('commons.businessNameRequired'))
+    .label(t('commons.businessName'));
 
 const emailForLogin = (t: TFunction) =>
   yup
     .string()
-    .required(t('authentication.requiredEmailForLogin'))
-    .matches(EMAIL_REGEX, t('authentication.validEmail'))
-    .label(t('authentication.email'));
+    .required(t('commons.requiredEmailForLogin'))
+    .matches(EMAIL_REGEX, t('commons.validEmail'))
+    .label(t('commons.email'));
 
 const emailForSignup = (t: TFunction) =>
   yup
     .string()
-    .required(t('authentication.requiredEmailForSignUp'))
-    .matches(EMAIL_REGEX, t('authentication.validEmail'))
-    .label(t('authentication.email'));
+    .required(t('commons.requiredEmailForSignUp'))
+    .matches(EMAIL_REGEX, t('commons.validEmail'))
+    .label(t('commons.email'));
 
 const phoneNumber = (t: TFunction) =>
   yup
     .string()
-    .required(t('authentication.requiredPhoneNumber'))
-    .label(t('authentication.phoneNumber'));
+    .required(t('commons.requiredPhoneNumber'))
+    .label(t('commons.phoneNumber'));
 
 const password = (t: TFunction) =>
   yup
     .string()
-    .required(t('authentication.requiredPassword'))
-    .label(t('authentication.password'));
+    .required(t('commons.requiredPassword'))
+    .label(t('commons.password'));
 
 const newPassword = (t: TFunction) =>
   yup
     .string()
     .required()
-    .min(8, t('authentication.minLength'))
-    .matches(/[a-z]/, t('authentication.1lowerChar'))
-    .matches(/[A-Z]/, t('authentication.1upperChar'))
-    .matches(/[0-9]/, t('authentication.1number'))
-    .matches(/[!@#$%^&*(),.?":{}|<>]/, t('authentication.1special'))
-    .label(t('authentication.password'));
+    .min(8, t('commons.minLength'))
+    .matches(/[a-z]/, t('commons.1lowerChar'))
+    .matches(/[A-Z]/, t('commons.1upperChar'))
+    .matches(/[0-9]/, t('commons.1number'))
+    .matches(/[!@#$%^&*(),.?":{}|<>]/, t('commons.1special'))
+    .label(t('commons.password'));
 
 const code = yup.string().required().min(6);
 

package/src/screens/SavedCards/CardRow.tsx

@@ -3,7 +3,7 @@ import { Alert, Card, IconButton, Text, View } from '../../components';
 import { RadioButton, useTheme } from 'react-native-paper';
 import { useTranslation } from 'react-i18next';
 import { getCardName } from '../../utils/checkout';
-import { CustomerCardPayment } from '../../types/customer';
+import { CustomerCardPayment } from '@kiosinc/commons-types';
 
 export const CardRow = ({
   card,
@@ -26,18 +26,18 @@ export const CardRow = ({
 
   const onDeleteCard = () => {
     Alert.show({
-      title: t('checkout.confirmCardDelete'),
-      description: t('checkout.cardDeleteDesc', {
+      title: t('commons.confirmCardDelete'),
+      description: t('commons.cardDeleteDesc', {
         card: card.cardDetails.last4,
       }),
       buttons: [
         {
-          label: t('delete'),
+          label: t('commons.delete'),
           textColor: theme.colors.error,
           onPress: () => onDelete(card.id),
         },
         {
-          label: t('cancel'),
+          label: t('commons.cancel'),
           textColor: theme.colors.onSurface,
         },
       ],

package/src/screens/SavedCards/SavedCards.tsx

@@ -15,7 +15,7 @@ import { onStartCardEntry } from '../../utils/square';
 import { useCustomerQueries } from '../../hooks/useCustomer';
 import { useCheckCustomer } from '../../hooks/useCheckCustomer';
 import { CardRow } from './CardRow';
-import { CustomerCardPayment } from '../../types/customer';
+import { CustomerCardPayment } from '@kiosinc/commons-types';
 
 export const SavedCards = ({
   onCheckout,
@@ -64,7 +64,7 @@ export const SavedCards = ({
   };
 
   const label =
-    cards.length > 0 ? t('checkout.payAndPlaceOrder') : t('checkout.payByCard');
+    cards.length > 0 ? t('commons.payAndPlaceOrder') : t('commons.payByCard');
 
   if (isLoading) {
     return <ActivityIndicator />;
@@ -134,11 +134,11 @@ export const SavedCards = ({
             <>
               {cards.length > 0 ? (
                 <Text mb="8" variant="titleMedium">
-                  {t('checkout.paymentMethods')}
+                  {t('commons.paymentMethods')}
                 </Text>
               ) : (
                 <Text variant="bodyLarge" color="outline">
-                  {t('checkout.noSavedCards')}
+                  {t('commons.noSavedCards')}
                 </Text>
               )}
             </>
@@ -152,7 +152,7 @@ export const SavedCards = ({
                 icon="plus"
                 mode="text"
               >
-                {t('checkout.addCard')}
+                {t('commons.addCard')}
               </Button>
             </View>
           }
@@ -169,7 +169,7 @@ export const SavedCards = ({
         >
           <View>
             <Text variant="bodyLarge" color="onSurface">
-              {t('order.total')}
+              {t('commons.total')}
             </Text>
             <Text variant="titleLarge" color="onSurface">
               {total}

package/src/{selectBusiness → screens/SelectBusiness}/CreateBusinessBottomSheet.tsx

@@ -6,10 +6,10 @@ import {
   TextInput,
   View,
   BottomSheet,
-} from '../components';
+} from '../../components';
 import { BottomSheetTextInput } from '@gorhom/bottom-sheet';
 import { useTranslation } from 'react-i18next';
-import { useCreateBusiness } from './useCreateBusiness';
+import { useCreateBusiness } from '../../hooks';
 
 type CreateBusinessBottomSheetProps = {
   isVisible: boolean;
@@ -44,7 +44,7 @@ export const CreateBusinessBottomSheet = forwardRef(
       <BottomSheet pressBehavior="close" ref={ref as any}>
         <View px="16" bg="background" flex={1}>
           <Text pt="16" variant="titleLarge">
-            {t('home.createBusiness')}
+            {t('commons.createBusiness')}
           </Text>
           <KeyboardAvoidingView>
             <TextInput
@@ -55,11 +55,11 @@ export const CreateBusinessBottomSheet = forwardRef(
               mode="outlined"
               onChangeText={setName}
               value={name}
-              label={t('home.businessName')}
+              label={t('commons.businessName')}
             />
             <View mt="16" flexDirection="row" justifyContent="flex-end">
               <Button mode="text" onPress={close}>
-                {t('cancel')}
+                {t('commons.cancel')}
               </Button>
               <Button
                 loading={isLoading}
@@ -67,7 +67,7 @@ export const CreateBusinessBottomSheet = forwardRef(
                 mode="text"
                 onPress={onCreate}
               >
-                {t('create')}
+                {t('commons.create')}
               </Button>
             </View>
           </KeyboardAvoidingView>

package/src/{selectBusiness → screens/SelectBusiness}/SelectBusiness.tsx

@@ -10,7 +10,7 @@ import {
   Text,
   View,
   LinkButton,
-} from '../components';
+} from '../../components';
 import { FlashList } from '@shopify/flash-list';
 import { useTranslation } from 'react-i18next';
 import { ActivityIndicator, useTheme } from 'react-native-paper';
@@ -18,11 +18,10 @@ import { useMMKVString } from 'react-native-mmkv';
 import { type NavigationProp, useNavigation } from '@react-navigation/native';
 import { useQueryClient } from '@tanstack/react-query';
 import { CreateBusinessBottomSheet } from './CreateBusinessBottomSheet';
-import { useBusinesses } from './useBusinesses';
-import { MMKV_KEYS } from '../constants';
-import { useSingleSnapBottomSheetRef } from '../utils/useSingleSnapBottomSheetRef';
-import Tick from '../assets/icons/tick.svg';
-import { useLogout } from '../auth/hooks/useLogout';
+import { useBusinesses, useLogout } from '../../hooks';
+import { MMKV_KEYS } from '../../constants';
+import { useSingleSnapBottomSheetRef } from '../../utils';
+import Tick from '../../assets/icons/tick.svg';
 
 const BusinessCard = ({
   business,
@@ -116,7 +115,7 @@ export const SelectBusiness = () => {
 
   return (
     <ParentView flex={1} backgroundColor="background">
-      <Header title={t('home.selectBusiness')} />
+      <Header title={t('commons.selectBusiness')} />
       {searchText.length === 0 && !isFetching && businesses?.length === 0 && (
         <View
           position="absolute"
@@ -125,7 +124,7 @@ export const SelectBusiness = () => {
           alignItems={'center'}
           justifyContent={'center'}
         >
-          <Text alignSelf={'center'}>{t('home.noBusiness')}</Text>
+          <Text alignSelf={'center'}>{t('commons.noBusiness')}</Text>
         </View>
       )}
       <View px="16" flex={1}>
@@ -134,7 +133,7 @@ export const SelectBusiness = () => {
           mb="12"
           bg="inverseOnSurface"
           value={searchText}
-          placeholder={t('home.searchBusiness')}
+          placeholder={t('commons.searchBusiness')}
           onChangeText={setSearchText}
         />
         {!isFetching && (
@@ -173,7 +172,7 @@ export const SelectBusiness = () => {
         {!selectedBusinessId && (
           <View justifyContent="flex-end">
             <LinkButton mode="text" onPress={handleLogout} alignSelf={'center'}>
-              {t('profile.logout')}
+              {t('commons.logout')}
             </LinkButton>
           </View>
         )}