Skip to content

Dev to Main Sync #1395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iamitprakash merged 2 commits into from
Jan 21, 2026
Merged

Dev to Main Sync #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca733ba
hotfix: show task status dropdown to backlog task status (#1391)
MayankBansal12 Jan 21, 2026
91950da
Merge branch 'main' into develop
iamitprakash Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/Unit/Components/Tasks/TaskStatusDropdown.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ describe('TaskStatusDropdown', () => {
const msgTag = screen.queryByTestId('msg');
expect(msgTag).toBeNull();
});
it('should show text Backlog when a task with Backlog status is passed down.', () => {
it.skip('should show text Backlog when a task with Backlog status is passed down.', () => {
const oldProgress = 100;
const oldStatus = BACKEND_TASK_STATUS.BACKLOG;

Expand Down
16 changes: 5 additions & 11 deletions src/components/tasks/TaskStatusDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,11 @@ export function TaskStatusDropdown({
data-testid={isDevMode ? 'task-status-label' : undefined}
>
Status:{' '}
{newStatus === BACKEND_TASK_STATUS.BACKLOG ? (
<span data-testid="task-status-backlog">
{beautifyStatus(newStatus)}
</span>
) : (
<TaskStatusSelect
newStatus={newStatus}
handleChange={handleChange}
taskStatus={taskStatus}
/>
)}
<TaskStatusSelect
newStatus={newStatus}
handleChange={handleChange}
taskStatus={taskStatus}
/>
</label>
<TaskDropDownModel
message={message}
Expand Down