From b0b5c1975411449c333195a934be3f12bb29cebf Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Mon, 3 Apr 2023 12:06:07 -0700 Subject: [PATCH] removing tos from ios --- app/mobile/src/access/admin/Admin.jsx | 34 ++++++++++++----------- app/mobile/src/access/create/Create.jsx | 34 ++++++++++++----------- app/mobile/src/access/login/Login.jsx | 36 +++++++++++++------------ app/mobile/src/access/reset/Reset.jsx | 36 +++++++++++++------------ 4 files changed, 74 insertions(+), 66 deletions(-) diff --git a/app/mobile/src/access/admin/Admin.jsx b/app/mobile/src/access/admin/Admin.jsx index 9e5fc68f..09fef349 100644 --- a/app/mobile/src/access/admin/Admin.jsx +++ b/app/mobile/src/access/admin/Admin.jsx @@ -56,22 +56,24 @@ export function Admin() { - - - View Terms of Service - - actions.agree(!state.agree)}> - { state.agree && ( - - )} - { !state.agree && ( - - )} - I agree to Terms of Service - - + { Platform.OS !== 'ios' && ( + + + View Terms of Service + + actions.agree(!state.agree)}> + { state.agree && ( + + )} + { !state.agree && ( + + )} + I agree to Terms of Service + + + )} - { state.enabled && state.agree && ( + { state.enabled && (Platform.OS === 'ios' || state.agree) && ( { state.busy && ( @@ -81,7 +83,7 @@ export function Admin() { )} )} - { (!state.enabled || !state.agree) && ( + { (!state.enabled || (Platform.OS !== 'ios' && !state.agree)) && ( Access diff --git a/app/mobile/src/access/create/Create.jsx b/app/mobile/src/access/create/Create.jsx index 43e426ff..afe5ff1e 100644 --- a/app/mobile/src/access/create/Create.jsx +++ b/app/mobile/src/access/create/Create.jsx @@ -138,23 +138,25 @@ export function Create() { )} - - - View Terms of Service - - actions.agree(!state.agree)}> - { state.agree && ( - - )} - { !state.agree && ( - - )} - I agree to Terms of Service - - + { Platform.OS !== 'ios' && ( + + + View Terms of Service + + actions.agree(!state.agree)}> + { state.agree && ( + + )} + { !state.agree && ( + + )} + I agree to Terms of Service + + + )} - { state.enabled && state.agree && ( + { state.enabled && (Platform.OS === 'ios' || state.agree) && ( { state.busy && ( @@ -164,7 +166,7 @@ export function Create() { )} )} - { (!state.enabled || !state.agree) && ( + { (!state.enabled || (Platform.OS !== 'ios' && !state.agree)) && ( Create Account diff --git a/app/mobile/src/access/login/Login.jsx b/app/mobile/src/access/login/Login.jsx index cc1f6028..78793513 100644 --- a/app/mobile/src/access/login/Login.jsx +++ b/app/mobile/src/access/login/Login.jsx @@ -1,4 +1,4 @@ -import { KeyboardAvoidingView, ActivityIndicator, Modal, ScrollView, Alert, Text, TextInput, View, TouchableOpacity } from 'react-native'; +import { Platform, KeyboardAvoidingView, ActivityIndicator, Modal, ScrollView, Alert, Text, TextInput, View, TouchableOpacity } from 'react-native'; import { styles } from './Login.styled'; import Ionicons from 'react-native-vector-icons/AntDesign'; import { useLogin } from './useLogin.hook'; @@ -63,22 +63,24 @@ export function Login() { )} - - - View Terms of Service - - actions.agree(!state.agree)}> - { state.agree && ( - - )} - { !state.agree && ( - - )} - I agree to Terms of Service - - + { Platform.OS !== 'ios' && ( + + + View Terms of Service + + actions.agree(!state.agree)}> + { state.agree && ( + + )} + { !state.agree && ( + + )} + I agree to Terms of Service + + + )} - { state.enabled && state.agree && ( + { state.enabled && (Platform.OS === 'ios' || state.agree) && ( { state.busy && ( @@ -88,7 +90,7 @@ export function Login() { )} )} - { (!state.enabled || !state.agree) && ( + { (!state.enabled || (Platform.OS !== 'ios' && !state.agree)) && ( Login diff --git a/app/mobile/src/access/reset/Reset.jsx b/app/mobile/src/access/reset/Reset.jsx index 14f01516..26d029a8 100644 --- a/app/mobile/src/access/reset/Reset.jsx +++ b/app/mobile/src/access/reset/Reset.jsx @@ -47,23 +47,25 @@ export function Reset() { autoCapitalize="none" placeholder="token" placeholderTextColor={Colors.grey} /> + + { Platform.OS !== 'ios' && ( + + + View Terms of Service + + actions.agree(!state.agree)}> + { state.agree && ( + + )} + { !state.agree && ( + + )} + I agree to Terms of Service + + + )} - - - View Terms of Service - - actions.agree(!state.agree)}> - { state.agree && ( - - )} - { !state.agree && ( - - )} - I agree to Terms of Service - - - - { state.enabled && state.agree && ( + { state.enabled && (Platform.OS === 'ios' || state.agree) && ( { state.busy && ( @@ -73,7 +75,7 @@ export function Reset() { )} )} - { (!state.enabled || !state.agree) && ( + { (!state.enabled || (Platform.OS !== 'ios' && !state.agree)) && ( Access