octo/tooot
octo
/
tooot
mirror of https://github.com/tooot-app/app
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #153 from tooot-app/main 

Release v2.1.1
This commit is contained in:
xmflsct 2021-07-07 18:59:41 +02:00 committed by GitHub
parent 0245a5c0e3 6488a8f7bd
commit 32c6112f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -4,7 +4,7 @@
"native": "210511", "native": "210511",
"major": 2, "major": 2,
"minor": 1, "minor": 1,
"patch": 0, "patch": 1,
"expo": "41.0.0" "expo": "41.0.0"
}, },
"description": "tooot app for Mastodon", "description": "tooot app for Mastodon",

2
src/components/Timeline/Default.tsx
View File

@ -49,7 +49,7 @@ const TimelineDefault: React.FC<Props> = ({
StackNavigationProp<Nav.TabLocalStackParamList> StackNavigationProp<Nav.TabLocalStackParamList>
>() >()
let actualStatus = item.reblog ? item.reblog : item const actualStatus = item.reblog ? item.reblog : item
const ownAccount = actualStatus.account.id === instanceAccount?.id const ownAccount = actualStatus.account.id === instanceAccount?.id

8
src/screens/Tabs/Shared/Account/Information/Actions.tsx
View File

@ -5,8 +5,7 @@ import { useNavigation } from '@react-navigation/native'
import { useRelationshipQuery } from '@utils/queryHooks/relationship' import { useRelationshipQuery } from '@utils/queryHooks/relationship'
import { import {
getInstanceAccount, getInstanceAccount,
getInstancePush, getInstancePush
getInstanceUri
} from '@utils/slices/instancesSlice' } from '@utils/slices/instancesSlice'
import { StyleConstants } from '@utils/styles/constants' import { StyleConstants } from '@utils/styles/constants'
import React from 'react' import React from 'react'
@ -41,6 +40,10 @@ const Conversation = ({ account }: { account: Mastodon.Account }) => {
} }
const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => { const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
if (!account) {
return null
}
const { t } = useTranslation('screenTabs') const { t } = useTranslation('screenTabs')
const navigation = useNavigation() const navigation = useNavigation()
@ -65,7 +68,6 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
getInstancePush, getInstancePush,
(prev, next) => prev?.global.value === next?.global.value (prev, next) => prev?.global.value === next?.global.value
) )
const instanceUri = useSelector(getInstanceUri)
if (myInfo) { if (myInfo) {
return ( return (