From 1442337e3cd9176c593a7e0b76db0b74beb2394c Mon Sep 17 00:00:00 2001
From: reece00 <37351410+reece00@users.noreply.github.com>
Date: Tue, 12 Dec 2023 02:22:22 +0800
Subject: [PATCH 1/2] The language filtering option of the mask is stored

---
 app/components/mask.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/components/mask.tsx b/app/components/mask.tsx
index 3f616c3ac..479b226ed 100644
--- a/app/components/mask.tsx
+++ b/app/components/mask.tsx
@@ -387,7 +387,16 @@ export function MaskPage() {
   const maskStore = useMaskStore();
   const chatStore = useChatStore();
 
-  const [filterLang, setFilterLang] = useState<Lang>();
+  const [filterLang, setFilterLang] = useState<Lang | undefined>(
+    localStorage.getItem("Mask-language") as Lang | undefined,
+  );
+  useEffect(() => {
+    if (filterLang) {
+      localStorage.setItem("Mask-language", filterLang);
+    } else {
+      localStorage.removeItem("Mask-language");
+    }
+  }, [filterLang]);
 
   const allMasks = maskStore
     .getAll()

From 943a2707d2976bfab8ecd2258bc629396de18775 Mon Sep 17 00:00:00 2001
From: Eric Huang <erich2s0103@gmail.com>
Date: Fri, 15 Dec 2023 09:37:37 +0800
Subject: [PATCH 2/2] fix(chat-item): selected chat-item showing border in
 other pages

---
 app/components/chat-list.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/components/chat-list.tsx b/app/components/chat-list.tsx
index 33967717d..7ef6e7b83 100644
--- a/app/components/chat-list.tsx
+++ b/app/components/chat-list.tsx
@@ -12,7 +12,7 @@ import {
 import { useChatStore } from "../store";
 
 import Locale from "../locales";
-import { Link, useNavigate } from "react-router-dom";
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import { Path } from "../constant";
 import { MaskAvatar } from "./mask";
 import { Mask } from "../store/mask";
@@ -40,12 +40,16 @@ export function ChatItem(props: {
       });
     }
   }, [props.selected]);
+
+  const { pathname: currentPath } = useLocation();
   return (
     <Draggable draggableId={`${props.id}`} index={props.index}>
       {(provided) => (
         <div
           className={`${styles["chat-item"]} ${
-            props.selected && styles["chat-item-selected"]
+            props.selected &&
+            (currentPath === Path.Chat || currentPath === Path.Home) &&
+            styles["chat-item-selected"]
           }`}
           onClick={props.onClick}
           ref={(ele) => {