From 86ba18fdc495e0519b91eb9c9f826a6a9ed15e88 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Fri, 23 Apr 2021 15:28:44 -0700 Subject: circle ci errors --- src/components/common/BadgeDetailView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/components/common') diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx index 437b1914..1309fad5 100644 --- a/src/components/common/BadgeDetailView.tsx +++ b/src/components/common/BadgeDetailView.tsx @@ -87,7 +87,7 @@ const BadgeDetailView: React.FC = ({ fetchBadges(); }; - const badgeEditCell = ({item: {id, name, badgeImage}}) => { + const badgeEditCell = ({item: {id, nameLocal, badgeImage}}) => { return ( = ({ setBadgeViewVisible(false); navigation.navigate('MutualBadgeHolders', { badge_id: id, - badge_title: name, + badge_title: nameLocal, badge_img: badgeImage, }); }}> -- cgit v1.2.3-70-g09d2 From 08af552d55c3a2ef2ab3d2456c600981517253b8 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Fri, 23 Apr 2021 15:35:57 -0700 Subject: name issue fixed --- src/components/common/BadgeDetailView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/components/common') diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx index 1309fad5..c6c1619b 100644 --- a/src/components/common/BadgeDetailView.tsx +++ b/src/components/common/BadgeDetailView.tsx @@ -119,14 +119,14 @@ const BadgeDetailView: React.FC = ({ {isEditable && ( { - removeBadgeCell(name); + removeBadgeCell(nameLocal); }}> )} - {name} + {nameLocal} ); -- cgit v1.2.3-70-g09d2 From e676ec0c9124613507b2064cb139522a2568c26e Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Fri, 23 Apr 2021 15:38:50 -0700 Subject: name issue --- src/components/common/BadgeDetailView.tsx | 14 +++++++------- src/components/profile/ProfileHeader.tsx | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/components/common') diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx index c6c1619b..13613287 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; + userFullName?: string; } const BadgeDetailView: React.FC = ({ - name, + userFullName, isEditable = true, setBadgeViewVisible, }) => { @@ -87,7 +87,7 @@ const BadgeDetailView: React.FC = ({ fetchBadges(); }; - const badgeEditCell = ({item: {id, nameLocal, badgeImage}}) => { + const badgeEditCell = ({item: {id, name, badgeImage}}) => { return ( = ({ setBadgeViewVisible(false); navigation.navigate('MutualBadgeHolders', { badge_id: id, - badge_title: nameLocal, + badge_title: name, badge_img: badgeImage, }); }}> @@ -119,14 +119,14 @@ const BadgeDetailView: React.FC = ({ {isEditable && ( { - removeBadgeCell(nameLocal); + removeBadgeCell(name); }}> )} - {nameLocal} + {name} ); @@ -146,7 +146,7 @@ const BadgeDetailView: React.FC = ({ }; const modalHeader = () => { - const heading = isEditable ? 'Edit your badges!' : name; + const heading = isEditable ? 'Edit your badges!' : userFullName; 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 3e83d991..5d5b695e 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -135,7 +135,7 @@ const ProfileHeader: React.FC = ({ {showBadgeView && ( )} -- cgit v1.2.3-70-g09d2 From c43281c29c8454c0e7f43e5a19434a2d9f01ea8b Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Fri, 23 Apr 2021 16:07:17 -0700 Subject: incorrect data issue fixed --- src/components/common/BadgeDetailView.tsx | 18 +++++++++++------- src/components/profile/ProfileHeader.tsx | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/components/common') diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx index 13613287..9dd64bfa 100644 --- a/src/components/common/BadgeDetailView.tsx +++ b/src/components/common/BadgeDetailView.tsx @@ -17,23 +17,27 @@ import {BADGE_GRADIENT_FIRST} from '../../constants'; import {BADGE_DATA} from '../../constants/badges'; import {getSuggestedPeopleProfile, removeBadgesService} from '../../services'; import {RootState} from '../../store/rootreducer'; -import {UniversityBadge, UniversityType} from '../../types'; +import {ScreenType, UniversityBadge, UniversityType} from '../../types'; import {getUniversityBadge, normalize} from '../../utils'; interface BadgeDetailModalProps { + userXId: string | undefined; + screenType: ScreenType; isEditable: boolean; setBadgeViewVisible: Function; userFullName?: string; } const BadgeDetailView: React.FC = ({ + userXId, + screenType, userFullName, isEditable = true, setBadgeViewVisible, }) => { - const { - user: {userId = ''}, - } = useSelector((state: RootState) => state.user); + const {user} = useSelector((state: RootState) => + userXId ? state.userX[screenType][userXId] : state.user, + ); const navigation = useNavigation(); const [selectedBadges, setSelectedBadges] = useState([]); const [isLoading, setIsLoading] = useState(true); @@ -42,8 +46,8 @@ const BadgeDetailView: React.FC = ({ ); const fetchBadges = async () => { - if (userId) { - const response = await getSuggestedPeopleProfile(userId); + if (user.userId) { + const response = await getSuggestedPeopleProfile(user.userId); if (response) { const data = response.badges; let extractedBadgeNames: UniversityBadge[] = []; @@ -83,7 +87,7 @@ const BadgeDetailView: React.FC = ({ const removeBadgeCell = async (badge: string) => { setIsLoading(true); - await removeBadgesService([badge], userId); + await removeBadgesService([badge], user.userId); fetchBadges(); }; diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index e4f864f2..35ec0ea9 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -146,6 +146,8 @@ const ProfileHeader: React.FC = ({ {showBadgeView && (