diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js index be803e62a98b..cfd0b03ff192 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js @@ -155,8 +155,7 @@ const SettingsModalStackNavigator = createModalStackNavigator({ [SCREENS.SETTINGS.PREFERENCES]: () => require('../../../pages/settings/Preferences/PreferencesPage').default, Settings_Preferences_PriorityMode: () => require('../../../pages/settings/Preferences/PriorityModePage').default, Settings_Preferences_Language: () => require('../../../pages/settings/Preferences/LanguagePage').default, - // Will be uncommented as part of https://github.com/Expensify/App/issues/21670 - // Settings_Preferences_Theme: () => require('../../../pages/settings/Preferences/ThemePage').default, + Settings_Preferences_Theme: () => require('../../../pages/settings/Preferences/ThemePage').default, Settings_Close: () => require('../../../pages/settings/Security/CloseAccountPage').default, [SCREENS.SETTINGS.SECURITY]: () => require('../../../pages/settings/Security/SecuritySettingsPage').default, Settings_About: () => require('../../../pages/settings/AboutPage/AboutPage').default, diff --git a/src/pages/settings/Preferences/PreferencesPage.js b/src/pages/settings/Preferences/PreferencesPage.js index b010c3790056..db0428a2b507 100755 --- a/src/pages/settings/Preferences/PreferencesPage.js +++ b/src/pages/settings/Preferences/PreferencesPage.js @@ -29,11 +29,15 @@ const propTypes = { /** Whether or not the user is subscribed to news updates */ isSubscribedToNewsletter: PropTypes.bool, }), + + /** The app's color theme */ + preferredTheme: PropTypes.string, }; const defaultProps = { priorityMode: CONST.PRIORITY_MODE.DEFAULT, user: {}, + preferredTheme: CONST.DEFAULT_THEME, }; function PreferencesPage(props) { @@ -80,6 +84,12 @@ function PreferencesPage(props) { description={translate('languagePage.language')} onPress={() => Navigation.navigate(ROUTES.SETTINGS_LANGUAGE)} /> + Navigation.navigate(ROUTES.SETTINGS_THEME)} + /> {/* Enable additional test features in non-production environments */} {!isProduction && ( @@ -102,4 +112,7 @@ export default withOnyx({ user: { key: ONYXKEYS.USER, }, + preferredTheme: { + key: ONYXKEYS.PREFERRED_THEME, + }, })(PreferencesPage);