Skip to content

Commit bc62838

Browse files
authored
Merge pull request #33181 from Expensify/georgia-joinDiscussion
[CP Staging] Fix Sign In Modal Header/"Join the Discussion" Colors
2 parents 990815f + 655c06c commit bc62838

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

src/pages/signin/SignInModal.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
import React from 'react';
22
import HeaderWithBackButton from '@components/HeaderWithBackButton';
33
import ScreenWrapper from '@components/ScreenWrapper';
4-
import useThemeStyles from '@hooks/useThemeStyles';
4+
import useStyleUtils from '@hooks/useStyleUtils';
5+
import useTheme from '@hooks/useTheme';
56
import Navigation from '@libs/Navigation/Navigation';
67
import * as Session from '@userActions/Session';
8+
import SCREENS from '@src/SCREENS';
79
import SignInPage from './SignInPage';
810

911
const propTypes = {};
1012

1113
const defaultProps = {};
1214

1315
function SignInModal() {
14-
const styles = useThemeStyles();
16+
const theme = useTheme();
17+
const StyleUtils = useStyleUtils();
18+
1519
if (!Session.isAnonymousUser()) {
1620
// Sign in in RHP is only for anonymous users
1721
Navigation.isNavigationReady().then(() => {
@@ -20,7 +24,7 @@ function SignInModal() {
2024
}
2125
return (
2226
<ScreenWrapper
23-
style={[styles.highlightBG]}
27+
style={[StyleUtils.getBackgroundColorStyle(theme.PAGE_THEMES[SCREENS.RIGHT_MODAL.SIGN_IN].backgroundColor)]}
2428
includeSafeAreaPaddingBottom={false}
2529
shouldEnableMaxHeight
2630
testID={SignInModal.displayName}

src/styles/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2372,7 +2372,7 @@ const styles = (theme: ThemeColors) =>
23722372
anonymousRoomFooterLogoTaglineText: {
23732373
fontFamily: fontFamily.EXP_NEUE,
23742374
fontSize: variables.fontSizeMedium,
2375-
color: theme.textLight,
2375+
color: theme.text,
23762376
},
23772377
signInButtonAvatar: {
23782378
width: 80,

src/styles/theme/themes/dark.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ const darkTheme = {
130130
backgroundColor: colors.pink800,
131131
statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
132132
},
133+
[SCREENS.RIGHT_MODAL.SIGN_IN]: {
134+
backgroundColor: colors.productDark200,
135+
statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
136+
},
133137
},
134138

135139
statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,

src/styles/theme/themes/light.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ const lightTheme = {
130130
backgroundColor: colors.pink800,
131131
statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
132132
},
133+
[SCREENS.RIGHT_MODAL.SIGN_IN]: {
134+
backgroundColor: colors.productDark200,
135+
statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
136+
},
133137
},
134138

135139
statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,

0 commit comments

Comments
 (0)