Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix undefined color keys #27483

Merged
merged 5 commits into from
Sep 15, 2023
Merged

Fix undefined color keys #27483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c91e1f
use border color instead of old midtone (green700) for future theme s…
grgia Sep 15, 2023
ee0b6fa
use page pattern for status
grgia Sep 15, 2023
6682d2a
error dot should be red
grgia Sep 15, 2023
364b1bb
Remove non-used key
grgia Sep 15, 2023
67913fe
use link color to match text
grgia Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/FormHelpMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function FormHelpMessage(props) {
{props.isError && (
<Icon
src={Expensicons.DotIndicator}
fill={themeColors.success}
fill={themeColors.danger}
/>
)}
<View style={[styles.flex1, props.isError && styles.ml2]}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/TabSelector/TabSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ const getBackgroundColor = (position, routesLength, tabIndex) => {

return position.interpolate({
inputRange,
outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.midtone : themeColors.appBG)),
outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.border : themeColors.appBG)),
});
}
return themeColors.midtone;
return themeColors.border;
};

function TabSelector({state, navigation, onTabPress, position}) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ReimbursementAccount/BankAccountStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ function BankAccountStep(props) {
<View style={[styles.ml1]}>
<Icon
src={Expensicons.Lock}
fill={themeColors.BRAND_COLORS.blue400}
fill={themeColors.link}
/>
</View>
</PressableWithoutFeedback>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/settings/Profile/CustomStatus/StatusPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
<StaticHeaderPageLayout
title={localize.translate('statusPage.status')}
onBackButtonPress={navigateBackToSettingsPage}
backgroundColor={themeColors.midtone}
backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[ROUTES.SETTINGS_STATUS]}
image={MobileBackgroundImage}
footer={footerComponent}
>
Expand Down
1 change: 1 addition & 0 deletions src/styles/themes/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ darkTheme.PAGE_BACKGROUND_COLORS = {
[SCREENS.HOME]: darkTheme.sidebar,
[SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
[SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
[ROUTES.SETTINGS_STATUS]: colors.green700,
[ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
[ROUTES.SETTINGS_SECURITY]: colors.ice500,
};
Expand Down
1 change: 1 addition & 0 deletions src/styles/themes/light.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ lightTheme.PAGE_BACKGROUND_COLORS = {
[SCREENS.HOME]: lightTheme.sidebar,
[SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
[SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
[ROUTES.SETTINGS_STATUS]: colors.green700,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heads-up, the keys here need to be screen names, not routes. I will fix this in #27482

Copy link
Contributor Author

@grgia grgia Sep 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I was following the pattern with the other routes, so I left a review about adding documentation for this pattern

[ROUTES.I_KNOW_A_TEACHER]: colors.tangerine800,
[ROUTES.SETTINGS_SECURITY]: colors.ice500,
};
Expand Down