Merge branch 'feat/1.0.8/ui' of github.com:answerdev/answer into feat/1.0.8/ui

ui/src/components/Tag/index.tsx

@@ -30,7 +30,9 @@ const Index: FC<IProps> = ({
         data.recommend && 'badge-tag-required',
         className,
       )}>
-      <span className={textClassName}>{data.display_name}</span>
+      <span className={textClassName}>
+        {data.display_name || data.slug_name}
+      </span>
     </Link>
   );
 };

ui/src/pages/Tags/Info/index.tsx

@@ -204,7 +204,8 @@ const TagIntroduction = () => {
                       data={{
                         slug_name: tagName || '',
                         main_tag_slug_name: '',
-                        display_name: '',
+                        display_name:
+                          tagInfo?.display_name || tagInfo?.slug_name || '',
                         recommend: false,
                         reserved: false,
                       }}