diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json index 9dc92f8b..46a28c89 100644 --- a/src/i18n/en/screens/tabs.json +++ b/src/i18n/en/screens/tabs.json @@ -267,7 +267,8 @@ "heading": "Help us improve", "description": "Collecting only non-user relative usage" }, - "version": "Version v{{version}}" + "version": "Version v{{version}}", + "instanceVersion": "Mastodon version v{{version}}" }, "switch": { "existing": "Choose from logged in", diff --git a/src/screens/Tabs/Me/Settings/Analytics.tsx b/src/screens/Tabs/Me/Settings/Analytics.tsx index aa5f7d44..fe3f0df3 100644 --- a/src/screens/Tabs/Me/Settings/Analytics.tsx +++ b/src/screens/Tabs/Me/Settings/Analytics.tsx @@ -1,5 +1,6 @@ import { MenuContainer, MenuRow } from '@components/Menu' import { useAppDispatch } from '@root/store' +import { getInstanceVersion } from '@utils/slices/instancesSlice' import { changeAnalytics, getSettingsAnalytics @@ -9,7 +10,7 @@ import { useTheme } from '@utils/styles/ThemeManager' import Constants from 'expo-constants' import React from 'react' import { useTranslation } from 'react-i18next' -import { StyleSheet, Text } from 'react-native' +import { Text } from 'react-native' import { useSelector } from 'react-redux' const SettingsAnalytics: React.FC = () => { @@ -18,6 +19,7 @@ const SettingsAnalytics: React.FC = () => { const { t } = useTranslation('screenTabs') const settingsAnalytics = useSelector(getSettingsAnalytics) + const instanceVersion = useSelector(getInstanceVersion, () => true) return ( @@ -29,19 +31,27 @@ const SettingsAnalytics: React.FC = () => { dispatch(changeAnalytics(!settingsAnalytics)) } /> - + {t('me.settings.version', { version: Constants.manifest?.version })} + + {t('me.settings.instanceVersion', { version: instanceVersion })} + ) } -const styles = StyleSheet.create({ - version: { - textAlign: 'center', - ...StyleConstants.FontStyle.S, - marginTop: StyleConstants.Spacing.M - } -}) - export default SettingsAnalytics