diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-26 18:32:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 18:32:01 -0400 |
| commit | 27fdbf976907be00afdd10b0e545d0a429e27443 (patch) | |
| tree | a980b8d47d5388e8103aa1cfdce289b5f08ca6f4 /src/components/common | |
| parent | ec04de92a8ab2e0b1c62c29dc8ab27acff18c1a3 (diff) | |
| parent | f7ff39021cb77dbbd5317b573398f7afea43e456 (diff) | |
Merge pull request #390 from shravyaramesh/tma818-badge-bugfix
[TMA-818] Badge bug
Diffstat (limited to 'src/components/common')
| -rw-r--r-- | src/components/common/BadgeDetailView.tsx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx index 9dd64bfa..bc4384e8 100644 --- a/src/components/common/BadgeDetailView.tsx +++ b/src/components/common/BadgeDetailView.tsx @@ -17,7 +17,7 @@ import {BADGE_GRADIENT_FIRST} from '../../constants'; import {BADGE_DATA} from '../../constants/badges'; import {getSuggestedPeopleProfile, removeBadgesService} from '../../services'; import {RootState} from '../../store/rootreducer'; -import {ScreenType, UniversityBadge, UniversityType} from '../../types'; +import {ScreenType, UniversityBadge} from '../../types'; import {getUniversityBadge, normalize} from '../../utils'; interface BadgeDetailModalProps { @@ -35,7 +35,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({ isEditable = true, setBadgeViewVisible, }) => { - const {user} = useSelector((state: RootState) => + const {user, profile} = useSelector((state: RootState) => userXId ? state.userX[screenType][userXId] : state.user, ); const navigation = useNavigation(); @@ -175,7 +175,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({ <View style={styles.modalImageContainerStyles}> <Image style={styles.modalImageStyles} - source={getUniversityBadge(UniversityType.Brown, 'Crest')} + source={getUniversityBadge(profile.university, 'Crest')} /> </View> </View> @@ -285,8 +285,15 @@ const styles = StyleSheet.create({ flex: 1, justifyContent: 'center', alignItems: 'center', + height: 50, + }, + modalImageStyles: { + left: -15, + top: -10, + width: 62, + height: 70, + marginBottom: 10, }, - modalImageStyles: {left: -15, top: -30}, modalListStyles: { alignSelf: 'center', marginVertical: 35, |