Merge pull request #384 from ankit-thanekar007/tma-807-onpress-indicator

[TMA 806] - On Press Tutorial

1 files changed, 14 insertions, 10 deletions

diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index f3e92bd4..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;
-  userName?: string;
+  userFullName?: string;
 }
 
 const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
-  userName,
+  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<UniversityBadge[]>([]);
   const [isLoading, setIsLoading] = useState(true);
@@ -42,8 +46,8 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
   );
 
   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<BadgeDetailModalProps> = ({
 
   const removeBadgeCell = async (badge: string) => {
     setIsLoading(true);
-    await removeBadgesService([badge], userId);
+    await removeBadgesService([badge], user.userId);
     fetchBadges();
   };
 
@@ -146,7 +150,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
   };
 
   const modalHeader = () => {
-    const heading = isEditable ? 'Edit your badges!' : userName;
+    const heading = isEditable ? 'Edit your badges!' : userFullName;
     const subheading = isEditable
       ? 'Add or delete your badges'
       : 'View badges to discover groups!';