From cdc8d483cbe45070a025772852797f07dddbfbcb Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 31 Jul 2024 14:04:22 +0800
Subject: [PATCH 1/2] fix double \ is replaced

---
 src/libs/PolicyUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 6ffc7cfdc0b9..1b7f29a69567 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -293,7 +293,7 @@ function getTagList(policyTagList: OnyxEntry<PolicyTagList>, tagIndex: number):
  * Cleans up escaping of colons (used to create multi-level tags, e.g. "Parent: Child") in the tag name we receive from the backend
  */
 function getCleanedTagName(tag: string) {
-    return tag?.replace(/\\{1,2}:/g, CONST.COLON);
+    return tag?.replace(/\\:/g, CONST.COLON);
 }
 
 /**

From 31fbfbc772c40108aa6c8a5db046a44de7a15db8 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 31 Jul 2024 14:04:43 +0800
Subject: [PATCH 2/2] fix no error when saving same tag name in x:y format

---
 src/pages/workspace/tags/WorkspaceCreateTagPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index 1214507480ae..b79863e32245 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -40,7 +40,7 @@ function CreateTagPage({route, policyTags}: CreateTagPageProps) {
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
-            const tagName = values.tagName.trim();
+            const tagName = PolicyUtils.escapeTagName(values.tagName.trim());
             const {tags} = PolicyUtils.getTagList(policyTags, 0);
 
             if (!ValidationUtils.isRequiredFulfilled(tagName)) {