Skip to content

Commit

Permalink
Merge pull request #541 from thornbill/no-expo-version
Browse files Browse the repository at this point in the history
  • Loading branch information
thornbill authored Nov 8, 2024
2 parents faa703c + 2aa6dc4 commit dd21cbd
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 20 deletions.
5 changes: 0 additions & 5 deletions components/AppInfoFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import { useNavigation } from '@react-navigation/native';
import Constants from 'expo-constants';
import React, { useContext } from 'react';
import { useTranslation } from 'react-i18next';
import { StyleSheet, View } from 'react-native';
import { Text, ThemeContext } from 'react-native-elements';

Expand All @@ -16,7 +15,6 @@ import { getAppName } from '../utils/Device';

const AppInfoFooter = () => {
const navigation = useNavigation();
const { t } = useTranslation();
const { theme } = useContext(ThemeContext);

const textStyle = {
Expand All @@ -38,9 +36,6 @@ const AppInfoFooter = () => {
<Text testID='app-version' style={textStyle}>
{`${Constants.nativeAppVersion} (${Constants.nativeBuildVersion})`}
</Text>
<Text testID='expo-version' style={textStyle}>
{t('settings.expoVersion', { version: Constants.expoVersion })}
</Text>
</View>
);
};
Expand Down
2 changes: 0 additions & 2 deletions components/__tests__/AppInfoFooter.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jest.mock('@react-navigation/native', () => {

describe('AppInfoFooter', () => {
it('should render correctly', () => {
Constants.expoVersion = '39.0.0';
Constants.nativeAppVersion = '1.0.0';
Constants.nativeBuildVersion = '1.0.0.0';
Device.osName = 'Test OS'; // eslint-disable-line no-import-assign, import/namespace
Expand All @@ -45,6 +44,5 @@ describe('AppInfoFooter', () => {
fireEvent(appName, 'onLongPress');
expect(mockNavigate).toHaveBeenCalledWith(Screens.DevSettingsScreen);
expect(getByTestId('app-version')).toHaveTextContent('1.0.0 (1.0.0.0)');
expect(getByTestId('expo-version')).toHaveTextContent('Expo Version: 39.0.0');
});
});
3 changes: 1 addition & 2 deletions langs/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@
"lightTheme": "Use Light Theme",
"systemTheme": "Use System Theme",
"rotationLock": "Rotation Lock",
"tabLabels": "Show Tab Labels",
"expoVersion": "Expo Version: {{version}}"
"tabLabels": "Show Tab Labels"
},
"links": {
"website": "Jellyfin Website",
Expand Down
11 changes: 0 additions & 11 deletions screens/__tests__/__snapshots__/SettingsScreen.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -720,17 +720,6 @@ exports[`SettingsScreen should render correctly 1`] = `
>
mock (mock)
</Text>
<Text
style={
Object {
"color": "#43484d",
"fontSize": 15,
}
}
testID="expo-version"
>
Expo Version: mock
</Text>
</View>
</View>
</View>
Expand Down

0 comments on commit dd21cbd

Please sign in to comment.