Merge pull request #47687 from daledah/fix/47301

fix: unexpected behavior of tag selection
Expensify · Aug 22, 2024 · 19ca2bb · 19ca2bb
2 parents 4ad8900 + 5f7cb17
commit 19ca2bb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
@@ -141,10 +141,11 @@ function insertTagIntoTransactionTagsString(transactionTags: string, tag: string
     const tagArray = TransactionUtils.getTagArrayFromName(transactionTags);
     tagArray[tagIndex] = tag;
 
-    return tagArray
-        .map((tagItem) => tagItem.trim())
-        .filter((tagItem) => !!tagItem)
-        .join(CONST.COLON);
+    while (tagArray.length > 0 && !tagArray[tagArray.length - 1]) {
+        tagArray.pop();
+    }
+
+    return tagArray.map((tagItem) => tagItem.trim()).join(CONST.COLON);
 }
 
 function isMovingTransactionFromTrackExpense(action?: IOUAction) {

diff --git a/tests/unit/IOUUtilsTest.ts b/tests/unit/IOUUtilsTest.ts
@@ -114,6 +114,24 @@ describe('IOUUtils', () => {
             expect(IOUUtils.calculateAmount(participantsAccountIDs.length, 100, 'BHD')).toBe(33);
         });
     });
+
+    describe('insertTagIntoTransactionTagsString', () => {
+        test('Inserting a tag into tag string should update the tag', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString(':NY:Texas', 'California', 2)).toBe(':NY:California');
+        });
+
+        test('Inserting a tag into an index with no tags should update the tag', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString('::California', 'NY', 1)).toBe(':NY:California');
+        });
+
+        test('Inserting a tag with colon in name into tag string should keep the colon in tag', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString('East:NY:California', 'City \\: \\:', 1)).toBe('East:City \\: \\::California');
+        });
+
+        test('Remove a tag from tagString', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString('East:City \\: \\::California', '', 1)).toBe('East::California');
+        });
+    });
 });
 
 describe('isValidMoneyRequestType', () => {