some bugfixes

ramory-l · Jan 4, 2021 · d6dc081 · d6dc081
1 parent 9c7c09e
commit d6dc081
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/frontend/src/components/matchesTable.jsx b/frontend/src/components/matchesTable.jsx
@@ -68,7 +68,7 @@ const MatchesTable = (props) => {
       content: (user) => {
         const tagsStr = user.tags
           .map((tag) => {
-            return `#${tag.tag}`;
+            return `#${tag.name}`;
           })
           .join(", ");
         return <HelpBox textInBox={tagsStr} text={user.tags.length} />;

diff --git a/frontend/src/components/tagsInput.jsx b/frontend/src/components/tagsInput.jsx
@@ -16,20 +16,8 @@ const TagsInput = ({ userId, editMode, isSearchForm }) => {
         ? await getUserTags(getCurrentUser().sub)
         : await getUserTags(userId);
       const { data: suggestions } = await getTopTags();
-      const modifiedTags = tags.map((tagName) => {
-        return {
-          id: tagName.id,
-          name: tagName.tag,
-        };
-      });
-      const modifiedSuggestions = suggestions.map((tagName) => {
-        return {
-          id: tagName.id,
-          name: tagName.tag,
-        };
-      });
-      setTags(modifiedTags);
-      setSuggestions(modifiedSuggestions);
+      setTags(tags);
+      setSuggestions(suggestions);
     };
     fetchTags();
   }, [userId, isSearchForm]);

diff --git a/frontend/src/components/userAvatar.jsx b/frontend/src/components/userAvatar.jsx
@@ -98,7 +98,7 @@ const UserAvatar = (props) => {
             rateUpdateFunction={setRate}
             isBlocked={isBlocked}
           />
-          {isMatch ? (
+          {isMatch && !isBlocked ? (
             <LinkButton
               to={`/messages/${user.username}`}
               className="btn btn-info"
@@ -112,7 +112,7 @@ const UserAvatar = (props) => {
                 unblockUser(user.id);
                 setIsBlocked(false);
               }}
-              className="btn btn-success"
+              className="btn btn-success mt-2"
             >
               Unblock
             </button>