Merge pull request #119 from TEAM-SYLUV/develop

현장 QA 반영
TEAM-SYLUV · Aug 6, 2024 · 4d31ba3 · 4d31ba3
2 parents f871223 + 444524d
commit 4d31ba3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/src/components/Common/Search.js b/src/components/Common/Search.js
@@ -9,18 +9,11 @@ const Search = ({ marketList }) => {
     const [searchInput, setSearchInput] = useState("");
 
     const getHighlightedText = (text, highlight) => {
-        const highlightIndex = Hangul.search(text, highlight);
-        if (highlightIndex === -1) return text;
-
-        const startIndex = highlightIndex;
-        const endIndex = highlightIndex + highlight.length;
-
-        return (
-            <>
-                {text.substring(0, startIndex)}
-                <Highlight>{text.substring(startIndex, endIndex)}</Highlight>
-                {text.substring(endIndex)}
-            </>
+        const regex = new RegExp(`(${highlight})`, "gi");
+        const parts = text.split(regex);
+
+        return parts.map((part, index) =>
+            regex.test(part) ? <Highlight key={index}>{part}</Highlight> : part
         );
     };
 

diff --git a/src/owner/components/OwnerHeader.js b/src/owner/components/OwnerHeader.js
@@ -18,7 +18,7 @@ const OwnerHeader = ({ name, stores }) => {
             {isClicked && (
                 <ButtonModal
                     title="계정 유형 전환"
-                    subText="일반 사용자 계정으로 전환하시겠습니까?"
+                    subText="방문객 계정으로 전환하시겠습니까?"
                     left="이동"
                     right="취소"
                     onLeftClick={() => {

diff --git a/src/pages/MyPage.js b/src/pages/MyPage.js
@@ -94,7 +94,7 @@ const MyPage = () => {
                                         navigate("/owner");
                                     }}
                                 >
-                                    상인 계정 전환
+                                    사장님 계정 전환
                                 </span>
                                 <Line />
                                 <span