fix: conflict

ui/src/components/TagSelector/index.tsx

@@ -166,7 +166,13 @@ const TagSelector: FC<IProps> = ({
               variant="outline-secondary"
               size="sm">
               {item.slug_name}
-              <Icon name="x" onClick={() => handleRemove(item)} />
+
+              <Button
+                className="btn-no-border"
+                variant="link"
+                onClick={() => handleRemove(item)}>
+                x
+              </Button>
             </Button>
           );
         })}

ui/src/pages/Admin/Flags/index.tsx

@@ -97,7 +97,9 @@ const Flags: FC = () => {
           <tr>
             <th>{t('flagged')}</th>
             <th style={{ width: '20%' }}>{t('created')}</th>
-            <th style={{ width: '20%' }}>{t('action')}</th>
+            {curFilter !== 'completed' ? (
+              <th style={{ width: '20%' }}>{t('action')}</th>
+            ) : null}
           </tr>
         </thead>
         <tbody className="align-middle">
@@ -140,11 +142,13 @@ const Flags: FC = () => {
                     )}
                   </Stack>
                 </td>
-                <td>
-                  <Button variant="link" onClick={() => handleReview(li)}>
-                    {t('review')}
-                  </Button>
-                </td>
+                {curFilter !== 'completed' ? (
+                  <td>
+                    <Button variant="link" onClick={() => handleReview(li)}>
+                      {t('review')}
+                    </Button>
+                  </td>
+                ) : null}
               </tr>
             );
           })}

ui/src/pages/Questions/Detail/components/Answer/index.tsx

@@ -77,8 +77,8 @@ const Index: FC<Props> = ({
         {data?.adopted === 2 && (
           <Button
             disabled={!isAuthor}
-            variant="success"
-            className="ms-3"
+            variant="outline-success"
+            className="ms-3 active"
             onClick={acceptAnswer}>
             <Icon name="check-circle-fill" className="me-2" />
             <span>{t('answers.btn_accepted')}</span>