aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Chen <ivan@tagg.id>2021-04-23 18:12:00 -0400
committerIvan Chen <ivan@tagg.id>2021-04-23 18:12:00 -0400
commit7d2414c756a2edb9393161d439ce2deb3e96b5c4 (patch)
tree4185c2c33bc2c76b2e6440750dd731eff3ef0ed4
parent6f65b7f194073222640d26d1582be69349f1c340 (diff)
better fix
-rw-r--r--src/components/common/BadgeDetailView.tsx14
-rw-r--r--src/components/profile/ProfileHeader.tsx2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index 2c9678b4..f3e92bd4 100644
--- a/src/components/common/BadgeDetailView.tsx
+++ b/src/components/common/BadgeDetailView.tsx
@@ -23,11 +23,11 @@ import {getUniversityBadge, normalize} from '../../utils';
interface BadgeDetailModalProps {
isEditable: boolean;
setBadgeViewVisible: Function;
- name?: string;
+ userName?: string;
}
const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
- name,
+ userName,
isEditable = true,
setBadgeViewVisible,
}) => {
@@ -87,7 +87,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
fetchBadges();
};
- const badgeEditCell = ({item: {id, name: badgeName, badgeImage}}) => {
+ const badgeEditCell = ({item: {id, name, badgeImage}}) => {
return (
<TouchableOpacity
style={styles.badgeCellContainerStyles}
@@ -95,7 +95,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
setBadgeViewVisible(false);
navigation.navigate('MutualBadgeHolders', {
badge_id: id,
- badge_title: badgeName,
+ badge_title: name,
badge_img: badgeImage,
});
}}>
@@ -119,14 +119,14 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
{isEditable && (
<TouchableOpacity
onPress={() => {
- removeBadgeCell(badgeName);
+ removeBadgeCell(name);
}}>
<CloseIcon height={25} width={25} color="gray" />
</TouchableOpacity>
)}
</View>
<View style={styles.userNameContainerStyles}>
- <Text style={styles.badgeCellTextStyles}>{badgeName}</Text>
+ <Text style={styles.badgeCellTextStyles}>{name}</Text>
</View>
</TouchableOpacity>
);
@@ -146,7 +146,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
};
const modalHeader = () => {
- const heading = isEditable ? 'Edit your badges!' : name;
+ const heading = isEditable ? 'Edit your badges!' : userName;
const subheading = isEditable
? 'Add or delete your badges'
: 'View badges to discover groups!';
diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx
index 494b33bd..9e11b8d5 100644
--- a/src/components/profile/ProfileHeader.tsx
+++ b/src/components/profile/ProfileHeader.tsx
@@ -82,7 +82,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
{showBadgeView && (
<BadgeDetailView
isEditable={userXName === username}
- name={name}
+ userName={name}
setBadgeViewVisible={setBadgeViewVisible}
/>
)}