@kiosinc/commons-rn 0.1.102 → 0.2.0

package/src/screens/Auth/LoginWithPhoneNumber.tsx

@@ -84,7 +84,11 @@ export const LoginWithPhoneNumber = () => {
           pt="4"
           flexDirection="row"
         >
-          <Text variant="labelLarge">{t('commons.newToApp')}</Text>
+          <Text variant="labelLarge">
+            {t('commons.newToApp', {
+              appName: Config.APP_DISPLAY_NAME ?? 'LUMINA',
+            })}
+          </Text>
           <LinkButton
             mode="text"
             onPress={() => {

package/src/screens/Auth/SignUp.tsx

@@ -4,14 +4,13 @@ import {
   View,
   TextInput,
   Button,
-  LinkButton,
   KeyboardAvoidingView,
   Header,
   PhoneInput,
 } from '../../components';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { StyleSheet } from 'react-native';
+import { Checkbox } from 'react-native-paper';
 import { Controller, useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import {
@@ -33,6 +32,7 @@ export type TUserForm = {
 
 export const SignUp = () => {
   const [selectedCountry, setSelectedCountry] = useState<ICountry>();
+  const [isTermsChecked, setIsTermsChecked] = useState(false);
   const { t } = useTranslation();
   const { useIsCheckRegistered } = useAuth();
   const { mutate: checkRegistration, isLoading: isCheckingIsRegistered } =
@@ -70,7 +70,11 @@ export const SignUp = () => {
 
   return (
     <ParentView px="16">
-      <Header title={t('commons.createAccountTitle')} />
+      <Header
+        title={t('commons.createAccountTitle', {
+          appName: Config.APP_DISPLAY_NAME ?? 'LUMINA',
+        })}
+      />
       <KeyboardAvoidingView
         flex={1}
         behavior="padding"
@@ -154,42 +158,50 @@ export const SignUp = () => {
           }}
           name="phoneNumber"
         />
+
+        <View flexDirection={'row'} pt="10" alignItems={'center'}>
+          <Checkbox.Android
+            status={isTermsChecked ? 'checked' : 'unchecked'}
+            onPress={() => {
+              setIsTermsChecked(!isTermsChecked);
+            }}
+          />
+          <View flexDirection={'row'} alignItems={'center'} flex={1} ms={'8'}>
+            <Text variant="bodyMedium">
+              {t('commons.byContinue', {
+                appName: Config.APP_DISPLAY_NAME ?? 'LUMINA',
+              })}{' '}
+              <Text
+                variant="labelLarge"
+                color={'primary'}
+                textDecorationLine={'underline'}
+                onPress={() => Linking.openURL(url || TERMS_OF_SERVICE)}
+              >
+                {t('commons.termsAndConditions')}
+              </Text>
+              <Text variant="bodyMedium"> {t('commons.and')} </Text>
+              <Text
+                variant="labelLarge"
+                color={'primary'}
+                textDecorationLine={'underline'}
+                onPress={() => Linking.openURL(PRIVACY_POLICY)}
+              >
+                {t('commons.privacyPolicy')}
+              </Text>
+            </Text>
+          </View>
+        </View>
+
         <Button
           loading={isCheckingIsRegistered}
           mt="24"
+          disabled={!isTermsChecked}
           onPress={handleSubmit(onSubmit)}
           mode="contained"
         >
           {t('commons.createAccount')}
         </Button>
-        <View flexDirection="row" flexWrap="wrap" pt="10">
-          <Text variant="bodyMedium">{t('commons.byContinue')} </Text>
-          <LinkButton
-            labelStyle={style.linkButton}
-            mode="text"
-            onPress={() => Linking.openURL(url || TERMS_OF_SERVICE)}
-          >
-            {t('commons.termsAndConditions')}
-          </LinkButton>
-          <Text variant="bodyMedium"> {t('commons.and')} </Text>
-          <LinkButton
-            labelStyle={style.linkButton}
-            mode="text"
-            onPress={() => Linking.openURL(PRIVACY_POLICY)}
-          >
-            {t('commons.privacyPolicy')}
-          </LinkButton>
-        </View>
       </KeyboardAvoidingView>
     </ParentView>
   );
 };
-
-const style = StyleSheet.create({
-  linkButton: {
-    paddingVertical: 0,
-    marginVertical: 0,
-    marginHorizontal: 2,
-    textDecorationLine: 'underline',
-  },
-});

package/src/types/react-native-config.d.ts

@@ -7,13 +7,16 @@ declare module 'react-native-config' {
     CHILDS_SERVER_ENV: string;
     SQUARE_BASE_URL: string;
     BASE_URL: string;
-    SQUARE_BASE_URL: string;
+    APP_META_KEY: string;
     MIXPANEL_TOKEN: string;
     APP_NAME: string;
     URL_SCHEME: string;
     BUNDLE_IDENTIFIER: string;
     PLAY_STORE_URL?: string;
     APP_STORE_URL?: string;
+    APP_NAME: string;
+    APP_DISPLAY_NAME: string;
+    APPLE_PAY_MERCHANT_ID: string;
   }
 
   export const Config: NativeConfig;