octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Removed external instance

Browse Source
This commit is contained in:
Zhiyuan Zheng
2021-01-26 12:17:25 +01:00
parent 08f3036753
commit 4076733061
22 changed files with 169 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/Instance.tsx
View File

@ -8,7 +8,7 @@ import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
import { getLocalInstances, remoteUpdate } from '@utils/slices/instancesSlice'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import * as Linking from 'expo-linking'
import * as WebBrowser from 'expo-web-browser'
import { debounce } from 'lodash'
import React, { useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@ -18,6 +18,7 @@ import { useDispatch, useSelector } from 'react-redux'
import { Placeholder, Fade } from 'rn-placeholder'
import analytics from './analytics'
import InstanceAuth from './Instance/Auth'
import EULA from './Instance/EULA'
import InstanceInfo from './Instance/Info'
import { toast } from './toast'
@ -159,6 +160,8 @@ const ComponentInstance: React.FC<Props> = ({
}
}, [instanceDomain, instanceQuery.data, appsQuery.data])
const [agreed, setAgreed] = useState(false)
return (
<>
{!disableHeaderImage ? (
@ -201,18 +204,15 @@ const ComponentInstance: React.FC<Props> = ({
onPress={processUpdate}
disabled={
!instanceQuery.data?.uri ||
(type === 'remote' && !instanceQuery.data.publicAllow)
(type === 'remote' && !instanceQuery.data.publicAllow) ||
!agreed
}
loading={instanceQuery.isFetching || appsQuery.isFetching}
/>
</View>
{type === 'remote' &&
instanceQuery.data &&
!instanceQuery.data.publicAllow ? (
<Text style={[styles.privateInstance, { color: theme.red }]}>
{t('server.privateInstance')}
</Text>
) : null}
<EULA agreed={agreed} setAgreed={setAgreed} />
<View>
<Placeholder
{...(instanceQuery.isFetching && {
@ -277,15 +277,17 @@ const ComponentInstance: React.FC<Props> = ({
style={styles.disclaimerIcon}
/>
<Text style={[styles.disclaimerText, { color: theme.secondary }]}>
{t('server.disclaimer')}
{t('server.disclaimer.base')}
<Text
style={{ color: theme.blue }}
onPress={() => {
analytics('view_privacy')
Linking.openURL('https://tooot.app/privacy')
WebBrowser.openBrowserAsync(
'https://tooot.app/privacy-policy'
)
}}
>
https://tooot.app/privacy
{t('server.disclaimer.privacy')}
</Text>
</Text>
</View>