Merge pull request #43635 from Krishna2323/krishna2323/issue/42917

fix: Tags - Enable tag option is no longer grayed out after renaming tag offline.
Expensify · Jun 17, 2024 · 73569e7 · 73569e7
2 parents eb59c33 + d58edc3
commit 73569e7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
@@ -195,6 +195,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
                                     ...tagsToUpdate[key],
                                     errors: null,
                                     pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
                                         enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                     },
                                     pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
@@ -220,6 +221,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
                                     ...tagsToUpdate[key],
                                     errors: null,
                                     pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
                                         enabled: null,
                                     },
                                     pendingAction: null,
@@ -245,6 +247,7 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {
                                     ...tagsToUpdate[key],
                                     errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
                                     pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
                                         enabled: null,
                                     },
                                     pendingAction: null,
@@ -395,6 +398,7 @@ function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName:
                                 name: newTagName,
                                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                 pendingFields: {
+                                    ...tag.pendingFields,
                                     name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                 },
                                 previousTagName: oldTagName,
@@ -415,6 +419,7 @@ function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName:
                             [newTagName]: {
                                 pendingAction: null,
                                 pendingFields: {
+                                    ...tag.pendingFields,
                                     name: null,
                                 },
                             },
@@ -435,6 +440,7 @@ function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName:
                                 ...tag,
                                 pendingAction: null,
                                 pendingFields: {
+                                    ...tag.pendingFields,
                                     name: null,
                                 },
                                 errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),