1
0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
This commit is contained in:
Zhiyuan Zheng
2021-01-27 00:35:34 +01:00
parent 9ae1612a96
commit 41bfeed56f
24 changed files with 558 additions and 457 deletions

View File

@ -1,7 +1,6 @@
import { useNavigation } from '@react-navigation/native'
import { InstanceLocal, localAddInstance } from '@utils/slices/instancesSlice'
import * as AuthSession from 'expo-auth-session'
import Constants from 'expo-constants'
import React, { useEffect } from 'react'
import { useQueryClient } from 'react-query'
import { useDispatch } from 'react-redux'
@ -16,17 +15,9 @@ export interface Props {
const InstanceAuth = React.memo(
({ instanceDomain, instanceUri, appData, goBack }: Props) => {
let redirectUri: string
switch (Constants.manifest.releaseChannel) {
case 'production':
case 'staging':
case 'testing':
redirectUri = 'tooot://expo-auth-session'
break
default:
redirectUri = 'exp://127.0.0.1:19000'
break
}
const redirectUri = AuthSession.makeRedirectUri({ useProxy: false })
const navigation = useNavigation()
const queryClient = useQueryClient()
const dispatch = useDispatch()

View File

@ -23,11 +23,11 @@ const Names: React.FC<{ accounts: Mastodon.Account[] }> = ({ accounts }) => {
return (
<Text numberOfLines={1}>
<Text style={[styles.namesLeading, { color: theme.secondary }]}>
{t('shared.header.conversation.withAccounts')}{' '}
{t('shared.header.conversation.withAccounts')}
</Text>
{accounts.map((account, index) => (
<Text key={account.id} numberOfLines={1}>
{index !== 0 ? ', ' : undefined}
{index !== 0 ? t('common:separator') : undefined}
<ParseEmojis
content={account.display_name || account.username}
emojis={account.emojis}