Merge pull request #351 from tooot-app/main

Release v4.1.6

.github/workflows/build.yml

@@ -110,6 +110,9 @@ jobs:
           ENVIRONMENT: ${{ steps.branch.outputs.branch }}
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
+          SENTRY_ORGANIZATION: ${{ secrets.SENTRY_ORGANIZATION }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
           ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
           ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}

package.json

@@ -4,7 +4,7 @@
     "native": "220603",
     "major": 4,
     "minor": 1,
-    "patch": 5,
+    "patch": 6,
     "expo": "45.0.0"
   },
   "description": "tooot app for Mastodon",

src/components/Timeline/Shared/HeaderDefault.android.tsx

@@ -24,7 +24,7 @@ export interface Props {
 }
 
 const TimelineHeaderDefault = ({ queryKey, status, highlighted }: Props) => {
-  if (!queryKey) return
+  if (!queryKey) return null
 
   const { t } = useTranslation('componentContextMenu')
   const { colors } = useTheme()

src/components/Timeline/Shared/Translate.tsx

@@ -57,7 +57,9 @@ const TimelineTranslate = React.memo(
     }, [])
 
     const settingsLanguage = useSelector(getSettingsLanguage)
-    const targetLanguage = Localization.locale || settingsLanguage || 'en'
+    const targetLanguage = settingsLanguage?.startsWith('en')
+      ? Localization.locale || settingsLanguage || 'en'
+      : settingsLanguage || Localization.locale || 'en'
 
     const [enabled, setEnabled] = useState(false)
     const { refetch, data, isLoading, isSuccess, isError } = useTranslateQuery({