diff --git a/package.json b/package.json
index 2b9bfe16..caf787f8 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"native": "220508",
"major": 4,
"minor": 0,
- "patch": 0,
+ "patch": 1,
"expo": "45.0.0"
},
"description": "tooot app for Mastodon",
diff --git a/src/App.tsx b/src/App.tsx
index 214d097a..c0032d71 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -54,7 +54,6 @@ import { enableFreeze } from 'react-native-screens'
import { QueryClientProvider } from 'react-query'
import { Provider } from 'react-redux'
import { PersistGate } from 'redux-persist/integration/react'
-import { IntlProvider } from 'react-intl'
Platform.select({
android: LogBox.ignoreLogs(['Setting a timer for a long period of time'])
@@ -132,9 +131,7 @@ const App: React.FC = () => {
-
-
-
+
diff --git a/src/Screens.tsx b/src/Screens.tsx
index 6fa2fa60..53d27938 100644
--- a/src/Screens.tsx
+++ b/src/Screens.tsx
@@ -26,6 +26,7 @@ import * as Linking from 'expo-linking'
import { addScreenshotListener } from 'expo-screen-capture'
import React, { useCallback, useEffect, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
+import { IntlProvider } from 'react-intl'
import { Alert, Platform, StatusBar } from 'react-native'
import ShareMenu from 'react-native-share-menu'
import { useSelector } from 'react-redux'
@@ -39,7 +40,7 @@ export interface Props {
}
const Screens: React.FC = ({ localCorrupt }) => {
- const { t } = useTranslation('screens')
+ const { i18n, t } = useTranslation('screens')
const dispatch = useAppDispatch()
const instanceActive = useSelector(getInstanceActive)
const { colors, theme } = useTheme()
@@ -320,7 +321,7 @@ const Screens: React.FC = ({ localCorrupt }) => {
}, [])
return (
- <>
+
= ({ localCorrupt }) => {
- >
+
)
}
diff --git a/src/components/Timeline/Default.tsx b/src/components/Timeline/Default.tsx
index 3605f240..cba31325 100644
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@@ -156,6 +156,7 @@ const TimelineDefault = React.memo(
rootQueryKey={rootQueryKey}
highlighted={highlighted}
status={actualStatus}
+ ownAccount={ownAccount}
accts={uniqBy(
(
[actualStatus.account] as Mastodon.Account[] &
diff --git a/src/components/Timeline/Shared/Actions.tsx b/src/components/Timeline/Shared/Actions.tsx
index 51c65848..654c47ec 100644
--- a/src/components/Timeline/Shared/Actions.tsx
+++ b/src/components/Timeline/Shared/Actions.tsx
@@ -22,6 +22,7 @@ export interface Props {
rootQueryKey?: QueryKeyTimeline
highlighted: boolean
status: Mastodon.Status
+ ownAccount?: boolean
accts: Mastodon.Account['acct'][] // When replying to conversations
reblog: boolean
}
@@ -31,6 +32,7 @@ const TimelineActions: React.FC = ({
rootQueryKey,
highlighted,
status,
+ ownAccount = false,
accts,
reblog
}) => {
@@ -207,7 +209,8 @@ const TimelineActions: React.FC = ({
= ({
{status.reblogs_count > 0 ? (
= ({
style={styles.action}
onPress={onPressReblog}
children={childrenReblog}
- disabled={status.visibility === 'direct'}
+ disabled={
+ status.visibility === 'direct' ||
+ (status.visibility === 'private' && !ownAccount)
+ }
/>