Skip to content

Commit

Permalink
feat: light design changes (#273)
Browse files Browse the repository at this point in the history
  • Loading branch information
ice-hades authored Feb 19, 2024
1 parent f9513df commit feeb63e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/components/ListItems/UserListItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {Avatar} from '@components/Avatar/Avatar';
import {stopPropagation} from '@components/KeyboardDismiss';
import {Touchable} from '@components/Touchable';
import {COLORS} from '@constants/colors';
import {isLightDesign} from '@constants/featureFlags';
import {CountryFlagAbbreviation, flags} from '@flags';
import {MainStackParamList} from '@navigation/Main';
import {useNavigation} from '@react-navigation/native';
Expand Down Expand Up @@ -51,7 +52,7 @@ export const UserListItem = memo(
<Touchable
style={styles.touchArea}
onPress={() => navigation.navigate('UserProfile', {userId})}
disabled={disabled}>
disabled={isLightDesign || disabled}>
<View style={styles.imageContainer}>
{user.profilePictureUrl && (
<Avatar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import {Avatar} from '@components/Avatar/Avatar';
import {Touchable} from '@components/Touchable';
import {COLORS} from '@constants/colors';
import {isLightDesign} from '@constants/featureFlags';
import {MainStackParamList} from '@navigation/Main';
import {useNavigation} from '@react-navigation/native';
import {NativeStackNavigationProp} from '@react-navigation/native-stack';
Expand Down Expand Up @@ -34,7 +35,9 @@ export const TeamMember = memo(({userId}: Props) => {
);

return (
<Touchable onPress={() => navigation.navigate('UserProfile', {userId})}>
<Touchable
disabled={isLightDesign}
onPress={() => navigation.navigate('UserProfile', {userId})}>
<View>
<Avatar
uri={profilePictureUrl}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: ice License 1.0

import {Api} from '@api/index';
import {isLightDesign} from '@constants/featureFlags';
import {
isAuthorizedSelector,
userSelector,
Expand All @@ -17,7 +18,7 @@ export function* checkStatusNoticeSaga() {
const isAppActive: ReturnType<typeof isAppActiveSelector> = yield select(
isAppActiveSelector,
);
if (!isAuthorized || !isAppActive) {
if (!isAuthorized || !isAppActive || isLightDesign) {
return null;
}

Expand Down

0 comments on commit feeb63e

Please sign in to comment.